@webiny/handler-aws 6.5.0-beta.1 → 6.5.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/handler-aws",
-	"version": "6.5.0-beta.1",
+	"version": "6.5.0-beta.3",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -17,15 +17,15 @@
 	"license": "MIT",
 	"dependencies": {
 		"@fastify/aws-lambda": "6.4.0",
-		"@webiny/aws-sdk": "6.5.0-beta.1",
-		"@webiny/handler": "6.5.0-beta.1",
-		"@webiny/plugins": "6.5.0-beta.1",
-		"@webiny/utils": "6.5.0-beta.1",
+		"@webiny/aws-sdk": "6.5.0-beta.3",
+		"@webiny/handler": "6.5.0-beta.3",
+		"@webiny/plugins": "6.5.0-beta.3",
+		"@webiny/utils": "6.5.0-beta.3",
 		"fastify": "5.10.0",
 		"pino-lambda": "4.4.1"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "6.5.0-beta.1",
+		"@webiny/build-tools": "6.5.0-beta.3",
 		"rimraf": "6.1.3",
 		"typescript": "7.0.2",
 		"vitest": "4.1.10"

package/plugins/index.js

@@ -1,5 +1,8 @@
+import { createRequestIdPlugin } from "./requestId.js";
 const registerDefaultPlugins = (context)=>{
-    context.plugins.register([]);
+    context.plugins.register([
+        createRequestIdPlugin()
+    ]);
 };
 export { registerDefaultPlugins };
 

package/plugins/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugins/index.js","sources":["../../src/plugins/index.ts"],"sourcesContent":["import type { Context } from \"@webiny/handler/types.js\";\n\nexport const registerDefaultPlugins = (context: Context): void => {\n    context.plugins.register([\n        //\n    ]);\n};\n"],"names":["registerDefaultPlugins","context"],"mappings":"AAEO,MAAMA,yBAAyB,CAACC;IACnCA,QAAQ,OAAO,CAAC,QAAQ,CAAC,EAExB;AACL"}
+{"version":3,"file":"plugins/index.js","sources":["../../src/plugins/index.ts"],"sourcesContent":["import type { Context } from \"@webiny/handler/types.js\";\nimport { createRequestIdPlugin } from \"./requestId.js\";\n\nexport const registerDefaultPlugins = (context: Context): void => {\n    context.plugins.register([createRequestIdPlugin()]);\n};\n"],"names":["registerDefaultPlugins","context","createRequestIdPlugin"],"mappings":";AAGO,MAAMA,yBAAyB,CAACC;IACnCA,QAAQ,OAAO,CAAC,QAAQ,CAAC;QAACC;KAAwB;AACtD"}

package/plugins/requestId.d.ts

@@ -0,0 +1,10 @@
+import type { Context } from "@webiny/handler/types.js";
+/**
+ * Replaces the generated request id with the Lambda invocation's own, so a value reported to a
+ * client can be matched against CloudWatch and X-Ray.
+ *
+ * Registered as a `HandlerOnRequestPlugin` rather than from the handler factory closure: the default
+ * is registered per request inside `preHandler`, and `registerInstance` appends while `resolve`
+ * returns the last registration. Registering earlier would mean the generated value always won.
+ */
+export declare const createRequestIdPlugin: () => import("@webiny/handler").HandlerOnRequestPlugin<Context>;

package/plugins/requestId.js

@@ -0,0 +1,11 @@
+import { RequestId, createHandlerOnRequest } from "@webiny/handler";
+const createRequestIdPlugin = ()=>createHandlerOnRequest(async (request, _reply, context)=>{
+        const awsRequestId = request.awsLambda?.context?.awsRequestId;
+        if (!awsRequestId) return;
+        context.container.registerInstance(RequestId, {
+            value: awsRequestId
+        });
+    });
+export { createRequestIdPlugin };
+
+//# sourceMappingURL=requestId.js.map

package/plugins/requestId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugins/requestId.js","sources":["../../src/plugins/requestId.ts"],"sourcesContent":["import { createHandlerOnRequest, RequestId } from \"@webiny/handler\";\nimport type { Context } from \"@webiny/handler/types.js\";\n\ninterface RequestWithLambdaContext {\n    awsLambda?: {\n        context?: {\n            awsRequestId?: string;\n        };\n    };\n}\n\n/**\n * Replaces the generated request id with the Lambda invocation's own, so a value reported to a\n * client can be matched against CloudWatch and X-Ray.\n *\n * Registered as a `HandlerOnRequestPlugin` rather than from the handler factory closure: the default\n * is registered per request inside `preHandler`, and `registerInstance` appends while `resolve`\n * returns the last registration. Registering earlier would mean the generated value always won.\n */\nexport const createRequestIdPlugin = () => {\n    return createHandlerOnRequest<Context>(async (request, _reply, context) => {\n        const awsRequestId = (request as unknown as RequestWithLambdaContext).awsLambda?.context\n            ?.awsRequestId;\n        /**\n         * Nothing to do without one: `@webiny/handler` has already registered a generated default\n         * earlier in the same `preHandler` hook, so the abstraction still resolves.\n         */\n        if (!awsRequestId) {\n            return;\n        }\n\n        context.container.registerInstance(RequestId, { value: awsRequestId });\n    });\n};\n"],"names":["createRequestIdPlugin","createHandlerOnRequest","request","_reply","context","awsRequestId","RequestId"],"mappings":";AAmBO,MAAMA,wBAAwB,IAC1BC,uBAAgC,OAAOC,SAASC,QAAQC;QAC3D,MAAMC,eAAgBH,QAAgD,SAAS,EAAE,SAC3E;QAKN,IAAI,CAACG,cACD;QAGJD,QAAQ,SAAS,CAAC,gBAAgB,CAACE,WAAW;YAAE,OAAOD;QAAa;IACxE"}