@webiny/api-file-manager-s3 6.0.0-beta.0 → 6.0.0-rc.1

package/README.md

@@ -1 +1,11 @@
-# @webiny/api-file-manager-s3
+# @webiny/api-file-manager-s3
+
+> [!NOTE]
+> This package is part of the [Webiny](https://www.webiny.com) monorepo.
+> It’s **included in every Webiny project by default** and is not meant to be used as a standalone package.
+
+📘 **Documentation:** [https://www.webiny.com/docs](https://www.webiny.com/docs)
+
+---
+
+_This README file is automatically generated during the publish process._

package/assetDelivery/assetDeliveryConfig.d.ts

@@ -1,6 +1,2 @@
-import { createAssetDelivery as createBaseAssetDelivery } from "@webiny/api-file-manager";
-export declare type AssetDeliveryParams = Parameters<typeof createBaseAssetDelivery>[0] & {
-    imageResizeWidths?: number[];
-    presignedUrlTtl?: number;
-};
-export declare const assetDeliveryConfig: (params: AssetDeliveryParams) => (import("@webiny/api-file-manager").AssetDeliveryConfigModifierPlugin | (import("@webiny/api-file-manager").AssetDeliveryConfigModifierPlugin | import("@webiny/handler").ModifyFastifyPlugin)[])[];
+import type { AssetDeliveryParams } from "../assetDelivery/types.js";
+export declare const assetDeliveryConfig: (params: AssetDeliveryParams) => (import("@webiny/api-file-manager").AssetDeliveryConfigModifierPlugin | (import("@webiny/api-file-manager").AssetDeliveryConfigModifierPlugin | import("@webiny/handler/index").ModifyFastifyPlugin)[])[];

package/assetDelivery/assetDeliveryConfig.js

@@ -1,39 +1,41 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.assetDeliveryConfig = void 0;
-var _apiFileManager = require("@webiny/api-file-manager");
-var _clientS = require("@webiny/aws-sdk/client-s3");
-var _S3AssetResolver = require("./s3/S3AssetResolver");
-var _S3OutputStrategy = require("./s3/S3OutputStrategy");
-var _SharpTransform = require("./s3/SharpTransform");
-const assetDeliveryConfig = params => {
+import { createAssetDelivery as createBaseAssetDelivery, createAssetDeliveryConfig } from "@webiny/api-file-manager";
+import { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import { S3AssetResolver } from "./s3/S3AssetResolver.js";
+import { S3OutputStrategy } from "./s3/S3OutputStrategy.js";
+import { SharpTransform } from "./s3/SharpTransform.js";
+import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/index.js";
+export const assetDeliveryConfig = params => {
   const bucket = process.env.S3_BUCKET;
   const region = process.env.AWS_REGION;
   const {
-    presignedUrlTtl = 900,
-    imageResizeWidths = [100, 300, 500, 750, 1000, 1500, 2500],
-    ...baseParams
+    // Presigned URLs last 1 hour
+    presignedUrlTtl = 3600,
+    imageResizeWidths = [128, 384, 640, 750, 828, 1080, 1200, 1920, 2048, 3840],
+    /**
+     * Even though Lambda's response payload limit is 6,291,556 bytes, we leave some room for the response envelope.
+     * We had situations where a 4.7MB file would cause the payload to go over the limit, so let's be on the safe side.
+     */
+    assetStreamingMaxSize = 4718592
   } = params;
   return [
   // Base asset delivery
-  (0, _apiFileManager.createAssetDelivery)(baseParams),
+  createBaseAssetDelivery(),
   // S3 plugins
-  (0, _apiFileManager.createAssetDeliveryConfig)(config => {
-    const s3 = new _clientS.S3({
+  createAssetDeliveryConfig(config => {
+    const s3 = new S3({
       region
     });
-    config.decorateAssetResolver(() => {
+    config.decorateAssetResolver(({
+      container
+    }) => {
       // This resolver loads file information from the `.metadata` file.
-      return new _S3AssetResolver.S3AssetResolver(s3, bucket);
+      return new S3AssetResolver(container.resolve(GlobalKeyValueStore), s3, bucket);
     });
     config.decorateAssetOutputStrategy(() => {
-      return new _S3OutputStrategy.S3OutputStrategy(s3, bucket, presignedUrlTtl);
+      return new S3OutputStrategy(s3, bucket, presignedUrlTtl, assetStreamingMaxSize);
     });
     config.decorateAssetTransformationStrategy(() => {
-      return new _SharpTransform.SharpTransform({
+      return new SharpTransform({
         s3,
         bucket,
         imageResizeWidths
@@ -41,6 +43,5 @@ const assetDeliveryConfig = params => {
     });
   })];
 };
-exports.assetDeliveryConfig = assetDeliveryConfig;
 
 //# sourceMappingURL=assetDeliveryConfig.js.map

package/assetDelivery/assetDeliveryConfig.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiFileManager","require","_clientS","_S3AssetResolver","_S3OutputStrategy","_SharpTransform","assetDeliveryConfig","params","bucket","process","env","S3_BUCKET","region","AWS_REGION","presignedUrlTtl","imageResizeWidths","baseParams","createBaseAssetDelivery","createAssetDeliveryConfig","config","s3","S3","decorateAssetResolver","S3AssetResolver","decorateAssetOutputStrategy","S3OutputStrategy","decorateAssetTransformationStrategy","SharpTransform","exports"],"sources":["assetDeliveryConfig.ts"],"sourcesContent":["import {\n    createAssetDelivery as createBaseAssetDelivery,\n    createAssetDeliveryConfig\n} from \"@webiny/api-file-manager\";\nimport { S3 } from \"@webiny/aws-sdk/client-s3\";\nimport { S3AssetResolver } from \"~/assetDelivery/s3/S3AssetResolver\";\nimport { S3OutputStrategy } from \"~/assetDelivery/s3/S3OutputStrategy\";\nimport { SharpTransform } from \"~/assetDelivery/s3/SharpTransform\";\n\nexport type AssetDeliveryParams = Parameters<typeof createBaseAssetDelivery>[0] & {\n    imageResizeWidths?: number[];\n    presignedUrlTtl?: number;\n};\n\nexport const assetDeliveryConfig = (params: AssetDeliveryParams) => {\n    const bucket = process.env.S3_BUCKET as string;\n    const region = process.env.AWS_REGION as string;\n\n    const {\n        presignedUrlTtl = 900,\n        imageResizeWidths = [100, 300, 500, 750, 1000, 1500, 2500],\n        ...baseParams\n    } = params;\n\n    return [\n        // Base asset delivery\n        createBaseAssetDelivery(baseParams),\n        // S3 plugins\n        createAssetDeliveryConfig(config => {\n            const s3 = new S3({ region });\n\n            config.decorateAssetResolver(() => {\n                // This resolver loads file information from the `.metadata` file.\n                return new S3AssetResolver(s3, bucket);\n            });\n\n            config.decorateAssetOutputStrategy(() => {\n                return new S3OutputStrategy(s3, bucket, presignedUrlTtl);\n            });\n\n            config.decorateAssetTransformationStrategy(() => {\n                return new SharpTransform({ s3, bucket, imageResizeWidths });\n            });\n        })\n    ];\n};\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAIA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,gBAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AAOO,MAAMK,mBAAmB,GAAIC,MAA2B,IAAK;EAChE,MAAMC,MAAM,GAAGC,OAAO,CAACC,GAAG,CAACC,SAAmB;EAC9C,MAAMC,MAAM,GAAGH,OAAO,CAACC,GAAG,CAACG,UAAoB;EAE/C,MAAM;IACFC,eAAe,GAAG,GAAG;IACrBC,iBAAiB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;IAC1D,GAAGC;EACP,CAAC,GAAGT,MAAM;EAEV,OAAO;EACH;EACA,IAAAU,mCAAuB,EAACD,UAAU,CAAC;EACnC;EACA,IAAAE,yCAAyB,EAACC,MAAM,IAAI;IAChC,MAAMC,EAAE,GAAG,IAAIC,WAAE,CAAC;MAAET;IAAO,CAAC,CAAC;IAE7BO,MAAM,CAACG,qBAAqB,CAAC,MAAM;MAC/B;MACA,OAAO,IAAIC,gCAAe,CAACH,EAAE,EAAEZ,MAAM,CAAC;IAC1C,CAAC,CAAC;IAEFW,MAAM,CAACK,2BAA2B,CAAC,MAAM;MACrC,OAAO,IAAIC,kCAAgB,CAACL,EAAE,EAAEZ,MAAM,EAAEM,eAAe,CAAC;IAC5D,CAAC,CAAC;IAEFK,MAAM,CAACO,mCAAmC,CAAC,MAAM;MAC7C,OAAO,IAAIC,8BAAc,CAAC;QAAEP,EAAE;QAAEZ,MAAM;QAAEO;MAAkB,CAAC,CAAC;IAChE,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC;AAACa,OAAA,CAAAtB,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["createAssetDelivery","createBaseAssetDelivery","createAssetDeliveryConfig","S3","S3AssetResolver","S3OutputStrategy","SharpTransform","GlobalKeyValueStore","assetDeliveryConfig","params","bucket","process","env","S3_BUCKET","region","AWS_REGION","presignedUrlTtl","imageResizeWidths","assetStreamingMaxSize","config","s3","decorateAssetResolver","container","resolve","decorateAssetOutputStrategy","decorateAssetTransformationStrategy"],"sources":["assetDeliveryConfig.ts"],"sourcesContent":["import {\n    createAssetDelivery as createBaseAssetDelivery,\n    createAssetDeliveryConfig\n} from \"@webiny/api-file-manager\";\nimport { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { S3AssetResolver } from \"~/assetDelivery/s3/S3AssetResolver.js\";\nimport { S3OutputStrategy } from \"~/assetDelivery/s3/S3OutputStrategy.js\";\nimport { SharpTransform } from \"~/assetDelivery/s3/SharpTransform.js\";\nimport type { AssetDeliveryParams } from \"~/assetDelivery/types.js\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\n\nexport const assetDeliveryConfig = (params: AssetDeliveryParams) => {\n    const bucket = process.env.S3_BUCKET as string;\n    const region = process.env.AWS_REGION as string;\n\n    const {\n        // Presigned URLs last 1 hour\n        presignedUrlTtl = 3600,\n        imageResizeWidths = [128, 384, 640, 750, 828, 1080, 1200, 1920, 2048, 3840],\n        /**\n         * Even though Lambda's response payload limit is 6,291,556 bytes, we leave some room for the response envelope.\n         * We had situations where a 4.7MB file would cause the payload to go over the limit, so let's be on the safe side.\n         */\n        assetStreamingMaxSize = 4718592\n    } = params;\n\n    return [\n        // Base asset delivery\n        createBaseAssetDelivery(),\n        // S3 plugins\n        createAssetDeliveryConfig(config => {\n            const s3 = new S3({ region });\n\n            config.decorateAssetResolver(({ container }) => {\n                // This resolver loads file information from the `.metadata` file.\n                return new S3AssetResolver(container.resolve(GlobalKeyValueStore), s3, bucket);\n            });\n\n            config.decorateAssetOutputStrategy(() => {\n                return new S3OutputStrategy(s3, bucket, presignedUrlTtl, assetStreamingMaxSize);\n            });\n\n            config.decorateAssetTransformationStrategy(() => {\n                return new SharpTransform({ s3, bucket, imageResizeWidths });\n            });\n        })\n    ];\n};\n"],"mappings":"AAAA,SACIA,mBAAmB,IAAIC,uBAAuB,EAC9CC,yBAAyB,QACtB,0BAA0B;AACjC,SAASC,EAAE,QAAQ,oCAAoC;AACvD,SAASC,eAAe;AACxB,SAASC,gBAAgB;AACzB,SAASC,cAAc;AAEvB,SAASC,mBAAmB,QAAQ,kDAAkD;AAEtF,OAAO,MAAMC,mBAAmB,GAAIC,MAA2B,IAAK;EAChE,MAAMC,MAAM,GAAGC,OAAO,CAACC,GAAG,CAACC,SAAmB;EAC9C,MAAMC,MAAM,GAAGH,OAAO,CAACC,GAAG,CAACG,UAAoB;EAE/C,MAAM;IACF;IACAC,eAAe,GAAG,IAAI;IACtBC,iBAAiB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;IAC3E;AACR;AACA;AACA;IACQC,qBAAqB,GAAG;EAC5B,CAAC,GAAGT,MAAM;EAEV,OAAO;EACH;EACAR,uBAAuB,CAAC,CAAC;EACzB;EACAC,yBAAyB,CAACiB,MAAM,IAAI;IAChC,MAAMC,EAAE,GAAG,IAAIjB,EAAE,CAAC;MAAEW;IAAO,CAAC,CAAC;IAE7BK,MAAM,CAACE,qBAAqB,CAAC,CAAC;MAAEC;IAAU,CAAC,KAAK;MAC5C;MACA,OAAO,IAAIlB,eAAe,CAACkB,SAAS,CAACC,OAAO,CAAChB,mBAAmB,CAAC,EAAEa,EAAE,EAAEV,MAAM,CAAC;IAClF,CAAC,CAAC;IAEFS,MAAM,CAACK,2BAA2B,CAAC,MAAM;MACrC,OAAO,IAAInB,gBAAgB,CAACe,EAAE,EAAEV,MAAM,EAAEM,eAAe,EAAEE,qBAAqB,CAAC;IACnF,CAAC,CAAC;IAEFC,MAAM,CAACM,mCAAmC,CAAC,MAAM;MAC7C,OAAO,IAAInB,cAAc,CAAC;QAAEc,EAAE;QAAEV,MAAM;QAAEO;MAAkB,CAAC,CAAC;IAChE,CAAC,CAAC;EACN,CAAC,CAAC,CACL;AACL,CAAC","ignoreList":[]}

package/assetDelivery/createAssetDelivery.d.ts

@@ -1,3 +1,3 @@
-import { PluginFactory } from "@webiny/plugins/types";
-import type { AssetDeliveryParams } from "./assetDeliveryConfig";
-export declare const createAssetDelivery: (params: AssetDeliveryParams) => PluginFactory;
+import type { PluginFactory } from "@webiny/plugins/types.js";
+import type { AssetDeliveryParams } from "../assetDelivery/types.js";
+export declare const createAssetDelivery: (params?: AssetDeliveryParams) => PluginFactory[];

package/assetDelivery/createAssetDelivery.js

@@ -1,20 +1,23 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createAssetDelivery = void 0;
-var _apiFileManager = require("@webiny/api-file-manager");
-const createAssetDelivery = params => {
+import { createAssetDeliveryPluginLoader } from "@webiny/api-file-manager";
+import { createThreatDetectionPluginLoader } from "./threatDetection/index.js";
+export const createAssetDelivery = (params = {}) => {
+  return [
   /**
    * We only want to load this plugin in the context of the Asset Delivery Lambda function.
    */
-  return (0, _apiFileManager.createAssetDeliveryPluginLoader)(() => {
-    return import( /* webpackChunkName: "s3AssetDelivery" */"./assetDeliveryConfig").then(({
+  createAssetDeliveryPluginLoader(() => {
+    return import(/* webpackChunkName: "s3AssetDelivery" */"./assetDeliveryConfig.js").then(({
       assetDeliveryConfig
     }) => assetDeliveryConfig(params));
-  });
+  }),
+  /**
+   * We only want to load this plugin in the context of the Threat Detection Lambda function.
+   */
+  createThreatDetectionPluginLoader(() => {
+    return import(/* webpackChunkName: "threatDetectionEventHandler" */"./threatDetection/createThreatDetectionEventHandler.js").then(({
+      createThreatDetectionEventHandler
+    }) => createThreatDetectionEventHandler());
+  })];
 };
-exports.createAssetDelivery = createAssetDelivery;
 
 //# sourceMappingURL=createAssetDelivery.js.map

package/assetDelivery/createAssetDelivery.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiFileManager","require","createAssetDelivery","params","createAssetDeliveryPluginLoader","then","assetDeliveryConfig","exports"],"sources":["createAssetDelivery.ts"],"sourcesContent":["import { createAssetDeliveryPluginLoader } from \"@webiny/api-file-manager\";\nimport { PluginFactory } from \"@webiny/plugins/types\";\nimport type { AssetDeliveryParams } from \"./assetDeliveryConfig\";\n\nexport const createAssetDelivery = (params: AssetDeliveryParams): PluginFactory => {\n    /**\n     * We only want to load this plugin in the context of the Asset Delivery Lambda function.\n     */\n    return createAssetDeliveryPluginLoader(() => {\n        return import(/* webpackChunkName: \"s3AssetDelivery\" */ \"./assetDeliveryConfig\").then(\n            ({ assetDeliveryConfig }) => assetDeliveryConfig(params)\n        );\n    });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAIO,MAAMC,mBAAmB,GAAIC,MAA2B,IAAoB;EAC/E;AACJ;AACA;EACI,OAAO,IAAAC,+CAA+B,EAAC,MAAM;IACzC,OAAO,MAAM,EAAC,gEAAiE,CAAC,CAACC,IAAI,CACjF,CAAC;MAAEC;IAAoB,CAAC,KAAKA,mBAAmB,CAACH,MAAM,CAC3D,CAAC;EACL,CAAC,CAAC;AACN,CAAC;AAACI,OAAA,CAAAL,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["createAssetDeliveryPluginLoader","createThreatDetectionPluginLoader","createAssetDelivery","params","then","assetDeliveryConfig","createThreatDetectionEventHandler"],"sources":["createAssetDelivery.ts"],"sourcesContent":["import { createAssetDeliveryPluginLoader } from \"@webiny/api-file-manager\";\nimport type { PluginFactory } from \"@webiny/plugins/types.js\";\nimport { createThreatDetectionPluginLoader } from \"~/assetDelivery/threatDetection/index.js\";\nimport type { AssetDeliveryParams } from \"~/assetDelivery/types.js\";\n\nexport const createAssetDelivery = (params: AssetDeliveryParams = {}): PluginFactory[] => {\n    return [\n        /**\n         * We only want to load this plugin in the context of the Asset Delivery Lambda function.\n         */\n        createAssetDeliveryPluginLoader(() => {\n            return import(\n                /* webpackChunkName: \"s3AssetDelivery\" */ \"./assetDeliveryConfig.js\"\n            ).then(({ assetDeliveryConfig }) => assetDeliveryConfig(params));\n        }),\n        /**\n         * We only want to load this plugin in the context of the Threat Detection Lambda function.\n         */\n        createThreatDetectionPluginLoader(() => {\n            return import(\n                /* webpackChunkName: \"threatDetectionEventHandler\" */ \"./threatDetection/createThreatDetectionEventHandler.js\"\n            ).then(({ createThreatDetectionEventHandler }) => createThreatDetectionEventHandler());\n        })\n    ];\n};\n"],"mappings":"AAAA,SAASA,+BAA+B,QAAQ,0BAA0B;AAE1E,SAASC,iCAAiC;AAG1C,OAAO,MAAMC,mBAAmB,GAAGA,CAACC,MAA2B,GAAG,CAAC,CAAC,KAAsB;EACtF,OAAO;EACH;AACR;AACA;EACQH,+BAA+B,CAAC,MAAM;IAClC,OAAO,MAAM,CACT,mEACJ,CAAC,CAACI,IAAI,CAAC,CAAC;MAAEC;IAAoB,CAAC,KAAKA,mBAAmB,CAACF,MAAM,CAAC,CAAC;EACpE,CAAC,CAAC;EACF;AACR;AACA;EACQF,iCAAiC,CAAC,MAAM;IACpC,OAAO,MAAM,CACT,6GACJ,CAAC,CAACG,IAAI,CAAC,CAAC;MAAEE;IAAkC,CAAC,KAAKA,iCAAiC,CAAC,CAAC,CAAC;EAC1F,CAAC,CAAC,CACL;AACL,CAAC","ignoreList":[]}

package/assetDelivery/index.d.ts

@@ -1,9 +1,8 @@
-export { S3AssetResolver } from "./s3/S3AssetResolver";
-export { S3AssetMetadataReader } from "./s3/S3AssetMetadataReader";
-export { S3OutputStrategy } from "./s3/S3OutputStrategy";
-export { S3ContentsReader } from "./s3/S3ContentsReader";
-export { S3ErrorAssetReply } from "./s3/S3ErrorAssetReply";
-export { S3RedirectAssetReply } from "./s3/S3RedirectAssetReply";
-export { S3StreamAssetReply } from "./s3/S3StreamAssetReply";
-export { SharpTransform } from "./s3/SharpTransform";
-export { CallableContentsReader } from "./s3/transformation/CallableContentsReader";
+export { S3AssetResolver } from "./s3/S3AssetResolver.js";
+export { S3OutputStrategy } from "./s3/S3OutputStrategy.js";
+export { S3ContentsReader } from "./s3/S3ContentsReader.js";
+export { S3ErrorAssetReply } from "./s3/S3ErrorAssetReply.js";
+export { S3RedirectAssetReply } from "./s3/S3RedirectAssetReply.js";
+export { S3StreamAssetReply } from "./s3/S3StreamAssetReply.js";
+export { SharpTransform } from "./s3/SharpTransform.js";
+export { CallableContentsReader } from "./s3/transformation/CallableContentsReader.js";

package/assetDelivery/index.js

@@ -1,70 +1,10 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "CallableContentsReader", {
-  enumerable: true,
-  get: function () {
-    return _CallableContentsReader.CallableContentsReader;
-  }
-});
-Object.defineProperty(exports, "S3AssetMetadataReader", {
-  enumerable: true,
-  get: function () {
-    return _S3AssetMetadataReader.S3AssetMetadataReader;
-  }
-});
-Object.defineProperty(exports, "S3AssetResolver", {
-  enumerable: true,
-  get: function () {
-    return _S3AssetResolver.S3AssetResolver;
-  }
-});
-Object.defineProperty(exports, "S3ContentsReader", {
-  enumerable: true,
-  get: function () {
-    return _S3ContentsReader.S3ContentsReader;
-  }
-});
-Object.defineProperty(exports, "S3ErrorAssetReply", {
-  enumerable: true,
-  get: function () {
-    return _S3ErrorAssetReply.S3ErrorAssetReply;
-  }
-});
-Object.defineProperty(exports, "S3OutputStrategy", {
-  enumerable: true,
-  get: function () {
-    return _S3OutputStrategy.S3OutputStrategy;
-  }
-});
-Object.defineProperty(exports, "S3RedirectAssetReply", {
-  enumerable: true,
-  get: function () {
-    return _S3RedirectAssetReply.S3RedirectAssetReply;
-  }
-});
-Object.defineProperty(exports, "S3StreamAssetReply", {
-  enumerable: true,
-  get: function () {
-    return _S3StreamAssetReply.S3StreamAssetReply;
-  }
-});
-Object.defineProperty(exports, "SharpTransform", {
-  enumerable: true,
-  get: function () {
-    return _SharpTransform.SharpTransform;
-  }
-});
-var _S3AssetResolver = require("./s3/S3AssetResolver");
-var _S3AssetMetadataReader = require("./s3/S3AssetMetadataReader");
-var _S3OutputStrategy = require("./s3/S3OutputStrategy");
-var _S3ContentsReader = require("./s3/S3ContentsReader");
-var _S3ErrorAssetReply = require("./s3/S3ErrorAssetReply");
-var _S3RedirectAssetReply = require("./s3/S3RedirectAssetReply");
-var _S3StreamAssetReply = require("./s3/S3StreamAssetReply");
-var _SharpTransform = require("./s3/SharpTransform");
-var _CallableContentsReader = require("./s3/transformation/CallableContentsReader");
+export { S3AssetResolver } from "./s3/S3AssetResolver.js";
+export { S3OutputStrategy } from "./s3/S3OutputStrategy.js";
+export { S3ContentsReader } from "./s3/S3ContentsReader.js";
+export { S3ErrorAssetReply } from "./s3/S3ErrorAssetReply.js";
+export { S3RedirectAssetReply } from "./s3/S3RedirectAssetReply.js";
+export { S3StreamAssetReply } from "./s3/S3StreamAssetReply.js";
+export { SharpTransform } from "./s3/SharpTransform.js";
+export { CallableContentsReader } from "./s3/transformation/CallableContentsReader.js";
 
 //# sourceMappingURL=index.js.map

package/assetDelivery/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_S3AssetResolver","require","_S3AssetMetadataReader","_S3OutputStrategy","_S3ContentsReader","_S3ErrorAssetReply","_S3RedirectAssetReply","_S3StreamAssetReply","_SharpTransform","_CallableContentsReader"],"sources":["index.ts"],"sourcesContent":["export { S3AssetResolver } from \"./s3/S3AssetResolver\";\nexport { S3AssetMetadataReader } from \"./s3/S3AssetMetadataReader\";\nexport { S3OutputStrategy } from \"./s3/S3OutputStrategy\";\nexport { S3ContentsReader } from \"./s3/S3ContentsReader\";\nexport { S3ErrorAssetReply } from \"./s3/S3ErrorAssetReply\";\nexport { S3RedirectAssetReply } from \"./s3/S3RedirectAssetReply\";\nexport { S3StreamAssetReply } from \"./s3/S3StreamAssetReply\";\nexport { SharpTransform } from \"./s3/SharpTransform\";\nexport { CallableContentsReader } from \"./s3/transformation/CallableContentsReader\";\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,iBAAA,GAAAH,OAAA;AACA,IAAAI,kBAAA,GAAAJ,OAAA;AACA,IAAAK,qBAAA,GAAAL,OAAA;AACA,IAAAM,mBAAA,GAAAN,OAAA;AACA,IAAAO,eAAA,GAAAP,OAAA;AACA,IAAAQ,uBAAA,GAAAR,OAAA","ignoreList":[]}
+{"version":3,"names":["S3AssetResolver","S3OutputStrategy","S3ContentsReader","S3ErrorAssetReply","S3RedirectAssetReply","S3StreamAssetReply","SharpTransform","CallableContentsReader"],"sources":["index.ts"],"sourcesContent":["export { S3AssetResolver } from \"./s3/S3AssetResolver.js\";\nexport { S3OutputStrategy } from \"./s3/S3OutputStrategy.js\";\nexport { S3ContentsReader } from \"./s3/S3ContentsReader.js\";\nexport { S3ErrorAssetReply } from \"./s3/S3ErrorAssetReply.js\";\nexport { S3RedirectAssetReply } from \"./s3/S3RedirectAssetReply.js\";\nexport { S3StreamAssetReply } from \"./s3/S3StreamAssetReply.js\";\nexport { SharpTransform } from \"./s3/SharpTransform.js\";\nexport { CallableContentsReader } from \"./s3/transformation/CallableContentsReader.js\";\n"],"mappings":"AAAA,SAASA,eAAe;AACxB,SAASC,gBAAgB;AACzB,SAASC,gBAAgB;AACzB,SAASC,iBAAiB;AAC1B,SAASC,oBAAoB;AAC7B,SAASC,kBAAkB;AAC3B,SAASC,cAAc;AACvB,SAASC,sBAAsB","ignoreList":[]}

package/assetDelivery/s3/S3AssetResolver.d.ts

@@ -1,8 +1,11 @@
-import { S3 } from "@webiny/aws-sdk/client-s3";
-import { Asset, AssetRequest, AssetResolver } from "@webiny/api-file-manager";
+import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import type { AssetRequest, AssetResolver } from "@webiny/api-file-manager";
+import { Asset } from "@webiny/api-file-manager";
+import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/index.js";
 export declare class S3AssetResolver implements AssetResolver {
-    private readonly s3;
-    private readonly bucket;
-    constructor(s3: S3, bucket: string);
+    private keyValueStore;
+    private s3;
+    private bucket;
+    constructor(keyValueStore: GlobalKeyValueStore.Interface, s3: S3, bucket: string);
     resolve(request: AssetRequest): Promise<Asset | undefined>;
 }

package/assetDelivery/s3/S3AssetResolver.js

@@ -1,37 +1,29 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.S3AssetResolver = void 0;
-var _apiFileManager = require("@webiny/api-file-manager");
-var _S3AssetMetadataReader = require("./S3AssetMetadataReader");
-var _S3ContentsReader = require("./S3ContentsReader");
-class S3AssetResolver {
-  constructor(s3, bucket) {
+import { Asset } from "@webiny/api-file-manager";
+import { S3ContentsReader } from "../index.js";
+import { ObjectKey } from "../threatDetection/ObjectKey.js";
+export class S3AssetResolver {
+  constructor(keyValueStore, s3, bucket) {
+    this.keyValueStore = keyValueStore;
     this.s3 = s3;
     this.bucket = bucket;
   }
   async resolve(request) {
-    try {
-      const metadataReader = new _S3AssetMetadataReader.S3AssetMetadataReader(this.s3, this.bucket);
-      const metadata = await metadataReader.getMetadata(request.getKey());
-      const asset = new _apiFileManager.Asset({
-        id: metadata.id,
-        tenant: metadata.tenant,
-        locale: metadata.locale,
-        size: metadata.size,
-        contentType: metadata.contentType,
-        key: request.getKey()
-      });
-      asset.setContentsReader(new _S3ContentsReader.S3ContentsReader(this.s3, this.bucket));
-      return asset;
-    } catch (error) {
-      console.log(`S3AssetResolver failed to read metadata: ${error.message}`);
+    const fileId = ObjectKey.from(request.getKey()).id();
+    const result = await this.keyValueStore.get(`FileManager/File/${fileId}/Metadata`);
+    if (result.isFail()) {
       return undefined;
     }
+    const metadata = result.value;
+    const asset = new Asset({
+      id: metadata.id,
+      tenant: metadata.tenant,
+      size: metadata.size,
+      contentType: metadata.contentType,
+      key: metadata.bucketKey
+    });
+    asset.setContentsReader(new S3ContentsReader(this.s3, this.bucket));
+    return asset;
   }
 }
-exports.S3AssetResolver = S3AssetResolver;
 
 //# sourceMappingURL=S3AssetResolver.js.map

package/assetDelivery/s3/S3AssetResolver.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiFileManager","require","_S3AssetMetadataReader","_S3ContentsReader","S3AssetResolver","constructor","s3","bucket","resolve","request","metadataReader","S3AssetMetadataReader","metadata","getMetadata","getKey","asset","Asset","id","tenant","locale","size","contentType","key","setContentsReader","S3ContentsReader","error","console","log","message","undefined","exports"],"sources":["S3AssetResolver.ts"],"sourcesContent":["import { S3 } from \"@webiny/aws-sdk/client-s3\";\nimport { Asset, AssetRequest, AssetResolver } from \"@webiny/api-file-manager\";\nimport { S3AssetMetadataReader } from \"./S3AssetMetadataReader\";\nimport { S3ContentsReader } from \"./S3ContentsReader\";\n\nexport class S3AssetResolver implements AssetResolver {\n    private readonly s3: S3;\n    private readonly bucket: string;\n\n    constructor(s3: S3, bucket: string) {\n        this.s3 = s3;\n        this.bucket = bucket;\n    }\n\n    async resolve(request: AssetRequest): Promise<Asset | undefined> {\n        try {\n            const metadataReader = new S3AssetMetadataReader(this.s3, this.bucket);\n            const metadata = await metadataReader.getMetadata(request.getKey());\n\n            const asset = new Asset({\n                id: metadata.id,\n                tenant: metadata.tenant,\n                locale: metadata.locale,\n                size: metadata.size,\n                contentType: metadata.contentType,\n                key: request.getKey()\n            });\n\n            asset.setContentsReader(new S3ContentsReader(this.s3, this.bucket));\n\n            return asset;\n        } catch (error) {\n            console.log(`S3AssetResolver failed to read metadata: ${error.message}`);\n            return undefined;\n        }\n    }\n}\n"],"mappings":";;;;;;AACA,IAAAA,eAAA,GAAAC,OAAA;AACA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AAEO,MAAMG,eAAe,CAA0B;EAIlDC,WAAWA,CAACC,EAAM,EAAEC,MAAc,EAAE;IAChC,IAAI,CAACD,EAAE,GAAGA,EAAE;IACZ,IAAI,CAACC,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAMC,OAAOA,CAACC,OAAqB,EAA8B;IAC7D,IAAI;MACA,MAAMC,cAAc,GAAG,IAAIC,4CAAqB,CAAC,IAAI,CAACL,EAAE,EAAE,IAAI,CAACC,MAAM,CAAC;MACtE,MAAMK,QAAQ,GAAG,MAAMF,cAAc,CAACG,WAAW,CAACJ,OAAO,CAACK,MAAM,CAAC,CAAC,CAAC;MAEnE,MAAMC,KAAK,GAAG,IAAIC,qBAAK,CAAC;QACpBC,EAAE,EAAEL,QAAQ,CAACK,EAAE;QACfC,MAAM,EAAEN,QAAQ,CAACM,MAAM;QACvBC,MAAM,EAAEP,QAAQ,CAACO,MAAM;QACvBC,IAAI,EAAER,QAAQ,CAACQ,IAAI;QACnBC,WAAW,EAAET,QAAQ,CAACS,WAAW;QACjCC,GAAG,EAAEb,OAAO,CAACK,MAAM,CAAC;MACxB,CAAC,CAAC;MAEFC,KAAK,CAACQ,iBAAiB,CAAC,IAAIC,kCAAgB,CAAC,IAAI,CAAClB,EAAE,EAAE,IAAI,CAACC,MAAM,CAAC,CAAC;MAEnE,OAAOQ,KAAK;IAChB,CAAC,CAAC,OAAOU,KAAK,EAAE;MACZC,OAAO,CAACC,GAAG,CAAE,4CAA2CF,KAAK,CAACG,OAAQ,EAAC,CAAC;MACxE,OAAOC,SAAS;IACpB;EACJ;AACJ;AAACC,OAAA,CAAA1B,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["Asset","S3ContentsReader","ObjectKey","S3AssetResolver","constructor","keyValueStore","s3","bucket","resolve","request","fileId","from","getKey","id","result","get","isFail","undefined","metadata","value","asset","tenant","size","contentType","key","bucketKey","setContentsReader"],"sources":["S3AssetResolver.ts"],"sourcesContent":["import type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type { AssetRequest, AssetResolver } from \"@webiny/api-file-manager\";\nimport { Asset } from \"@webiny/api-file-manager\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\nimport { S3ContentsReader } from \"~/assetDelivery/index.js\";\nimport { ObjectKey } from \"~/assetDelivery/threatDetection/ObjectKey.js\";\n\ninterface AssetMetadata {\n    id: string;\n    tenant: string;\n    size: number;\n    contentType: string;\n    bucketKey: string;\n}\n\nexport class S3AssetResolver implements AssetResolver {\n    constructor(\n        private keyValueStore: GlobalKeyValueStore.Interface,\n        private s3: S3,\n        private bucket: string\n    ) {}\n\n    async resolve(request: AssetRequest): Promise<Asset | undefined> {\n        const fileId = ObjectKey.from(request.getKey()).id();\n        const result = await this.keyValueStore.get<AssetMetadata>(\n            `FileManager/File/${fileId}/Metadata`\n        );\n\n        if (result.isFail()) {\n            return undefined;\n        }\n\n        const metadata = result.value;\n\n        const asset = new Asset({\n            id: metadata.id,\n            tenant: metadata.tenant,\n            size: metadata.size,\n            contentType: metadata.contentType,\n            key: metadata.bucketKey\n        });\n\n        asset.setContentsReader(new S3ContentsReader(this.s3, this.bucket));\n\n        return asset;\n    }\n}\n"],"mappings":"AAEA,SAASA,KAAK,QAAQ,0BAA0B;AAEhD,SAASC,gBAAgB;AACzB,SAASC,SAAS;AAUlB,OAAO,MAAMC,eAAe,CAA0B;EAClDC,WAAWA,CACCC,aAA4C,EAC5CC,EAAM,EACNC,MAAc,EACxB;IAAA,KAHUF,aAA4C,GAA5CA,aAA4C;IAAA,KAC5CC,EAAM,GAANA,EAAM;IAAA,KACNC,MAAc,GAAdA,MAAc;EACvB;EAEH,MAAMC,OAAOA,CAACC,OAAqB,EAA8B;IAC7D,MAAMC,MAAM,GAAGR,SAAS,CAACS,IAAI,CAACF,OAAO,CAACG,MAAM,CAAC,CAAC,CAAC,CAACC,EAAE,CAAC,CAAC;IACpD,MAAMC,MAAM,GAAG,MAAM,IAAI,CAACT,aAAa,CAACU,GAAG,CACvC,oBAAoBL,MAAM,WAC9B,CAAC;IAED,IAAII,MAAM,CAACE,MAAM,CAAC,CAAC,EAAE;MACjB,OAAOC,SAAS;IACpB;IAEA,MAAMC,QAAQ,GAAGJ,MAAM,CAACK,KAAK;IAE7B,MAAMC,KAAK,GAAG,IAAIpB,KAAK,CAAC;MACpBa,EAAE,EAAEK,QAAQ,CAACL,EAAE;MACfQ,MAAM,EAAEH,QAAQ,CAACG,MAAM;MACvBC,IAAI,EAAEJ,QAAQ,CAACI,IAAI;MACnBC,WAAW,EAAEL,QAAQ,CAACK,WAAW;MACjCC,GAAG,EAAEN,QAAQ,CAACO;IAClB,CAAC,CAAC;IAEFL,KAAK,CAACM,iBAAiB,CAAC,IAAIzB,gBAAgB,CAAC,IAAI,CAACK,EAAE,EAAE,IAAI,CAACC,MAAM,CAAC,CAAC;IAEnE,OAAOa,KAAK;EAChB;AACJ","ignoreList":[]}

package/assetDelivery/s3/S3ContentsReader.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="node" />
-import { S3 } from "@webiny/aws-sdk/client-s3";
-import { Asset, AssetContentsReader } from "@webiny/api-file-manager";
+import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import type { Asset, AssetContentsReader } from "@webiny/api-file-manager";
 export declare class S3ContentsReader implements AssetContentsReader {
     private s3;
     private readonly bucket;

package/assetDelivery/s3/S3ContentsReader.js

@@ -1,10 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.S3ContentsReader = void 0;
-class S3ContentsReader {
+export class S3ContentsReader {
   constructor(s3, bucket) {
     this.s3 = s3;
     this.bucket = bucket;
@@ -22,6 +16,5 @@ class S3ContentsReader {
     return Buffer.from(await Body.transformToByteArray());
   }
 }
-exports.S3ContentsReader = S3ContentsReader;
 
 //# sourceMappingURL=S3ContentsReader.js.map

package/assetDelivery/s3/S3ContentsReader.js.map

@@ -1 +1 @@
-{"version":3,"names":["S3ContentsReader","constructor","s3","bucket","read","asset","Body","getObject","Bucket","Key","getKey","Error","Buffer","from","transformToByteArray","exports"],"sources":["S3ContentsReader.ts"],"sourcesContent":["import { S3 } from \"@webiny/aws-sdk/client-s3\";\nimport { Asset, AssetContentsReader } from \"@webiny/api-file-manager\";\n\nexport class S3ContentsReader implements AssetContentsReader {\n    private s3: S3;\n    private readonly bucket: string;\n\n    constructor(s3: S3, bucket: string) {\n        this.s3 = s3;\n        this.bucket = bucket;\n    }\n\n    async read(asset: Asset): Promise<Buffer> {\n        const { Body } = await this.s3.getObject({\n            Bucket: this.bucket,\n            Key: asset.getKey()\n        });\n\n        if (!Body) {\n            throw Error(`Unable to read ${asset.getKey()}!`);\n        }\n\n        return Buffer.from(await Body.transformToByteArray());\n    }\n}\n"],"mappings":";;;;;;AAGO,MAAMA,gBAAgB,CAAgC;EAIzDC,WAAWA,CAACC,EAAM,EAAEC,MAAc,EAAE;IAChC,IAAI,CAACD,EAAE,GAAGA,EAAE;IACZ,IAAI,CAACC,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAMC,IAAIA,CAACC,KAAY,EAAmB;IACtC,MAAM;MAAEC;IAAK,CAAC,GAAG,MAAM,IAAI,CAACJ,EAAE,CAACK,SAAS,CAAC;MACrCC,MAAM,EAAE,IAAI,CAACL,MAAM;MACnBM,GAAG,EAAEJ,KAAK,CAACK,MAAM,CAAC;IACtB,CAAC,CAAC;IAEF,IAAI,CAACJ,IAAI,EAAE;MACP,MAAMK,KAAK,CAAE,kBAAiBN,KAAK,CAACK,MAAM,CAAC,CAAE,GAAE,CAAC;IACpD;IAEA,OAAOE,MAAM,CAACC,IAAI,CAAC,MAAMP,IAAI,CAACQ,oBAAoB,CAAC,CAAC,CAAC;EACzD;AACJ;AAACC,OAAA,CAAAf,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["S3ContentsReader","constructor","s3","bucket","read","asset","Body","getObject","Bucket","Key","getKey","Error","Buffer","from","transformToByteArray"],"sources":["S3ContentsReader.ts"],"sourcesContent":["import type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type { Asset, AssetContentsReader } from \"@webiny/api-file-manager\";\n\nexport class S3ContentsReader implements AssetContentsReader {\n    private s3: S3;\n    private readonly bucket: string;\n\n    constructor(s3: S3, bucket: string) {\n        this.s3 = s3;\n        this.bucket = bucket;\n    }\n\n    async read(asset: Asset): Promise<Buffer> {\n        const { Body } = await this.s3.getObject({\n            Bucket: this.bucket,\n            Key: asset.getKey()\n        });\n\n        if (!Body) {\n            throw Error(`Unable to read ${asset.getKey()}!`);\n        }\n\n        return Buffer.from(await Body.transformToByteArray());\n    }\n}\n"],"mappings":"AAGA,OAAO,MAAMA,gBAAgB,CAAgC;EAIzDC,WAAWA,CAACC,EAAM,EAAEC,MAAc,EAAE;IAChC,IAAI,CAACD,EAAE,GAAGA,EAAE;IACZ,IAAI,CAACC,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAMC,IAAIA,CAACC,KAAY,EAAmB;IACtC,MAAM;MAAEC;IAAK,CAAC,GAAG,MAAM,IAAI,CAACJ,EAAE,CAACK,SAAS,CAAC;MACrCC,MAAM,EAAE,IAAI,CAACL,MAAM;MACnBM,GAAG,EAAEJ,KAAK,CAACK,MAAM,CAAC;IACtB,CAAC,CAAC;IAEF,IAAI,CAACJ,IAAI,EAAE;MACP,MAAMK,KAAK,CAAC,kBAAkBN,KAAK,CAACK,MAAM,CAAC,CAAC,GAAG,CAAC;IACpD;IAEA,OAAOE,MAAM,CAACC,IAAI,CAAC,MAAMP,IAAI,CAACQ,oBAAoB,CAAC,CAAC,CAAC;EACzD;AACJ","ignoreList":[]}

package/assetDelivery/s3/S3ErrorAssetReply.js

@@ -1,11 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.S3ErrorAssetReply = void 0;
-var _apiFileManager = require("@webiny/api-file-manager");
-class S3ErrorAssetReply extends _apiFileManager.AssetReply {
+import { AssetReply } from "@webiny/api-file-manager";
+export class S3ErrorAssetReply extends AssetReply {
   constructor(message) {
     super({
       code: 400,
@@ -15,6 +9,5 @@ class S3ErrorAssetReply extends _apiFileManager.AssetReply {
     });
   }
 }
-exports.S3ErrorAssetReply = S3ErrorAssetReply;
 
 //# sourceMappingURL=S3ErrorAssetReply.js.map

package/assetDelivery/s3/S3ErrorAssetReply.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiFileManager","require","S3ErrorAssetReply","AssetReply","constructor","message","code","body","error","exports"],"sources":["S3ErrorAssetReply.ts"],"sourcesContent":["import { AssetReply } from \"@webiny/api-file-manager\";\n\nexport class S3ErrorAssetReply extends AssetReply {\n    constructor(message: string) {\n        super({\n            code: 400,\n            body: () => ({ error: message })\n        });\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAEO,MAAMC,iBAAiB,SAASC,0BAAU,CAAC;EAC9CC,WAAWA,CAACC,OAAe,EAAE;IACzB,KAAK,CAAC;MACFC,IAAI,EAAE,GAAG;MACTC,IAAI,EAAEA,CAAA,MAAO;QAAEC,KAAK,EAAEH;MAAQ,CAAC;IACnC,CAAC,CAAC;EACN;AACJ;AAACI,OAAA,CAAAP,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"names":["AssetReply","S3ErrorAssetReply","constructor","message","code","body","error"],"sources":["S3ErrorAssetReply.ts"],"sourcesContent":["import { AssetReply } from \"@webiny/api-file-manager\";\n\nexport class S3ErrorAssetReply extends AssetReply {\n    constructor(message: string) {\n        super({\n            code: 400,\n            body: () => ({ error: message })\n        });\n    }\n}\n"],"mappings":"AAAA,SAASA,UAAU,QAAQ,0BAA0B;AAErD,OAAO,MAAMC,iBAAiB,SAASD,UAAU,CAAC;EAC9CE,WAAWA,CAACC,OAAe,EAAE;IACzB,KAAK,CAAC;MACFC,IAAI,EAAE,GAAG;MACTC,IAAI,EAAEA,CAAA,MAAO;QAAEC,KAAK,EAAEH;MAAQ,CAAC;IACnC,CAAC,CAAC;EACN;AACJ","ignoreList":[]}

package/assetDelivery/s3/S3OutputStrategy.d.ts

@@ -1,5 +1,5 @@
-import { Asset, AssetOutputStrategy, AssetReply } from "@webiny/api-file-manager";
-import { S3 } from "@webiny/aws-sdk/client-s3";
+import type { Asset, AssetOutputStrategy, AssetReply } from "@webiny/api-file-manager";
+import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
 /**
  * This strategy outputs an asset taking into account the size of the asset contents.
  * If the asset is larger than 5MB, a presigned URL will be generated, and a redirect will happen.
@@ -8,7 +8,8 @@ export declare class S3OutputStrategy implements AssetOutputStrategy {
     private readonly s3;
     private readonly bucket;
     private readonly presignedUrlTtl;
-    constructor(s3: S3, bucket: string, presignedUrlTtl: number);
+    private readonly assetStreamingMaxSize;
+    constructor(s3: S3, bucket: string, presignedUrlTtl: number, assetStreamingMaxSize: number);
     output(asset: Asset): Promise<AssetReply>;
     protected getPresignedUrl(asset: Asset): Promise<string>;
 }

package/assetDelivery/s3/S3OutputStrategy.js

@@ -1,32 +1,28 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.S3OutputStrategy = void 0;
-var _clientS = require("@webiny/aws-sdk/client-s3");
-var _S3RedirectAssetReply = require("./S3RedirectAssetReply");
-var _S3StreamAssetReply = require("./S3StreamAssetReply");
-const MAX_RETURN_CONTENT_LENGTH = 4915200; // ~4.8 MB
+import { GetObjectCommand, getSignedUrl } from "@webiny/aws-sdk/client-s3/index.js";
+import { S3RedirectAssetReply } from "./S3RedirectAssetReply.js";
+import { S3StreamAssetReply } from "./S3StreamAssetReply.js";
 
 /**
  * This strategy outputs an asset taking into account the size of the asset contents.
  * If the asset is larger than 5MB, a presigned URL will be generated, and a redirect will happen.
  */
-class S3OutputStrategy {
-  constructor(s3, bucket, presignedUrlTtl) {
+export class S3OutputStrategy {
+  constructor(s3, bucket, presignedUrlTtl, assetStreamingMaxSize) {
+    this.assetStreamingMaxSize = assetStreamingMaxSize;
     this.presignedUrlTtl = presignedUrlTtl;
     this.s3 = s3;
     this.bucket = bucket;
   }
   async output(asset) {
-    if ((await asset.getSize()) > MAX_RETURN_CONTENT_LENGTH) {
-      return new _S3RedirectAssetReply.S3RedirectAssetReply(await this.getPresignedUrl(asset), this.presignedUrlTtl);
+    if (asset.getSize() > this.assetStreamingMaxSize) {
+      console.log(`Asset size is greater than ${this.assetStreamingMaxSize}; redirecting to a presigned S3 URL.`);
+      return new S3RedirectAssetReply(await this.getPresignedUrl(asset), this.presignedUrlTtl);
     }
-    return new _S3StreamAssetReply.S3StreamAssetReply(asset);
+    console.log(`Asset size is smaller than ${this.assetStreamingMaxSize}; streaming directly from Lambda function.`);
+    return new S3StreamAssetReply(asset);
   }
   getPresignedUrl(asset) {
-    return (0, _clientS.getSignedUrl)(this.s3, new _clientS.GetObjectCommand({
+    return getSignedUrl(this.s3, new GetObjectCommand({
       Bucket: this.bucket,
       Key: asset.getKey()
     }), {
@@ -34,6 +30,5 @@ class S3OutputStrategy {
     });
   }
 }
-exports.S3OutputStrategy = S3OutputStrategy;
 
 //# sourceMappingURL=S3OutputStrategy.js.map

package/assetDelivery/s3/S3OutputStrategy.js.map

@@ -1 +1 @@
-{"version":3,"names":["_clientS","require","_S3RedirectAssetReply","_S3StreamAssetReply","MAX_RETURN_CONTENT_LENGTH","S3OutputStrategy","constructor","s3","bucket","presignedUrlTtl","output","asset","getSize","S3RedirectAssetReply","getPresignedUrl","S3StreamAssetReply","getSignedUrl","GetObjectCommand","Bucket","Key","getKey","expiresIn","exports"],"sources":["S3OutputStrategy.ts"],"sourcesContent":["import { Asset, AssetOutputStrategy, AssetReply } from \"@webiny/api-file-manager\";\nimport { GetObjectCommand, getSignedUrl, S3 } from \"@webiny/aws-sdk/client-s3\";\nimport { S3RedirectAssetReply } from \"~/assetDelivery/s3/S3RedirectAssetReply\";\nimport { S3StreamAssetReply } from \"~/assetDelivery/s3/S3StreamAssetReply\";\n\nconst MAX_RETURN_CONTENT_LENGTH = 4915200; // ~4.8 MB\n\n/**\n * This strategy outputs an asset taking into account the size of the asset contents.\n * If the asset is larger than 5MB, a presigned URL will be generated, and a redirect will happen.\n */\nexport class S3OutputStrategy implements AssetOutputStrategy {\n    private readonly s3: S3;\n    private readonly bucket: string;\n    private readonly presignedUrlTtl: number;\n\n    constructor(s3: S3, bucket: string, presignedUrlTtl: number) {\n        this.presignedUrlTtl = presignedUrlTtl;\n        this.s3 = s3;\n        this.bucket = bucket;\n    }\n\n    async output(asset: Asset): Promise<AssetReply> {\n        if ((await asset.getSize()) > MAX_RETURN_CONTENT_LENGTH) {\n            return new S3RedirectAssetReply(\n                await this.getPresignedUrl(asset),\n                this.presignedUrlTtl\n            );\n        }\n\n        return new S3StreamAssetReply(asset);\n    }\n\n    protected getPresignedUrl(asset: Asset) {\n        return getSignedUrl(\n            this.s3,\n            new GetObjectCommand({\n                Bucket: this.bucket,\n                Key: asset.getKey()\n            }),\n            { expiresIn: this.presignedUrlTtl }\n        );\n    }\n}\n"],"mappings":";;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,qBAAA,GAAAD,OAAA;AACA,IAAAE,mBAAA,GAAAF,OAAA;AAEA,MAAMG,yBAAyB,GAAG,OAAO,CAAC,CAAC;;AAE3C;AACA;AACA;AACA;AACO,MAAMC,gBAAgB,CAAgC;EAKzDC,WAAWA,CAACC,EAAM,EAAEC,MAAc,EAAEC,eAAuB,EAAE;IACzD,IAAI,CAACA,eAAe,GAAGA,eAAe;IACtC,IAAI,CAACF,EAAE,GAAGA,EAAE;IACZ,IAAI,CAACC,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAME,MAAMA,CAACC,KAAY,EAAuB;IAC5C,IAAI,CAAC,MAAMA,KAAK,CAACC,OAAO,CAAC,CAAC,IAAIR,yBAAyB,EAAE;MACrD,OAAO,IAAIS,0CAAoB,CAC3B,MAAM,IAAI,CAACC,eAAe,CAACH,KAAK,CAAC,EACjC,IAAI,CAACF,eACT,CAAC;IACL;IAEA,OAAO,IAAIM,sCAAkB,CAACJ,KAAK,CAAC;EACxC;EAEUG,eAAeA,CAACH,KAAY,EAAE;IACpC,OAAO,IAAAK,qBAAY,EACf,IAAI,CAACT,EAAE,EACP,IAAIU,yBAAgB,CAAC;MACjBC,MAAM,EAAE,IAAI,CAACV,MAAM;MACnBW,GAAG,EAAER,KAAK,CAACS,MAAM,CAAC;IACtB,CAAC,CAAC,EACF;MAAEC,SAAS,EAAE,IAAI,CAACZ;IAAgB,CACtC,CAAC;EACL;AACJ;AAACa,OAAA,CAAAjB,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["GetObjectCommand","getSignedUrl","S3RedirectAssetReply","S3StreamAssetReply","S3OutputStrategy","constructor","s3","bucket","presignedUrlTtl","assetStreamingMaxSize","output","asset","getSize","console","log","getPresignedUrl","Bucket","Key","getKey","expiresIn"],"sources":["S3OutputStrategy.ts"],"sourcesContent":["import type { Asset, AssetOutputStrategy, AssetReply } from \"@webiny/api-file-manager\";\nimport type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { GetObjectCommand, getSignedUrl } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { S3RedirectAssetReply } from \"~/assetDelivery/s3/S3RedirectAssetReply.js\";\nimport { S3StreamAssetReply } from \"~/assetDelivery/s3/S3StreamAssetReply.js\";\n\n/**\n * This strategy outputs an asset taking into account the size of the asset contents.\n * If the asset is larger than 5MB, a presigned URL will be generated, and a redirect will happen.\n */\nexport class S3OutputStrategy implements AssetOutputStrategy {\n    private readonly s3: S3;\n    private readonly bucket: string;\n    private readonly presignedUrlTtl: number;\n    private readonly assetStreamingMaxSize: number;\n\n    constructor(s3: S3, bucket: string, presignedUrlTtl: number, assetStreamingMaxSize: number) {\n        this.assetStreamingMaxSize = assetStreamingMaxSize;\n        this.presignedUrlTtl = presignedUrlTtl;\n        this.s3 = s3;\n        this.bucket = bucket;\n    }\n\n    async output(asset: Asset): Promise<AssetReply> {\n        if (asset.getSize() > this.assetStreamingMaxSize) {\n            console.log(\n                `Asset size is greater than ${this.assetStreamingMaxSize}; redirecting to a presigned S3 URL.`\n            );\n\n            return new S3RedirectAssetReply(\n                await this.getPresignedUrl(asset),\n                this.presignedUrlTtl\n            );\n        }\n\n        console.log(\n            `Asset size is smaller than ${this.assetStreamingMaxSize}; streaming directly from Lambda function.`\n        );\n        return new S3StreamAssetReply(asset);\n    }\n\n    protected getPresignedUrl(asset: Asset) {\n        return getSignedUrl(\n            this.s3,\n            new GetObjectCommand({\n                Bucket: this.bucket,\n                Key: asset.getKey()\n            }),\n            { expiresIn: this.presignedUrlTtl }\n        );\n    }\n}\n"],"mappings":"AAEA,SAASA,gBAAgB,EAAEC,YAAY,QAAQ,oCAAoC;AACnF,SAASC,oBAAoB;AAC7B,SAASC,kBAAkB;;AAE3B;AACA;AACA;AACA;AACA,OAAO,MAAMC,gBAAgB,CAAgC;EAMzDC,WAAWA,CAACC,EAAM,EAAEC,MAAc,EAAEC,eAAuB,EAAEC,qBAA6B,EAAE;IACxF,IAAI,CAACA,qBAAqB,GAAGA,qBAAqB;IAClD,IAAI,CAACD,eAAe,GAAGA,eAAe;IACtC,IAAI,CAACF,EAAE,GAAGA,EAAE;IACZ,IAAI,CAACC,MAAM,GAAGA,MAAM;EACxB;EAEA,MAAMG,MAAMA,CAACC,KAAY,EAAuB;IAC5C,IAAIA,KAAK,CAACC,OAAO,CAAC,CAAC,GAAG,IAAI,CAACH,qBAAqB,EAAE;MAC9CI,OAAO,CAACC,GAAG,CACP,8BAA8B,IAAI,CAACL,qBAAqB,sCAC5D,CAAC;MAED,OAAO,IAAIP,oBAAoB,CAC3B,MAAM,IAAI,CAACa,eAAe,CAACJ,KAAK,CAAC,EACjC,IAAI,CAACH,eACT,CAAC;IACL;IAEAK,OAAO,CAACC,GAAG,CACP,8BAA8B,IAAI,CAACL,qBAAqB,4CAC5D,CAAC;IACD,OAAO,IAAIN,kBAAkB,CAACQ,KAAK,CAAC;EACxC;EAEUI,eAAeA,CAACJ,KAAY,EAAE;IACpC,OAAOV,YAAY,CACf,IAAI,CAACK,EAAE,EACP,IAAIN,gBAAgB,CAAC;MACjBgB,MAAM,EAAE,IAAI,CAACT,MAAM;MACnBU,GAAG,EAAEN,KAAK,CAACO,MAAM,CAAC;IACtB,CAAC,CAAC,EACF;MAAEC,SAAS,EAAE,IAAI,CAACX;IAAgB,CACtC,CAAC;EACL;AACJ","ignoreList":[]}

package/assetDelivery/s3/S3RedirectAssetReply.js

@@ -1,16 +1,10 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.S3RedirectAssetReply = void 0;
-var _apiFileManager = require("@webiny/api-file-manager");
-var _handler = require("@webiny/handler");
-class S3RedirectAssetReply extends _apiFileManager.AssetReply {
+import { AssetReply } from "@webiny/api-file-manager";
+import { ResponseHeaders } from "@webiny/handler";
+export class S3RedirectAssetReply extends AssetReply {
   constructor(url, cacheDuration) {
     super({
       code: 301,
-      headers: _handler.ResponseHeaders.create({
+      headers: ResponseHeaders.create({
         location: url,
         "cache-control": "public, max-age=" + cacheDuration
       }),
@@ -18,6 +12,5 @@ class S3RedirectAssetReply extends _apiFileManager.AssetReply {
     });
   }
 }
-exports.S3RedirectAssetReply = S3RedirectAssetReply;
 
 //# sourceMappingURL=S3RedirectAssetReply.js.map

package/assetDelivery/s3/S3RedirectAssetReply.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiFileManager","require","_handler","S3RedirectAssetReply","AssetReply","constructor","url","cacheDuration","code","headers","ResponseHeaders","create","location","body","exports"],"sources":["S3RedirectAssetReply.ts"],"sourcesContent":["import { AssetReply } from \"@webiny/api-file-manager\";\nimport { ResponseHeaders } from \"@webiny/handler\";\n\nexport class S3RedirectAssetReply extends AssetReply {\n    constructor(url: string, cacheDuration: number) {\n        super({\n            code: 301,\n            headers: ResponseHeaders.create({\n                location: url,\n                \"cache-control\": \"public, max-age=\" + cacheDuration\n            }),\n            body: () => \"\"\n        });\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAEO,MAAME,oBAAoB,SAASC,0BAAU,CAAC;EACjDC,WAAWA,CAACC,GAAW,EAAEC,aAAqB,EAAE;IAC5C,KAAK,CAAC;MACFC,IAAI,EAAE,GAAG;MACTC,OAAO,EAAEC,wBAAe,CAACC,MAAM,CAAC;QAC5BC,QAAQ,EAAEN,GAAG;QACb,eAAe,EAAE,kBAAkB,GAAGC;MAC1C,CAAC,CAAC;MACFM,IAAI,EAAEA,CAAA,KAAM;IAChB,CAAC,CAAC;EACN;AACJ;AAACC,OAAA,CAAAX,oBAAA,GAAAA,oBAAA","ignoreList":[]}
+{"version":3,"names":["AssetReply","ResponseHeaders","S3RedirectAssetReply","constructor","url","cacheDuration","code","headers","create","location","body"],"sources":["S3RedirectAssetReply.ts"],"sourcesContent":["import { AssetReply } from \"@webiny/api-file-manager\";\nimport { ResponseHeaders } from \"@webiny/handler\";\n\nexport class S3RedirectAssetReply extends AssetReply {\n    constructor(url: string, cacheDuration: number) {\n        super({\n            code: 301,\n            headers: ResponseHeaders.create({\n                location: url,\n                \"cache-control\": \"public, max-age=\" + cacheDuration\n            }),\n            body: () => \"\"\n        });\n    }\n}\n"],"mappings":"AAAA,SAASA,UAAU,QAAQ,0BAA0B;AACrD,SAASC,eAAe,QAAQ,iBAAiB;AAEjD,OAAO,MAAMC,oBAAoB,SAASF,UAAU,CAAC;EACjDG,WAAWA,CAACC,GAAW,EAAEC,aAAqB,EAAE;IAC5C,KAAK,CAAC;MACFC,IAAI,EAAE,GAAG;MACTC,OAAO,EAAEN,eAAe,CAACO,MAAM,CAAC;QAC5BC,QAAQ,EAAEL,GAAG;QACb,eAAe,EAAE,kBAAkB,GAAGC;MAC1C,CAAC,CAAC;MACFK,IAAI,EAAEA,CAAA,KAAM;IAChB,CAAC,CAAC;EACN;AACJ","ignoreList":[]}

package/assetDelivery/s3/S3StreamAssetReply.d.ts

@@ -1,4 +1,5 @@
-import { Asset, AssetReply } from "@webiny/api-file-manager";
+import type { Asset } from "@webiny/api-file-manager";
+import { AssetReply } from "@webiny/api-file-manager";
 export declare class S3StreamAssetReply extends AssetReply {
     constructor(asset: Asset);
 }