@webiny/api-file-manager 5.34.8 → 5.35.0-beta.0

package/handlers/download/getS3Object.js

@@ -0,0 +1,57 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getS3Object = void 0;
+var _utils = require("../utils");
+var _loaders = _interopRequireDefault(require("../transform/loaders"));
+const MAX_RETURN_CONTENT_LENGTH = 5000000; // ~4.77MB
+
+const getS3Object = async (fileInfo, s3, context) => {
+  const {
+    filename,
+    options,
+    extension
+  } = fileInfo;
+  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({
+      context,
+      s3,
+      options,
+      file: {
+        name: filename,
+        extension,
+        contentLength
+      }
+    });
+    if (!canProcess) {
+      continue;
+    }
+    return loader.process({
+      context,
+      s3,
+      options,
+      file: {
+        name: filename,
+        extension,
+        contentLength
+      }
+    });
+  }
+
+  // If no processors handled the file request, just return the S3 object taking its size into consideration.
+  let object;
+  if (contentLength < MAX_RETURN_CONTENT_LENGTH) {
+    object = await s3.getObject(params).promise();
+  }
+  return {
+    object,
+    params
+  };
+};
+exports.getS3Object = getS3Object;

package/handlers/download/getS3Object.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["MAX_RETURN_CONTENT_LENGTH","getS3Object","fileInfo","s3","context","filename","options","extension","params","getObjectParams","objectHead","headObject","promise","contentLength","ContentLength","loader","loaders","canProcess","file","name","process","object","getObject"],"sources":["getS3Object.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport { Context } from \"@webiny/handler/types\";\nimport { getObjectParams } from \"~/handlers/utils\";\nimport loaders from \"~/handlers/transform/loaders\";\nimport { ObjectParamsResponse } from \"~/handlers/utils/getObjectParams\";\nimport { extractFileInformation } from \"./extractFileInformation\";\n\ninterface S3Object {\n    object?: S3.Types.GetObjectOutput;\n    params: ObjectParamsResponse;\n}\n\nconst MAX_RETURN_CONTENT_LENGTH = 5000000; // ~4.77MB\n\nexport const getS3Object = async (\n    fileInfo: ReturnType<typeof extractFileInformation>,\n    s3: S3,\n    context: Context\n): Promise<S3Object> => {\n    const { filename, options, extension } = fileInfo;\n    const params = getObjectParams(filename);\n\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"],"mappings":";;;;;;;AAEA;AACA;AASA,MAAMA,yBAAyB,GAAG,OAAO,CAAC,CAAC;;AAEpC,MAAMC,WAAW,GAAG,OACvBC,QAAmD,EACnDC,EAAM,EACNC,OAAgB,KACI;EACpB,MAAM;IAAEC,QAAQ;IAAEC,OAAO;IAAEC;EAAU,CAAC,GAAGL,QAAQ;EACjD,MAAMM,MAAM,GAAG,IAAAC,sBAAe,EAACJ,QAAQ,CAAC;EAExC,MAAMK,UAAU,GAAG,MAAMP,EAAE,CAACQ,UAAU,CAACH,MAAM,CAAC,CAACI,OAAO,EAAE;EACxD,MAAMC,aAAa,GAAGH,UAAU,CAACI,aAAa,GAAGJ,UAAU,CAACI,aAAa,GAAG,CAAC;EAE7E,KAAK,MAAMC,MAAM,IAAIC,gBAAO,EAAE;IAC1B,MAAMC,UAAU,GAAGF,MAAM,CAACE,UAAU,CAAC;MACjCb,OAAO;MACPD,EAAE;MACFG,OAAO;MACPY,IAAI,EAAE;QACFC,IAAI,EAAEd,QAAQ;QACdE,SAAS;QACTM;MACJ;IACJ,CAAC,CAAC;IAEF,IAAI,CAACI,UAAU,EAAE;MACb;IACJ;IACA,OAAOF,MAAM,CAACK,OAAO,CAAC;MAClBhB,OAAO;MACPD,EAAE;MACFG,OAAO;MACPY,IAAI,EAAE;QACFC,IAAI,EAAEd,QAAQ;QACdE,SAAS;QACTM;MACJ;IACJ,CAAC,CAAC;EACN;;EAEA;EACA,IAAIQ,MAAM;EACV,IAAIR,aAAa,GAAGb,yBAAyB,EAAE;IAC3CqB,MAAM,GAAG,MAAMlB,EAAE,CAACmB,SAAS,CAACd,MAAM,CAAC,CAACI,OAAO,EAAE;EACjD;EAEA,OAAO;IAAES,MAAM;IAAEb;EAAO,CAAC;AAC7B,CAAC;AAAC"}

