@webiny/api-file-manager 5.30.0 → 5.31.0-beta.0

package/handlers/download/index.d.ts

@@ -1,8 +1,3 @@
-import { HandlerPlugin } from "@webiny/handler/types";
-import { ArgsContext } from "@webiny/handler-args/types";
-import { DownloadHandlerEventArgs } from "../types";
-import { ClientContext } from "@webiny/handler-client/types";
-interface Context extends ClientContext, ArgsContext<DownloadHandlerEventArgs> {
-}
-declare const _default: () => HandlerPlugin<Context>;
-export default _default;
+import { RoutePlugin } from "@webiny/handler-aws/gateway";
+import { Context } from "@webiny/handler/types";
+export declare const createDownloadFilePlugins: () => RoutePlugin<Context>[];

package/handlers/download/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createDownloadFilePlugins = void 0;
 
 var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
 
@@ -17,29 +17,36 @@ var _utils = require("../utils");
 
 var _loaders = _interopRequireDefault(require("../transform/loaders"));
 
+var _gateway = require("@webiny/handler-aws/gateway");
+
 const MAX_RETURN_CONTENT_LENGTH = 5000000; // ~4.77MB
 
 const DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year
 
+const PRESIGNED_URL_EXPIRATION = 900; // 15 minutes
+
 /**
  * Based on given path, extracts file key and additional options sent via query params.
- * @param event
  */
-const extractFilenameOptions = event => {
-  const path = (0, _sanitizeFilename.default)(event.pathParameters.path);
+
+const extractFilenameOptions = request => {
+  const path = (0, _sanitizeFilename.default)(request.params.path);
   return {
     filename: decodeURI(path),
-    options: event.queryStringParameters,
+    options: request.query,
     extension: _path.default.extname(path)
   };
 };
 
-const getS3Object = async (event, s3, context) => {
+const getS3Object = async (request, s3, context) => {
   const {
     options,
     filename,
     extension
-  } = extractFilenameOptions(event);
+  } = extractFilenameOptions(request);
+  const params = (0, _utils.getObjectParams)(filename);
+  const objectHead = await s3.headObject(params).promise();
+  const contentLength = objectHead.ContentLength ? objectHead.ContentLength : 0;
 
   for (const loader of _loaders.default) {
     const canProcess = loader.canProcess({
@@ -48,7 +55,8 @@ const getS3Object = async (event, s3, context) => {
       options,
       file: {
         name: filename,
-        extension
+        extension,
+        contentLength
       }
     });
 
@@ -62,25 +70,31 @@ const getS3Object = async (event, s3, context) => {
       options,
       file: {
         name: filename,
-        extension
+        extension,
+        contentLength
       }
     });
-  } // If no processors handled the file request, just return the S3 object by default.
+  } // If no processors handled the file request, just return the S3 object taking its size into consideration.
 
 
-  const params = (0, _utils.getObjectParams)(filename);
+  let object;
+
+  if (contentLength < MAX_RETURN_CONTENT_LENGTH) {
+    object = await s3.getObject(params).promise();
+  }
+
   return {
-    object: await s3.getObject(params).promise(),
-    params: params
+    object,
+    params
   };
 };
 
-var _default = () => ({
-  type: "handler",
-  name: "handler-download-file",
-
-  async handle(context) {
-    const eventHandler = async event => {
+const createDownloadFilePlugins = () => {
+  return [new _gateway.RoutePlugin(({
+    onGet,
+    context
+  }) => {
+    onGet("/files/:path", async (request, reply) => {
       const {
         region
       } = (0, _utils.getEnvironment)();
@@ -90,42 +104,29 @@ var _default = () => ({
       const {
         params,
         object
-      } = await getS3Object(event, s3, context);
-      const contentLength = object.ContentLength === undefined ? 0 : object.ContentLength;
-
-      if (contentLength < MAX_RETURN_CONTENT_LENGTH) {
-        return {
-          /**
-           * It is safe to cast as buffer or unknown
-           */
-          data: object.Body || null,
-          headers: {
-            "Content-Type": object.ContentType,
-            "Cache-Control": "public, max-age=" + DEFAULT_CACHE_MAX_AGE
-          }
-        };
-      } // Lambda can return max 6MB of content, so if our object's size is larger, we are sending
-      // a 301 Redirect, redirecting the user to the public URL of the object in S3.
-
+      } = await getS3Object(request, s3, context); // If there's an "object", it means we can return its body directly.
+
+      if (object) {
+        return reply.headers({
+          "Content-Type": object.ContentType,
+          "Cache-Control": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`,
+          "x-webiny-base64-encoded": true
+        }).send(object.Body || "");
+      }
 
-      await s3.putObjectAcl({
+      const presignedUrl = s3.getSignedUrl("getObject", {
         Bucket: params.Bucket,
-        ACL: "public-read",
-        Key: params.Key
-      }).promise();
-      return {
-        data: null,
-        statusCode: 301,
-        headers: {
-          Location: `https://${params.Bucket}.s3.amazonaws.com/${params.Key}`
-        }
-      };
-    };
-
-    const handler = (0, _utils.createHandler)(eventHandler);
-    return await handler(context.invocationArgs);
-  }
+        Key: params.Key,
+        Expires: PRESIGNED_URL_EXPIRATION
+      }); // Lambda can return max 6MB of content, so if our object's size is larger, we are sending
+      // a 301 Redirect, redirecting the user to the public URL of the object in S3.
 
-});
+      return reply.code(301).headers({
+        Location: presignedUrl,
+        "Cache-Control": "public, max-age=" + PRESIGNED_URL_EXPIRATION
+      }).send("");
+    });
+  })];
+};
 
-exports.default = _default;
+exports.createDownloadFilePlugins = createDownloadFilePlugins;

