@middy/core 7.2.2 → 7.3.0

package/executionModeDurableContext.js

@@ -25,15 +25,31 @@ export const executionModeDurableContext = (
 		);
 		copyKeys(request.context, request.context.lambdaContext, lambdaContextKeys);
 
-		const response = await runRequest(
-			request,
-			beforeMiddlewares,
-			lambdaHandler,
-			afterMiddlewares,
-			onErrorMiddlewares,
-			plugin,
-		);
-		await plugin.requestEnd(request);
+		// See executionModeStandard for the .cause-chaining rationale.
+		let handlerError;
+		let response;
+		try {
+			response = await runRequest(
+				request,
+				beforeMiddlewares,
+				lambdaHandler,
+				afterMiddlewares,
+				onErrorMiddlewares,
+				plugin,
+			);
+		} catch (err) {
+			handlerError = err;
+		}
+		try {
+			await plugin.requestEnd(request);
+		} catch (hookErr) {
+			if (handlerError) {
+				handlerError.cause ??= hookErr;
+			} else {
+				throw hookErr;
+			}
+		}
+		if (handlerError) throw handlerError;
 		return response;
 	});
 	middy.handler = (replaceLambdaHandler) => {

package/executionModeStandard.js

@@ -11,16 +11,34 @@ export const executionModeStandard = (
 	const middy = async (event, context) => {
 		const request = middyRequest(event, context);
 		plugin.requestStart(request);
-
-		const response = await runRequest(
-			request,
-			beforeMiddlewares,
-			lambdaHandler,
-			afterMiddlewares,
-			onErrorMiddlewares,
-			plugin,
-		);
-		await plugin.requestEnd(request);
+		// Run requestEnd without letting a throw in the hook replace the
+		// handler's original error. If only requestEnd throws, it propagates
+		// (same as a naive finally). If both throw, the hook error is attached
+		// as `.cause` on the handler error (only if no cause is already set).
+		let handlerError;
+		let response;
+		try {
+			response = await runRequest(
+				request,
+				beforeMiddlewares,
+				lambdaHandler,
+				afterMiddlewares,
+				onErrorMiddlewares,
+				plugin,
+			);
+		} catch (err) {
+			handlerError = err;
+		}
+		try {
+			await plugin.requestEnd(request);
+		} catch (hookErr) {
+			if (handlerError) {
+				handlerError.cause ??= hookErr;
+			} else {
+				throw hookErr;
+			}
+		}
+		if (handlerError) throw handlerError;
 		return response;
 	};
 	middy.handler = (replaceLambdaHandler) => {

package/executionModeStreamifyResponse.js

@@ -54,8 +54,23 @@ export const executionModeStreamifyResponse = (
 				});
 			}
 
-			await pipeline(handlerStream, responseStream);
-			await plugin.requestEnd(request);
+			// See executionModeStandard for the .cause-chaining rationale.
+			let handlerError;
+			try {
+				await pipeline(handlerStream, responseStream);
+			} catch (err) {
+				handlerError = err;
+			}
+			try {
+				await plugin.requestEnd(request);
+			} catch (hookErr) {
+				if (handlerError) {
+					handlerError.cause ??= hookErr;
+				} else {
+					throw hookErr;
+				}
+			}
+			if (handlerError) throw handlerError;
 		},
 	);
 

package/index.d.ts

@@ -229,4 +229,8 @@ declare namespace middy {
 	};
 }
 
+export declare function middyValidateOptions(
+	options?: Record<string, unknown>,
+): void;
+
 export default middy;

package/index.js

@@ -1,6 +1,7 @@
 // Copyright 2017 - 2026 will Farrell, Luciano Mammino, and Middy contributors.
 // SPDX-License-Identifier: MIT
 import { setTimeout } from "node:timers";
+import { validateOptions } from "@middy/util";
 import { executionModeStandard } from "./executionModeStandard.js";
 
 const defaultLambdaHandler = () => {};
@@ -17,6 +18,23 @@ const defaultPluginConfig = {
 	executionMode: executionModeStandard,
 };
 
+const optionSchema = {
+	internal: "object?",
+	beforePrefetch: "function?",
+	requestStart: "function?",
+	beforeMiddleware: "function?",
+	afterMiddleware: "function?",
+	beforeHandler: "function?",
+	timeoutEarlyInMillis: "number?",
+	timeoutEarlyResponse: "function?",
+	afterHandler: "function?",
+	requestEnd: "function?",
+	executionMode: "function?",
+};
+
+export const middyValidateOptions = (options) =>
+	validateOptions("@middy/core", optionSchema, options);
+
 export const middy = (setupLambdaHandler, pluginConfig) => {
 	let lambdaHandler;
 	let plugin;
@@ -183,7 +201,8 @@ const runRequest = async (
 			await runMiddlewares(request, onErrorMiddlewares, plugin);
 		} catch (err) {
 			// Save error that wasn't handled
-			err.originalError = request.error;
+			err.originalError = request.error; // TODO remove in v8, use cause
+			err.cause ??= request.error;
 			request.error = err;
 
 			throw request.error;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@middy/core",
-	"version": "7.2.2",
+	"version": "7.3.0",
 	"description": "🛵 The stylish Node.js middleware engine for AWS Lambda (core package)",
 	"type": "module",
 	"engines": {
@@ -17,36 +17,24 @@
 			"import": {
 				"types": "./index.d.ts",
 				"default": "./index.js"
-			},
-			"require": {
-				"default": "./index.js"
 			}
 		},
 		"./Standard": {
 			"import": {
 				"types": "./executionModeStandard.d.ts",
 				"default": "./executionModeStandard.js"
-			},
-			"require": {
-				"default": "./executionModeStandard.js"
 			}
 		},
 		"./DurableContext": {
 			"import": {
 				"types": "./executionModeDurableContext.d.ts",
 				"default": "./executionModeDurableContext.js"
-			},
-			"require": {
-				"default": "./executionModeDurableContext.js"
 			}
 		},
 		"./StreamifyResponse": {
 			"import": {
 				"types": "./executionModeStreamifyResponse.d.ts",
 				"default": "./executionModeStreamifyResponse.js"
-			},
-			"require": {
-				"default": "./executionModeStreamifyResponse.js"
 			}
 		}
 	},
@@ -97,7 +85,7 @@
 		"url": "https://github.com/sponsors/willfarrell"
 	},
 	"dependencies": {
-		"@middy/util": "7.2.2"
+		"@middy/util": "7.3.0"
 	},
 	"peerDependencies": {
 		"@aws/durable-execution-sdk-js": "^1.0.0"
@@ -110,7 +98,7 @@
 	"devDependencies": {
 		"@aws/durable-execution-sdk-js": "^1.0.0",
 		"@aws/durable-execution-sdk-js-testing": "^1.0.0",
-		"@datastream/core": "0.1.6",
+		"@datastream/core": "0.3.2",
 		"@types/aws-lambda": "^8.0.0",
 		"@types/node": "^22.0.0"
 	}