@middy/core 7.1.2 → 7.1.3

package/README.md

@@ -42,7 +42,7 @@ npm install --save @middy/core
 
 ## Documentation and examples
 
-For documentation and examples, refers to the main [Middy monorepo on GitHub](https://github.com/middyjs/middy) or [Middy official website](https://middy.js.org).
+For documentation and examples, refer to the main [Middy monorepo on GitHub](https://github.com/middyjs/middy) or [Middy official website](https://middy.js.org).
 
 
 ## Contributing

package/executionModeDurableContext.js

@@ -13,7 +13,7 @@ export const executionModeDurableContext = (
 ) => {
 	const middy = withDurableExecution(async (event, context) => {
 		const request = middyRequest(event, context);
-		plugin.requestStart?.(request);
+		plugin.requestStart(request);
 
 		// normalize context with executionModeStandard
 		// https://docs.aws.amazon.com/lambda/latest/dg/typescript-context.html
@@ -33,7 +33,7 @@ export const executionModeDurableContext = (
 			onErrorMiddlewares,
 			plugin,
 		);
-		await plugin.requestEnd?.(request);
+		await plugin.requestEnd(request);
 		return response;
 	});
 	middy.handler = (replaceLambdaHandler) => {
@@ -44,7 +44,7 @@ export const executionModeDurableContext = (
 };
 
 const copyKeys = (to, from, keys) => {
-	keys.forEach((key) => {
-		to[key] = from[key];
-	});
+	for (let i = 0, len = keys.length; i < len; i++) {
+		to[keys[i]] = from[keys[i]];
+	}
 };

package/executionModeStandard.js

@@ -10,7 +10,7 @@ export const executionModeStandard = (
 ) => {
 	const middy = async (event, context) => {
 		const request = middyRequest(event, context);
-		plugin.requestStart?.(request);
+		plugin.requestStart(request);
 
 		const response = await runRequest(
 			request,
@@ -20,7 +20,7 @@ export const executionModeStandard = (
 			onErrorMiddlewares,
 			plugin,
 		);
-		await plugin.requestEnd?.(request);
+		await plugin.requestEnd(request);
 		return response;
 	};
 	middy.handler = (replaceLambdaHandler) => {

package/executionModeStreamifyResponse.js

@@ -16,7 +16,7 @@ export const executionModeStreamifyResponse = (
 	const middy = awslambda.streamifyResponse(
 		async (event, lambdaResponseStream, context) => {
 			const request = middyRequest(event, context);
-			plugin.requestStart?.(request);
+			plugin.requestStart(request);
 			const handlerResponse = await runRequest(
 				request,
 				beforeMiddlewares,
@@ -55,7 +55,7 @@ export const executionModeStreamifyResponse = (
 			}
 
 			await pipeline(handlerStream, responseStream);
-			await plugin.requestEnd?.(request);
+			await plugin.requestEnd(request);
 		},
 	);
 

package/index.d.ts

@@ -17,7 +17,7 @@ export declare const executionModeDurableContext: PluginExecutionMode;
 export declare const executionModeStreamifyResponse: PluginExecutionMode;
 
 interface PluginObject {
-	internal?: any;
+	internal?: Record<string, unknown>;
 	beforePrefetch?: PluginHook;
 	requestStart?: PluginHook;
 	beforeMiddleware?: PluginHookWithMiddlewareName;
@@ -31,7 +31,7 @@ interface PluginObject {
 }
 
 export interface Request<
-	TEvent = any,
+	TEvent = unknown,
 	TResult = any,
 	TErr = Error,
 	TContext extends LambdaContext | LambdaContextDurable = LambdaContext,
@@ -39,14 +39,14 @@ export interface Request<
 > {
 	event: TEvent;
 	context: TContext;
-	response: TResult | null;
+	response: TResult | undefined;
 	earlyResponse?: TResult | null | undefined;
-	error: TErr | null;
+	error: TErr | undefined;
 	internal: TInternal;
 }
 
 declare type MiddlewareFn<
-	TEvent = any,
+	TEvent = unknown,
 	TResult = any,
 	TErr = Error,
 	TContext extends LambdaContext | LambdaContextDurable = LambdaContext,
@@ -91,7 +91,7 @@ type MiddyInputPromiseHandler<
 > = (event: TEvent, context: TContext) => Promise<TResult>;
 
 export interface MiddyfiedHandler<
-	TEvent = any,
+	TEvent = unknown,
 	TResult = any,
 	TErr = Error,
 	TContext extends LambdaContext | LambdaContextDurable = LambdaContext,
@@ -122,7 +122,7 @@ export interface MiddyfiedHandler<
 }
 
 declare type AttachMiddlewareFn<
-	TEvent = any,
+	TEvent = unknown,
 	TResult = any,
 	TErr = Error,
 	TContext extends LambdaContext | LambdaContextDurable = LambdaContext,
@@ -132,7 +132,7 @@ declare type AttachMiddlewareFn<
 ) => MiddyfiedHandler<TEvent, TResult, TErr, TContext, TInternal>;
 
 declare type AttachMiddlewareObj<
-	TEvent = any,
+	TEvent = unknown,
 	TResult = any,
 	TErr = Error,
 	TContext extends LambdaContext | LambdaContextDurable = LambdaContext,
@@ -142,7 +142,7 @@ declare type AttachMiddlewareObj<
 ) => MiddyfiedHandler<TEvent, TResult, TErr, TContext, TInternal>;
 
 declare type UseFn<
-	TEvent = any,
+	TEvent = unknown,
 	TResult = any,
 	TErr = Error,
 	TContext extends LambdaContext | LambdaContextDurable = LambdaContext,
@@ -187,7 +187,7 @@ declare type MiddlewareHandler<
 	THandler extends LambdaHandler<any, any>,
 	TContext extends LambdaContext | LambdaContextDurable = LambdaContext,
 	TResult = any,
-	TEvent = any,
+	TEvent = unknown,
 > =
 	THandler extends LambdaHandler<TEvent, TResult> // always true
 		? MiddyInputHandler<TEvent, TResult, TContext>

package/index.js

@@ -4,6 +4,7 @@ import { setTimeout } from "node:timers";
 import { executionModeStandard } from "./executionModeStandard.js";
 
 const defaultLambdaHandler = () => {};
+const noop = () => {};
 const defaultPluginConfig = {
 	timeoutEarlyInMillis: 5,
 	timeoutEarlyResponse: () => {
@@ -29,6 +30,14 @@ export const middy = (setupLambdaHandler, pluginConfig) => {
 	}
 	plugin.timeoutEarly = plugin.timeoutEarlyInMillis > 0;
 
+	// Pre-compute single-call plugin hooks as noop to avoid optional chaining
+	// Note: beforeMiddleware/afterMiddleware kept as optional chaining in runMiddlewares
+	// because V8 optimizes ?.() null-checks faster than noop calls in tight loops
+	plugin.requestStart ??= noop;
+	plugin.requestEnd ??= noop;
+	plugin.beforeHandler ??= noop;
+	plugin.afterHandler ??= noop;
+
 	plugin.beforePrefetch?.();
 	const beforeMiddlewares = [];
 	const afterMiddlewares = [];
@@ -95,6 +104,7 @@ export const middy = (setupLambdaHandler, pluginConfig) => {
 
 // shared AbortController, because it's slow
 let handlerAbort = new AbortController();
+let abortOpts = { signal: handlerAbort.signal };
 const runRequest = async (
 	request,
 	beforeMiddlewares,
@@ -114,23 +124,24 @@ const runRequest = async (
 		await runMiddlewares(request, beforeMiddlewares, plugin);
 
 		// Check if before stack hasn't exit early
-		if (!Object.hasOwn(request, "earlyResponse")) {
-			plugin.beforeHandler?.();
+		if (!("earlyResponse" in request)) {
+			plugin.beforeHandler();
 
 			// Can't manually abort and timeout with same AbortSignal
 			// https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/timeout_static
 			if (handlerAbort.signal.aborted) {
 				handlerAbort = new AbortController();
+				abortOpts = { signal: handlerAbort.signal };
 			}
-			const promises = [
-				lambdaHandler(request.event, request.context, {
-					signal: handlerAbort.signal,
-				}),
-			];
 
 			// clearTimeout pattern is 10x faster than using AbortController
 			// Note: signal.abort is slow ~6_000ns
 			// Required --test-force-exit to ignore unresolved timeoutPromise
+			const handlerResult = lambdaHandler(
+				request.event,
+				request.context,
+				abortOpts,
+			);
 			if (timeoutEarly) {
 				let timeoutResolve;
 				const timeoutPromise = new Promise((resolve, reject) => {
@@ -138,8 +149,8 @@ const runRequest = async (
 						handlerAbort.abort();
 						try {
 							resolve(plugin.timeoutEarlyResponse());
-						} catch (e) {
-							reject(e);
+						} catch (err) {
+							reject(err);
 						}
 					};
 				});
@@ -147,18 +158,19 @@ const runRequest = async (
 					timeoutResolve,
 					getRemainingTimeInMillis() - plugin.timeoutEarlyInMillis,
 				);
-				promises.push(timeoutPromise);
+				request.response = await Promise.race([handlerResult, timeoutPromise]);
+			} else {
+				request.response = await handlerResult;
 			}
-			request.response = await Promise.race(promises);
 
 			if (timeoutID) {
 				clearTimeout(timeoutID);
 			}
 
-			plugin.afterHandler?.();
+			plugin.afterHandler();
 			await runMiddlewares(request, afterMiddlewares, plugin);
 		}
-	} catch (e) {
+	} catch (err) {
 		// timeout should be aborted when errors happen in handler
 		if (timeoutID) {
 			clearTimeout(timeoutID);
@@ -166,13 +178,13 @@ const runRequest = async (
 
 		// Reset response changes made by after stack before error thrown
 		request.response = undefined;
-		request.error = e;
+		request.error = err;
 		try {
 			await runMiddlewares(request, onErrorMiddlewares, plugin);
-		} catch (e) {
+		} catch (err) {
 			// Save error that wasn't handled
-			e.originalError = request.error;
-			request.error = e;
+			err.originalError = request.error;
+			request.error = err;
 
 			throw request.error;
 		}
@@ -183,17 +195,17 @@ const runRequest = async (
 	return request.response;
 };
 
-const runMiddlewares = async (request, middlewares, pluginConfig) => {
+const runMiddlewares = async (request, middlewares, plugin) => {
 	for (const nextMiddleware of middlewares) {
-		pluginConfig.beforeMiddleware?.(nextMiddleware.name);
+		plugin.beforeMiddleware?.(nextMiddleware.name);
 		const res = await nextMiddleware(request);
-		pluginConfig.afterMiddleware?.(nextMiddleware.name);
+		plugin.afterMiddleware?.(nextMiddleware.name);
 		// short circuit chaining and respond early
 		if (typeof res !== "undefined") {
 			request.earlyResponse = res;
 		}
 		// earlyResponse pattern added in 6.0.0 to handle undefined values
-		if (Object.hasOwn(request, "earlyResponse")) {
+		if ("earlyResponse" in request) {
 			request.response = request.earlyResponse;
 			return;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@middy/core",
-	"version": "7.1.2",
+	"version": "7.1.3",
 	"description": "🛵 The stylish Node.js middleware engine for AWS Lambda (core package)",
 	"type": "module",
 	"engines": {
@@ -96,6 +96,9 @@
 		"type": "github",
 		"url": "https://github.com/sponsors/willfarrell"
 	},
+	"dependencies": {
+		"@middy/util": "7.1.3"
+	},
 	"peerDependencies": {
 		"@aws/durable-execution-sdk-js": "^1.0.0"
 	},
@@ -110,6 +113,5 @@
 		"@datastream/core": "0.0.42",
 		"@types/aws-lambda": "^8.0.0",
 		"@types/node": "^22.0.0"
-	},
-	"gitHead": "7a6c0fbb8ab71d6a2171e678697de9f237568431"
+	}
 }