@webiny/handler-aws 0.0.0-unstable.1e66d121db → 0.0.0-unstable.2aaa1916d9

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/handler-aws",
-	"version": "0.0.0-unstable.1e66d121db",
+	"version": "0.0.0-unstable.2aaa1916d9",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -12,32 +12,26 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@babel/runtime": "7.19.0",
-		"@fastify/aws-lambda": "3.1.3",
-		"@webiny/handler": "0.0.0-unstable.1e66d121db",
-		"@webiny/handler-client": "0.0.0-unstable.1e66d121db",
-		"@webiny/plugins": "0.0.0-unstable.1e66d121db",
-		"aws-lambda": "1.0.7",
-		"fastify": "4.7.0"
+		"@fastify/aws-lambda": "4.1.0",
+		"@webiny/aws-sdk": "0.0.0-unstable.2aaa1916d9",
+		"@webiny/handler": "0.0.0-unstable.2aaa1916d9",
+		"@webiny/handler-client": "0.0.0-unstable.2aaa1916d9",
+		"@webiny/plugins": "0.0.0-unstable.2aaa1916d9",
+		"@webiny/utils": "0.0.0-unstable.2aaa1916d9",
+		"fastify": "4.29.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.19.3",
-		"@babel/core": "^7.19.3",
-		"@babel/preset-env": "^7.19.4",
-		"@babel/preset-typescript": "^7.18.6",
-		"@webiny/cli": "^0.0.0-unstable.1e66d121db",
-		"@webiny/project-utils": "^0.0.0-unstable.1e66d121db",
-		"rimraf": "^3.0.2",
-		"ttypescript": "^1.5.13",
-		"typescript": "4.7.4"
+		"@webiny/project-utils": "0.0.0-unstable.2aaa1916d9",
+		"rimraf": "6.0.1",
+		"typescript": "5.3.3"
 	},
 	"publishConfig": {
 		"access": "public",
 		"directory": "dist"
 	},
 	"scripts": {
-		"build": "yarn webiny run build",
-		"watch": "yarn webiny run watch"
+		"build": "node ../cli/bin.js run build",
+		"watch": "node ../cli/bin.js run watch"
 	},
-	"gitHead": "b670bf27c5039de1a2b0be764a09ba4cb94ad5e2"
+	"gitHead": "2aaa1916d95b4fb2aa0cc2543f60934c2f3d969c"
 }

package/plugins/handlerClient.js

@@ -1,16 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createHandlerClientPlugin = void 0;
-
-var _lambda = _interopRequireDefault(require("aws-sdk/clients/lambda"));
-
+var _clientLambda = require("@webiny/aws-sdk/client-lambda");
 var _handlerClient = require("@webiny/handler-client");
