Responding with 405: draft implementation.

RobinTail · Jan 31, 2025 · cea730f · cea730f
1 parent e1bb762
commit cea730f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 8 deletions.
diff --git a/src/result-handler.ts b/src/result-handler.ts
@@ -116,10 +116,13 @@ export const defaultResultHandler = new ResultHandler({
     if (error) {
       const httpError = ensureHttpError(error);
       logServerError(httpError, logger, request, input);
-      return void response.status(httpError.statusCode).json({
-        status: "error",
-        error: { message: getPublicErrorMessage(httpError) },
-      });
+      return void response
+        .status(httpError.statusCode)
+        .setHeaders(new Map(Object.entries(httpError.headers || {})))
+        .json({
+          status: "error",
+          error: { message: getPublicErrorMessage(httpError) },
+        });
     }
     response
       .status(defaultStatusCodes.positive)

diff --git a/src/server-helpers.ts b/src/server-helpers.ts
@@ -47,10 +47,32 @@ export const createParserFailureHandler =
 export const createNotFoundHandler =
   ({ errorHandler, getLogger }: HandlerCreatorParams): RequestHandler =>
   async (request, response) => {
-    const error = createHttpError(
-      404,
-      `Can not ${request.method} ${request.path}`,
-    );
+    const supportedMethods = request.app.router.stack
+      .map(({ route, ...rest }) =>
+        route && "matchers" in rest && Array.isArray(rest.matchers)
+          ? { route, matchers: rest.matchers }
+          : undefined,
+      )
+      .filter((entry) =>
+        entry?.matchers?.some(
+          (fn) => typeof fn === "function" && fn(request.path),
+        ),
+      )
+      .flatMap((entry) =>
+        entry?.route &&
+        "methods" in entry.route &&
+        typeof entry.route.methods === "object" &&
+        entry.route.methods !== null
+          ? Object.keys(entry.route.methods).map((method) =>
+              method.toUpperCase(),
+            )
+          : [],
+      );
+    const error = supportedMethods.length
+      ? createHttpError(405, `${request.method} is not allowed`, {
+          headers: { Allowed: supportedMethods.join(", ") },
+        })
+      : createHttpError(404, `Can not ${request.method} ${request.path}`);
     const logger = getLogger(request);
     try {
       errorHandler.execute({

diff --git a/src/server.ts b/src/server.ts
@@ -93,6 +93,8 @@ export const createServer = async (config: ServerConfig, routing: Routing) => {
   initRouting({ app, routing, getLogger, config, parsers });
   app.use(parserFailureHandler, notFoundHandler);
 
+  logger.info("stack", app.router.stack);
+
   const created: Array<http.Server | https.Server> = [];
   const makeStarter =
     (server: (typeof created)[number], subject: HttpConfig["listen"]) => () =>