package/handlers/download/index.d.ts

@@ -1,3 +1,2 @@
-import { RoutePlugin } from "@webiny/handler-aws/gateway";
-import { Context } from "@webiny/handler/types";
-export declare const createDownloadFilePlugins: () => RoutePlugin<Context>[];
+export * from "./byExactKey";
+export * from "./byAlias";

package/handlers/download/index.js

@@ -1,132 +1,27 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createDownloadFilePlugins = void 0;
-
-var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
-
-var _sanitizeFilename = _interopRequireDefault(require("sanitize-filename"));
-
-var _path = _interopRequireDefault(require("path"));
-
-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.
- */
-
-const extractFilenameOptions = request => {
-  const path = (0, _sanitizeFilename.default)(request.params.path);
-  return {
-    filename: decodeURI(path),
-    options: request.query,
-    extension: _path.default.extname(path)
-  };
-};
-
-const getS3Object = async (request, s3, context) => {
-  const {
-    options,
-    filename,
-    extension
-  } = 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({
-      context,
-      s3,
-      options,
-      file: {
-        name: filename,
-        extension,
-        contentLength
-      }
-    });
-
-    if (!canProcess) {
-      continue;
+var _byExactKey = require("./byExactKey");
+Object.keys(_byExactKey).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _byExactKey[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _byExactKey[key];
     }
-
-    return loader.process({
-      context,
-      s3,
-      options,
-      file: {
-        name: filename,
-        extension,
-        contentLength
-      }
-    });
-  } // If no processors handled the file request, just return the S3 object taking its size into consideration.
-
-
-  let object;
-
-  if (contentLength < MAX_RETURN_CONTENT_LENGTH) {
-    object = await s3.getObject(params).promise();
-  }
-
-  return {
-    object,
-    params
-  };
-};
-
-const createDownloadFilePlugins = () => {
-  return [new _gateway.RoutePlugin(({
-    onGet,
-    context
-  }) => {
-    onGet("/files/:path", async (request, reply) => {
-      const {
-        region
-      } = (0, _utils.getEnvironment)();
-      const s3 = new _s.default({
-        region
-      });
-      const {
-        params,
-        object
-      } = 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 || "");
-      }
-
-      const presignedUrl = s3.getSignedUrl("getObject", {
-        Bucket: params.Bucket,
-        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.createDownloadFilePlugins = createDownloadFilePlugins;
+  });
+});
+var _byAlias = require("./byAlias");
+Object.keys(_byAlias).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _byAlias[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _byAlias[key];
+    }
+  });
+});

package/handlers/download/index.js.map