package/handlers/download/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["MAX_RETURN_CONTENT_LENGTH","DEFAULT_CACHE_MAX_AGE","extractFilenameOptions","event","path","sanitizeFilename","pathParameters","filename","decodeURI","options","queryStringParameters","extension","pathLib","extname","getS3Object","s3","context","loader","loaders","canProcess","file","name","process","params","getObjectParams","object","getObject","promise","type","handle","eventHandler","region","getEnvironment","S3","contentLength","ContentLength","undefined","data","Body","headers","ContentType","putObjectAcl","Bucket","ACL","Key","statusCode","Location","handler","createHandler","invocationArgs"],"sources":["index.ts"],"sourcesContent":["import { HandlerPlugin } from \"@webiny/handler/types\";\nimport S3 from \"aws-sdk/clients/s3\";\nimport sanitizeFilename from \"sanitize-filename\";\nimport pathLib from \"path\";\nimport { createHandler, getEnvironment, getObjectParams, EventHandlerCallable } from \"../utils\";\nimport loaders from \"../transform/loaders\";\nimport { ArgsContext } from \"@webiny/handler-args/types\";\nimport { DownloadHandlerEventArgs } from \"~/handlers/types\";\nimport { ClientContext } from \"@webiny/handler-client/types\";\n\nconst MAX_RETURN_CONTENT_LENGTH = 5000000; // ~4.77MB\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\n\ninterface Context extends ClientContext, ArgsContext<DownloadHandlerEventArgs> {}\n/**\n * Based on given path, extracts file key and additional options sent via query params.\n * @param event\n */\nconst extractFilenameOptions = (event: DownloadHandlerEventArgs) => {\n    const path = sanitizeFilename(event.pathParameters.path);\n    return {\n        filename: decodeURI(path),\n        options: event.queryStringParameters,\n        extension: pathLib.extname(path)\n    };\n};\n\nconst getS3Object = async (event: DownloadHandlerEventArgs, s3: S3, context: Context) => {\n    const { options, filename, extension } = extractFilenameOptions(event);\n\n    for (const loader of loaders) {\n        const canProcess = loader.canProcess({\n            context,\n            s3,\n            options,\n            file: {\n                name: filename,\n                extension\n            }\n        });\n\n        if (!canProcess) {\n            continue;\n        }\n        return loader.process({\n            context,\n            s3,\n            options,\n            file: {\n                name: filename,\n                extension\n            }\n        });\n    }\n\n    // If no processors handled the file request, just return the S3 object by default.\n    const params = getObjectParams(filename);\n    return {\n        object: await s3.getObject(params).promise(),\n        params: params\n    };\n};\n\nexport default (): HandlerPlugin<Context> => ({\n    type: \"handler\",\n    name: \"handler-download-file\",\n    async handle(context) {\n        const eventHandler: EventHandlerCallable<DownloadHandlerEventArgs> = async event => {\n            const { region } = getEnvironment();\n            const s3 = new S3({ region });\n\n            const { params, object } = await getS3Object(event, s3, context);\n\n            const contentLength = object.ContentLength === undefined ? 0 : object.ContentLength;\n            if (contentLength < MAX_RETURN_CONTENT_LENGTH) {\n                return {\n                    /**\n                     * It is safe to cast as buffer or unknown\n                     */\n                    data: object.Body || null,\n                    headers: {\n                        \"Content-Type\": object.ContentType,\n                        \"Cache-Control\": \"public, max-age=\" + DEFAULT_CACHE_MAX_AGE\n                    }\n                };\n            }\n\n            // Lambda can return max 6MB of content, so if our object's size is larger, we are sending\n            // a 301 Redirect, redirecting the user to the public URL of the object in S3.\n            await s3\n                .putObjectAcl({\n                    Bucket: params.Bucket,\n                    ACL: \"public-read\",\n                    Key: params.Key\n                })\n                .promise();\n\n            return {\n                data: null,\n                statusCode: 301,\n                headers: {\n                    Location: `https://${params.Bucket}.s3.amazonaws.com/${params.Key}`\n                }\n            };\n        };\n        const handler = createHandler(eventHandler);\n\n        return await handler(context.invocationArgs);\n    }\n});\n"],"mappings":"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"}
+{"version":3,"names":["MAX_RETURN_CONTENT_LENGTH","DEFAULT_CACHE_MAX_AGE","PRESIGNED_URL_EXPIRATION","extractFilenameOptions","request","path","sanitizeFilename","params","filename","decodeURI","options","query","extension","pathLib","extname","getS3Object","s3","context","getObjectParams","objectHead","headObject","promise","contentLength","ContentLength","loader","loaders","canProcess","file","name","process","object","getObject","createDownloadFilePlugins","RoutePlugin","onGet","reply","region","getEnvironment","S3","headers","ContentType","send","Body","presignedUrl","getSignedUrl","Bucket","Key","Expires","code","Location"],"sources":["index.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport sanitizeFilename from \"sanitize-filename\";\nimport pathLib from \"path\";\nimport { getEnvironment, getObjectParams } from \"../utils\";\nimport loaders from \"../transform/loaders\";\nimport { RoutePlugin } from \"@webiny/handler-aws/gateway\";\nimport { Context, Request } from \"@webiny/handler/types\";\nimport { ObjectParamsResponse } from \"~/handlers/utils/getObjectParams\";\n\nconst MAX_RETURN_CONTENT_LENGTH = 5000000; // ~4.77MB\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\nconst PRESIGNED_URL_EXPIRATION = 900; // 15 minutes\n/**\n * Based on given path, extracts file key and additional options sent via query params.\n */\nconst extractFilenameOptions = (request: Request) => {\n    const path = sanitizeFilename((request.params as any).path);\n    return {\n        filename: decodeURI(path),\n        options: request.query as any,\n        extension: pathLib.extname(path)\n    };\n};\n\ninterface S3Object {\n    object?: S3.Types.GetObjectOutput;\n    params: ObjectParamsResponse;\n}\n\nconst getS3Object = async (request: Request, s3: S3, context: Context): Promise<S3Object> => {\n    const { options, filename, extension } = extractFilenameOptions(request);\n    const params = getObjectParams(filename);\n    const objectHead = await s3.headObject(params).promise();\n    const contentLength = objectHead.ContentLength ? objectHead.ContentLength : 0;\n\n    for (const loader of loaders) {\n        const canProcess = loader.canProcess({\n            context,\n            s3,\n            options,\n            file: {\n                name: filename,\n                extension,\n                contentLength\n            }\n        });\n\n        if (!canProcess) {\n            continue;\n        }\n        return loader.process({\n            context,\n            s3,\n            options,\n            file: {\n                name: filename,\n                extension,\n                contentLength\n            }\n        });\n    }\n\n    // If no processors handled the file request, just return the S3 object taking its size into consideration.\n    let object;\n    if (contentLength < MAX_RETURN_CONTENT_LENGTH) {\n        object = await s3.getObject(params).promise();\n    }\n\n    return { object, params };\n};\n\nexport const createDownloadFilePlugins = () => {\n    return [\n        new RoutePlugin(({ onGet, context }) => {\n            onGet(\"/files/:path\", async (request, reply) => {\n                const { region } = getEnvironment();\n                const s3 = new S3({ region });\n\n                const { params, object } = await getS3Object(request, s3, context);\n\n                // If there's an \"object\", it means we can return its body directly.\n                if (object) {\n                    return reply\n                        .headers({\n                            \"Content-Type\": object.ContentType,\n                            \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`,\n                            \"x-webiny-base64-encoded\": true\n                        })\n                        .send(object.Body || \"\");\n                }\n\n                const presignedUrl = s3.getSignedUrl(\"getObject\", {\n                    Bucket: params.Bucket,\n                    Key: params.Key,\n                    Expires: PRESIGNED_URL_EXPIRATION\n                });\n\n                // Lambda can return max 6MB of content, so if our object's size is larger, we are sending\n                // a 301 Redirect, redirecting the user to the public URL of the object in S3.\n                return reply\n                    .code(301)\n                    .headers({\n                        Location: presignedUrl,\n                        \"Cache-Control\": \"public, max-age=\" + PRESIGNED_URL_EXPIRATION\n                    })\n                    .send(\"\");\n            });\n        })\n    ];\n};\n"],"mappings":"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"}

package/handlers/manage/index.d.ts

@@ -1,5 +1,5 @@
-import { HandlerPlugin } from "@webiny/handler/types";
-import { ArgsContext } from "@webiny/handler-args/types";
-import { ManageHandlerEventArgs } from "../types";
-declare const _default: () => HandlerPlugin<ArgsContext<ManageHandlerEventArgs>>;
-export default _default;
+import { S3EventHandler } from "@webiny/handler-aws";
+/**
+ * This handler must be run through @webiny/handler-aws/s3
+ */
+export declare const createManageFilePlugins: () => S3EventHandler<void>[];

package/handlers/manage/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createManageFilePlugins = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -15,57 +15,57 @@ var _utils = require("../utils");
 
 var _managers = _interopRequireDefault(require("../transform/managers"));
 
