@middy/input-output-logger 7.0.0-alpha.2 → 7.0.0

package/index.d.ts

@@ -2,7 +2,8 @@ import type middy from "@middy/core";
 
 interface Options {
 	logger?: (message: any) => void;
-	awsContext?: boolean;
+	executionContext?: boolean;
+	lambdaContext?: boolean;
 	omitPaths?: string[];
 	mask?: string;
 }

package/index.js

@@ -1,17 +1,23 @@
 import { Transform } from "node:stream";
 import { TransformStream } from "node:stream/web";
+import {
+	executionContextKeys,
+	isExecutionModeDurable,
+	lambdaContextKeys,
+} from "@middy/util";
 
 const defaults = {
 	logger: (message) => {
 		console.log(JSON.stringify(message));
 	},
-	awsContext: false,
+	executionContext: false,
+	lambdaContext: false,
 	omitPaths: [],
 	mask: undefined,
 };
 
 const inputOutputLoggerMiddleware = (opts = {}) => {
-	const { logger, awsContext, omitPaths, mask } = {
+	const { logger, executionContext, lambdaContext, omitPaths, mask } = {
 		...defaults,
 		...opts,
 	};
@@ -29,8 +35,27 @@ const inputOutputLoggerMiddleware = (opts = {}) => {
 	const omitAndLog = (param, request) => {
 		const message = { [param]: request[param] };
 
-		if (awsContext) {
-			message.context = pick(request.context, awsContextKeys);
+		if (executionContext) {
+			if (isExecutionModeDurable(request.context)) {
+				message.context ??= {};
+				message.context.executionContext = pick(
+					request.context.executionContext,
+					executionContextKeys,
+				);
+			} else {
+				message.context = pick(request.context, executionContextKeys);
+			}
+		}
+		if (lambdaContext) {
+			if (isExecutionModeDurable(request.context)) {
+				message.context ??= {};
+				message.context.lambdaContext = pick(
+					request.context.lambdaContext,
+					lambdaContextKeys,
+				);
+			} else {
+				message.context = pick(request.context, lambdaContextKeys);
+			}
 		}
 
 		let cloneMessage = message;
@@ -95,20 +120,6 @@ const inputOutputLoggerMiddleware = (opts = {}) => {
 	};
 };
 
-// https://docs.aws.amazon.com/lambda/latest/dg/nodejs-context.html
-const awsContextKeys = [
-	"functionName",
-	"functionVersion",
-	"invokedFunctionArn",
-	"memoryLimitInMB",
-	"awsRequestId",
-	"logGroupName",
-	"logStreamName",
-	"identity",
-	"clientContext",
-	"callbackWaitsForEmptyEventLoop",
-];
-
 // move to util, if ever used elsewhere
 const pick = (originalObject = {}, keysToPick = []) => {
 	const newObject = {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@middy/input-output-logger",
-	"version": "7.0.0-alpha.2",
+	"version": "7.0.0",
 	"description": "Input and output logger middleware for the middy framework",
 	"type": "module",
 	"engines": {
@@ -63,9 +63,12 @@
 		"type": "github",
 		"url": "https://github.com/sponsors/willfarrell"
 	},
+	"dependencies": {
+		"@middy/util": "7.0.0"
+	},
 	"devDependencies": {
-		"@datastream/core": "0.0.41",
-		"@middy/core": "7.0.0-alpha.2",
+		"@datastream/core": "0.0.42",
+		"@middy/core": "7.0.0",
 		"@types/node": "^22.0.0"
 	},
 	"gitHead": "7a6c0fbb8ab71d6a2171e678697de9f237568431"