@@ -1 +1 @@
-{"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":";;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAIA,MAAMA,yBAAyB,GAAG,OAAlC,C,CAA2C;;AAC3C,MAAMC,qBAAqB,GAAG,QAA9B,C,CAAwC;;AACxC,MAAMC,wBAAwB,GAAG,GAAjC,C,CAAsC;;AACtC;AACA;AACA;;AACA,MAAMC,sBAAsB,GAAIC,OAAD,IAAsB;EACjD,MAAMC,IAAI,GAAG,IAAAC,yBAAA,EAAkBF,OAAO,CAACG,MAAT,CAAwBF,IAAzC,CAAb;EACA,OAAO;IACHG,QAAQ,EAAEC,SAAS,CAACJ,IAAD,CADhB;IAEHK,OAAO,EAAEN,OAAO,CAACO,KAFd;IAGHC,SAAS,EAAEC,aAAA,CAAQC,OAAR,CAAgBT,IAAhB;EAHR,CAAP;AAKH,CAPD;;AAcA,MAAMU,WAAW,GAAG,OAAOX,OAAP,EAAyBY,EAAzB,EAAiCC,OAAjC,KAAyE;EACzF,MAAM;IAAEP,OAAF;IAAWF,QAAX;IAAqBI;EAArB,IAAmCT,sBAAsB,CAACC,OAAD,CAA/D;EACA,MAAMG,MAAM,GAAG,IAAAW,sBAAA,EAAgBV,QAAhB,CAAf;EACA,MAAMW,UAAU,GAAG,MAAMH,EAAE,CAACI,UAAH,CAAcb,MAAd,EAAsBc,OAAtB,EAAzB;EACA,MAAMC,aAAa,GAAGH,UAAU,CAACI,aAAX,GAA2BJ,UAAU,CAACI,aAAtC,GAAsD,CAA5E;;EAEA,KAAK,MAAMC,MAAX,IAAqBC,gBAArB,EAA8B;IAC1B,MAAMC,UAAU,GAAGF,MAAM,CAACE,UAAP,CAAkB;MACjCT,OADiC;MAEjCD,EAFiC;MAGjCN,OAHiC;MAIjCiB,IAAI,EAAE;QACFC,IAAI,EAAEpB,QADJ;QAEFI,SAFE;QAGFU;MAHE;IAJ2B,CAAlB,CAAnB;;IAWA,IAAI,CAACI,UAAL,EAAiB;MACb;IACH;;IACD,OAAOF,MAAM,CAACK,OAAP,CAAe;MAClBZ,OADkB;MAElBD,EAFkB;MAGlBN,OAHkB;MAIlBiB,IAAI,EAAE;QACFC,IAAI,EAAEpB,QADJ;QAEFI,SAFE;QAGFU;MAHE;IAJY,CAAf,CAAP;EAUH,CA/BwF,CAiCzF;;;EACA,IAAIQ,MAAJ;;EACA,IAAIR,aAAa,GAAGtB,yBAApB,EAA+C;IAC3C8B,MAAM,GAAG,MAAMd,EAAE,CAACe,SAAH,CAAaxB,MAAb,EAAqBc,OAArB,EAAf;EACH;;EAED,OAAO;IAAES,MAAF;IAAUvB;EAAV,CAAP;AACH,CAxCD;;AA0CO,MAAMyB,yBAAyB,GAAG,MAAM;EAC3C,OAAO,CACH,IAAIC,oBAAJ,CAAgB,CAAC;IAAEC,KAAF;IAASjB;EAAT,CAAD,KAAwB;IACpCiB,KAAK,CAAC,cAAD,EAAiB,OAAO9B,OAAP,EAAgB+B,KAAhB,KAA0B;MAC5C,MAAM;QAAEC;MAAF,IAAa,IAAAC,qBAAA,GAAnB;MACA,MAAMrB,EAAE,GAAG,IAAIsB,UAAJ,CAAO;QAAEF;MAAF,CAAP,CAAX;MAEA,MAAM;QAAE7B,MAAF;QAAUuB;MAAV,IAAqB,MAAMf,WAAW,CAACX,OAAD,EAAUY,EAAV,EAAcC,OAAd,CAA5C,CAJ4C,CAM5C;;MACA,IAAIa,MAAJ,EAAY;QACR,OAAOK,KAAK,CACPI,OADE,CACM;UACL,gBAAgBT,MAAM,CAACU,WADlB;UAEL,iBAAkB,mBAAkBvC,qBAAsB,EAFrD;UAGL,2BAA2B;QAHtB,CADN,EAMFwC,IANE,CAMGX,MAAM,CAACY,IAAP,IAAe,EANlB,CAAP;MAOH;;MAED,MAAMC,YAAY,GAAG3B,EAAE,CAAC4B,YAAH,CAAgB,WAAhB,EAA6B;QAC9CC,MAAM,EAAEtC,MAAM,CAACsC,MAD+B;QAE9CC,GAAG,EAAEvC,MAAM,CAACuC,GAFkC;QAG9CC,OAAO,EAAE7C;MAHqC,CAA7B,CAArB,CAjB4C,CAuB5C;MACA;;MACA,OAAOiC,KAAK,CACPa,IADE,CACG,GADH,EAEFT,OAFE,CAEM;QACLU,QAAQ,EAAEN,YADL;QAEL,iBAAiB,qBAAqBzC;MAFjC,CAFN,EAMFuC,IANE,CAMG,EANH,CAAP;IAOH,CAhCI,CAAL;EAiCH,CAlCD,CADG,CAAP;AAqCH,CAtCM"}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./byExactKey\";\nexport * from \"./byAlias\";\n"],"mappings":";;;;;AAAA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}

package/handlers/manage/index.js

@@ -1,22 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createManageFilePlugins = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
-
 var _utils = require("../utils");
-
 var _managers = _interopRequireDefault(require("../transform/managers"));
-
 var _handlerAws = require("@webiny/handler-aws");
-
 /**
  * This handler must be run through @webiny/handler-aws/s3
  */
