@webiny/api-file-manager 0.0.0-mt-3 → 0.0.0-unstable.2af142b57e

package/handlers/download/index.d.ts

@@ -1,3 +1,3 @@
-import { HandlerPlugin } from "@webiny/handler/types";
-declare const _default: () => HandlerPlugin;
-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

@@ -1,87 +1,81 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-
+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.
- * @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);
-
-  for (let i = 0; i < _loaders.default.length; i++) {
-    const loader = _loaders.default[i];
+  } = 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
+        extension,
+        contentLength
       }
     });
-
-    if (canProcess) {
-      return loader.process({
-        context,
-        s3,
-        options,
-        file: {
-          name: filename,
-          extension
-        }
-      });
+    if (!canProcess) {
+      continue;
     }
-  } // If no processors handled the file request, just return the S3 object by default.
-
+    return loader.process({
+      context,
+      s3,
+      options,
+      file: {
+        name: filename,
+        extension,
+        contentLength
+      }
+    });
+  }
 
-  const params = (0, _utils.getObjectParams)(filename);
+  // 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: await s3.getObject(params).promise(),
-    params: params
+    object,
+    params
   };
 };
-
-var _default = () => ({
-  type: "handler",
-  name: "handler-download-file",
-
-  async handle(context) {
-    const event = context.invocationArgs;
-    const handler = (0, _utils.createHandler)(async event => {
+const createDownloadFilePlugins = () => {
+  return [new _gateway.RoutePlugin(({
+    onGet,
+    context
+  }) => {
+    onGet("/files/:path", async (request, reply) => {
       const {
         region
       } = (0, _utils.getEnvironment)();
@@ -91,35 +85,29 @@ var _default = () => ({
       const {
         params,
         object
-      } = await getS3Object(event, s3, context);
+      } = 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
+      });
 
-      if (object.ContentLength < MAX_RETURN_CONTENT_LENGTH) {
-        return {
-          data: object.Body,
-          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
+      // 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 s3.putObjectAcl({
-        Bucket: params.Bucket,
-        ACL: "public-read",
-        Key: params.Key
-      }).promise();
-      return {
-        statusCode: 301,
-        headers: {
-          Location: `https://${params.Bucket}.s3.amazonaws.com/${params.Key}`
-        }
-      };
+      return reply.code(301).headers({
+        Location: presignedUrl,
+        "Cache-Control": "public, max-age=" + PRESIGNED_URL_EXPIRATION
+      }).send("");
     });
-    return await handler(event);
-  }
-
-});
-
-exports.default = _default;
+  })];
+};
+exports.createDownloadFilePlugins = createDownloadFilePlugins;

package/handlers/download/index.js.map

@@ -0,0 +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,OAAO,CAAC,CAAC;AAC3C,MAAMC,qBAAqB,GAAG,QAAQ,CAAC,CAAC;AACxC,MAAMC,wBAAwB,GAAG,GAAG,CAAC,CAAC;AACtC;AACA;AACA;AACA,MAAMC,sBAAsB,GAAIC,OAAgB,IAAK;EACjD,MAAMC,IAAI,GAAG,IAAAC,yBAAgB,EAAEF,OAAO,CAACG,MAAM,CAASF,IAAI,CAAC;EAC3D,OAAO;IACHG,QAAQ,EAAEC,SAAS,CAACJ,IAAI,CAAC;IACzBK,OAAO,EAAEN,OAAO,CAACO,KAAY;IAC7BC,SAAS,EAAEC,aAAO,CAACC,OAAO,CAACT,IAAI;EACnC,CAAC;AACL,CAAC;AAOD,MAAMU,WAAW,GAAG,OAAOX,OAAgB,EAAEY,EAAM,EAAEC,OAAgB,KAAwB;EACzF,MAAM;IAAEP,OAAO;IAAEF,QAAQ;IAAEI;EAAU,CAAC,GAAGT,sBAAsB,CAACC,OAAO,CAAC;EACxE,MAAMG,MAAM,GAAG,IAAAW,sBAAe,EAACV,QAAQ,CAAC;EACxC,MAAMW,UAAU,GAAG,MAAMH,EAAE,CAACI,UAAU,CAACb,MAAM,CAAC,CAACc,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;MACjCT,OAAO;MACPD,EAAE;MACFN,OAAO;MACPiB,IAAI,EAAE;QACFC,IAAI,EAAEpB,QAAQ;QACdI,SAAS;QACTU;MACJ;IACJ,CAAC,CAAC;IAEF,IAAI,CAACI,UAAU,EAAE;MACb;IACJ;IACA,OAAOF,MAAM,CAACK,OAAO,CAAC;MAClBZ,OAAO;MACPD,EAAE;MACFN,OAAO;MACPiB,IAAI,EAAE;QACFC,IAAI,EAAEpB,QAAQ;QACdI,SAAS;QACTU;MACJ;IACJ,CAAC,CAAC;EACN;;EAEA;EACA,IAAIQ,MAAM;EACV,IAAIR,aAAa,GAAGtB,yBAAyB,EAAE;IAC3C8B,MAAM,GAAG,MAAMd,EAAE,CAACe,SAAS,CAACxB,MAAM,CAAC,CAACc,OAAO,EAAE;EACjD;EAEA,OAAO;IAAES,MAAM;IAAEvB;EAAO,CAAC;AAC7B,CAAC;AAEM,MAAMyB,yBAAyB,GAAG,MAAM;EAC3C,OAAO,CACH,IAAIC,oBAAW,CAAC,CAAC;IAAEC,KAAK;IAAEjB;EAAQ,CAAC,KAAK;IACpCiB,KAAK,CAAC,cAAc,EAAE,OAAO9B,OAAO,EAAE+B,KAAK,KAAK;MAC5C,MAAM;QAAEC;MAAO,CAAC,GAAG,IAAAC,qBAAc,GAAE;MACnC,MAAMrB,EAAE,GAAG,IAAIsB,UAAE,CAAC;QAAEF;MAAO,CAAC,CAAC;MAE7B,MAAM;QAAE7B,MAAM;QAAEuB;MAAO,CAAC,GAAG,MAAMf,WAAW,CAACX,OAAO,EAAEY,EAAE,EAAEC,OAAO,CAAC;;MAElE;MACA,IAAIa,MAAM,EAAE;QACR,OAAOK,KAAK,CACPI,OAAO,CAAC;UACL,cAAc,EAAET,MAAM,CAACU,WAAW;UAClC,eAAe,EAAG,mBAAkBvC,qBAAsB,EAAC;UAC3D,yBAAyB,EAAE;QAC/B,CAAC,CAAC,CACDwC,IAAI,CAACX,MAAM,CAACY,IAAI,IAAI,EAAE,CAAC;MAChC;MAEA,MAAMC,YAAY,GAAG3B,EAAE,CAAC4B,YAAY,CAAC,WAAW,EAAE;QAC9CC,MAAM,EAAEtC,MAAM,CAACsC,MAAM;QACrBC,GAAG,EAAEvC,MAAM,CAACuC,GAAG;QACfC,OAAO,EAAE7C;MACb,CAAC,CAAC;;MAEF;MACA;MACA,OAAOiC,KAAK,CACPa,IAAI,CAAC,GAAG,CAAC,CACTT,OAAO,CAAC;QACLU,QAAQ,EAAEN,YAAY;QACtB,eAAe,EAAE,kBAAkB,GAAGzC;MAC1C,CAAC,CAAC,CACDuC,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}

