Merge branch 'main' into docs/split-router

Author: sdangol

.github/workflows/bootstrap_region.yml

@@ -91,7 +91,7 @@ jobs:
           mask-aws-account-id: true
       - id: go-setup
         name: Setup Go
-        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version: '>=1.23.0'
       - id: go-env

.github/workflows/layer_balance.yml

@@ -52,7 +52,7 @@ jobs:
           mask-aws-account-id: true
       - id: go-setup
         name: Setup Go
-        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version: '>=1.23.0'
       - id: go-env

examples/snippets/package.json

@@ -40,7 +40,7 @@
     "@aws-sdk/client-ssm": "^3.932.0",
     "@aws-sdk/util-dynamodb": "^3.932.0",
     "@middy/core": "^4.7.0",
-    "@redis/client": "^5.9.0",
+    "@redis/client": "^5.10.0",
     "@valkey/valkey-glide": "^2.1.2",
     "aws-sdk": "^2.1692.0",
     "aws-sdk-client-mock": "^4.1.0",

package-lock.json

@@ -53,9 +53,9 @@
     "@biomejs/biome": "^2.3.5",
     "@types/aws-lambda": "^8.10.159",
     "@types/node": "^24.10.1",
-    "@vitest/coverage-v8": "^4.0.10",
+    "@vitest/coverage-v8": "^4.0.12",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.5",
+    "lint-staged": "^16.2.7",
     "markdownlint-cli2": "^0.19.0",
     "middy5": "npm:@middy/core@^5.4.3",
     "middy6": "npm:@middy/core@^6.0.0",

package.json

@@ -308,19 +308,11 @@ class Router {
       ]);
 
       requestContext.params = route?.params ?? {};
-      const middlewareResult = await middleware({
+      await middleware({
         reqCtx: requestContext,
         next: () => Promise.resolve(),
       });
 
-      // middleware result takes precedence to allow short-circuiting
-      if (middlewareResult !== undefined) {
-        requestContext.res = handlerResultToWebResponse(middlewareResult, {
-          statusCode: getStatusCode(middlewareResult),
-          resHeaders: requestContext.res.headers,
-        });
-      }
-
       return requestContext;
     } catch (error) {
       this.logger.debug(`There was an error processing the request: ${error}`);

packages/event-handler/src/rest/Router.ts

@@ -33,6 +33,7 @@ import {
   SAFE_CHARS,
   UNSAFE_CHARS,
 } from './constants.js';
+import { handlerResultToWebResponse } from './converters.js';
 
 export function getPathString(path: Path): string {
   return isString(path) ? path : path.source.replaceAll(/\\\//g, '/');
@@ -230,6 +231,11 @@ export const isExtendedAPIGatewayProxyResult = (
  * follows the onion model where middleware executes in order before `next()` and in
  * reverse order after `next()`.
  *
+ * When a middleware returns a value(short-circuits), that result becomes the response
+ * and the `res` object in the `RequestContext` is mutated with that result converted
+ * to a Web Response preserving any existing headers while applying the status code
+ * from the middleware result.
+ *
  * @param middleware - Array of middleware functions to compose
  * @returns A single middleware function that executes all provided middleware in sequence
  *
@@ -294,8 +300,13 @@ export const composeMiddleware = (middleware: Middleware[]): Middleware => {
         );
       }
 
+      // middleware result takes precedence to allow short-circuiting
       if (middlewareResult !== undefined) {
         result = middlewareResult;
+        reqCtx.res = handlerResultToWebResponse(middlewareResult, {
+          statusCode: getStatusCode(middlewareResult),
+          resHeaders: reqCtx.res.headers,
+        });
       }
     };
 

packages/event-handler/src/rest/utils.ts

@@ -777,5 +777,33 @@ describe('Class: Router - Middleware', () => {
       expect(result.statusCode).toBe(403);
       expect(result.body).toBe('Route middleware response');
     });
+
+    it('allows post processing middleware to access the response returned early by a pre-processing middleware', async () => {
+      // Prepare
+      const app = new Router();
+      let message = '';
+      app.get(
+        '/test',
+        [
+          async ({ reqCtx, next }) => {
+            await next();
+            const clonedRes = reqCtx.res.clone();
+            message = (await clonedRes.json()).message;
+          },
+          () => {
+            return Promise.resolve({ message: 'Middleware applied' });
+          },
+        ],
+        () => {
+          return { message: 'Handler applied' };
+        }
+      );
+
+      // Act
+      await app.resolve(createTestEvent('/test', 'GET'), context);
+
+      // Assess
+      expect(message).toEqual('Middleware applied');
+    });
   });
 });