@webiny/handler-aws 6.4.12-beta.5 → 6.5.0-beta.1

package/execute.js

@@ -6,7 +6,7 @@ const createHandleResponse = (app, resolve)=>(err, result)=>{
             headers: {}
         });
         if (app.__webiny_raw_result) return resolve(app.__webiny_raw_result);
-        else if (!result) {
+        if (!result) {
             const response = {
                 statusCode: 200,
                 body: "",

package/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sources":["../src/execute.ts"],"sourcesContent":["import type { FastifyInstance } from \"@webiny/handler/types.js\";\nimport type { APIGatewayProxyResult } from \"@webiny/aws-sdk/types/index.js\";\nimport type { LightMyRequestCallback } from \"fastify\";\nimport { Base64EncodeHeader } from \"~/types.js\";\n\ninterface Resolve {\n    (response: APIGatewayProxyResult | any): void;\n}\nconst createHandleResponse = (app: FastifyInstance, resolve: Resolve): LightMyRequestCallback => {\n    return (err, result) => {\n        if (err) {\n            return resolve({\n                statusCode: 500,\n                body: JSON.stringify(err),\n                headers: {}\n            });\n        }\n        if (app.__webiny_raw_result) {\n            return resolve(app.__webiny_raw_result);\n        } else if (!result) {\n            const response: APIGatewayProxyResult = {\n                statusCode: 200,\n                body: \"\",\n                headers: {},\n                isBase64Encoded: false\n            };\n            return resolve(response);\n        }\n\n        const isBase64Encoded =\n            !!result.headers[Base64EncodeHeader.encoded] ||\n            !!result.headers[Base64EncodeHeader.binary];\n        const response: APIGatewayProxyResult = {\n            statusCode: result.statusCode,\n            body: isBase64Encoded ? result.rawPayload.toString(\"base64\") : result.payload,\n            headers: result.headers as APIGatewayProxyResult[\"headers\"],\n            isBase64Encoded\n        };\n        return resolve(response);\n    };\n};\n\nconst getPayloadProperty = (\n    payload: any,\n    prop: string,\n    defaults: Record<string, any> = {}\n): Record<string, any> => {\n    if (payload && typeof payload === \"object\") {\n        const value = payload[prop] ? payload[prop] : {};\n\n        return {\n            ...defaults,\n            ...value\n        };\n    }\n    return defaults;\n};\n\nexport interface ExecuteParams {\n    app: FastifyInstance;\n    url: string;\n    payload: any;\n}\n\nexport const execute = (params: ExecuteParams): Promise<any> => {\n    const { app, url, payload } = params;\n\n    const query = getPayloadProperty(payload, \"query\", {});\n    const headers = getPayloadProperty(payload, \"headers\", {\n        [\"content-type\"]: \"application/json\"\n    });\n\n    const cookies = getPayloadProperty(payload, \"cookies\", {});\n\n    return new Promise(resolve => {\n        app.inject(\n            {\n                method: \"POST\",\n                url,\n                payload: payload || {},\n                body: payload || {},\n                query,\n                headers,\n                cookies\n            },\n            createHandleResponse(app, resolve)\n        );\n    });\n};\n"],"names":["createHandleResponse","app","resolve","err","result","JSON","response","isBase64Encoded","Base64EncodeHeader","getPayloadProperty","payload","prop","defaults","value","execute","params","url","query","headers","cookies","Promise"],"mappings":";AAQA,MAAMA,uBAAuB,CAACC,KAAsBC,UACzC,CAACC,KAAKC;QACT,IAAID,KACA,OAAOD,QAAQ;YACX,YAAY;YACZ,MAAMG,KAAK,SAAS,CAACF;YACrB,SAAS,CAAC;QACd;QAEJ,IAAIF,IAAI,mBAAmB,EACvB,OAAOC,QAAQD,IAAI,mBAAmB;aACnC,IAAI,CAACG,QAAQ;YAChB,MAAME,WAAkC;gBACpC,YAAY;gBACZ,MAAM;gBACN,SAAS,CAAC;gBACV,iBAAiB;YACrB;YACA,OAAOJ,QAAQI;QACnB;QAEA,MAAMC,kBACF,CAAC,CAACH,OAAO,OAAO,CAACI,mBAAmB,OAAO,CAAC,IAC5C,CAAC,CAACJ,OAAO,OAAO,CAACI,mBAAmB,MAAM,CAAC;QAC/C,MAAMF,WAAkC;YACpC,YAAYF,OAAO,UAAU;YAC7B,MAAMG,kBAAkBH,OAAO,UAAU,CAAC,QAAQ,CAAC,YAAYA,OAAO,OAAO;YAC7E,SAASA,OAAO,OAAO;YACvBG;QACJ;QACA,OAAOL,QAAQI;IACnB;AAGJ,MAAMG,qBAAqB,CACvBC,SACAC,MACAC,WAAgC,CAAC,CAAC;IAElC,IAAIF,WAAW,AAAmB,YAAnB,OAAOA,SAAsB;QACxC,MAAMG,QAAQH,OAAO,CAACC,KAAK,GAAGD,OAAO,CAACC,KAAK,GAAG,CAAC;QAE/C,OAAO;YACH,GAAGC,QAAQ;YACX,GAAGC,KAAK;QACZ;IACJ;IACA,OAAOD;AACX;AAQO,MAAME,UAAU,CAACC;IACpB,MAAM,EAAEd,GAAG,EAAEe,GAAG,EAAEN,OAAO,EAAE,GAAGK;IAE9B,MAAME,QAAQR,mBAAmBC,SAAS,SAAS,CAAC;IACpD,MAAMQ,UAAUT,mBAAmBC,SAAS,WAAW;QACnD,CAAC,eAAe,EAAE;IACtB;IAEA,MAAMS,UAAUV,mBAAmBC,SAAS,WAAW,CAAC;IAExD,OAAO,IAAIU,QAAQlB,CAAAA;QACfD,IAAI,MAAM,CACN;YACI,QAAQ;YACRe;YACA,SAASN,WAAW,CAAC;YACrB,MAAMA,WAAW,CAAC;YAClBO;YACAC;YACAC;QACJ,GACAnB,qBAAqBC,KAAKC;IAElC;AACJ"}
+{"version":3,"file":"execute.js","sources":["../src/execute.ts"],"sourcesContent":["import type { FastifyInstance } from \"@webiny/handler/types.js\";\nimport type { APIGatewayProxyResult } from \"@webiny/aws-sdk/types/index.js\";\nimport type { LightMyRequestCallback } from \"fastify\";\nimport { Base64EncodeHeader } from \"~/types.js\";\n\ninterface Resolve {\n    (response: APIGatewayProxyResult | any): void;\n}\nconst createHandleResponse = (app: FastifyInstance, resolve: Resolve): LightMyRequestCallback => {\n    return (err, result) => {\n        if (err) {\n            return resolve({\n                statusCode: 500,\n                body: JSON.stringify(err),\n                headers: {}\n            });\n        }\n        if (app.__webiny_raw_result) {\n            return resolve(app.__webiny_raw_result);\n        } else if (!result) {\n            const response: APIGatewayProxyResult = {\n                statusCode: 200,\n                body: \"\",\n                headers: {},\n                isBase64Encoded: false\n            };\n            return resolve(response);\n        }\n\n        const isBase64Encoded =\n            !!result.headers[Base64EncodeHeader.encoded] ||\n            !!result.headers[Base64EncodeHeader.binary];\n        const response: APIGatewayProxyResult = {\n            statusCode: result.statusCode,\n            body: isBase64Encoded ? result.rawPayload.toString(\"base64\") : result.payload,\n            headers: result.headers as APIGatewayProxyResult[\"headers\"],\n            isBase64Encoded\n        };\n        return resolve(response);\n    };\n};\n\nconst getPayloadProperty = (\n    payload: any,\n    prop: string,\n    defaults: Record<string, any> = {}\n): Record<string, any> => {\n    if (payload && typeof payload === \"object\") {\n        const value = payload[prop] ? payload[prop] : {};\n\n        return {\n            ...defaults,\n            ...value\n        };\n    }\n    return defaults;\n};\n\nexport interface ExecuteParams {\n    app: FastifyInstance;\n    url: string;\n    payload: any;\n}\n\nexport const execute = (params: ExecuteParams): Promise<any> => {\n    const { app, url, payload } = params;\n\n    const query = getPayloadProperty(payload, \"query\", {});\n    const headers = getPayloadProperty(payload, \"headers\", {\n        [\"content-type\"]: \"application/json\"\n    });\n\n    const cookies = getPayloadProperty(payload, \"cookies\", {});\n\n    return new Promise(resolve => {\n        app.inject(\n            {\n                method: \"POST\",\n                url,\n                payload: payload || {},\n                body: payload || {},\n                query,\n                headers,\n                cookies\n            },\n            createHandleResponse(app, resolve)\n        );\n    });\n};\n"],"names":["createHandleResponse","app","resolve","err","result","JSON","response","isBase64Encoded","Base64EncodeHeader","getPayloadProperty","payload","prop","defaults","value","execute","params","url","query","headers","cookies","Promise"],"mappings":";AAQA,MAAMA,uBAAuB,CAACC,KAAsBC,UACzC,CAACC,KAAKC;QACT,IAAID,KACA,OAAOD,QAAQ;YACX,YAAY;YACZ,MAAMG,KAAK,SAAS,CAACF;YACrB,SAAS,CAAC;QACd;QAEJ,IAAIF,IAAI,mBAAmB,EACvB,OAAOC,QAAQD,IAAI,mBAAmB;QACnC,IAAI,CAACG,QAAQ;YAChB,MAAME,WAAkC;gBACpC,YAAY;gBACZ,MAAM;gBACN,SAAS,CAAC;gBACV,iBAAiB;YACrB;YACA,OAAOJ,QAAQI;QACnB;QAEA,MAAMC,kBACF,CAAC,CAACH,OAAO,OAAO,CAACI,mBAAmB,OAAO,CAAC,IAC5C,CAAC,CAACJ,OAAO,OAAO,CAACI,mBAAmB,MAAM,CAAC;QAC/C,MAAMF,WAAkC;YACpC,YAAYF,OAAO,UAAU;YAC7B,MAAMG,kBAAkBH,OAAO,UAAU,CAAC,QAAQ,CAAC,YAAYA,OAAO,OAAO;YAC7E,SAASA,OAAO,OAAO;YACvBG;QACJ;QACA,OAAOL,QAAQI;IACnB;AAGJ,MAAMG,qBAAqB,CACvBC,SACAC,MACAC,WAAgC,CAAC,CAAC;IAElC,IAAIF,WAAW,AAAmB,YAAnB,OAAOA,SAAsB;QACxC,MAAMG,QAAQH,OAAO,CAACC,KAAK,GAAGD,OAAO,CAACC,KAAK,GAAG,CAAC;QAE/C,OAAO;YACH,GAAGC,QAAQ;YACX,GAAGC,KAAK;QACZ;IACJ;IACA,OAAOD;AACX;AAQO,MAAME,UAAU,CAACC;IACpB,MAAM,EAAEd,GAAG,EAAEe,GAAG,EAAEN,OAAO,EAAE,GAAGK;IAE9B,MAAME,QAAQR,mBAAmBC,SAAS,SAAS,CAAC;IACpD,MAAMQ,UAAUT,mBAAmBC,SAAS,WAAW;QACnD,CAAC,eAAe,EAAE;IACtB;IAEA,MAAMS,UAAUV,mBAAmBC,SAAS,WAAW,CAAC;IAExD,OAAO,IAAIU,QAAQlB,CAAAA;QACfD,IAAI,MAAM,CACN;YACI,QAAQ;YACRe;YACA,SAASN,WAAW,CAAC;YACrB,MAAMA,WAAW,CAAC;YAClBO;YACAC;YACAC;QACJ,GACAnB,qBAAqBC,KAAKC;IAElC;AACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/handler-aws",
-	"version": "6.4.12-beta.5",
+	"version": "6.5.0-beta.1",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -16,19 +16,19 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@fastify/aws-lambda": "6.4.1",
-		"@webiny/aws-sdk": "6.4.12-beta.5",
-		"@webiny/handler": "6.4.12-beta.5",
-		"@webiny/plugins": "6.4.12-beta.5",
-		"@webiny/utils": "6.4.12-beta.5",
-		"fastify": "5.12.5",
+		"@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",
+		"fastify": "5.10.0",
 		"pino-lambda": "4.4.1"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "6.4.12-beta.5",
+		"@webiny/build-tools": "6.5.0-beta.1",
 		"rimraf": "6.1.3",
-		"typescript": "6.0.3",
-		"vitest": "5.0.1"
+		"typescript": "7.0.2",
+		"vitest": "4.1.10"
 	},
 	"publishConfig": {
 		"access": "public"

package/plugins/index.js

@@ -1,8 +1,5 @@
-import { createRequestIdPlugin } from "./requestId.js";
 const registerDefaultPlugins = (context)=>{
-    context.plugins.register([
-        createRequestIdPlugin()
-    ]);
+    context.plugins.register([]);
 };
 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\";\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"}
+{"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"}

package/plugins/requestId.d.ts

@@ -1,10 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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"}