@@ -25,39 +18,31 @@ const createManageFilePlugins = () => {
     event
   }) => {
     const keys = [];
-
     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 (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;
         }
-
         await manager.process({
           s3,
           key,
@@ -67,5 +52,4 @@ const createManageFilePlugins = () => {
     }
   })];
 };
-
 exports.createManageFilePlugins = createManageFilePlugins;

package/handlers/manage/index.js.map

@@ -1 +1 @@
-{"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"}
+{"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,0BAAc,CAAC,OAAO;IAAEC;EAAM,CAAC,KAAK;IACpC,MAAMC,IAAc,GAAG,EAAE;IACzB,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,KAAK,CAACG,OAAO,CAACC,MAAM,EAAEF,CAAC,EAAE,EAAE;MAC3C,MAAMG,MAAM,GAAGL,KAAK,CAACG,OAAO,CAACD,CAAC,CAAC;MAC/B,IAAI,OAAOG,MAAM,CAACC,EAAE,CAACC,MAAM,CAACC,GAAG,KAAK,QAAQ,EAAE;QAC1CP,IAAI,CAACQ,IAAI,CAACJ,MAAM,CAACC,EAAE,CAACC,MAAM,CAACC,GAAG,CAAC;MACnC;IACJ;IAEA,IAAIP,IAAI,CAACG,MAAM,KAAK,CAAC,EAAE;MACnB;IACJ;IAEA,MAAM;MAAEM;IAAO,CAAC,GAAG,IAAAC,qBAAc,GAAE;IACnC,MAAML,EAAE,GAAG,IAAIM,UAAE,CAAC;MAAEF;IAAO,CAAC,CAAC;IAE7B,KAAK,MAAMF,GAAG,IAAIP,IAAI,EAAE;MACpB,MAAMY,SAAS,GAAGC,aAAI,CAACC,OAAO,CAACP,GAAG,CAAC;MAEnC,KAAK,MAAMQ,OAAO,IAAIC,iBAAQ,EAAE;QAC5B,MAAMC,UAAU,GAAGF,OAAO,CAACE,UAAU,CAAC;UAClCV,GAAG;UACHK;QACJ,CAAC,CAAC;QAEF,IAAI,CAACK,UAAU,EAAE;UACb;QACJ;QACA,MAAMF,OAAO,CAACG,OAAO,CAAC;UAClBb,EAAE;UACFE,GAAG;UACHK;QACJ,CAAC,CAAC;MACN;IACJ;EACJ,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}

package/handlers/transform/index.js

@@ -1,26 +1,19 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createTransformFilePlugins = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
-
 var _transformImage = _interopRequireDefault(require("./transformImage"));
-
 var _optimizeImage = _interopRequireDefault(require("./optimizeImage"));
-
 var _utils = require("../utils");
-
-var _utils2 = require("./utils");
-
+var newUtils = _interopRequireWildcard(require("./utils"));
+var legacyUtils = _interopRequireWildcard(require("./legacyUtils"));
 var _handler = require("@webiny/handler");
-
 const createTransformFilePlugins = () => {
   return [(0, _handler.createEvent)(async ({
     payload
@@ -32,24 +25,25 @@ const createTransformFilePlugins = () => {
       key,
       transformations
     } = body;
-
     try {
       const env = (0, _utils.getEnvironment)();
       const s3 = new _s.default({
         region: env.region
       });
       let optimizedImageObject;
+      const utils = key.includes("/") ? newUtils : legacyUtils;
       const params = {
         initial: (0, _utils.getObjectParams)(key),
-        optimized: (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
+        optimized: (0, _utils.getObjectParams)(utils.getImageKey({
           key
         })),
-        optimizedTransformed: (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
+        optimizedTransformed: (0, _utils.getObjectParams)(utils.getImageKey({
           key,
           transformations
         }))
-      }; // 1. Get optimized image.
+      };
 
+      // 1. Get optimized image.
       try {
         optimizedImageObject = await s3.getObject(params.optimized).promise();
       } catch (e) {
@@ -60,17 +54,17 @@ const createTransformFilePlugins = () => {
           Body: await (0, _optimizeImage.default)(optimizedImageObject.Body, optimizedImageObject.ContentType)
         })).promise();
         optimizedImageObject = await s3.getObject(params.optimized).promise();
-      } // 2. If no transformations requested, just exit.
-
+      }
 
+      // 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.
-
+      }
 
+      // 3. If transformations requested, apply them in save it into the bucket.
       await s3.putObject((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params.optimizedTransformed), {}, {
         ContentType: optimizedImageObject.ContentType,
         Body: await (0, _transformImage.default)(optimizedImageObject.Body, transformations)
@@ -92,5 +86,4 @@ const createTransformFilePlugins = () => {
     }
   })];
 };
-
 exports.createTransformFilePlugins = createTransformFilePlugins;

package/handlers/transform/index.js.map

@@ -1 +1 @@
-{"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","ex","console","JSON","stringify","code","data"],"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 (ex) {\n                console.error(\n                    JSON.stringify({\n                        message: ex.message,\n                        code: ex.code,\n                        data: ex.data\n                    })\n                );\n                return {\n                    error: true,\n                    message: ex.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,6DAEKT,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,6DAEKT,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,OAAOE,EAAP,EAAW;MACTC,OAAO,CAACJ,KAAR,CACIK,IAAI,CAACC,SAAL,CAAe;QACXL,OAAO,EAAEE,EAAE,CAACF,OADD;QAEXM,IAAI,EAAEJ,EAAE,CAACI,IAFE;QAGXC,IAAI,EAAEL,EAAE,CAACK;MAHE,CAAf,CADJ;MAOA,OAAO;QACHR,KAAK,EAAE,IADJ;QAEHC,OAAO,EAAEE,EAAE,CAACF;MAFT,CAAP;IAIH;EACJ,CAzED,CADG,CAAP;AA4EH,CA7EM"}
+{"version":3,"names":["createTransformFilePlugins","createEvent","payload","body","key","transformations","env","getEnvironment","s3","S3","region","optimizedImageObject","utils","includes","newUtils","legacyUtils","params","initial","getObjectParams","optimized","getImageKey","optimizedTransformed","getObject","promise","e","putObject","ContentType","Body","optimizeImage","error","message","transformImage","ex","console","JSON","stringify","code","data"],"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 * as newUtils from \"./utils\";\nimport * as legacyUtils from \"./legacyUtils\";\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 utils = key.includes(\"/\") ? newUtils : legacyUtils;\n\n                const params = {\n                    initial: getObjectParams(key),\n                    optimized: getObjectParams(utils.getImageKey({ key })),\n                    optimizedTransformed: getObjectParams(\n                        utils.getImageKey({ key, transformations })\n                    )\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 (ex) {\n                console.error(\n                    JSON.stringify({\n                        message: ex.message,\n                        code: ex.code,\n                        data: ex.data\n                    })\n                );\n                return {\n                    error: true,\n                    message: ex.message\n                };\n            }\n        })\n    ];\n};\n"],"mappings":";;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEO,MAAMA,0BAA0B,GAAG,MAAM;EAC5C,OAAO,CACH,IAAAC,oBAAW,EAA+B,OAAO;IAAEC;EAAQ,CAAC,KAAK;IAC7D,MAAM;MAAEC;IAAK,CAAC,GAAGD,OAAO;IACxB,MAAM;MAAEE,GAAG;MAAEC;IAAgB,CAAC,GAAGF,IAAI;IACrC,IAAI;MACA,MAAMG,GAAG,GAAG,IAAAC,qBAAc,GAAE;MAC5B,MAAMC,EAAE,GAAG,IAAIC,UAAE,CAAC;QAAEC,MAAM,EAAEJ,GAAG,CAACI;MAAO,CAAC,CAAC;MAEzC,IAAIC,oBAA8C;MAElD,MAAMC,KAAK,GAAGR,GAAG,CAACS,QAAQ,CAAC,GAAG,CAAC,GAAGC,QAAQ,GAAGC,WAAW;MAExD,MAAMC,MAAM,GAAG;QACXC,OAAO,EAAE,IAAAC,sBAAe,EAACd,GAAG,CAAC;QAC7Be,SAAS,EAAE,IAAAD,sBAAe,EAACN,KAAK,CAACQ,WAAW,CAAC;UAAEhB;QAAI,CAAC,CAAC,CAAC;QACtDiB,oBAAoB,EAAE,IAAAH,sBAAe,EACjCN,KAAK,CAACQ,WAAW,CAAC;UAAEhB,GAAG;UAAEC;QAAgB,CAAC,CAAC;MAEnD,CAAC;;MAED;MACA,IAAI;QACAM,oBAAoB,GAAG,MAAMH,EAAE,CAACc,SAAS,CAACN,MAAM,CAACG,SAAS,CAAC,CAACI,OAAO,EAAE;MACzE,CAAC,CAAC,OAAOC,CAAC,EAAE;QACR;QACAb,oBAAoB,GAAG,MAAMH,EAAE,CAACc,SAAS,CAACN,MAAM,CAACC,OAAO,CAAC,CAACM,OAAO,EAAE;QAEnE,MAAMf,EAAE,CACHiB,SAAS,6DACHT,MAAM,CAACG,SAAS;UACnBO,WAAW,EAAEf,oBAAoB,CAACe,WAAW;UAC7CC,IAAI,EAAE,MAAM,IAAAC,sBAAa,EACrBjB,oBAAoB,CAACgB,IAAI,EACzBhB,oBAAoB,CAACe,WAAW;QACnC,GACH,CACDH,OAAO,EAAE;QAEdZ,oBAAoB,GAAG,MAAMH,EAAE,CAACc,SAAS,CAACN,MAAM,CAACG,SAAS,CAAC,CAACI,OAAO,EAAE;MACzE;;MAEA;MACA,IAAI,CAAClB,eAAe,EAAE;QAClB,OAAO;UACHwB,KAAK,EAAE,KAAK;UACZC,OAAO,EAAE;QACb,CAAC;MACL;;MAEA;MACA,MAAMtB,EAAE,CACHiB,SAAS,6DACHT,MAAM,CAACK,oBAAoB;QAC9BK,WAAW,EAAEf,oBAAoB,CAACe,WAAW;QAC7CC,IAAI,EAAE,MAAM,IAAAI,uBAAc,EACtBpB,oBAAoB,CAACgB,IAAI,EACzBtB,eAAe;MAClB,GACH,CACDkB,OAAO,EAAE;MAEd,OAAO;QACHM,KAAK,EAAE,KAAK;QACZC,OAAO,EAAE;MACb,CAAC;IACL,CAAC,CAAC,OAAOE,EAAE,EAAE;MACTC,OAAO,CAACJ,KAAK,CACTK,IAAI,CAACC,SAAS,CAAC;QACXL,OAAO,EAAEE,EAAE,CAACF,OAAO;QACnBM,IAAI,EAAEJ,EAAE,CAACI,IAAI;QACbC,IAAI,EAAEL,EAAE,CAACK;MACb,CAAC,CAAC,CACL;MACD,OAAO;QACHR,KAAK,EAAE,IAAI;QACXC,OAAO,EAAEE,EAAE,CAACF;MAChB,CAAC;IACL;EACJ,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}

package/handlers/transform/legacyUtils.d.ts

@@ -0,0 +1,17 @@
+/**
+ * BACKWARDS-COMPATIBILITY!
+ *
+ * This file contains utilities for files that don't have `id/key` structure, meaning, all files created before 5.35.0 release.
+ */
+declare const SUPPORTED_IMAGES: string[];
+declare const SUPPORTED_TRANSFORMABLE_IMAGES: string[];
+declare const OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = "img-o-t-";
+declare const OPTIMIZED_IMAGE_PREFIX = "img-o-";
+declare const getOptimizedImageKeyPrefix: (key: string) => string;
+declare const getOptimizedTransformedImageKeyPrefix: (key: string) => string;
+interface GetImageKeyParams {
+    key: string;
+    transformations?: any;
+}
+declare const getImageKey: ({ key, transformations }: GetImageKeyParams) => string;
+export { SUPPORTED_IMAGES, SUPPORTED_TRANSFORMABLE_IMAGES, OPTIMIZED_TRANSFORMED_IMAGE_PREFIX, OPTIMIZED_IMAGE_PREFIX, getImageKey, getOptimizedImageKeyPrefix, getOptimizedTransformedImageKeyPrefix };

package/handlers/transform/legacyUtils.js

@@ -0,0 +1,42 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getOptimizedTransformedImageKeyPrefix = exports.getOptimizedImageKeyPrefix = exports.getImageKey = exports.SUPPORTED_TRANSFORMABLE_IMAGES = exports.SUPPORTED_IMAGES = exports.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = exports.OPTIMIZED_IMAGE_PREFIX = void 0;
+var _objectHash = _interopRequireDefault(require("object-hash"));
+/**
+ * BACKWARDS-COMPATIBILITY!
+ *
+ * This file contains utilities for files that don't have `id/key` structure, meaning, all files created before 5.35.0 release.
+ */
+
+const SUPPORTED_IMAGES = [".jpg", ".jpeg", ".png", ".svg", ".gif"];
+exports.SUPPORTED_IMAGES = SUPPORTED_IMAGES;
+const SUPPORTED_TRANSFORMABLE_IMAGES = [".jpg", ".jpeg", ".png"];
+exports.SUPPORTED_TRANSFORMABLE_IMAGES = SUPPORTED_TRANSFORMABLE_IMAGES;
+const OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = "img-o-t-";
+exports.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = OPTIMIZED_TRANSFORMED_IMAGE_PREFIX;
+const OPTIMIZED_IMAGE_PREFIX = "img-o-";
+exports.OPTIMIZED_IMAGE_PREFIX = OPTIMIZED_IMAGE_PREFIX;
+const getOptimizedImageKeyPrefix = key => {
+  return `${OPTIMIZED_IMAGE_PREFIX}${(0, _objectHash.default)(key)}-`;
+};
+exports.getOptimizedImageKeyPrefix = getOptimizedImageKeyPrefix;
+const getOptimizedTransformedImageKeyPrefix = key => {
+  return `${OPTIMIZED_TRANSFORMED_IMAGE_PREFIX}${(0, _objectHash.default)(key)}-`;
+};
+exports.getOptimizedTransformedImageKeyPrefix = getOptimizedTransformedImageKeyPrefix;
+const getImageKey = ({
+  key,
+  transformations
+}) => {
+  if (!transformations) {
+    const prefix = getOptimizedImageKeyPrefix(key);
+    return prefix + key;
+  }
+  const prefix = getOptimizedTransformedImageKeyPrefix(key);
+  return `${prefix}${(0, _objectHash.default)(transformations)}-${key}`;
+};
+exports.getImageKey = getImageKey;

package/handlers/transform/legacyUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["SUPPORTED_IMAGES","SUPPORTED_TRANSFORMABLE_IMAGES","OPTIMIZED_TRANSFORMED_IMAGE_PREFIX","OPTIMIZED_IMAGE_PREFIX","getOptimizedImageKeyPrefix","key","objectHash","getOptimizedTransformedImageKeyPrefix","getImageKey","transformations","prefix"],"sources":["legacyUtils.ts"],"sourcesContent":["/**\n * BACKWARDS-COMPATIBILITY!\n *\n * This file contains utilities for files that don't have `id/key` structure, meaning, all files created before 5.35.0 release.\n */\n\nimport objectHash from \"object-hash\";\n\nconst SUPPORTED_IMAGES = [\".jpg\", \".jpeg\", \".png\", \".svg\", \".gif\"];\nconst SUPPORTED_TRANSFORMABLE_IMAGES = [\".jpg\", \".jpeg\", \".png\"];\n\nconst OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = \"img-o-t-\";\nconst OPTIMIZED_IMAGE_PREFIX = \"img-o-\";\n\nconst getOptimizedImageKeyPrefix = (key: string): string => {\n    return `${OPTIMIZED_IMAGE_PREFIX}${objectHash(key)}-`;\n};\n\nconst getOptimizedTransformedImageKeyPrefix = (key: string): string => {\n    return `${OPTIMIZED_TRANSFORMED_IMAGE_PREFIX}${objectHash(key)}-`;\n};\n\ninterface GetImageKeyParams {\n    key: string;\n    transformations?: any;\n}\n\nconst getImageKey = ({ key, transformations }: GetImageKeyParams): string => {\n    if (!transformations) {\n        const prefix = getOptimizedImageKeyPrefix(key);\n        return prefix + key;\n    }\n\n    const prefix = getOptimizedTransformedImageKeyPrefix(key);\n    return `${prefix}${objectHash(transformations)}-${key}`;\n};\n\nexport {\n    SUPPORTED_IMAGES,\n    SUPPORTED_TRANSFORMABLE_IMAGES,\n    OPTIMIZED_TRANSFORMED_IMAGE_PREFIX,\n    OPTIMIZED_IMAGE_PREFIX,\n    getImageKey,\n    getOptimizedImageKeyPrefix,\n    getOptimizedTransformedImageKeyPrefix\n};\n"],"mappings":";;;;;;;AAMA;AANA;AACA;AACA;AACA;AACA;;AAIA,MAAMA,gBAAgB,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;AAAC;AACnE,MAAMC,8BAA8B,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;AAAC;AAEjE,MAAMC,kCAAkC,GAAG,UAAU;AAAC;AACtD,MAAMC,sBAAsB,GAAG,QAAQ;AAAC;AAExC,MAAMC,0BAA0B,GAAIC,GAAW,IAAa;EACxD,OAAQ,GAAEF,sBAAuB,GAAE,IAAAG,mBAAU,EAACD,GAAG,CAAE,GAAE;AACzD,CAAC;AAAC;AAEF,MAAME,qCAAqC,GAAIF,GAAW,IAAa;EACnE,OAAQ,GAAEH,kCAAmC,GAAE,IAAAI,mBAAU,EAACD,GAAG,CAAE,GAAE;AACrE,CAAC;AAAC;AAOF,MAAMG,WAAW,GAAG,CAAC;EAAEH,GAAG;EAAEI;AAAmC,CAAC,KAAa;EACzE,IAAI,CAACA,eAAe,EAAE;IAClB,MAAMC,MAAM,GAAGN,0BAA0B,CAACC,GAAG,CAAC;IAC9C,OAAOK,MAAM,GAAGL,GAAG;EACvB;EAEA,MAAMK,MAAM,GAAGH,qCAAqC,CAACF,GAAG,CAAC;EACzD,OAAQ,GAAEK,MAAO,GAAE,IAAAJ,mBAAU,EAACG,eAAe,CAAE,IAAGJ,GAAI,EAAC;AAC3D,CAAC;AAAC"}

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