-var _default = () => ({
-  type: "handler",
-  name: "handler-download-file",
+var _handlerAws = require("@webiny/handler-aws");
 
-  async handle(context) {
-    // TODO @ts-refactor check in createHandler for returns types that eventHandler must return
-    // @ts-ignore
-    const eventHandler = async event => {
-      const keys = [];
+/**
+ * This handler must be run through @webiny/handler-aws/s3
+ */
+const createManageFilePlugins = () => {
+  return [new _handlerAws.S3EventHandler(async ({
+    event
+  }) => {
+    const keys = [];
 
-      for (let i = 0; i < event.Records.length; i++) {
-        const record = event.Records[i];
+    for (let i = 0; i < event.Records.length; i++) {
+      const record = event.Records[i];
 
-        if (typeof record.s3.object.key === "string") {
-          keys.push(record.s3.object.key);
-        }
+      if (typeof record.s3.object.key === "string") {
+        keys.push(record.s3.object.key);
       }
-
-      const {
-        region
-      } = (0, _utils.getEnvironment)();
-      const s3 = new _s.default({
-        region
-      });
-
-      for (const key of keys) {
-        const extension = _path.default.extname(key);
-
-        for (const manager of _managers.default) {
-          const canProcess = manager.canProcess({
-            key,
-            extension
-          });
-
-          if (!canProcess) {
-            continue;
-          }
-
-          await manager.process({
-            s3,
-            key,
-            extension
-          });
+    }
+
+    if (keys.length === 0) {
+      return;
+    }
+
+    const {
+      region
+    } = (0, _utils.getEnvironment)();
+    const s3 = new _s.default({
+      region
+    });
+
+    for (const key of keys) {
+      const extension = _path.default.extname(key);
+
+      for (const manager of _managers.default) {
+        const canProcess = manager.canProcess({
+          key,
+          extension
+        });
+
+        if (!canProcess) {
+          continue;
         }
-      }
-    };
 
-    const handler = (0, _utils.createHandler)(eventHandler);
-    return await handler(context.invocationArgs);
-  }
-
-});
+        await manager.process({
+          s3,
+          key,
+          extension
+        });
+      }
+    }
+  })];
+};
 
-exports.default = _default;
+exports.createManageFilePlugins = createManageFilePlugins;

package/handlers/manage/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["type","name","handle","context","eventHandler","event","keys","i","Records","length","record","s3","object","key","push","region","getEnvironment","S3","extension","path","extname","manager","managers","canProcess","process","handler","createHandler","invocationArgs"],"sources":["index.ts"],"sourcesContent":["import path from \"path\";\nimport S3 from \"aws-sdk/clients/s3\";\nimport { HandlerPlugin } from \"@webiny/handler/types\";\nimport { createHandler, getEnvironment, EventHandlerCallable } from \"../utils\";\nimport managers from \"../transform/managers\";\nimport { ArgsContext } from \"@webiny/handler-args/types\";\nimport { ManageHandlerEventArgs } from \"~/handlers/types\";\n\nexport default (): HandlerPlugin<ArgsContext<ManageHandlerEventArgs>> => ({\n    type: \"handler\",\n    name: \"handler-download-file\",\n    async handle(context) {\n        // TODO @ts-refactor check in createHandler for returns types that eventHandler must return\n        // @ts-ignore\n        const eventHandler: EventHandlerCallable<ManageHandlerEventArgs> = async event => {\n            const keys: string[] = [];\n            for (let i = 0; i < event.Records.length; i++) {\n                const record = event.Records[i];\n                if (typeof record.s3.object.key === \"string\") {\n                    keys.push(record.s3.object.key);\n                }\n            }\n\n            const { region } = getEnvironment();\n            const s3 = new S3({ region });\n\n            for (const key of keys) {\n                const extension = path.extname(key);\n\n                for (const manager of managers) {\n                    const canProcess = manager.canProcess({\n                        key,\n                        extension\n                    });\n\n                    if (!canProcess) {\n                        continue;\n                    }\n                    await manager.process({\n                        s3,\n                        key,\n                        extension\n                    });\n                }\n            }\n        };\n\n        const handler = createHandler(eventHandler);\n\n        return await handler(context.invocationArgs);\n    }\n});\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AAEA;;AACA;;eAIe,OAA2D;EACtEA,IAAI,EAAE,SADgE;EAEtEC,IAAI,EAAE,uBAFgE;;EAGtE,MAAMC,MAAN,CAAaC,OAAb,EAAsB;IAClB;IACA;IACA,MAAMC,YAA0D,GAAG,MAAMC,KAAN,IAAe;MAC9E,MAAMC,IAAc,GAAG,EAAvB;;MACA,KAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGF,KAAK,CAACG,OAAN,CAAcC,MAAlC,EAA0CF,CAAC,EAA3C,EAA+C;QAC3C,MAAMG,MAAM,GAAGL,KAAK,CAACG,OAAN,CAAcD,CAAd,CAAf;;QACA,IAAI,OAAOG,MAAM,CAACC,EAAP,CAAUC,MAAV,CAAiBC,GAAxB,KAAgC,QAApC,EAA8C;UAC1CP,IAAI,CAACQ,IAAL,CAAUJ,MAAM,CAACC,EAAP,CAAUC,MAAV,CAAiBC,GAA3B;QACH;MACJ;;MAED,MAAM;QAAEE;MAAF,IAAa,IAAAC,qBAAA,GAAnB;MACA,MAAML,EAAE,GAAG,IAAIM,UAAJ,CAAO;QAAEF;MAAF,CAAP,CAAX;;MAEA,KAAK,MAAMF,GAAX,IAAkBP,IAAlB,EAAwB;QACpB,MAAMY,SAAS,GAAGC,aAAA,CAAKC,OAAL,CAAaP,GAAb,CAAlB;;QAEA,KAAK,MAAMQ,OAAX,IAAsBC,iBAAtB,EAAgC;UAC5B,MAAMC,UAAU,GAAGF,OAAO,CAACE,UAAR,CAAmB;YAClCV,GADkC;YAElCK;UAFkC,CAAnB,CAAnB;;UAKA,IAAI,CAACK,UAAL,EAAiB;YACb;UACH;;UACD,MAAMF,OAAO,CAACG,OAAR,CAAgB;YAClBb,EADkB;YAElBE,GAFkB;YAGlBK;UAHkB,CAAhB,CAAN;QAKH;MACJ;IACJ,CA/BD;;IAiCA,MAAMO,OAAO,GAAG,IAAAC,oBAAA,EAActB,YAAd,CAAhB;IAEA,OAAO,MAAMqB,OAAO,CAACtB,OAAO,CAACwB,cAAT,CAApB;EACH;;AA1CqE,CAA3D,C"}
+{"version":3,"names":["createManageFilePlugins","S3EventHandler","event","keys","i","Records","length","record","s3","object","key","push","region","getEnvironment","S3","extension","path","extname","manager","managers","canProcess","process"],"sources":["index.ts"],"sourcesContent":["import path from \"path\";\nimport S3 from \"aws-sdk/clients/s3\";\nimport { getEnvironment } from \"../utils\";\nimport managers from \"../transform/managers\";\nimport { S3EventHandler } from \"@webiny/handler-aws\";\n\n/**\n * This handler must be run through @webiny/handler-aws/s3\n */\nexport const createManageFilePlugins = () => {\n    return [\n        new S3EventHandler(async ({ event }) => {\n            const keys: string[] = [];\n            for (let i = 0; i < event.Records.length; i++) {\n                const record = event.Records[i];\n                if (typeof record.s3.object.key === \"string\") {\n                    keys.push(record.s3.object.key);\n                }\n            }\n\n            if (keys.length === 0) {\n                return;\n            }\n\n            const { region } = getEnvironment();\n            const s3 = new S3({ region });\n\n            for (const key of keys) {\n                const extension = path.extname(key);\n\n                for (const manager of managers) {\n                    const canProcess = manager.canProcess({\n                        key,\n                        extension\n                    });\n\n                    if (!canProcess) {\n                        continue;\n                    }\n                    await manager.process({\n                        s3,\n                        key,\n                        extension\n                    });\n                }\n            }\n        })\n    ];\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA;AACA;AACA;AACO,MAAMA,uBAAuB,GAAG,MAAM;EACzC,OAAO,CACH,IAAIC,0BAAJ,CAAmB,OAAO;IAAEC;EAAF,CAAP,KAAqB;IACpC,MAAMC,IAAc,GAAG,EAAvB;;IACA,KAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGF,KAAK,CAACG,OAAN,CAAcC,MAAlC,EAA0CF,CAAC,EAA3C,EAA+C;MAC3C,MAAMG,MAAM,GAAGL,KAAK,CAACG,OAAN,CAAcD,CAAd,CAAf;;MACA,IAAI,OAAOG,MAAM,CAACC,EAAP,CAAUC,MAAV,CAAiBC,GAAxB,KAAgC,QAApC,EAA8C;QAC1CP,IAAI,CAACQ,IAAL,CAAUJ,MAAM,CAACC,EAAP,CAAUC,MAAV,CAAiBC,GAA3B;MACH;IACJ;;IAED,IAAIP,IAAI,CAACG,MAAL,KAAgB,CAApB,EAAuB;MACnB;IACH;;IAED,MAAM;MAAEM;IAAF,IAAa,IAAAC,qBAAA,GAAnB;IACA,MAAML,EAAE,GAAG,IAAIM,UAAJ,CAAO;MAAEF;IAAF,CAAP,CAAX;;IAEA,KAAK,MAAMF,GAAX,IAAkBP,IAAlB,EAAwB;MACpB,MAAMY,SAAS,GAAGC,aAAA,CAAKC,OAAL,CAAaP,GAAb,CAAlB;;MAEA,KAAK,MAAMQ,OAAX,IAAsBC,iBAAtB,EAAgC;QAC5B,MAAMC,UAAU,GAAGF,OAAO,CAACE,UAAR,CAAmB;UAClCV,GADkC;UAElCK;QAFkC,CAAnB,CAAnB;;QAKA,IAAI,CAACK,UAAL,EAAiB;UACb;QACH;;QACD,MAAMF,OAAO,CAACG,OAAR,CAAgB;UAClBb,EADkB;UAElBE,GAFkB;UAGlBK;QAHkB,CAAhB,CAAN;MAKH;IACJ;EACJ,CAnCD,CADG,CAAP;AAsCH,CAvCM"}

package/handlers/transform/index.d.ts

@@ -1,5 +1,2 @@
-import { HandlerPlugin } from "@webiny/handler/types";
-import { ArgsContext } from "@webiny/handler-args/types";
-import { TransformHandlerEventArgs } from "../types";
-declare const _default: () => HandlerPlugin<ArgsContext<TransformHandlerEventArgs>>;
-export default _default;
+import { TransformHandlerEventPayload } from "../types";
+export declare const createTransformFilePlugins: () => import("@webiny/handler").EventPlugin<TransformHandlerEventPayload, import("@webiny/handler/types").Context, any>[];

package/handlers/transform/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createTransformFilePlugins = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -19,81 +19,77 @@ var _utils = require("../utils");
 
 var _utils2 = require("./utils");
 
+var _handler = require("@webiny/handler");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-var _default = () => ({
-  type: "handler",
-  name: "handler-download-file",
-
-  async handle(context) {
-    // TODO @ts-refactor check in createHandler for returns types that eventHandler must return
-    // @ts-ignore
-    const eventHandler = async ({
-      body: {
-        transformations,
-        key
-      }
-    }) => {
+const createTransformFilePlugins = () => {
+  return [(0, _handler.createEvent)(async ({
+    payload
+  }) => {
+    const {
+      body
+    } = payload;
+    const {
+      key,
+      transformations
+    } = body;
+
+    try {
+      const env = (0, _utils.getEnvironment)();
+      const s3 = new _s.default({
+        region: env.region
+      });
+      let optimizedImageObject;
+      const params = {
+        initial: (0, _utils.getObjectParams)(key),
+        optimized: (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
+          key
+        })),
+        optimizedTransformed: (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
+          key,
+          transformations
+        }))
+      }; // 1. Get optimized image.
+
       try {
-        const env = (0, _utils.getEnvironment)();
-        const s3 = new _s.default({
-          region: env.region
-        });
-        let optimizedImageObject;
-        const params = {
-          initial: (0, _utils.getObjectParams)(key),
-          optimized: (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
-            key
-          })),
-          optimizedTransformed: (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
-            key,
-            transformations
-          }))
-        }; // 1. Get optimized image.
-
-        try {
-          optimizedImageObject = await s3.getObject(params.optimized).promise();
-        } catch (e) {
-          // If not found, try to create it by loading the initially uploaded image.
-          optimizedImageObject = await s3.getObject(params.initial).promise();
-          await s3.putObject(_objectSpread(_objectSpread({}, params.optimized), {}, {
-            ContentType: optimizedImageObject.ContentType,
-            Body: await (0, _optimizeImage.default)(optimizedImageObject.Body, optimizedImageObject.ContentType)
-          })).promise();
-          optimizedImageObject = await s3.getObject(params.optimized).promise();
-        } // 2. If no transformations requested, just exit.
-
-
-        if (!transformations) {
-          return {
-            error: false,
-            message: ""
-          };
-        } // 3. If transformations requested, apply them in save it into the bucket.
-
-
-        await s3.putObject(_objectSpread(_objectSpread({}, params.optimizedTransformed), {}, {
+        optimizedImageObject = await s3.getObject(params.optimized).promise();
+      } catch (e) {
+        // If not found, try to create it by loading the initially uploaded image.
+        optimizedImageObject = await s3.getObject(params.initial).promise();
+        await s3.putObject(_objectSpread(_objectSpread({}, params.optimized), {}, {
           ContentType: optimizedImageObject.ContentType,
-          Body: await (0, _transformImage.default)(optimizedImageObject.Body, transformations)
+          Body: await (0, _optimizeImage.default)(optimizedImageObject.Body, optimizedImageObject.ContentType)
         })).promise();
+        optimizedImageObject = await s3.getObject(params.optimized).promise();
+      } // 2. If no transformations requested, just exit.
+
+
+      if (!transformations) {
         return {
           error: false,
           message: ""
         };
-      } catch (e) {
-        return {
-          error: true,
-          message: e.message
-        };
-      }
-    };
-
-    const handler = (0, _utils.createHandler)(eventHandler);
-    return await handler(context.invocationArgs);
-  }
-
-});
-
-exports.default = _default;
+      } // 3. If transformations requested, apply them in save it into the bucket.
+
+
+      await s3.putObject(_objectSpread(_objectSpread({}, params.optimizedTransformed), {}, {
+        ContentType: optimizedImageObject.ContentType,
+        Body: await (0, _transformImage.default)(optimizedImageObject.Body, transformations)
+      })).promise();
+      return {
+        error: false,
+        message: ""
+      };
+    } catch (e) {
+      return {
+        error: true,
+        message: e.message
+      };
+    }
+  })];
+};
+
+exports.createTransformFilePlugins = createTransformFilePlugins;

