@webiny/handler-aws 0.0.0-unstable.aa00eecd97 → 0.0.0-unstable.ac6ebf63c6

package/package.json

@@ -1,6 +1,7 @@
 {
 	"name": "@webiny/handler-aws",
-	"version": "0.0.0-unstable.aa00eecd97",
+	"version": "0.0.0-unstable.ac6ebf63c6",
+	"type": "module",
 	"main": "index.js",
 	"repository": {
 		"type": "git",
@@ -12,32 +13,24 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@babel/runtime": "7.20.13",
-		"@fastify/aws-lambda": "3.1.3",
-		"@webiny/handler": "0.0.0-unstable.aa00eecd97",
-		"@webiny/handler-client": "0.0.0-unstable.aa00eecd97",
-		"@webiny/plugins": "0.0.0-unstable.aa00eecd97",
-		"aws-lambda": "1.0.7",
-		"fastify": "4.11.0"
+		"@fastify/aws-lambda": "6.4.0",
+		"@webiny/aws-sdk": "0.0.0-unstable.ac6ebf63c6",
+		"@webiny/handler": "0.0.0-unstable.ac6ebf63c6",
+		"@webiny/handler-client": "0.0.0-unstable.ac6ebf63c6",
+		"@webiny/plugins": "0.0.0-unstable.ac6ebf63c6",
+		"@webiny/utils": "0.0.0-unstable.ac6ebf63c6",
+		"fastify": "5.7.4",
+		"pino-lambda": "4.4.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "7.20.7",
-		"@babel/core": "7.20.12",
-		"@babel/preset-env": "7.20.2",
-		"@babel/preset-typescript": "7.18.6",
-		"@webiny/cli": "0.0.0-unstable.aa00eecd97",
-		"@webiny/project-utils": "0.0.0-unstable.aa00eecd97",
-		"rimraf": "3.0.2",
-		"ttypescript": "1.5.15",
-		"typescript": "4.7.4"
+		"@webiny/build-tools": "0.0.0-unstable.ac6ebf63c6",
+		"rimraf": "6.1.3",
+		"typescript": "5.9.3",
+		"vitest": "3.2.4"
 	},
 	"publishConfig": {
 		"access": "public",
 		"directory": "dist"
 	},
-	"scripts": {
-		"build": "yarn webiny run build",
-		"watch": "yarn webiny run watch"
-	},
-	"gitHead": "aa00eecd97d16da9bdb0581f33d491487ce43ce9"
+	"gitHead": "ac6ebf63c6de308703d41f2c1b375e03cd96b813"
 }

package/plugins/handlerClient.js