-
 const createHandlerClientPlugin = () => {
   const plugin = new _handlerClient.HandlerClientPlugin({
     invoke: async params => {
@@ -19,27 +14,24 @@ const createHandlerClientPlugin = () => {
         name,
         payload
       } = params;
-      const lambdaClient = new _lambda.default({
+      const lambdaClient = new _clientLambda.LambdaClient({
         region: process.env.AWS_REGION
       });
-      const response = await lambdaClient.invoke({
+      const response = await lambdaClient.send(new _clientLambda.InvokeCommand({
         FunctionName: name,
         InvocationType: useAwait === false ? "Event" : "RequestResponse",
         Payload: JSON.stringify(payload)
-      }).promise();
-
+      }));
       if (useAwait === false) {
         return null;
       }
-
-      const Payload = response.Payload;
-      return JSON.parse(Payload);
+      const decoder = new TextDecoder("utf-8");
+      return JSON.parse(decoder.decode(response.Payload));
     },
     canUse: params => {
-      if (!(params !== null && params !== void 0 && params.name)) {
+      if (!params?.name) {
         return true;
       }
-
       const {
         name
       } = params;
@@ -47,16 +39,15 @@ const createHandlerClientPlugin = () => {
        * In case we are invoking currently active lambda, let's use this plugin as well.
        * When invoking some other lambda, name starts with arn.
        */
-
       if (name === process.env.AWS_LAMBDA_FUNCTION_NAME) {
         return true;
       }
-
       return name.match("arn:") !== null;
     }
   });
   plugin.name = "handler-client";
   return plugin;
 };
+exports.createHandlerClientPlugin = createHandlerClientPlugin;
 
-exports.createHandlerClientPlugin = createHandlerClientPlugin;
+//# sourceMappingURL=handlerClient.js.map

package/plugins/handlerClient.js.map

@@ -1 +1 @@
-{"version":3,"names":["createHandlerClientPlugin","plugin","HandlerClientPlugin","invoke","params","await","useAwait","name","payload","lambdaClient","LambdaClient","region","process","env","AWS_REGION","response","FunctionName","InvocationType","Payload","JSON","stringify","promise","parse","canUse","AWS_LAMBDA_FUNCTION_NAME","match"],"sources":["handlerClient.ts"],"sourcesContent":["import LambdaClient from \"aws-sdk/clients/lambda\";\nimport { HandlerClientPlugin } from \"@webiny/handler-client\";\n\nexport const createHandlerClientPlugin = () => {\n    const plugin = new HandlerClientPlugin({\n        invoke: async params => {\n            const { await: useAwait, name, payload } = params;\n            const lambdaClient = new LambdaClient({\n                region: process.env.AWS_REGION\n            });\n            const response = await lambdaClient\n                .invoke({\n                    FunctionName: name,\n                    InvocationType: useAwait === false ? \"Event\" : \"RequestResponse\",\n                    Payload: JSON.stringify(payload)\n                })\n                .promise();\n\n            if (useAwait === false) {\n                return null;\n            }\n\n            const Payload = response.Payload as string;\n            return JSON.parse(Payload);\n        },\n        canUse: params => {\n            if (!params?.name) {\n                return true;\n            }\n            const { name } = params;\n            /**\n             * In case we are invoking currently active lambda, let's use this plugin as well.\n             * When invoking some other lambda, name starts with arn.\n             */\n            if (name === process.env.AWS_LAMBDA_FUNCTION_NAME) {\n                return true;\n            }\n            return name.match(\"arn:\") !== null;\n        }\n    });\n\n    plugin.name = \"handler-client\";\n\n    return plugin;\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AAEO,MAAMA,yBAAyB,GAAG,MAAM;EAC3C,MAAMC,MAAM,GAAG,IAAIC,kCAAJ,CAAwB;IACnCC,MAAM,EAAE,MAAMC,MAAN,IAAgB;MACpB,MAAM;QAAEC,KAAK,EAAEC,QAAT;QAAmBC,IAAnB;QAAyBC;MAAzB,IAAqCJ,MAA3C;MACA,MAAMK,YAAY,GAAG,IAAIC,eAAJ,CAAiB;QAClCC,MAAM,EAAEC,OAAO,CAACC,GAAR,CAAYC;MADc,CAAjB,CAArB;MAGA,MAAMC,QAAQ,GAAG,MAAMN,YAAY,CAC9BN,MADkB,CACX;QACJa,YAAY,EAAET,IADV;QAEJU,cAAc,EAAEX,QAAQ,KAAK,KAAb,GAAqB,OAArB,GAA+B,iBAF3C;QAGJY,OAAO,EAAEC,IAAI,CAACC,SAAL,CAAeZ,OAAf;MAHL,CADW,EAMlBa,OANkB,EAAvB;;MAQA,IAAIf,QAAQ,KAAK,KAAjB,EAAwB;QACpB,OAAO,IAAP;MACH;;MAED,MAAMY,OAAO,GAAGH,QAAQ,CAACG,OAAzB;MACA,OAAOC,IAAI,CAACG,KAAL,CAAWJ,OAAX,CAAP;IACH,CApBkC;IAqBnCK,MAAM,EAAEnB,MAAM,IAAI;MACd,IAAI,EAACA,MAAD,aAACA,MAAD,eAACA,MAAM,CAAEG,IAAT,CAAJ,EAAmB;QACf,OAAO,IAAP;MACH;;MACD,MAAM;QAAEA;MAAF,IAAWH,MAAjB;MACA;AACZ;AACA;AACA;;MACY,IAAIG,IAAI,KAAKK,OAAO,CAACC,GAAR,CAAYW,wBAAzB,EAAmD;QAC/C,OAAO,IAAP;MACH;;MACD,OAAOjB,IAAI,CAACkB,KAAL,CAAW,MAAX,MAAuB,IAA9B;IACH;EAlCkC,CAAxB,CAAf;EAqCAxB,MAAM,CAACM,IAAP,GAAc,gBAAd;EAEA,OAAON,MAAP;AACH,CAzCM"}
+{"version":3,"names":["_clientLambda","require","_handlerClient","createHandlerClientPlugin","plugin","HandlerClientPlugin","invoke","params","await","useAwait","name","payload","lambdaClient","LambdaClient","region","process","env","AWS_REGION","response","send","InvokeCommand","FunctionName","InvocationType","Payload","JSON","stringify","decoder","TextDecoder","parse","decode","canUse","AWS_LAMBDA_FUNCTION_NAME","match","exports"],"sources":["handlerClient.ts"],"sourcesContent":["import { LambdaClient, InvokeCommand } from \"@webiny/aws-sdk/client-lambda\";\nimport { HandlerClientPlugin } from \"@webiny/handler-client\";\n\nexport const createHandlerClientPlugin = () => {\n    const plugin = new HandlerClientPlugin({\n        invoke: async params => {\n            const { await: useAwait, name, payload } = params;\n            const lambdaClient = new LambdaClient({\n                region: process.env.AWS_REGION\n            });\n            const response = await lambdaClient.send(\n                new InvokeCommand({\n                    FunctionName: name,\n                    InvocationType: useAwait === false ? \"Event\" : \"RequestResponse\",\n                    Payload: JSON.stringify(payload)\n                })\n            );\n\n            if (useAwait === false) {\n                return null;\n            }\n\n            const decoder = new TextDecoder(\"utf-8\");\n            return JSON.parse(decoder.decode(response.Payload));\n        },\n        canUse: params => {\n            if (!params?.name) {\n                return true;\n            }\n            const { name } = params;\n            /**\n             * In case we are invoking currently active lambda, let's use this plugin as well.\n             * When invoking some other lambda, name starts with arn.\n             */\n            if (name === process.env.AWS_LAMBDA_FUNCTION_NAME) {\n                return true;\n            }\n            return name.match(\"arn:\") !== null;\n        }\n    });\n\n    plugin.name = \"handler-client\";\n\n    return plugin;\n};\n"],"mappings":";;;;;;AAAA,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AAEO,MAAME,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,MAAMC,MAAM,GAAG,IAAIC,kCAAmB,CAAC;IACnCC,MAAM,EAAE,MAAMC,MAAM,IAAI;MACpB,MAAM;QAAEC,KAAK,EAAEC,QAAQ;QAAEC,IAAI;QAAEC;MAAQ,CAAC,GAAGJ,MAAM;MACjD,MAAMK,YAAY,GAAG,IAAIC,0BAAY,CAAC;QAClCC,MAAM,EAAEC,OAAO,CAACC,GAAG,CAACC;MACxB,CAAC,CAAC;MACF,MAAMC,QAAQ,GAAG,MAAMN,YAAY,CAACO,IAAI,CACpC,IAAIC,2BAAa,CAAC;QACdC,YAAY,EAAEX,IAAI;QAClBY,cAAc,EAAEb,QAAQ,KAAK,KAAK,GAAG,OAAO,GAAG,iBAAiB;QAChEc,OAAO,EAAEC,IAAI,CAACC,SAAS,CAACd,OAAO;MACnC,CAAC,CACL,CAAC;MAED,IAAIF,QAAQ,KAAK,KAAK,EAAE;QACpB,OAAO,IAAI;MACf;MAEA,MAAMiB,OAAO,GAAG,IAAIC,WAAW,CAAC,OAAO,CAAC;MACxC,OAAOH,IAAI,CAACI,KAAK,CAACF,OAAO,CAACG,MAAM,CAACX,QAAQ,CAACK,OAAO,CAAC,CAAC;IACvD,CAAC;IACDO,MAAM,EAAEvB,MAAM,IAAI;MACd,IAAI,CAACA,MAAM,EAAEG,IAAI,EAAE;QACf,OAAO,IAAI;MACf;MACA,MAAM;QAAEA;MAAK,CAAC,GAAGH,MAAM;MACvB;AACZ;AACA;AACA;MACY,IAAIG,IAAI,KAAKK,OAAO,CAACC,GAAG,CAACe,wBAAwB,EAAE;QAC/C,OAAO,IAAI;MACf;MACA,OAAOrB,IAAI,CAACsB,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI;IACtC;EACJ,CAAC,CAAC;EAEF5B,MAAM,CAACM,IAAI,GAAG,gBAAgB;EAE9B,OAAON,MAAM;AACjB,CAAC;AAAC6B,OAAA,CAAA9B,yBAAA,GAAAA,yBAAA","ignoreList":[]}

package/plugins/index.d.ts

@@ -1,2 +1,2 @@
-import { Context } from "@webiny/handler/types";
+import type { Context } from "@webiny/handler/types";
 export declare const registerDefaultPlugins: (context: Context) => void;

package/plugins/index.js

@@ -4,11 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.registerDefaultPlugins = void 0;
-
 var _handlerClient = require("./handlerClient");
-
 const registerDefaultPlugins = context => {
   context.plugins.register([(0, _handlerClient.createHandlerClientPlugin)()]);
 };
+exports.registerDefaultPlugins = registerDefaultPlugins;
 
-exports.registerDefaultPlugins = registerDefaultPlugins;
+//# sourceMappingURL=index.js.map

package/plugins/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["registerDefaultPlugins","context","plugins","register","createHandlerClientPlugin"],"sources":["index.ts"],"sourcesContent":["import { createHandlerClientPlugin } from \"./handlerClient\";\nimport { Context } from \"@webiny/handler/types\";\n\nexport const registerDefaultPlugins = (context: Context): void => {\n    context.plugins.register([createHandlerClientPlugin()]);\n};\n"],"mappings":";;;;;;;AAAA;;AAGO,MAAMA,sBAAsB,GAAIC,OAAD,IAA4B;EAC9DA,OAAO,CAACC,OAAR,CAAgBC,QAAhB,CAAyB,CAAC,IAAAC,wCAAA,GAAD,CAAzB;AACH,CAFM"}
+{"version":3,"names":["_handlerClient","require","registerDefaultPlugins","context","plugins","register","createHandlerClientPlugin","exports"],"sources":["index.ts"],"sourcesContent":["import { createHandlerClientPlugin } from \"./handlerClient\";\nimport type { Context } from \"@webiny/handler/types\";\n\nexport const registerDefaultPlugins = (context: Context): void => {\n    context.plugins.register([createHandlerClientPlugin()]);\n};\n"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAGO,MAAMC,sBAAsB,GAAIC,OAAgB,IAAW;EAC9DA,OAAO,CAACC,OAAO,CAACC,QAAQ,CAAC,CAAC,IAAAC,wCAAyB,EAAC,CAAC,CAAC,CAAC;AAC3D,CAAC;AAACC,OAAA,CAAAL,sBAAA,GAAAA,sBAAA","ignoreList":[]}

package/raw/index.d.ts

@@ -4,16 +4,11 @@
  *
  * We should try to have some kind of standardized event type implementation at some point.
  */
-import { CreateHandlerParams as BaseCreateHandlerParams } from "@webiny/handler";
-import { Context as LambdaContext } from "aws-lambda";
-import { APIGatewayProxyResult } from "aws-lambda/trigger/api-gateway-proxy";
+import type { APIGatewayProxyResult, Context as LambdaContext } from "@webiny/aws-sdk/types";
+import type { CreateHandlerParams as BaseCreateHandlerParams } from "@webiny/handler";
 export interface HandlerCallable<Payload, Response = APIGatewayProxyResult> {
     (payload: Payload, context: LambdaContext): Promise<Response>;
 }
-export interface CreateHandlerParams extends BaseCreateHandlerParams {
-    http?: {
-        debug?: boolean;
-    };
-}
+export type CreateHandlerParams = BaseCreateHandlerParams;
 export declare const createHandler: <Payload = any, Response_1 = APIGatewayProxyResult>(params: CreateHandlerParams) => HandlerCallable<Payload, Response_1>;
 export * from "./plugins/RawEventHandler";

package/raw/index.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,13 +7,8 @@ var _exportNames = {
   createHandler: true
 };
 exports.createHandler = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _handler = require("@webiny/handler");
-
 var _RawEventHandler = require("./plugins/RawEventHandler");
-
 Object.keys(_RawEventHandler).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -27,47 +20,48 @@ Object.keys(_RawEventHandler).forEach(function (key) {
     }
   });
 });
-
 var _plugins = require("../plugins");
-
 var _execute = require("../execute");
-
+var _composedHandler = require("../utils/composedHandler");
 /**
  * This is the handler implementation for @webiny/handler/plugins/EventPlugin.
  * This is mostly meant for some custom lambda calls as we are sometimes invoking lambdas directly.
  *
  * We should try to have some kind of standardized event type implementation at some point.
  */
-const Reply = require("fastify/lib/reply");
 
+const Reply = require("fastify/lib/reply");
 const url = "/webiny-raw-event";
-
 const createHandler = params => {
   return (payload, context) => {
-    var _params$http;
-
     const app = (0, _handler.createHandler)({
-      plugins: params.plugins,
-      options: (0, _objectSpread2.default)({
-        logger: ((_params$http = params.http) === null || _params$http === void 0 ? void 0 : _params$http.debug) === true
-      }, params.options || {})
+      ...params,
+      options: {
+        logger: params.debug === true,
+        ...(params.options || {})
+      }
     });
     /**
      * We always must add our default plugins to the app.
      */
-
     (0, _plugins.registerDefaultPlugins)(app.webiny);
     /**
      * There must be an event plugin for this handler to work.
      */
-
-    const plugins = app.webiny.plugins.byType(_RawEventHandler.RawEventHandler.type);
-    const handler = plugins.shift();
-
-    if (!handler) {
+    const plugins = app.webiny.plugins.byType(_RawEventHandler.RawEventHandler.type).filter(plugin => {
+      /**
+       * Just in case check that the plugin contains canHandle method.
+       * If it does not, we assume it can handle any payload.
+       */
+      if (typeof plugin.canHandle !== "function") {
+        return true;
+      }
+      return plugin.canHandle(payload);
+    }).reverse();
+    if (plugins.length === 0) {
       throw new Error(`To run @webiny/handler-aws/raw, you must have RawEventHandler set.`);
     }
-
+    const handler = (0, _composedHandler.createComposedHandler)(plugins);
     app.post(url, async (request, reply) => {
       const params = {
         request,
@@ -76,12 +70,10 @@ const createHandler = params => {
         payload,
         lambdaContext: context
       };
-      const result = await handler.cb(params);
-
+      const result = await handler(params);
       if (result instanceof Reply) {
         return result;
       }
-
       app.__webiny_raw_result = result;
       return reply.send({});
     });
@@ -92,5 +84,6 @@ const createHandler = params => {
     });
   };
 };
+exports.createHandler = createHandler;
 
-exports.createHandler = createHandler;
+//# sourceMappingURL=index.js.map

package/raw/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["Reply","require","url","createHandler","params","payload","context","app","createBaseHandler","plugins","options","logger","http","debug","registerDefaultPlugins","webiny","byType","RawEventHandler","type","handler","shift","Error","post","request","reply","lambdaContext","result","cb","__webiny_raw_result","send","execute"],"sources":["index.ts"],"sourcesContent":["/**\n * This is the handler implementation for @webiny/handler/plugins/EventPlugin.\n * This is mostly meant for some custom lambda calls as we are sometimes invoking lambdas directly.\n *\n * We should try to have some kind of standardized event type implementation at some point.\n */\nimport {\n    createHandler as createBaseHandler,\n    CreateHandlerParams as BaseCreateHandlerParams\n} from \"@webiny/handler\";\nconst Reply = require(\"fastify/lib/reply\");\nimport { Context as LambdaContext } from \"aws-lambda\";\nimport { APIGatewayProxyResult } from \"aws-lambda/trigger/api-gateway-proxy\";\nimport { RawEventHandler } from \"~/raw/plugins/RawEventHandler\";\nimport { registerDefaultPlugins } from \"~/plugins\";\nimport { execute } from \"~/execute\";\n\nconst url = \"/webiny-raw-event\";\n\nexport interface HandlerCallable<Payload, Response = APIGatewayProxyResult> {\n    (payload: Payload, context: LambdaContext): Promise<Response>;\n}\n\nexport interface CreateHandlerParams extends BaseCreateHandlerParams {\n    http?: {\n        debug?: boolean;\n    };\n}\n\nexport const createHandler = <Payload = any, Response = APIGatewayProxyResult>(\n    params: CreateHandlerParams\n): HandlerCallable<Payload, Response> => {\n    return (payload, context) => {\n        const app = createBaseHandler({\n            plugins: params.plugins,\n            options: {\n                logger: params.http?.debug === true,\n                ...(params.options || {})\n            }\n        });\n        /**\n         * We always must add our default plugins to the app.\n         */\n        registerDefaultPlugins(app.webiny);\n        /**\n         * There must be an event plugin for this handler to work.\n         */\n        const plugins = app.webiny.plugins.byType<RawEventHandler<Payload, any, Response>>(\n            RawEventHandler.type\n        );\n        const handler = plugins.shift();\n        if (!handler) {\n            throw new Error(`To run @webiny/handler-aws/raw, you must have RawEventHandler set.`);\n        }\n\n        app.post(url, async (request, reply) => {\n            const params = {\n                request,\n                reply,\n                context: app.webiny,\n                payload,\n                lambdaContext: context\n            };\n            const result = await handler.cb(params);\n\n            if (result instanceof Reply) {\n                return result;\n            }\n\n            (app as any).__webiny_raw_result = result;\n            return reply.send({});\n        });\n        return execute({\n            app,\n            url,\n            payload\n        });\n    };\n};\n\nexport * from \"./plugins/RawEventHandler\";\n"],"mappings":";;;;;;;;;;;;;;AAMA;;AAOA;;AAmEA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AAlEA;;AACA;;AAfA;AACA;AACA;AACA;AACA;AACA;AAKA,MAAMA,KAAK,GAAGC,OAAO,CAAC,mBAAD,CAArB;;AAOA,MAAMC,GAAG,GAAG,mBAAZ;;AAYO,MAAMC,aAAa,GACtBC,MADyB,IAEY;EACrC,OAAO,CAACC,OAAD,EAAUC,OAAV,KAAsB;IAAA;;IACzB,MAAMC,GAAG,GAAG,IAAAC,sBAAA,EAAkB;MAC1BC,OAAO,EAAEL,MAAM,CAACK,OADU;MAE1BC,OAAO;QACHC,MAAM,EAAE,iBAAAP,MAAM,CAACQ,IAAP,8DAAaC,KAAb,MAAuB;MAD5B,GAECT,MAAM,CAACM,OAAP,IAAkB,EAFnB;IAFmB,CAAlB,CAAZ;IAOA;AACR;AACA;;IACQ,IAAAI,+BAAA,EAAuBP,GAAG,CAACQ,MAA3B;IACA;AACR;AACA;;IACQ,MAAMN,OAAO,GAAGF,GAAG,CAACQ,MAAJ,CAAWN,OAAX,CAAmBO,MAAnB,CACZC,gCAAA,CAAgBC,IADJ,CAAhB;IAGA,MAAMC,OAAO,GAAGV,OAAO,CAACW,KAAR,EAAhB;;IACA,IAAI,CAACD,OAAL,EAAc;MACV,MAAM,IAAIE,KAAJ,CAAW,oEAAX,CAAN;IACH;;IAEDd,GAAG,CAACe,IAAJ,CAASpB,GAAT,EAAc,OAAOqB,OAAP,EAAgBC,KAAhB,KAA0B;MACpC,MAAMpB,MAAM,GAAG;QACXmB,OADW;QAEXC,KAFW;QAGXlB,OAAO,EAAEC,GAAG,CAACQ,MAHF;QAIXV,OAJW;QAKXoB,aAAa,EAAEnB;MALJ,CAAf;MAOA,MAAMoB,MAAM,GAAG,MAAMP,OAAO,CAACQ,EAAR,CAAWvB,MAAX,CAArB;;MAEA,IAAIsB,MAAM,YAAY1B,KAAtB,EAA6B;QACzB,OAAO0B,MAAP;MACH;;MAEAnB,GAAD,CAAaqB,mBAAb,GAAmCF,MAAnC;MACA,OAAOF,KAAK,CAACK,IAAN,CAAW,EAAX,CAAP;IACH,CAhBD;IAiBA,OAAO,IAAAC,gBAAA,EAAQ;MACXvB,GADW;MAEXL,GAFW;MAGXG;IAHW,CAAR,CAAP;EAKH,CA7CD;AA8CH,CAjDM"}
+{"version":3,"names":["_handler","require","_RawEventHandler","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_plugins","_execute","_composedHandler","Reply","url","createHandler","params","payload","context","app","createBaseHandler","options","logger","debug","registerDefaultPlugins","webiny","plugins","byType","RawEventHandler","type","filter","plugin","canHandle","reverse","length","Error","handler","createComposedHandler","post","request","reply","lambdaContext","result","__webiny_raw_result","send","execute"],"sources":["index.ts"],"sourcesContent":["/**\n * This is the handler implementation for @webiny/handler/plugins/EventPlugin.\n * This is mostly meant for some custom lambda calls as we are sometimes invoking lambdas directly.\n *\n * We should try to have some kind of standardized event type implementation at some point.\n */\nimport type { APIGatewayProxyResult, Context as LambdaContext } from \"@webiny/aws-sdk/types\";\nimport type { CreateHandlerParams as BaseCreateHandlerParams } from \"@webiny/handler\";\nimport { createHandler as createBaseHandler } from \"@webiny/handler\";\nimport { RawEventHandler } from \"~/raw/plugins/RawEventHandler\";\nimport { registerDefaultPlugins } from \"~/plugins\";\nimport { execute } from \"~/execute\";\nimport { createComposedHandler } from \"~/utils/composedHandler\";\nimport type { Context, Request } from \"@webiny/handler/types\";\n\nconst Reply = require(\"fastify/lib/reply\");\n\nconst url = \"/webiny-raw-event\";\n\nexport interface HandlerCallable<Payload, Response = APIGatewayProxyResult> {\n    (payload: Payload, context: LambdaContext): Promise<Response>;\n}\n\nexport type CreateHandlerParams = BaseCreateHandlerParams;\n\ninterface HandlerParams<Payload = any> {\n    request: Request;\n    context: Context;\n    payload: Payload;\n    lambdaContext: LambdaContext;\n    reply: Record<string, any>;\n    next: () => Promise<Payload>;\n}\n\nexport const createHandler = <Payload = any, Response = APIGatewayProxyResult>(\n    params: CreateHandlerParams\n): HandlerCallable<Payload, Response> => {\n    return (payload, context) => {\n        const app = createBaseHandler({\n            ...params,\n            options: {\n                logger: params.debug === true,\n                ...(params.options || {})\n            }\n        });\n        /**\n         * We always must add our default plugins to the app.\n         */\n        registerDefaultPlugins(app.webiny);\n        /**\n         * There must be an event plugin for this handler to work.\n         */\n        const plugins = app.webiny.plugins\n            .byType<RawEventHandler<Payload, any, Response>>(RawEventHandler.type)\n            .filter(plugin => {\n                /**\n                 * Just in case check that the plugin contains canHandle method.\n                 * If it does not, we assume it can handle any payload.\n                 */\n                if (typeof plugin.canHandle !== \"function\") {\n                    return true;\n                }\n                return plugin.canHandle(payload);\n            })\n            .reverse();\n        if (plugins.length === 0) {\n            throw new Error(`To run @webiny/handler-aws/raw, you must have RawEventHandler set.`);\n        }\n\n        const handler = createComposedHandler<\n            RawEventHandler<Payload, any, Response>,\n            HandlerParams,\n            Response\n        >(plugins);\n\n        app.post(url, async (request, reply) => {\n            const params: Omit<HandlerParams, \"next\"> = {\n                request,\n                reply,\n                context: app.webiny,\n                payload,\n                lambdaContext: context\n            };\n            const result = await handler(params as unknown as HandlerParams);\n\n            if (result instanceof Reply) {\n                return result;\n            }\n\n            app.__webiny_raw_result = result;\n            return reply.send({});\n        });\n        return execute({\n            app,\n            url,\n            payload\n        });\n    };\n};\n\nexport * from \"./plugins/RawEventHandler\";\n"],"mappings":";;;;;;;;;AAQA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AA2FAE,MAAA,CAAAC,IAAA,CAAAF,gBAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,gBAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,gBAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AA1FA,IAAAS,QAAA,GAAAd,OAAA;AACA,IAAAe,QAAA,GAAAf,OAAA;AACA,IAAAgB,gBAAA,GAAAhB,OAAA;AAZA;AACA;AACA;AACA;AACA;AACA;;AAUA,MAAMiB,KAAK,GAAGjB,OAAO,CAAC,mBAAmB,CAAC;AAE1C,MAAMkB,GAAG,GAAG,mBAAmB;AAiBxB,MAAMC,aAAa,GACtBC,MAA2B,IACU;EACrC,OAAO,CAACC,OAAO,EAAEC,OAAO,KAAK;IACzB,MAAMC,GAAG,GAAG,IAAAC,sBAAiB,EAAC;MAC1B,GAAGJ,MAAM;MACTK,OAAO,EAAE;QACLC,MAAM,EAAEN,MAAM,CAACO,KAAK,KAAK,IAAI;QAC7B,IAAIP,MAAM,CAACK,OAAO,IAAI,CAAC,CAAC;MAC5B;IACJ,CAAC,CAAC;IACF;AACR;AACA;IACQ,IAAAG,+BAAsB,EAACL,GAAG,CAACM,MAAM,CAAC;IAClC;AACR;AACA;IACQ,MAAMC,OAAO,GAAGP,GAAG,CAACM,MAAM,CAACC,OAAO,CAC7BC,MAAM,CAA0CC,gCAAe,CAACC,IAAI,CAAC,CACrEC,MAAM,CAACC,MAAM,IAAI;MACd;AAChB;AACA;AACA;MACgB,IAAI,OAAOA,MAAM,CAACC,SAAS,KAAK,UAAU,EAAE;QACxC,OAAO,IAAI;MACf;MACA,OAAOD,MAAM,CAACC,SAAS,CAACf,OAAO,CAAC;IACpC,CAAC,CAAC,CACDgB,OAAO,CAAC,CAAC;IACd,IAAIP,OAAO,CAACQ,MAAM,KAAK,CAAC,EAAE;MACtB,MAAM,IAAIC,KAAK,CAAC,oEAAoE,CAAC;IACzF;IAEA,MAAMC,OAAO,GAAG,IAAAC,sCAAqB,EAInCX,OAAO,CAAC;IAEVP,GAAG,CAACmB,IAAI,CAACxB,GAAG,EAAE,OAAOyB,OAAO,EAAEC,KAAK,KAAK;MACpC,MAAMxB,MAAmC,GAAG;QACxCuB,OAAO;QACPC,KAAK;QACLtB,OAAO,EAAEC,GAAG,CAACM,MAAM;QACnBR,OAAO;QACPwB,aAAa,EAAEvB;MACnB,CAAC;MACD,MAAMwB,MAAM,GAAG,MAAMN,OAAO,CAACpB,MAAkC,CAAC;MAEhE,IAAI0B,MAAM,YAAY7B,KAAK,EAAE;QACzB,OAAO6B,MAAM;MACjB;MAEAvB,GAAG,CAACwB,mBAAmB,GAAGD,MAAM;MAChC,OAAOF,KAAK,CAACI,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;IACF,OAAO,IAAAC,gBAAO,EAAC;MACX1B,GAAG;MACHL,GAAG;MACHG;IACJ,CAAC,CAAC;EACN,CAAC;AACL,CAAC;AAACX,OAAA,CAAAS,aAAA,GAAAA,aAAA","ignoreList":[]}

package/raw/plugins/RawEventHandler.d.ts

@@ -1,13 +1,24 @@
-import { Reply, Context as BaseContext } from "@webiny/handler/types";
-import { Context as LambdaContext } from "aws-lambda";
-import { EventPlugin, EventPluginCallableParams } from "@webiny/handler";
+import type { Context as LambdaContext } from "@webiny/aws-sdk/types";
+import type { Context as BaseContext, Reply } from "@webiny/handler/types";
+import type { EventPluginCallableParams } from "@webiny/handler";
+import { EventPlugin } from "@webiny/handler";
 export interface RawEventHandlerCallableParams<Event, Context extends BaseContext> extends EventPluginCallableParams<Event, Context> {
     lambdaContext: LambdaContext;
 }
 export interface RawEventHandlerCallable<Event, Context extends BaseContext, Response> {
     (params: RawEventHandlerCallableParams<Event, Context>): Promise<Response | Reply>;
 }
-export declare class RawEventHandler<Event = any, Context extends BaseContext = BaseContext, Response = any> extends EventPlugin {
-    constructor(cb: RawEventHandlerCallable<Event, Context, Response>);
+export interface RawEventHandlerParamsConfig<Event = any, Context extends BaseContext = BaseContext, Response = any> {
+    canHandle(event: Event): boolean;
+    handle: RawEventHandlerCallable<Event, Context, Response>;
 }
-export declare const createEventHandler: <Event_1 = any, Context extends BaseContext = BaseContext, Response_1 = any>(cb: RawEventHandlerCallable<Event_1, Context, Response_1>) => RawEventHandler<Event_1, Context, Response_1>;
+export type RawEventHandlerParams<Event = any, Context extends BaseContext = BaseContext, Response = any> = RawEventHandlerCallable<Event, Context, Response> | RawEventHandlerParamsConfig<Event, Context, Response>;
+export declare class RawEventHandler<Event = any, Context extends BaseContext = BaseContext, Response = any> extends EventPlugin<Event, Context, Response> {
+    private readonly params;
+    constructor(params: RawEventHandlerParams<Event, Context, Response>);
+    /**
+     *
+     */
+    canHandle(event: Event): boolean;
+}
+export declare const createEventHandler: <Event_1 = any, Context extends BaseContext = BaseContext, Response_1 = any>(params: RawEventHandlerParams<Event_1, Context, Response_1>) => RawEventHandler<Event_1, Context, Response_1>;

package/raw/plugins/RawEventHandler.js

@@ -4,20 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createEventHandler = exports.RawEventHandler = void 0;
-
 var _handler = require("@webiny/handler");
-
 class RawEventHandler extends _handler.EventPlugin {
-  constructor(cb) {
+  constructor(params) {
+    const cb = typeof params === "function" ? params : params.handle;
+    /**
+     * Callable is correct, TS is just having problems with the override.
+     */
+    // @ts-expect-error
     super(cb);
+    this.params = params;
+  }
+  /**
+   *
+   */
+  canHandle(event) {
+    if (typeof this.params === "function" || !this.params?.canHandle) {
+      return true;
+    }
+    return this.params.canHandle(event);
   }
-
 }
-
 exports.RawEventHandler = RawEventHandler;
-
-const createEventHandler = cb => {
-  return new RawEventHandler(cb);
+const createEventHandler = params => {
+  return new RawEventHandler(params);
 };
+exports.createEventHandler = createEventHandler;
 
-exports.createEventHandler = createEventHandler;
+//# sourceMappingURL=RawEventHandler.js.map

package/raw/plugins/RawEventHandler.js.map

@@ -1 +1 @@
-{"version":3,"names":["RawEventHandler","EventPlugin","constructor","cb","createEventHandler"],"sources":["RawEventHandler.ts"],"sourcesContent":["import { Reply, Context as BaseContext } from \"@webiny/handler/types\";\nimport { Context as LambdaContext } from \"aws-lambda\";\nimport { EventPlugin, EventPluginCallableParams } from \"@webiny/handler\";\n\nexport interface RawEventHandlerCallableParams<Event, Context extends BaseContext>\n    extends EventPluginCallableParams<Event, Context> {\n    lambdaContext: LambdaContext;\n}\nexport interface RawEventHandlerCallable<Event, Context extends BaseContext, Response> {\n    (params: RawEventHandlerCallableParams<Event, Context>): Promise<Response | Reply>;\n}\n\nexport class RawEventHandler<\n    Event = any,\n    Context extends BaseContext = BaseContext,\n    Response = any\n> extends EventPlugin {\n    public constructor(cb: RawEventHandlerCallable<Event, Context, Response>) {\n        super(cb as any);\n    }\n}\n\nexport const createEventHandler = <\n    Event = any,\n    Context extends BaseContext = BaseContext,\n    Response = any\n>(\n    cb: RawEventHandlerCallable<Event, Context, Response>\n) => {\n    return new RawEventHandler<Event, Context, Response>(cb);\n};\n"],"mappings":";;;;;;;AAEA;;AAUO,MAAMA,eAAN,SAIGC,oBAJH,CAIe;EACXC,WAAW,CAACC,EAAD,EAAwD;IACtE,MAAMA,EAAN;EACH;;AAHiB;;;;AAMf,MAAMC,kBAAkB,GAK3BD,EAL8B,IAM7B;EACD,OAAO,IAAIH,eAAJ,CAA8CG,EAA9C,CAAP;AACH,CARM"}
+{"version":3,"names":["_handler","require","RawEventHandler","EventPlugin","constructor","params","cb","handle","canHandle","event","exports","createEventHandler"],"sources":["RawEventHandler.ts"],"sourcesContent":["import type { Context as LambdaContext } from \"@webiny/aws-sdk/types\";\nimport type { Context as BaseContext, Reply } from \"@webiny/handler/types\";\nimport type { EventPluginCallableParams } from \"@webiny/handler\";\nimport { EventPlugin } from \"@webiny/handler\";\n\nexport interface RawEventHandlerCallableParams<Event, Context extends BaseContext>\n    extends EventPluginCallableParams<Event, Context> {\n    lambdaContext: LambdaContext;\n}\nexport interface RawEventHandlerCallable<Event, Context extends BaseContext, Response> {\n    (params: RawEventHandlerCallableParams<Event, Context>): Promise<Response | Reply>;\n}\n\nexport interface RawEventHandlerParamsConfig<\n    Event = any,\n    Context extends BaseContext = BaseContext,\n    Response = any\n> {\n    canHandle(event: Event): boolean;\n    handle: RawEventHandlerCallable<Event, Context, Response>;\n}\n\nexport type RawEventHandlerParams<\n    Event = any,\n    Context extends BaseContext = BaseContext,\n    Response = any\n> =\n    | RawEventHandlerCallable<Event, Context, Response>\n    | RawEventHandlerParamsConfig<Event, Context, Response>;\n\nexport class RawEventHandler<\n    Event = any,\n    Context extends BaseContext = BaseContext,\n    Response = any\n> extends EventPlugin<Event, Context, Response> {\n    private readonly params: RawEventHandlerParams<Event, Context, Response>;\n\n    public constructor(params: RawEventHandlerParams<Event, Context, Response>) {\n        const cb = typeof params === \"function\" ? params : params.handle;\n        /**\n         * Callable is correct, TS is just having problems with the override.\n         */\n        // @ts-expect-error\n        super(cb);\n        this.params = params;\n    }\n    /**\n     *\n     */\n    public canHandle(event: Event): boolean {\n        if (typeof this.params === \"function\" || !this.params?.canHandle) {\n            return true;\n        }\n        return this.params.canHandle(event);\n    }\n}\n\nexport const createEventHandler = <\n    Event = any,\n    Context extends BaseContext = BaseContext,\n    Response = any\n>(\n    params: RawEventHandlerParams<Event, Context, Response>\n) => {\n    return new RawEventHandler<Event, Context, Response>(params);\n};\n"],"mappings":";;;;;;AAGA,IAAAA,QAAA,GAAAC,OAAA;AA2BO,MAAMC,eAAe,SAIlBC,oBAAW,CAA2B;EAGrCC,WAAWA,CAACC,MAAuD,EAAE;IACxE,MAAMC,EAAE,GAAG,OAAOD,MAAM,KAAK,UAAU,GAAGA,MAAM,GAAGA,MAAM,CAACE,MAAM;IAChE;AACR;AACA;IACQ;IACA,KAAK,CAACD,EAAE,CAAC;IACT,IAAI,CAACD,MAAM,GAAGA,MAAM;EACxB;EACA;AACJ;AACA;EACWG,SAASA,CAACC,KAAY,EAAW;IACpC,IAAI,OAAO,IAAI,CAACJ,MAAM,KAAK,UAAU,IAAI,CAAC,IAAI,CAACA,MAAM,EAAEG,SAAS,EAAE;MAC9D,OAAO,IAAI;IACf;IACA,OAAO,IAAI,CAACH,MAAM,CAACG,SAAS,CAACC,KAAK,CAAC;EACvC;AACJ;AAACC,OAAA,CAAAR,eAAA,GAAAA,eAAA;AAEM,MAAMS,kBAAkB,GAK3BN,MAAuD,IACtD;EACD,OAAO,IAAIH,eAAe,CAA2BG,MAAM,CAAC;AAChE,CAAC;AAACK,OAAA,CAAAC,kBAAA,GAAAA,kBAAA","ignoreList":[]}

package/registry.d.ts

@@ -0,0 +1,17 @@
+/**
+ * TODO: refactor this to use a proper DI container
+ */
+import type { HandlerEvent, SourceHandler } from "./types";
+import type { Context as LambdaContext } from "@webiny/aws-sdk/types";
+interface RegisterOptions {
+    silent?: boolean;
+}
+declare class HandlerRegistry {
+    private readonly handlers;
+    private constructor();
+    static create(): HandlerRegistry;
+    register(handler: SourceHandler<any>, options?: RegisterOptions): void;
+    getHandler(event: HandlerEvent, context: LambdaContext): SourceHandler;
+}
+export type { HandlerRegistry };
+export declare const registry: HandlerRegistry;

package/registry.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.registry = void 0;
+/**
+ * TODO: refactor this to use a proper DI container
+ */
+
+class HandlerRegistry {
+  handlers = new Map();
+  constructor() {
+    /**
+     * We don't want this class to be constructed outside the static create() method
+     */
+  }
+  static create() {
+    return new HandlerRegistry();
+  }
+  register(handler, options) {
+    if (this.handlers.has(handler.name)) {
+      if (options?.silent) {
+        return;
+      }
+      /**
+       * This should only happen during the development phase.
+       */
+      throw new Error(`Handler "${handler.name}" is already registered.`);
+    }
+    this.handlers.set(handler.name, handler);
+  }
+  getHandler(event, context) {
+    for (const handler of this.handlers.values()) {
+      if (handler.canUse(event, context)) {
+        return handler;
+      }
+    }
+    throw new Error(`There is no handler for the event: ${JSON.stringify(event)}`);
+  }
+}
+const registry = exports.registry = HandlerRegistry.create();
+
+//# sourceMappingURL=registry.js.map

package/registry.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["HandlerRegistry","handlers","Map","constructor","create","register","handler","options","has","name","silent","Error","set","getHandler","event","context","values","canUse","JSON","stringify","registry","exports"],"sources":["registry.ts"],"sourcesContent":["/**\n * TODO: refactor this to use a proper DI container\n */\nimport type { HandlerEvent, SourceHandler } from \"~/types\";\nimport type { Context as LambdaContext } from \"@webiny/aws-sdk/types\";\n\ninterface RegisterOptions {\n    silent?: boolean;\n}\n\nclass HandlerRegistry {\n    private readonly handlers = new Map<string, SourceHandler>();\n\n    private constructor() {\n        /**\n         * We don't want this class to be constructed outside the static create() method\n         */\n    }\n\n    public static create() {\n        return new HandlerRegistry();\n    }\n\n    public register(handler: SourceHandler<any>, options?: RegisterOptions) {\n        if (this.handlers.has(handler.name)) {\n            if (options?.silent) {\n                return;\n            }\n            /**\n             * This should only happen during the development phase.\n             */\n            throw new Error(`Handler \"${handler.name}\" is already registered.`);\n        }\n        this.handlers.set(handler.name, handler);\n    }\n\n    public getHandler(event: HandlerEvent, context: LambdaContext): SourceHandler {\n        for (const handler of this.handlers.values()) {\n            if (handler.canUse(event, context)) {\n                return handler;\n            }\n        }\n        throw new Error(`There is no handler for the event: ${JSON.stringify(event)}`);\n    }\n}\n\nexport type { HandlerRegistry };\n\nexport const registry = HandlerRegistry.create();\n"],"mappings":";;;;;;AAAA;AACA;AACA;;AAQA,MAAMA,eAAe,CAAC;EACDC,QAAQ,GAAG,IAAIC,GAAG,CAAwB,CAAC;EAEpDC,WAAWA,CAAA,EAAG;IAClB;AACR;AACA;EAFQ;EAKJ,OAAcC,MAAMA,CAAA,EAAG;IACnB,OAAO,IAAIJ,eAAe,CAAC,CAAC;EAChC;EAEOK,QAAQA,CAACC,OAA2B,EAAEC,OAAyB,EAAE;IACpE,IAAI,IAAI,CAACN,QAAQ,CAACO,GAAG,CAACF,OAAO,CAACG,IAAI,CAAC,EAAE;MACjC,IAAIF,OAAO,EAAEG,MAAM,EAAE;QACjB;MACJ;MACA;AACZ;AACA;MACY,MAAM,IAAIC,KAAK,CAAC,YAAYL,OAAO,CAACG,IAAI,0BAA0B,CAAC;IACvE;IACA,IAAI,CAACR,QAAQ,CAACW,GAAG,CAACN,OAAO,CAACG,IAAI,EAAEH,OAAO,CAAC;EAC5C;EAEOO,UAAUA,CAACC,KAAmB,EAAEC,OAAsB,EAAiB;IAC1E,KAAK,MAAMT,OAAO,IAAI,IAAI,CAACL,QAAQ,CAACe,MAAM,CAAC,CAAC,EAAE;MAC1C,IAAIV,OAAO,CAACW,MAAM,CAACH,KAAK,EAAEC,OAAO,CAAC,EAAE;QAChC,OAAOT,OAAO;MAClB;IACJ;IACA,MAAM,IAAIK,KAAK,CAAC,sCAAsCO,IAAI,CAACC,SAAS,CAACL,KAAK,CAAC,EAAE,CAAC;EAClF;AACJ;AAIO,MAAMM,QAAQ,GAAAC,OAAA,CAAAD,QAAA,GAAGpB,eAAe,CAACI,MAAM,CAAC,CAAC","ignoreList":[]}

package/s3/index.d.ts

@@ -1,11 +1,8 @@
-import { CreateHandlerParams as BaseCreateHandlerParams } from "@webiny/handler";
-import { S3Event, Context as LambdaContext } from "aws-lambda";
-import { APIGatewayProxyResult } from "aws-lambda/trigger/api-gateway-proxy";
+import type { HandlerFactoryParams } from "../types";
+import type { APIGatewayProxyResult, Context as LambdaContext, S3Event } from "@webiny/aws-sdk/types";
+export * from "./plugins/S3EventHandler";
 export interface HandlerCallable {
-    (payload: S3Event, context: LambdaContext): Promise<APIGatewayProxyResult>;
-}
-export interface CreateHandlerParams extends BaseCreateHandlerParams {
-    debug?: boolean;
+    (event: S3Event, context: LambdaContext): Promise<APIGatewayProxyResult>;
 }
-export declare const createHandler: (params: CreateHandlerParams) => HandlerCallable;
-export * from "./plugins/S3EventHandler";
+export type HandlerParams = HandlerFactoryParams;
+export declare const createHandler: (params: HandlerParams) => HandlerCallable;

package/s3/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,13 +8,9 @@ var _exportNames = {
   createHandler: true
 };
 exports.createHandler = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _handler = require("@webiny/handler");
-
+var _plugins = require("../plugins");
 var _S3EventHandler = require("./plugins/S3EventHandler");
-
 Object.keys(_S3EventHandler).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -27,62 +22,58 @@ Object.keys(_S3EventHandler).forEach(function (key) {
     }
   });
 });
-
-var _plugins = require("../plugins");
-
 var _execute = require("../execute");
-
-const Reply = require("fastify/lib/reply");
+var _reply = _interopRequireDefault(require("fastify/lib/reply"));
+var _composedHandler = require("../utils/composedHandler");
+/**
+ * We need a class, not an interface exported from types.
+ */
+// @ts-expect-error
 
 const url = "/webiny-s3-event";
-
 const createHandler = params => {
-  return (payload, context) => {
+  return async (event, context) => {
     const app = (0, _handler.createHandler)({
-      plugins: params.plugins,
-      options: (0, _objectSpread2.default)({
-        logger: params.debug === true
-      }, params.options || {})
+      ...params,
+      options: {
+        logger: params.debug === true,
+        ...(params.options || {})
+      }
     });
     /**
      * We always must add our default plugins to the app.
      */
-
     (0, _plugins.registerDefaultPlugins)(app.webiny);
     /**
      * There must be an event plugin for this handler to work.
      */
-
-    const plugins = app.webiny.plugins.byType(_S3EventHandler.S3EventHandler.type);
-    const handler = plugins.shift();
-
-    if (!handler) {
+    const plugins = app.webiny.plugins.byType(_S3EventHandler.S3EventHandler.type).reverse();
+    if (plugins.length === 0) {
       throw new Error(`To run @webiny/handler-aws/s3, you must have S3EventHandler set.`);
     }
-
+    const handler = (0, _composedHandler.createComposedHandler)(plugins);
     app.post(url, async (request, reply) => {
       const params = {
         request,
         reply,
         context: app.webiny,
-        event: payload,
+        event,
         lambdaContext: context
       };
-      const result = await handler.cb(params);
-
-      if (result instanceof Reply) {
+      const result = await handler(params);
+      if (result instanceof _reply.default) {
         return result;
       }
-
       app.__webiny_raw_result = result;
       return reply.send({});
     });
     return (0, _execute.execute)({
       app,
       url,
-      payload
+      payload: event
     });
   };
 };
+exports.createHandler = createHandler;
 
-exports.createHandler = createHandler;
+//# sourceMappingURL=index.js.map