package/handlers/transform/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["type","name","handle","context","eventHandler","body","transformations","key","env","getEnvironment","s3","S3","region","optimizedImageObject","params","initial","getObjectParams","optimized","getImageKey","optimizedTransformed","getObject","promise","e","putObject","ContentType","Body","optimizeImage","error","message","transformImage","handler","createHandler","invocationArgs"],"sources":["index.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport transformImage from \"./transformImage\";\nimport optimizeImage from \"./optimizeImage\";\nimport { createHandler, EventHandlerCallable, getEnvironment, getObjectParams } from \"../utils\";\nimport { getImageKey } from \"./utils\";\nimport { HandlerPlugin } from \"@webiny/handler/types\";\nimport { ArgsContext } from \"@webiny/handler-args/types\";\nimport { TransformHandlerEventArgs } from \"~/handlers/types\";\n\nexport default (): HandlerPlugin<ArgsContext<TransformHandlerEventArgs>> => ({\n    type: \"handler\",\n    name: \"handler-download-file\",\n    async handle(context) {\n        // TODO @ts-refactor check in createHandler for returns types that eventHandler must return\n        // @ts-ignore\n        const eventHandler: EventHandlerCallable<TransformHandlerEventArgs> = async ({\n            body: { transformations, key }\n        }) => {\n            try {\n                const env = getEnvironment();\n                const s3 = new S3({ region: env.region });\n\n                let optimizedImageObject: S3.Types.GetObjectOutput;\n\n                const params = {\n                    initial: getObjectParams(key),\n                    optimized: getObjectParams(getImageKey({ key })),\n                    optimizedTransformed: getObjectParams(getImageKey({ key, transformations }))\n                };\n\n                // 1. Get optimized image.\n                try {\n                    optimizedImageObject = await s3.getObject(params.optimized).promise();\n                } catch (e) {\n                    // If not found, try to create it by loading the initially uploaded image.\n                    optimizedImageObject = await s3.getObject(params.initial).promise();\n\n                    await s3\n                        .putObject({\n                            ...params.optimized,\n                            ContentType: optimizedImageObject.ContentType,\n                            Body: await optimizeImage(\n                                optimizedImageObject.Body as Buffer,\n                                optimizedImageObject.ContentType as string\n                            )\n                        })\n                        .promise();\n\n                    optimizedImageObject = await s3.getObject(params.optimized).promise();\n                }\n\n                // 2. If no transformations requested, just exit.\n                if (!transformations) {\n                    return { error: false, message: \"\" };\n                }\n\n                // 3. If transformations requested, apply them in save it into the bucket.\n                await s3\n                    .putObject({\n                        ...params.optimizedTransformed,\n                        ContentType: optimizedImageObject.ContentType,\n                        Body: await transformImage(\n                            optimizedImageObject.Body as Buffer,\n                            transformations\n                        )\n                    })\n                    .promise();\n\n                return { error: false, message: \"\" };\n            } catch (e) {\n                return { error: true, message: e.message };\n            }\n        };\n        const handler = createHandler(eventHandler);\n\n        return await handler(context.invocationArgs);\n    }\n});\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;;;;;eAKe,OAA8D;EACzEA,IAAI,EAAE,SADmE;EAEzEC,IAAI,EAAE,uBAFmE;;EAGzE,MAAMC,MAAN,CAAaC,OAAb,EAAsB;IAClB;IACA;IACA,MAAMC,YAA6D,GAAG,OAAO;MACzEC,IAAI,EAAE;QAAEC,eAAF;QAAmBC;MAAnB;IADmE,CAAP,KAEhE;MACF,IAAI;QACA,MAAMC,GAAG,GAAG,IAAAC,qBAAA,GAAZ;QACA,MAAMC,EAAE,GAAG,IAAIC,UAAJ,CAAO;UAAEC,MAAM,EAAEJ,GAAG,CAACI;QAAd,CAAP,CAAX;QAEA,IAAIC,oBAAJ;QAEA,MAAMC,MAAM,GAAG;UACXC,OAAO,EAAE,IAAAC,sBAAA,EAAgBT,GAAhB,CADE;UAEXU,SAAS,EAAE,IAAAD,sBAAA,EAAgB,IAAAE,mBAAA,EAAY;YAAEX;UAAF,CAAZ,CAAhB,CAFA;UAGXY,oBAAoB,EAAE,IAAAH,sBAAA,EAAgB,IAAAE,mBAAA,EAAY;YAAEX,GAAF;YAAOD;UAAP,CAAZ,CAAhB;QAHX,CAAf,CANA,CAYA;;QACA,IAAI;UACAO,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAH,CAAaN,MAAM,CAACG,SAApB,EAA+BI,OAA/B,EAA7B;QACH,CAFD,CAEE,OAAOC,CAAP,EAAU;UACR;UACAT,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAH,CAAaN,MAAM,CAACC,OAApB,EAA6BM,OAA7B,EAA7B;UAEA,MAAMX,EAAE,CACHa,SADC,iCAEKT,MAAM,CAACG,SAFZ;YAGEO,WAAW,EAAEX,oBAAoB,CAACW,WAHpC;YAIEC,IAAI,EAAE,MAAM,IAAAC,sBAAA,EACRb,oBAAoB,CAACY,IADb,EAERZ,oBAAoB,CAACW,WAFb;UAJd,IASDH,OATC,EAAN;UAWAR,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAH,CAAaN,MAAM,CAACG,SAApB,EAA+BI,OAA/B,EAA7B;QACH,CA/BD,CAiCA;;;QACA,IAAI,CAACf,eAAL,EAAsB;UAClB,OAAO;YAAEqB,KAAK,EAAE,KAAT;YAAgBC,OAAO,EAAE;UAAzB,CAAP;QACH,CApCD,CAsCA;;;QACA,MAAMlB,EAAE,CACHa,SADC,iCAEKT,MAAM,CAACK,oBAFZ;UAGEK,WAAW,EAAEX,oBAAoB,CAACW,WAHpC;UAIEC,IAAI,EAAE,MAAM,IAAAI,uBAAA,EACRhB,oBAAoB,CAACY,IADb,EAERnB,eAFQ;QAJd,IASDe,OATC,EAAN;QAWA,OAAO;UAAEM,KAAK,EAAE,KAAT;UAAgBC,OAAO,EAAE;QAAzB,CAAP;MACH,CAnDD,CAmDE,OAAON,CAAP,EAAU;QACR,OAAO;UAAEK,KAAK,EAAE,IAAT;UAAeC,OAAO,EAAEN,CAAC,CAACM;QAA1B,CAAP;MACH;IACJ,CAzDD;;IA0DA,MAAME,OAAO,GAAG,IAAAC,oBAAA,EAAc3B,YAAd,CAAhB;IAEA,OAAO,MAAM0B,OAAO,CAAC3B,OAAO,CAAC6B,cAAT,CAApB;EACH;;AAnEwE,CAA9D,C"}
+{"version":3,"names":["createTransformFilePlugins","createEvent","payload","body","key","transformations","env","getEnvironment","s3","S3","region","optimizedImageObject","params","initial","getObjectParams","optimized","getImageKey","optimizedTransformed","getObject","promise","e","putObject","ContentType","Body","optimizeImage","error","message","transformImage"],"sources":["index.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport transformImage from \"./transformImage\";\nimport optimizeImage from \"./optimizeImage\";\nimport { getEnvironment, getObjectParams } from \"../utils\";\nimport { getImageKey } from \"./utils\";\nimport { TransformHandlerEventPayload } from \"~/handlers/types\";\nimport { createEvent } from \"@webiny/handler\";\n\nexport const createTransformFilePlugins = () => {\n    return [\n        createEvent<TransformHandlerEventPayload>(async ({ payload }) => {\n            const { body } = payload;\n            const { key, transformations } = body;\n            try {\n                const env = getEnvironment();\n                const s3 = new S3({ region: env.region });\n\n                let optimizedImageObject: S3.Types.GetObjectOutput;\n\n                const params = {\n                    initial: getObjectParams(key),\n                    optimized: getObjectParams(getImageKey({ key })),\n                    optimizedTransformed: getObjectParams(getImageKey({ key, transformations }))\n                };\n\n                // 1. Get optimized image.\n                try {\n                    optimizedImageObject = await s3.getObject(params.optimized).promise();\n                } catch (e) {\n                    // If not found, try to create it by loading the initially uploaded image.\n                    optimizedImageObject = await s3.getObject(params.initial).promise();\n\n                    await s3\n                        .putObject({\n                            ...params.optimized,\n                            ContentType: optimizedImageObject.ContentType,\n                            Body: await optimizeImage(\n                                optimizedImageObject.Body as Buffer,\n                                optimizedImageObject.ContentType as string\n                            )\n                        })\n                        .promise();\n\n                    optimizedImageObject = await s3.getObject(params.optimized).promise();\n                }\n\n                // 2. If no transformations requested, just exit.\n                if (!transformations) {\n                    return {\n                        error: false,\n                        message: \"\"\n                    };\n                }\n\n                // 3. If transformations requested, apply them in save it into the bucket.\n                await s3\n                    .putObject({\n                        ...params.optimizedTransformed,\n                        ContentType: optimizedImageObject.ContentType,\n                        Body: await transformImage(\n                            optimizedImageObject.Body as Buffer,\n                            transformations\n                        )\n                    })\n                    .promise();\n\n                return {\n                    error: false,\n                    message: \"\"\n                };\n            } catch (e) {\n                return {\n                    error: true,\n                    message: e.message\n                };\n            }\n        })\n    ];\n};\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAEA;;;;;;AAEO,MAAMA,0BAA0B,GAAG,MAAM;EAC5C,OAAO,CACH,IAAAC,oBAAA,EAA0C,OAAO;IAAEC;EAAF,CAAP,KAAuB;IAC7D,MAAM;MAAEC;IAAF,IAAWD,OAAjB;IACA,MAAM;MAAEE,GAAF;MAAOC;IAAP,IAA2BF,IAAjC;;IACA,IAAI;MACA,MAAMG,GAAG,GAAG,IAAAC,qBAAA,GAAZ;MACA,MAAMC,EAAE,GAAG,IAAIC,UAAJ,CAAO;QAAEC,MAAM,EAAEJ,GAAG,CAACI;MAAd,CAAP,CAAX;MAEA,IAAIC,oBAAJ;MAEA,MAAMC,MAAM,GAAG;QACXC,OAAO,EAAE,IAAAC,sBAAA,EAAgBV,GAAhB,CADE;QAEXW,SAAS,EAAE,IAAAD,sBAAA,EAAgB,IAAAE,mBAAA,EAAY;UAAEZ;QAAF,CAAZ,CAAhB,CAFA;QAGXa,oBAAoB,EAAE,IAAAH,sBAAA,EAAgB,IAAAE,mBAAA,EAAY;UAAEZ,GAAF;UAAOC;QAAP,CAAZ,CAAhB;MAHX,CAAf,CANA,CAYA;;MACA,IAAI;QACAM,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAH,CAAaN,MAAM,CAACG,SAApB,EAA+BI,OAA/B,EAA7B;MACH,CAFD,CAEE,OAAOC,CAAP,EAAU;QACR;QACAT,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAH,CAAaN,MAAM,CAACC,OAApB,EAA6BM,OAA7B,EAA7B;QAEA,MAAMX,EAAE,CACHa,SADC,iCAEKT,MAAM,CAACG,SAFZ;UAGEO,WAAW,EAAEX,oBAAoB,CAACW,WAHpC;UAIEC,IAAI,EAAE,MAAM,IAAAC,sBAAA,EACRb,oBAAoB,CAACY,IADb,EAERZ,oBAAoB,CAACW,WAFb;QAJd,IASDH,OATC,EAAN;QAWAR,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAH,CAAaN,MAAM,CAACG,SAApB,EAA+BI,OAA/B,EAA7B;MACH,CA/BD,CAiCA;;;MACA,IAAI,CAACd,eAAL,EAAsB;QAClB,OAAO;UACHoB,KAAK,EAAE,KADJ;UAEHC,OAAO,EAAE;QAFN,CAAP;MAIH,CAvCD,CAyCA;;;MACA,MAAMlB,EAAE,CACHa,SADC,iCAEKT,MAAM,CAACK,oBAFZ;QAGEK,WAAW,EAAEX,oBAAoB,CAACW,WAHpC;QAIEC,IAAI,EAAE,MAAM,IAAAI,uBAAA,EACRhB,oBAAoB,CAACY,IADb,EAERlB,eAFQ;MAJd,IASDc,OATC,EAAN;MAWA,OAAO;QACHM,KAAK,EAAE,KADJ;QAEHC,OAAO,EAAE;MAFN,CAAP;IAIH,CAzDD,CAyDE,OAAON,CAAP,EAAU;MACR,OAAO;QACHK,KAAK,EAAE,IADJ;QAEHC,OAAO,EAAEN,CAAC,CAACM;MAFR,CAAP;IAIH;EACJ,CAlED,CADG,CAAP;AAqEH,CAtEM"}

package/handlers/transform/loaders/imageLoader.d.ts

@@ -3,6 +3,7 @@ import S3 from "aws-sdk/clients/s3";
 interface File {
     extension: string;
     name: string;
+    contentLength: number;
 }
 interface Options {
     width?: string;

package/handlers/transform/loaders/imageLoader.js.map

@@ -1 +1 @@
-{"version":3,"names":["IMAGE_TRANSFORMER_FUNCTION","process","env","callImageTransformerLambda","key","transformations","context","handlerClient","invoke","name","payload","body","canProcess","params","SUPPORTED_IMAGES","includes","file","extension","s3","options","objectParams","sanitizeImageTransformations","SUPPORTED_TRANSFORMABLE_IMAGES","getObjectParams","getImageKey","object","getObject","promise","e","imageTransformerLambdaResponse","error","Error","message"],"sources":["imageLoader.ts"],"sourcesContent":["import sanitizeImageTransformations from \"./sanitizeImageTransformations\";\nimport { getObjectParams } from \"../../utils\";\nimport { SUPPORTED_IMAGES, SUPPORTED_TRANSFORMABLE_IMAGES, getImageKey } from \"../utils\";\nimport { ClientContext } from \"@webiny/handler-client/types\";\nimport S3 from \"aws-sdk/clients/s3\";\n\nconst IMAGE_TRANSFORMER_FUNCTION = process.env.IMAGE_TRANSFORMER_FUNCTION as string;\n\ninterface TransformerParams {\n    context: ClientContext;\n    key: string;\n    transformations?: any;\n}\n\nconst callImageTransformerLambda = async ({ key, transformations, context }: TransformerParams) => {\n    return await context.handlerClient.invoke({\n        name: IMAGE_TRANSFORMER_FUNCTION,\n        payload: {\n            body: {\n                key,\n                transformations\n            }\n        }\n    });\n};\ninterface File {\n    extension: string;\n    name: string;\n}\ninterface Options {\n    width?: string;\n}\nexport interface CanProcessParams {\n    s3: S3;\n    file: File;\n    options?: Options;\n    context: ClientContext;\n}\nexport interface ProcessParams {\n    s3: S3;\n    file: File;\n    options?: Options;\n    context: ClientContext;\n}\nexport default {\n    canProcess: (params: CanProcessParams) => {\n        return SUPPORTED_IMAGES.includes(params.file.extension);\n    },\n    async process({ s3, file, options, context }: ProcessParams) {\n        // Loaders must return {object, params} object.\n        let objectParams;\n\n        const transformations = sanitizeImageTransformations(options);\n\n        if (transformations && SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {\n            objectParams = getObjectParams(getImageKey({ key: file.name, transformations }));\n            try {\n                return {\n                    object: await s3.getObject(objectParams).promise(),\n                    params: objectParams\n                };\n            } catch (e) {\n                const imageTransformerLambdaResponse = await callImageTransformerLambda({\n                    key: file.name,\n                    transformations,\n                    context\n                });\n\n                if (imageTransformerLambdaResponse.error) {\n                    throw Error(imageTransformerLambdaResponse.message);\n                }\n\n                return {\n                    object: await s3.getObject(objectParams).promise(),\n                    params: objectParams\n                };\n            }\n        }\n\n        objectParams = getObjectParams(getImageKey({ key: file.name }));\n        try {\n            return {\n                object: await s3.getObject(objectParams).promise(),\n                params: objectParams\n            };\n        } catch (e) {\n            const imageTransformerLambdaResponse = await callImageTransformerLambda({\n                key: file.name,\n                context\n            });\n\n            if (imageTransformerLambdaResponse.error) {\n                throw Error(imageTransformerLambdaResponse.message);\n            }\n\n            return {\n                object: await s3.getObject(objectParams).promise(),\n                params: objectParams\n            };\n        }\n    }\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAIA,MAAMA,0BAA0B,GAAGC,OAAO,CAACC,GAAR,CAAYF,0BAA/C;;AAQA,MAAMG,0BAA0B,GAAG,OAAO;EAAEC,GAAF;EAAOC,eAAP;EAAwBC;AAAxB,CAAP,KAAgE;EAC/F,OAAO,MAAMA,OAAO,CAACC,aAAR,CAAsBC,MAAtB,CAA6B;IACtCC,IAAI,EAAET,0BADgC;IAEtCU,OAAO,EAAE;MACLC,IAAI,EAAE;QACFP,GADE;QAEFC;MAFE;IADD;EAF6B,CAA7B,CAAb;AASH,CAVD;;eA8Be;EACXO,UAAU,EAAGC,MAAD,IAA8B;IACtC,OAAOC,wBAAA,CAAiBC,QAAjB,CAA0BF,MAAM,CAACG,IAAP,CAAYC,SAAtC,CAAP;EACH,CAHU;;EAIX,MAAMhB,OAAN,CAAc;IAAEiB,EAAF;IAAMF,IAAN;IAAYG,OAAZ;IAAqBb;EAArB,CAAd,EAA6D;IACzD;IACA,IAAIc,YAAJ;IAEA,MAAMf,eAAe,GAAG,IAAAgB,qCAAA,EAA6BF,OAA7B,CAAxB;;IAEA,IAAId,eAAe,IAAIiB,sCAAA,CAA+BP,QAA/B,CAAwCC,IAAI,CAACC,SAA7C,CAAvB,EAAgF;MAC5EG,YAAY,GAAG,IAAAG,sBAAA,EAAgB,IAAAC,mBAAA,EAAY;QAAEpB,GAAG,EAAEY,IAAI,CAACP,IAAZ;QAAkBJ;MAAlB,CAAZ,CAAhB,CAAf;;MACA,IAAI;QACA,OAAO;UACHoB,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAH,CAAaN,YAAb,EAA2BO,OAA3B,EADX;UAEHd,MAAM,EAAEO;QAFL,CAAP;MAIH,CALD,CAKE,OAAOQ,CAAP,EAAU;QACR,MAAMC,8BAA8B,GAAG,MAAM1B,0BAA0B,CAAC;UACpEC,GAAG,EAAEY,IAAI,CAACP,IAD0D;UAEpEJ,eAFoE;UAGpEC;QAHoE,CAAD,CAAvE;;QAMA,IAAIuB,8BAA8B,CAACC,KAAnC,EAA0C;UACtC,MAAMC,KAAK,CAACF,8BAA8B,CAACG,OAAhC,CAAX;QACH;;QAED,OAAO;UACHP,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAH,CAAaN,YAAb,EAA2BO,OAA3B,EADX;UAEHd,MAAM,EAAEO;QAFL,CAAP;MAIH;IACJ;;IAEDA,YAAY,GAAG,IAAAG,sBAAA,EAAgB,IAAAC,mBAAA,EAAY;MAAEpB,GAAG,EAAEY,IAAI,CAACP;IAAZ,CAAZ,CAAhB,CAAf;;IACA,IAAI;MACA,OAAO;QACHgB,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAH,CAAaN,YAAb,EAA2BO,OAA3B,EADX;QAEHd,MAAM,EAAEO;MAFL,CAAP;IAIH,CALD,CAKE,OAAOQ,CAAP,EAAU;MACR,MAAMC,8BAA8B,GAAG,MAAM1B,0BAA0B,CAAC;QACpEC,GAAG,EAAEY,IAAI,CAACP,IAD0D;QAEpEH;MAFoE,CAAD,CAAvE;;MAKA,IAAIuB,8BAA8B,CAACC,KAAnC,EAA0C;QACtC,MAAMC,KAAK,CAACF,8BAA8B,CAACG,OAAhC,CAAX;MACH;;MAED,OAAO;QACHP,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAH,CAAaN,YAAb,EAA2BO,OAA3B,EADX;QAEHd,MAAM,EAAEO;MAFL,CAAP;IAIH;EACJ;;AAxDU,C"}
+{"version":3,"names":["IMAGE_TRANSFORMER_FUNCTION","process","env","callImageTransformerLambda","key","transformations","context","handlerClient","invoke","name","payload","body","canProcess","params","SUPPORTED_IMAGES","includes","file","extension","s3","options","objectParams","sanitizeImageTransformations","SUPPORTED_TRANSFORMABLE_IMAGES","getObjectParams","getImageKey","object","getObject","promise","e","imageTransformerLambdaResponse","error","Error","message"],"sources":["imageLoader.ts"],"sourcesContent":["import sanitizeImageTransformations from \"./sanitizeImageTransformations\";\nimport { getObjectParams } from \"../../utils\";\nimport { SUPPORTED_IMAGES, SUPPORTED_TRANSFORMABLE_IMAGES, getImageKey } from \"../utils\";\nimport { ClientContext } from \"@webiny/handler-client/types\";\nimport S3 from \"aws-sdk/clients/s3\";\n\nconst IMAGE_TRANSFORMER_FUNCTION = process.env.IMAGE_TRANSFORMER_FUNCTION as string;\n\ninterface TransformerParams {\n    context: ClientContext;\n    key: string;\n    transformations?: {\n        width?: number;\n    };\n}\n\nconst callImageTransformerLambda = async ({ key, transformations, context }: TransformerParams) => {\n    return await context.handlerClient.invoke({\n        name: IMAGE_TRANSFORMER_FUNCTION,\n        payload: {\n            body: {\n                key,\n                transformations\n            }\n        }\n    });\n};\ninterface File {\n    extension: string;\n    name: string;\n    contentLength: number;\n}\ninterface Options {\n    width?: string;\n}\nexport interface CanProcessParams {\n    s3: S3;\n    file: File;\n    options?: Options;\n    context: ClientContext;\n}\nexport interface ProcessParams {\n    s3: S3;\n    file: File;\n    options?: Options;\n    context: ClientContext;\n}\nexport default {\n    canProcess: (params: CanProcessParams) => {\n        return SUPPORTED_IMAGES.includes(params.file.extension);\n    },\n    async process({ s3, file, options, context }: ProcessParams) {\n        // Loaders must return {object, params} object.\n        let objectParams;\n\n        const transformations = sanitizeImageTransformations(options);\n\n        if (transformations && SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {\n            objectParams = getObjectParams(getImageKey({ key: file.name, transformations }));\n            try {\n                return {\n                    object: await s3.getObject(objectParams).promise(),\n                    params: objectParams\n                };\n            } catch (e) {\n                const imageTransformerLambdaResponse = await callImageTransformerLambda({\n                    key: file.name,\n                    transformations,\n                    context\n                });\n\n                if (imageTransformerLambdaResponse.error) {\n                    throw Error(imageTransformerLambdaResponse.message);\n                }\n\n                return {\n                    object: await s3.getObject(objectParams).promise(),\n                    params: objectParams\n                };\n            }\n        }\n\n        objectParams = getObjectParams(getImageKey({ key: file.name }));\n        try {\n            return {\n                object: await s3.getObject(objectParams).promise(),\n                params: objectParams\n            };\n        } catch (e) {\n            const imageTransformerLambdaResponse = await callImageTransformerLambda({\n                key: file.name,\n                context\n            });\n\n            if (imageTransformerLambdaResponse.error) {\n                throw Error(imageTransformerLambdaResponse.message);\n            }\n\n            return {\n                object: await s3.getObject(objectParams).promise(),\n                params: objectParams\n            };\n        }\n    }\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAIA,MAAMA,0BAA0B,GAAGC,OAAO,CAACC,GAAR,CAAYF,0BAA/C;;AAUA,MAAMG,0BAA0B,GAAG,OAAO;EAAEC,GAAF;EAAOC,eAAP;EAAwBC;AAAxB,CAAP,KAAgE;EAC/F,OAAO,MAAMA,OAAO,CAACC,aAAR,CAAsBC,MAAtB,CAA6B;IACtCC,IAAI,EAAET,0BADgC;IAEtCU,OAAO,EAAE;MACLC,IAAI,EAAE;QACFP,GADE;QAEFC;MAFE;IADD;EAF6B,CAA7B,CAAb;AASH,CAVD;;eA+Be;EACXO,UAAU,EAAGC,MAAD,IAA8B;IACtC,OAAOC,wBAAA,CAAiBC,QAAjB,CAA0BF,MAAM,CAACG,IAAP,CAAYC,SAAtC,CAAP;EACH,CAHU;;EAIX,MAAMhB,OAAN,CAAc;IAAEiB,EAAF;IAAMF,IAAN;IAAYG,OAAZ;IAAqBb;EAArB,CAAd,EAA6D;IACzD;IACA,IAAIc,YAAJ;IAEA,MAAMf,eAAe,GAAG,IAAAgB,qCAAA,EAA6BF,OAA7B,CAAxB;;IAEA,IAAId,eAAe,IAAIiB,sCAAA,CAA+BP,QAA/B,CAAwCC,IAAI,CAACC,SAA7C,CAAvB,EAAgF;MAC5EG,YAAY,GAAG,IAAAG,sBAAA,EAAgB,IAAAC,mBAAA,EAAY;QAAEpB,GAAG,EAAEY,IAAI,CAACP,IAAZ;QAAkBJ;MAAlB,CAAZ,CAAhB,CAAf;;MACA,IAAI;QACA,OAAO;UACHoB,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAH,CAAaN,YAAb,EAA2BO,OAA3B,EADX;UAEHd,MAAM,EAAEO;QAFL,CAAP;MAIH,CALD,CAKE,OAAOQ,CAAP,EAAU;QACR,MAAMC,8BAA8B,GAAG,MAAM1B,0BAA0B,CAAC;UACpEC,GAAG,EAAEY,IAAI,CAACP,IAD0D;UAEpEJ,eAFoE;UAGpEC;QAHoE,CAAD,CAAvE;;QAMA,IAAIuB,8BAA8B,CAACC,KAAnC,EAA0C;UACtC,MAAMC,KAAK,CAACF,8BAA8B,CAACG,OAAhC,CAAX;QACH;;QAED,OAAO;UACHP,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAH,CAAaN,YAAb,EAA2BO,OAA3B,EADX;UAEHd,MAAM,EAAEO;QAFL,CAAP;MAIH;IACJ;;IAEDA,YAAY,GAAG,IAAAG,sBAAA,EAAgB,IAAAC,mBAAA,EAAY;MAAEpB,GAAG,EAAEY,IAAI,CAACP;IAAZ,CAAZ,CAAhB,CAAf;;IACA,IAAI;MACA,OAAO;QACHgB,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAH,CAAaN,YAAb,EAA2BO,OAA3B,EADX;QAEHd,MAAM,EAAEO;MAFL,CAAP;IAIH,CALD,CAKE,OAAOQ,CAAP,EAAU;MACR,MAAMC,8BAA8B,GAAG,MAAM1B,0BAA0B,CAAC;QACpEC,GAAG,EAAEY,IAAI,CAACP,IAD0D;QAEpEH;MAFoE,CAAD,CAAvE;;MAKA,IAAIuB,8BAA8B,CAACC,KAAnC,EAA0C;QACtC,MAAMC,KAAK,CAACF,8BAA8B,CAACG,OAAhC,CAAX;MACH;;MAED,OAAO;QACHP,MAAM,EAAE,MAAMP,EAAE,CAACQ,SAAH,CAAaN,YAAb,EAA2BO,OAA3B,EADX;QAEHd,MAAM,EAAEO;MAFL,CAAP;IAIH;EACJ;;AAxDU,C"}

package/handlers/transform/managers/imageManager.js

@@ -18,9 +18,12 @@ var _default = {
 
     if (_utils2.SUPPORTED_IMAGES.includes(extension) === false) {
       return false;
-    }
+    } // We only want to process original images, and delete all variations of it at once.
+    // We DO NOT want to process the event for the deletion of an optimized/transformed image.
+    // Unfortunately, there's no way to filter those events on the S3 bucket itself, so we have to do it this way.
+
 
-    return key.startsWith(_utils2.OPTIMIZED_IMAGE_PREFIX) || key.startsWith(_utils2.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX);
+    return !(key.startsWith(_utils2.OPTIMIZED_IMAGE_PREFIX) || key.startsWith(_utils2.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX));
   },
 
   async process({