@@ -1,36 +1,29 @@
-"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 _handlerClient = require("@webiny/handler-client");
-const createHandlerClientPlugin = () => {
-  const plugin = new _handlerClient.HandlerClientPlugin({
+import { LambdaClient, InvokeCommand } from "@webiny/aws-sdk/client-lambda/index.js";
+import { HandlerClientPlugin } from "@webiny/handler-client";
+export const createHandlerClientPlugin = () => {
+  const plugin = new HandlerClientPlugin({
     invoke: async params => {
       const {
         await: useAwait,
         name,
         payload
       } = params;
-      const lambdaClient = new _lambda.default({
+      const lambdaClient = new LambdaClient({
         region: process.env.AWS_REGION
       });
-      const response = await lambdaClient.invoke({
+      const response = await lambdaClient.send(new 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 {
@@ -49,4 +42,5 @@ const createHandlerClientPlugin = () => {
   plugin.name = "handler-client";
   return plugin;
 };
-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,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,eAAY,CAAC;QAClCC,MAAM,EAAEC,OAAO,CAACC,GAAG,CAACC;MACxB,CAAC,CAAC;MACF,MAAMC,QAAQ,GAAG,MAAMN,YAAY,CAC9BN,MAAM,CAAC;QACJa,YAAY,EAAET,IAAI;QAClBU,cAAc,EAAEX,QAAQ,KAAK,KAAK,GAAG,OAAO,GAAG,iBAAiB;QAChEY,OAAO,EAAEC,IAAI,CAACC,SAAS,CAACZ,OAAO;MACnC,CAAC,CAAC,CACDa,OAAO,EAAE;MAEd,IAAIf,QAAQ,KAAK,KAAK,EAAE;QACpB,OAAO,IAAI;MACf;MAEA,MAAMY,OAAO,GAAGH,QAAQ,CAACG,OAAiB;MAC1C,OAAOC,IAAI,CAACG,KAAK,CAACJ,OAAO,CAAC;IAC9B,CAAC;IACDK,MAAM,EAAEnB,MAAM,IAAI;MACd,IAAI,EAACA,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEG,IAAI,GAAE;QACf,OAAO,IAAI;MACf;MACA,MAAM;QAAEA;MAAK,CAAC,GAAGH,MAAM;MACvB;AACZ;AACA;AACA;MACY,IAAIG,IAAI,KAAKK,OAAO,CAACC,GAAG,CAACW,wBAAwB,EAAE;QAC/C,OAAO,IAAI;MACf;MACA,OAAOjB,IAAI,CAACkB,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI;IACtC;EACJ,CAAC,CAAC;EAEFxB,MAAM,CAACM,IAAI,GAAG,gBAAgB;EAE9B,OAAON,MAAM;AACjB,CAAC;AAAC"}
+{"version":3,"names":["LambdaClient","InvokeCommand","HandlerClientPlugin","createHandlerClientPlugin","plugin","invoke","params","await","useAwait","name","payload","lambdaClient","region","process","env","AWS_REGION","response","send","FunctionName","InvocationType","Payload","JSON","stringify","decoder","TextDecoder","parse","decode","canUse","AWS_LAMBDA_FUNCTION_NAME","match"],"sources":["handlerClient.ts"],"sourcesContent":["import { LambdaClient, InvokeCommand } from \"@webiny/aws-sdk/client-lambda/index.js\";\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,SAASA,YAAY,EAAEC,aAAa,QAAQ,wCAAwC;AACpF,SAASC,mBAAmB,QAAQ,wBAAwB;AAE5D,OAAO,MAAMC,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,MAAMC,MAAM,GAAG,IAAIF,mBAAmB,CAAC;IACnCG,MAAM,EAAE,MAAMC,MAAM,IAAI;MACpB,MAAM;QAAEC,KAAK,EAAEC,QAAQ;QAAEC,IAAI;QAAEC;MAAQ,CAAC,GAAGJ,MAAM;MACjD,MAAMK,YAAY,GAAG,IAAIX,YAAY,CAAC;QAClCY,MAAM,EAAEC,OAAO,CAACC,GAAG,CAACC;MACxB,CAAC,CAAC;MACF,MAAMC,QAAQ,GAAG,MAAML,YAAY,CAACM,IAAI,CACpC,IAAIhB,aAAa,CAAC;QACdiB,YAAY,EAAET,IAAI;QAClBU,cAAc,EAAEX,QAAQ,KAAK,KAAK,GAAG,OAAO,GAAG,iBAAiB;QAChEY,OAAO,EAAEC,IAAI,CAACC,SAAS,CAACZ,OAAO;MACnC,CAAC,CACL,CAAC;MAED,IAAIF,QAAQ,KAAK,KAAK,EAAE;QACpB,OAAO,IAAI;MACf;MAEA,MAAMe,OAAO,GAAG,IAAIC,WAAW,CAAC,OAAO,CAAC;MACxC,OAAOH,IAAI,CAACI,KAAK,CAACF,OAAO,CAACG,MAAM,CAACV,QAAQ,CAACI,OAAO,CAAC,CAAC;IACvD,CAAC;IACDO,MAAM,EAAErB,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,KAAKI,OAAO,CAACC,GAAG,CAACc,wBAAwB,EAAE;QAC/C,OAAO,IAAI;MACf;MACA,OAAOnB,IAAI,CAACoB,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI;IACtC;EACJ,CAAC,CAAC;EAEFzB,MAAM,CAACK,IAAI,GAAG,gBAAgB;EAE9B,OAAOL,MAAM;AACjB,CAAC","ignoreList":[]}

package/plugins/index.d.ts

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

package/plugins/index.js

@@ -1,11 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.registerDefaultPlugins = void 0;
-var _handlerClient = require("./handlerClient");
-const registerDefaultPlugins = context => {
-  context.plugins.register([(0, _handlerClient.createHandlerClientPlugin)()]);
+import { createHandlerClientPlugin } from "./handlerClient.js";
+export const registerDefaultPlugins = context => {
+  context.plugins.register([createHandlerClientPlugin()]);
 };
-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,OAAgB,IAAW;EAC9DA,OAAO,CAACC,OAAO,CAACC,QAAQ,CAAC,CAAC,IAAAC,wCAAyB,GAAE,CAAC,CAAC;AAC3D,CAAC;AAAC"}
+{"version":3,"names":["createHandlerClientPlugin","registerDefaultPlugins","context","plugins","register"],"sources":["index.ts"],"sourcesContent":["import { createHandlerClientPlugin } from \"./handlerClient.js\";\nimport type { Context } from \"@webiny/handler/types.js\";\n\nexport const registerDefaultPlugins = (context: Context): void => {\n    context.plugins.register([createHandlerClientPlugin()]);\n};\n"],"mappings":"AAAA,SAASA,yBAAyB;AAGlC,OAAO,MAAMC,sBAAsB,GAAIC,OAAgB,IAAW;EAC9DA,OAAO,CAACC,OAAO,CAACC,QAAQ,CAAC,CAACJ,yBAAyB,CAAC,CAAC,CAAC,CAAC;AAC3D,CAAC","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/index.js";
+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 declare const createHandler: <Payload = any, Response_1 = APIGatewayProxyResult>(params: CreateHandlerParams) => HandlerCallable<Payload, Response_1>;
-export * from "./plugins/RawEventHandler";
+export type CreateHandlerParams = BaseCreateHandlerParams;
+export declare const createHandler: <Payload = any, Response = APIGatewayProxyResult>(params: CreateHandlerParams) => HandlerCallable<Payload, Response>;
+export * from "./plugins/RawEventHandler.js";

package/raw/index.js

@@ -1,29 +1,3 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-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;
-  if (key in exports && exports[key] === _RawEventHandler[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _RawEventHandler[key];
-    }
-  });
-});
-var _plugins = require("../plugins");
-var _execute = require("../execute");
 /**
  * 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.
@@ -31,28 +5,44 @@ var _execute = require("../execute");
  * We should try to have some kind of standardized event type implementation at some point.
  */
 
-const Reply = require("fastify/lib/reply");
+import { createHandler as createBaseHandler } from "@webiny/handler";
+import { RawEventHandler } from "./plugins/RawEventHandler.js";
+import { registerDefaultPlugins } from "../plugins/index.js";
+import { execute } from "../execute.js";
+import { createComposedHandler } from "../utils/composedHandler.js";
+// @ts-expect-error
+import Reply from "fastify/lib/reply.js";
 const url = "/webiny-raw-event";
-const createHandler = params => {
+export const createHandler = params => {
   return (payload, context) => {
-    var _params$http;
-    const app = (0, _handler.createHandler)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-      options: (0, _objectSpread2.default)({
-        logger: ((_params$http = params.http) === null || _params$http === void 0 ? void 0 : _params$http.debug) === true
-      }, params.options || {})
-    }));
+    const app = createBaseHandler({
+      ...params,
+      options: {
+        logger: params.debug === true,
+        ...(params.options || {})
+      }
+    });
     /**
      * We always must add our default plugins to the app.
      */
-    (0, _plugins.registerDefaultPlugins)(app.webiny);
+    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.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 = createComposedHandler(plugins);
     app.post(url, async (request, reply) => {
       const params = {
         request,
@@ -61,18 +51,20 @@ 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({});
     });
-    return (0, _execute.execute)({
+    return execute({
       app,
       url,
       payload
     });
   };
 };
-exports.createHandler = createHandler;
+export * from "./plugins/RawEventHandler.js";
+
+//# sourceMappingURL=index.js.map

package/raw/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["Reply","require","url","createHandler","params","payload","context","app","createBaseHandler","options","logger","http","debug","registerDefaultPlugins","webiny","plugins","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            ...params,\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,mBAAmB,CAAC;AAO1C,MAAMC,GAAG,GAAG,mBAAmB;AAYxB,MAAMC,aAAa,GACtBC,MAA2B,IACU;EACrC,OAAO,CAACC,OAAO,EAAEC,OAAO,KAAK;IAAA;IACzB,MAAMC,GAAG,GAAG,IAAAC,sBAAiB,8DACtBJ,MAAM;MACTK,OAAO;QACHC,MAAM,EAAE,iBAAAN,MAAM,CAACO,IAAI,iDAAX,aAAaC,KAAK,MAAK;MAAI,GAC/BR,MAAM,CAACK,OAAO,IAAI,CAAC,CAAC;IAC3B,GACH;IACF;AACR;AACA;IACQ,IAAAI,+BAAsB,EAACN,GAAG,CAACO,MAAM,CAAC;IAClC;AACR;AACA;IACQ,MAAMC,OAAO,GAAGR,GAAG,CAACO,MAAM,CAACC,OAAO,CAACC,MAAM,CACrCC,gCAAe,CAACC,IAAI,CACvB;IACD,MAAMC,OAAO,GAAGJ,OAAO,CAACK,KAAK,EAAE;IAC/B,IAAI,CAACD,OAAO,EAAE;MACV,MAAM,IAAIE,KAAK,CAAE,oEAAmE,CAAC;IACzF;IAEAd,GAAG,CAACe,IAAI,CAACpB,GAAG,EAAE,OAAOqB,OAAO,EAAEC,KAAK,KAAK;MACpC,MAAMpB,MAAM,GAAG;QACXmB,OAAO;QACPC,KAAK;QACLlB,OAAO,EAAEC,GAAG,CAACO,MAAM;QACnBT,OAAO;QACPoB,aAAa,EAAEnB;MACnB,CAAC;MACD,MAAMoB,MAAM,GAAG,MAAMP,OAAO,CAACQ,EAAE,CAACvB,MAAM,CAAC;MAEvC,IAAIsB,MAAM,YAAY1B,KAAK,EAAE;QACzB,OAAO0B,MAAM;MACjB;MAECnB,GAAG,CAASqB,mBAAmB,GAAGF,MAAM;MACzC,OAAOF,KAAK,CAACK,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;IACF,OAAO,IAAAC,gBAAO,EAAC;MACXvB,GAAG;MACHL,GAAG;MACHG;IACJ,CAAC,CAAC;EACN,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["createHandler","createBaseHandler","RawEventHandler","registerDefaultPlugins","execute","createComposedHandler","Reply","url","params","payload","context","app","options","logger","debug","webiny","plugins","byType","type","filter","plugin","canHandle","reverse","length","Error","handler","post","request","reply","lambdaContext","result","__webiny_raw_result","send"],"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 {\n    APIGatewayProxyResult,\n    Context as LambdaContext\n} from \"@webiny/aws-sdk/types/index.js\";\nimport type { CreateHandlerParams as BaseCreateHandlerParams } from \"@webiny/handler\";\nimport { createHandler as createBaseHandler } from \"@webiny/handler\";\nimport { RawEventHandler } from \"~/raw/plugins/RawEventHandler.js\";\nimport { registerDefaultPlugins } from \"~/plugins/index.js\";\nimport { execute } from \"~/execute.js\";\nimport { createComposedHandler } from \"~/utils/composedHandler.js\";\nimport type { Context, Request } from \"@webiny/handler/types.js\";\n\n// @ts-expect-error\nimport Reply from \"fastify/lib/reply.js\";\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.js\";\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;;AAMA,SAASA,aAAa,IAAIC,iBAAiB,QAAQ,iBAAiB;AACpE,SAASC,eAAe;AACxB,SAASC,sBAAsB;AAC/B,SAASC,OAAO;AAChB,SAASC,qBAAqB;AAG9B;AACA,OAAOC,KAAK,MAAM,sBAAsB;AAExC,MAAMC,GAAG,GAAG,mBAAmB;AAiB/B,OAAO,MAAMP,aAAa,GACtBQ,MAA2B,IACU;EACrC,OAAO,CAACC,OAAO,EAAEC,OAAO,KAAK;IACzB,MAAMC,GAAG,GAAGV,iBAAiB,CAAC;MAC1B,GAAGO,MAAM;MACTI,OAAO,EAAE;QACLC,MAAM,EAAEL,MAAM,CAACM,KAAK,KAAK,IAAI;QAC7B,IAAIN,MAAM,CAACI,OAAO,IAAI,CAAC,CAAC;MAC5B;IACJ,CAAC,CAAC;IACF;AACR;AACA;IACQT,sBAAsB,CAACQ,GAAG,CAACI,MAAM,CAAC;IAClC;AACR;AACA;IACQ,MAAMC,OAAO,GAAGL,GAAG,CAACI,MAAM,CAACC,OAAO,CAC7BC,MAAM,CAA0Cf,eAAe,CAACgB,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,CAACZ,OAAO,CAAC;IACpC,CAAC,CAAC,CACDa,OAAO,CAAC,CAAC;IACd,IAAIN,OAAO,CAACO,MAAM,KAAK,CAAC,EAAE;MACtB,MAAM,IAAIC,KAAK,CAAC,oEAAoE,CAAC;IACzF;IAEA,MAAMC,OAAO,GAAGpB,qBAAqB,CAInCW,OAAO,CAAC;IAEVL,GAAG,CAACe,IAAI,CAACnB,GAAG,EAAE,OAAOoB,OAAO,EAAEC,KAAK,KAAK;MACpC,MAAMpB,MAAmC,GAAG;QACxCmB,OAAO;QACPC,KAAK;QACLlB,OAAO,EAAEC,GAAG,CAACI,MAAM;QACnBN,OAAO;QACPoB,aAAa,EAAEnB;MACnB,CAAC;MACD,MAAMoB,MAAM,GAAG,MAAML,OAAO,CAACjB,MAAkC,CAAC;MAEhE,IAAIsB,MAAM,YAAYxB,KAAK,EAAE;QACzB,OAAOwB,MAAM;MACjB;MAEAnB,GAAG,CAACoB,mBAAmB,GAAGD,MAAM;MAChC,OAAOF,KAAK,CAACI,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;IACF,OAAO5B,OAAO,CAAC;MACXO,GAAG;MACHJ,GAAG;MACHE;IACJ,CAAC,CAAC;EACN,CAAC;AACL,CAAC;AAED","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/index.js";
+import type { Context as BaseContext, Reply } from "@webiny/handler/types.js";
+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 = any, Context extends BaseContext = BaseContext, Response = any>(params: RawEventHandlerParams<Event, Context, Response>) => RawEventHandler<Event, Context, Response>;

package/raw/plugins/RawEventHandler.js

@@ -1,17 +1,26 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createEventHandler = exports.RawEventHandler = void 0;
-var _handler = require("@webiny/handler");
-class RawEventHandler extends _handler.EventPlugin {
-  constructor(cb) {
+import { EventPlugin } from "@webiny/handler";
+export class RawEventHandler extends EventPlugin {
+  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);
+export const createEventHandler = params => {
+  return new RawEventHandler(params);
 };
-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,eAAe,SAIlBC,oBAAW,CAAC;EACXC,WAAW,CAACC,EAAqD,EAAE;IACtE,KAAK,CAACA,EAAE,CAAQ;EACpB;AACJ;AAAC;AAEM,MAAMC,kBAAkB,GAK3BD,EAAqD,IACpD;EACD,OAAO,IAAIH,eAAe,CAA2BG,EAAE,CAAC;AAC5D,CAAC;AAAC"}
+{"version":3,"names":["EventPlugin","RawEventHandler","constructor","params","cb","handle","canHandle","event","createEventHandler"],"sources":["RawEventHandler.ts"],"sourcesContent":["import type { Context as LambdaContext } from \"@webiny/aws-sdk/types/index.js\";\nimport type { Context as BaseContext, Reply } from \"@webiny/handler/types.js\";\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,SAASA,WAAW,QAAQ,iBAAiB;AA2B7C,OAAO,MAAMC,eAAe,SAIlBD,WAAW,CAA2B;EAGrCE,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;AAEA,OAAO,MAAMC,kBAAkB,GAK3BL,MAAuD,IACtD;EACD,OAAO,IAAIF,eAAe,CAA2BE,MAAM,CAAC;AAChE,CAAC","ignoreList":[]}

package/registry.d.ts

@@ -0,0 +1,17 @@
+/**
+ * TODO: refactor this to use a proper DI container
+ */
+import type { HandlerEvent, SourceHandler } from "./types.js";
+import type { Context as LambdaContext } from "@webiny/aws-sdk/types/index.js";
+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,38 @@
+/**
+ * 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)}`);
+  }
+}
+export const 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"],"sources":["registry.ts"],"sourcesContent":["/**\n * TODO: refactor this to use a proper DI container\n */\nimport type { HandlerEvent, SourceHandler } from \"~/types.js\";\nimport type { Context as LambdaContext } from \"@webiny/aws-sdk/types/index.js\";\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;AAIA,OAAO,MAAMM,QAAQ,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.js";
+import type { APIGatewayProxyResult, Context as LambdaContext, S3Event } from "@webiny/aws-sdk/types/index.js";
+export * from "./plugins/S3EventHandler.js";
 export interface HandlerCallable {
-    (payload: S3Event, context: LambdaContext): Promise<APIGatewayProxyResult>;
+    (event: S3Event, context: LambdaContext): Promise<APIGatewayProxyResult>;
 }
-export interface CreateHandlerParams extends BaseCreateHandlerParams {
-    debug?: boolean;
-}
-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,70 +1,57 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {
-  createHandler: true
-};
-exports.createHandler = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _handler = require("@webiny/handler");
-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;
-  if (key in exports && exports[key] === _S3EventHandler[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _S3EventHandler[key];
-    }
-  });
-});
-var _plugins = require("../plugins");
-var _execute = require("../execute");
-const Reply = require("fastify/lib/reply");
+import { createHandler as createBaseHandler } from "@webiny/handler";
+import { registerDefaultPlugins } from "../plugins/index.js";
+import { S3EventHandler } from "./plugins/S3EventHandler.js";
+import { execute } from "../execute.js";
+/**
+ * We need a class, not an interface exported from types.
+ */
+// @ts-expect-error
+import Reply from "fastify/lib/reply.js";
+import { createComposedHandler } from "../utils/composedHandler.js";
+export * from "./plugins/S3EventHandler.js";
 const url = "/webiny-s3-event";
-const createHandler = params => {
-  return (payload, context) => {
-    const app = (0, _handler.createHandler)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-      options: (0, _objectSpread2.default)({
-        logger: params.debug === true
-      }, params.options || {})
-    }));
+export const createHandler = params => {
+  return async (event, context) => {
+    const app = createBaseHandler({
+      ...params,
+      options: {
+        logger: params.debug === true,
+        ...(params.options || {})
+      }
+    });
     /**
      * We always must add our default plugins to the app.
      */
-    (0, _plugins.registerDefaultPlugins)(app.webiny);
+    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.type).reverse();
+    if (plugins.length === 0) {
       throw new Error(`To run @webiny/handler-aws/s3, you must have S3EventHandler set.`);
     }
+    const handler = 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);
+      const result = await handler(params);
       if (result instanceof Reply) {
         return result;
       }
       app.__webiny_raw_result = result;
       return reply.send({});
     });
-    return (0, _execute.execute)({
+    return execute({
       app,
       url,
-      payload
+      payload: event
     });
   };
 };
-exports.createHandler = createHandler;
+
+//# sourceMappingURL=index.js.map