@@ -21,7 +21,7 @@ export interface ProcessParams {
     context: ClientContext;
 }
 declare const _default: {
-    canProcess: (params: CanProcessParams) => boolean;
+    canProcess: ({ file }: CanProcessParams) => boolean;
     process({ s3, file, options, context }: ProcessParams): Promise<{
         object: import("aws-sdk/lib/request").PromiseResult<S3.GetObjectOutput, import("aws-sdk/lib/error").AWSError>;
         params: import("../../utils/getObjectParams").ObjectParamsResponse;

package/handlers/transform/loaders/imageLoader.js

@@ -1,20 +1,16 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _sanitizeImageTransformations = _interopRequireDefault(require("./sanitizeImageTransformations"));
-
 var _utils = require("../../utils");
-
-var _utils2 = require("../utils");
-
+var newUtils = _interopRequireWildcard(require("../utils"));
+var legacyUtils = _interopRequireWildcard(require("../legacyUtils"));
 const IMAGE_TRANSFORMER_FUNCTION = process.env.IMAGE_TRANSFORMER_FUNCTION;
-
 const callImageTransformerLambda = async ({
   key,
   transformations,
@@ -30,12 +26,13 @@ const callImageTransformerLambda = async ({
     }
   });
 };
-
 var _default = {
-  canProcess: params => {
-    return _utils2.SUPPORTED_IMAGES.includes(params.file.extension);
+  canProcess: ({
+    file
+  }) => {
+    const utils = file.name.includes("/") ? newUtils : legacyUtils;
+    return utils.SUPPORTED_IMAGES.includes(file.extension);
   },
-
   async process({
     s3,
     file,
@@ -44,14 +41,13 @@ var _default = {
   }) {
     // Loaders must return {object, params} object.
     let objectParams;
+    const utils = file.name.includes("/") ? newUtils : legacyUtils;
     const transformations = (0, _sanitizeImageTransformations.default)(options);
-
-    if (transformations && _utils2.SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {
-      objectParams = (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
+    if (transformations && utils.SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {
+      objectParams = (0, _utils.getObjectParams)(utils.getImageKey({
         key: file.name,
         transformations
       }));
-
       try {
         return {
           object: await s3.getObject(objectParams).promise(),
@@ -63,22 +59,18 @@ var _default = {
           transformations,
           context
         });
-
         if (imageTransformerLambdaResponse.error) {
           throw Error(imageTransformerLambdaResponse.message);
         }
-
         return {
           object: await s3.getObject(objectParams).promise(),
           params: objectParams
         };
       }
     }
-
-    objectParams = (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
+    objectParams = (0, _utils.getObjectParams)(utils.getImageKey({
       key: file.name
     }));
-
     try {
       return {
         object: await s3.getObject(objectParams).promise(),
@@ -89,17 +81,14 @@ var _default = {
         key: file.name,
         context
       });
-
       if (imageTransformerLambdaResponse.error) {
         throw Error(imageTransformerLambdaResponse.message);
       }
-
       return {
         object: await s3.getObject(objectParams).promise(),
         params: objectParams
       };
     }
   }
-
 };
 exports.default = _default;