package/handlers/manage/index.d.ts

@@ -1,3 +1,5 @@
-import { HandlerPlugin } from "@webiny/handler/types";
-declare const _default: () => HandlerPlugin;
-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

@@ -1,70 +1,55 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-
+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 _default = () => ({
-  type: "handler",
-  name: "handler-download-file",
-
-  async handle(context) {
-    const event = context.invocationArgs;
-    const handler = (0, _utils.createHandler)(async 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);
-        }
+var _handlerAws = require("@webiny/handler-aws");
+/**
+ * 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];
+      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 (let i = 0; i < keys.length; i++) {
-        const key = keys[i];
-
-        const extension = _path.default.extname(key);
-
-        for (let j = 0; j < _managers.default.length; j++) {
-          const manager = _managers.default[j];
-          const canProcess = manager.canProcess({
-            s3,
-            key,
-            extension
-          });
-
-          if (canProcess) {
-            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;
         }
+        await manager.process({
+          s3,
+          key,
+          extension
+        });
       }
-    });
-    return await handler(event);
-  }
-
-});
-
-exports.default = _default;
+    }
+  })];
+};
+exports.createManageFilePlugins = createManageFilePlugins;

package/handlers/manage/index.js.map

@@ -0,0 +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,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.d.ts

@@ -1,3 +1,2 @@
-import { HandlerPlugin } from "@webiny/handler/types";
-declare const _default: () => HandlerPlugin;
-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

@@ -1,96 +1,81 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
+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");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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) {
-    const event = context.invocationArgs;
-    const handler = (0, _utils.createHandler)(async ({
-      body: {
-        transformations,
-        key
-      }
-    }) => {
+var _handler = require("@webiny/handler");
+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((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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
-        };
       }
-    });
-    return await handler(event);
-  }
-
-});
 
-exports.default = _default;
+      // 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)
+      })).promise();
+      return {
+        error: false,
+        message: ""
+      };
+    } catch (e) {
+      return {
+        error: true,
+        message: e.message
+      };
+    }
+  })];
+};
+exports.createTransformFilePlugins = createTransformFilePlugins;

package/handlers/transform/index.js.map

@@ -0,0 +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"],"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,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,MAAM,GAAG;QACXC,OAAO,EAAE,IAAAC,sBAAe,EAACV,GAAG,CAAC;QAC7BW,SAAS,EAAE,IAAAD,sBAAe,EAAC,IAAAE,mBAAW,EAAC;UAAEZ;QAAI,CAAC,CAAC,CAAC;QAChDa,oBAAoB,EAAE,IAAAH,sBAAe,EAAC,IAAAE,mBAAW,EAAC;UAAEZ,GAAG;UAAEC;QAAgB,CAAC,CAAC;MAC/E,CAAC;;MAED;MACA,IAAI;QACAM,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAS,CAACN,MAAM,CAACG,SAAS,CAAC,CAACI,OAAO,EAAE;MACzE,CAAC,CAAC,OAAOC,CAAC,EAAE;QACR;QACAT,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAS,CAACN,MAAM,CAACC,OAAO,CAAC,CAACM,OAAO,EAAE;QAEnE,MAAMX,EAAE,CACHa,SAAS,6DACHT,MAAM,CAACG,SAAS;UACnBO,WAAW,EAAEX,oBAAoB,CAACW,WAAW;UAC7CC,IAAI,EAAE,MAAM,IAAAC,sBAAa,EACrBb,oBAAoB,CAACY,IAAI,EACzBZ,oBAAoB,CAACW,WAAW;QACnC,GACH,CACDH,OAAO,EAAE;QAEdR,oBAAoB,GAAG,MAAMH,EAAE,CAACU,SAAS,CAACN,MAAM,CAACG,SAAS,CAAC,CAACI,OAAO,EAAE;MACzE;;MAEA;MACA,IAAI,CAACd,eAAe,EAAE;QAClB,OAAO;UACHoB,KAAK,EAAE,KAAK;UACZC,OAAO,EAAE;QACb,CAAC;MACL;;MAEA;MACA,MAAMlB,EAAE,CACHa,SAAS,6DACHT,MAAM,CAACK,oBAAoB;QAC9BK,WAAW,EAAEX,oBAAoB,CAACW,WAAW;QAC7CC,IAAI,EAAE,MAAM,IAAAI,uBAAc,EACtBhB,oBAAoB,CAACY,IAAI,EACzBlB,eAAe;MAClB,GACH,CACDc,OAAO,EAAE;MAEd,OAAO;QACHM,KAAK,EAAE,KAAK;QACZC,OAAO,EAAE;MACb,CAAC;IACL,CAAC,CAAC,OAAON,CAAC,EAAE;MACR,OAAO;QACHK,KAAK,EAAE,IAAI;QACXC,OAAO,EAAEN,CAAC,CAACM;MACf,CAAC;IACL;EACJ,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}

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

@@ -1,13 +1,30 @@
+import { ClientContext } from "@webiny/handler-client/types";
+import S3 from "aws-sdk/clients/s3";
+interface File {
+    extension: string;
+    name: string;
+    contentLength: number;
+}
+interface Options {
+    width?: string;
+}
+export interface CanProcessParams {
+    s3: S3;
+    file: File;
+    options?: Options;
+    context: ClientContext;
+}
+export interface ProcessParams {
+    s3: S3;
+    file: File;
+    options?: Options;
+    context: ClientContext;
+}
 declare const _default: {
-    canProcess: (opts: any) => boolean;
-    process({ s3, file, options, context }: {
-        s3: any;
-        file: any;
-        options: any;
-        context: any;
-    }): Promise<{
-        object: any;
-        params: any;
+    canProcess: (params: 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;
     }>;
 };
 export default _default;

package/handlers/transform/loaders/imageLoader.js

@@ -1,21 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+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");
-
-// @ts-ignore
 const IMAGE_TRANSFORMER_FUNCTION = process.env.IMAGE_TRANSFORMER_FUNCTION;
-
 const callImageTransformerLambda = async ({
   key,
   transformations,
@@ -31,12 +24,10 @@ const callImageTransformerLambda = async ({
     }
   });
 };
-
 var _default = {
-  canProcess: opts => {
-    return _utils2.SUPPORTED_IMAGES.includes(opts.file.extension);
+  canProcess: params => {
+    return _utils2.SUPPORTED_IMAGES.includes(params.file.extension);
   },
-
   async process({
     s3,
     file,
@@ -46,13 +37,11 @@ var _default = {
     // Loaders must return {object, params} object.
     let objectParams;
     const transformations = (0, _sanitizeImageTransformations.default)(options);
-
     if (transformations && _utils2.SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {
       objectParams = (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
         key: file.name,
         transformations
       }));
-
       try {
         return {
           object: await s3.getObject(objectParams).promise(),
@@ -64,22 +53,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)({
       key: file.name
     }));
-
     try {
       return {
         object: await s3.getObject(objectParams).promise(),
@@ -90,17 +75,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;