fix: use UnrecognizedError

packages/homeserver/src/app.ts

@@ -1,7 +1,7 @@
 import { logger } from "@bogeychan/elysia-logger";
 import { Elysia } from "elysia";
 
-import { BadJSONError, MatrixError } from "./errors";
+import { BadJSONError, MatrixError, UnrecognizedError } from "./errors";
 import federationEndpoints from "./routes/federation";
 import { keyV2Endpoints } from "./routes/key/server";
 import type { ElysiaRoutes } from "./extractRouteTypings";
@@ -24,6 +24,12 @@ export const app = new Elysia({
 			set.status = newError.status;
 			return newError.toJSON();
 		}
+
+		if (code === "NOT_FOUND") {
+			const newError = UnrecognizedError.notImplemented("Unrecognized request");
+			set.status = newError.status;
+			return newError.toJSON();
+		}
 	})
 	.use(
 		logger({
@@ -32,14 +38,6 @@ export const app = new Elysia({
 	)
 	.use(keyV2Endpoints)
 	.use(federationEndpoints)
-	.use(wellKnownEndpoint)
-	.onError(async ({ code }) => {
-		if (code === "NOT_FOUND") {
-			return {
-				errcode: "M_UNRECOGNIZED",
-				error: "Unrecognized request",
-			};
-		}
-	});
+	.use(wellKnownEndpoint);
 
 export type HomeServerRoutes = ElysiaRoutes<typeof app>;

packages/homeserver/src/errors.ts

@@ -97,9 +97,20 @@ export class LimitExceededError extends MatrixError<"M_LIMIT_EXCEEDED"> {
  * This is expected to be returned with a 404 HTTP status code if the endpoint is not implemented or a 405 HTTP status code if the endpoint is implemented, but the incorrect HTTP method is used.
  */
 export class UnrecognizedError extends MatrixError<"M_UNRECOGNIZED"> {
-	public constructor(message: string) {
+	private constructor(
+		message: string,
+		public readonly status: number,
+	) {
 		super("M_UNRECOGNIZED", message);
 	}
+
+	public static notImplemented(message: string) {
+		return new UnrecognizedError(message, 404);
+	}
+
+	public static methodNotAllowed(message: string) {
+		return new UnrecognizedError(message, 405);
+	}
 }
 
 /** An unknown error has occurred. */