@webiny/api-file-manager-s3 0.0.0-unstable.6f45466a1d → 0.0.0-unstable.7be00a75a9

package/assetDelivery/abstractions.d.ts

@@ -0,0 +1,9 @@
+import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+export interface IS3AssetDeliveryConfig {
+    presignedUrlTtl: number;
+    imageResizeWidths: number[];
+    assetStreamingMaxSize: number;
+}
+export declare const S3AssetDeliveryConfig: import("@webiny/di").Abstraction<IS3AssetDeliveryConfig>;
+export declare const S3Client: import("@webiny/di").Abstraction<S3>;
+export declare const S3Bucket: import("@webiny/di").Abstraction<string>;

package/assetDelivery/abstractions.js

@@ -0,0 +1,7 @@
+import { createAbstraction } from "@webiny/feature/api";
+const S3AssetDeliveryConfig = createAbstraction("AssetDelivery/S3Config");
+const S3Client = createAbstraction("AssetDelivery/S3Client");
+const S3Bucket = createAbstraction("AssetDelivery/S3Bucket");
+export { S3AssetDeliveryConfig, S3Bucket, S3Client };
+
+//# sourceMappingURL=abstractions.js.map

package/assetDelivery/abstractions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assetDelivery/abstractions.js","sources":["../../src/assetDelivery/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\n\nexport interface IS3AssetDeliveryConfig {\n    presignedUrlTtl: number;\n    imageResizeWidths: number[];\n    assetStreamingMaxSize: number;\n}\n\nexport const S3AssetDeliveryConfig =\n    createAbstraction<IS3AssetDeliveryConfig>(\"AssetDelivery/S3Config\");\n\nexport const S3Client = createAbstraction<S3>(\"AssetDelivery/S3Client\");\n\nexport const S3Bucket = createAbstraction<string>(\"AssetDelivery/S3Bucket\");\n"],"names":["S3AssetDeliveryConfig","createAbstraction","S3Client","S3Bucket"],"mappings":";AASO,MAAMA,wBACTC,kBAA0C;AAEvC,MAAMC,WAAWD,kBAAsB;AAEvC,MAAME,WAAWF,kBAA0B"}

package/assetDelivery/assetDeliveryConfig.d.ts

@@ -1,2 +1,2 @@
 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)[])[];
+export declare const assetDeliveryConfig: (params: AssetDeliveryParams) => (import("@webiny/handler").RegisterExtensionPlugin<import("@webiny/handler/types").Context> | (import("@webiny/handler").ModifyFastifyPlugin | import("@webiny/handler").RegisterExtensionPlugin<import("@webiny/handler/types").Context>)[])[];

package/assetDelivery/assetDeliveryConfig.js

@@ -1,47 +1,15 @@
-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 {
-    // 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
-  createBaseAssetDelivery(),
-  // S3 plugins
-  createAssetDeliveryConfig(config => {
-    const s3 = new S3({
-      region
-    });
-    config.decorateAssetResolver(({
-      container
-    }) => {
-      // This resolver loads file information from the `.metadata` file.
-      return new S3AssetResolver(container.resolve(GlobalKeyValueStore), s3, bucket);
-    });
-    config.decorateAssetOutputStrategy(() => {
-      return new S3OutputStrategy(s3, bucket, presignedUrlTtl, assetStreamingMaxSize);
-    });
-    config.decorateAssetTransformationStrategy(() => {
-      return new SharpTransform({
-        s3,
-        bucket,
-        imageResizeWidths
-      });
-    });
-  })];
+import { createAssetDelivery } from "@webiny/api-file-manager";
+import { createRegisterExtensionPlugin } from "@webiny/handler";
+import { createS3AssetDeliveryFeature } from "./feature.js";
+const assetDeliveryConfig = (params)=>{
+    const feature = createS3AssetDeliveryFeature(params);
+    return [
+        createAssetDelivery(),
+        createRegisterExtensionPlugin((context)=>{
+            feature.register(context.container);
+        })
+    ];
 };
+export { assetDeliveryConfig };
 
 //# sourceMappingURL=assetDeliveryConfig.js.map

package/assetDelivery/assetDeliveryConfig.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"file":"assetDelivery/assetDeliveryConfig.js","sources":["../../src/assetDelivery/assetDeliveryConfig.ts"],"sourcesContent":["import { createAssetDelivery as createBaseAssetDelivery } from \"@webiny/api-file-manager\";\nimport { createRegisterExtensionPlugin } from \"@webiny/handler\";\nimport type { AssetDeliveryParams } from \"~/assetDelivery/types.js\";\nimport { createS3AssetDeliveryFeature } from \"~/assetDelivery/feature.js\";\n\nexport const assetDeliveryConfig = (params: AssetDeliveryParams) => {\n    const feature = createS3AssetDeliveryFeature(params);\n\n    return [\n        createBaseAssetDelivery(),\n        createRegisterExtensionPlugin(context => {\n            feature.register(context.container);\n        })\n    ];\n};\n"],"names":["assetDeliveryConfig","params","feature","createS3AssetDeliveryFeature","createBaseAssetDelivery","createRegisterExtensionPlugin","context"],"mappings":";;;AAKO,MAAMA,sBAAsB,CAACC;IAChC,MAAMC,UAAUC,6BAA6BF;IAE7C,OAAO;QACHG;QACAC,8BAA8BC,CAAAA;YAC1BJ,QAAQ,QAAQ,CAACI,QAAQ,SAAS;QACtC;KACH;AACL"}

package/assetDelivery/createAssetDelivery.js

@@ -1,23 +1,9 @@
 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.
-   */
-  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());
-  })];
-};
+const createAssetDelivery = (params = {})=>[
+        createAssetDeliveryPluginLoader(()=>import("./assetDeliveryConfig.js").then(({ assetDeliveryConfig })=>assetDeliveryConfig(params))),
+        createThreatDetectionPluginLoader(()=>import("./threatDetection/createThreatDetectionEventHandler.js").then(({ createThreatDetectionEventHandler })=>createThreatDetectionEventHandler()))
+    ];
+export { createAssetDelivery };
 
 //# sourceMappingURL=createAssetDelivery.js.map

package/assetDelivery/createAssetDelivery.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"file":"assetDelivery/createAssetDelivery.js","sources":["../../src/assetDelivery/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"],"names":["createAssetDelivery","params","createAssetDeliveryPluginLoader","assetDeliveryConfig","createThreatDetectionPluginLoader","createThreatDetectionEventHandler"],"mappings":";;AAKO,MAAMA,sBAAsB,CAACC,SAA8B,CAAC,CAAC,GACzD;QAIHC,gCAAgC,IACrB,MAAM,CAAN,4BAEL,IAAI,CAAC,CAAC,EAAEC,mBAAmB,EAAE,GAAKA,oBAAoBF;QAK5DG,kCAAkC,IACvB,MAAM,CAAN,0DAEL,IAAI,CAAC,CAAC,EAAEC,iCAAiC,EAAE,GAAKA;KAEzD"}

package/assetDelivery/feature.d.ts

@@ -0,0 +1,5 @@
+import type { AssetDeliveryParams } from "./types.js";
+export declare const createS3AssetDeliveryFeature: (params?: AssetDeliveryParams) => {
+    name: string;
+    register(container: import("@webiny/di").Container): void;
+};

package/assetDelivery/feature.js

@@ -0,0 +1,37 @@
+import { createFeature } from "@webiny/feature/api";
+import { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import { S3AssetDeliveryConfig, S3Bucket, S3Client } from "./abstractions.js";
+import { S3AssetResolverImpl } from "./s3/S3AssetResolver.js";
+import { S3OutputStrategyImpl } from "./s3/S3OutputStrategy.js";
+import { SharpTransformImpl } from "./s3/SharpTransform.js";
+const createS3AssetDeliveryFeature = (params = {})=>createFeature({
+        name: "AssetDelivery/S3",
+        register (container) {
+            container.registerInstance(S3Client, new S3({
+                region: process.env.AWS_REGION
+            }));
+            container.registerInstance(S3Bucket, process.env.S3_BUCKET);
+            container.registerInstance(S3AssetDeliveryConfig, {
+                presignedUrlTtl: params.presignedUrlTtl ?? 3600,
+                imageResizeWidths: params.imageResizeWidths ?? [
+                    128,
+                    384,
+                    640,
+                    750,
+                    828,
+                    1080,
+                    1200,
+                    1920,
+                    2048,
+                    3840
+                ],
+                assetStreamingMaxSize: params.assetStreamingMaxSize ?? 4718592
+            });
+            container.register(S3AssetResolverImpl);
+            container.register(S3OutputStrategyImpl);
+            container.register(SharpTransformImpl);
+        }
+    });
+export { createS3AssetDeliveryFeature };
+
+//# sourceMappingURL=feature.js.map

package/assetDelivery/feature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assetDelivery/feature.js","sources":["../../src/assetDelivery/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { S3Client, S3Bucket, S3AssetDeliveryConfig } from \"./abstractions.js\";\nimport type { AssetDeliveryParams } from \"./types.js\";\nimport { S3AssetResolverImpl } from \"./s3/S3AssetResolver.js\";\nimport { S3OutputStrategyImpl } from \"./s3/S3OutputStrategy.js\";\nimport { SharpTransformImpl } from \"./s3/SharpTransform.js\";\n\nexport const createS3AssetDeliveryFeature = (params: AssetDeliveryParams = {}) => {\n    return createFeature({\n        name: \"AssetDelivery/S3\",\n        register(container) {\n            container.registerInstance(\n                S3Client,\n                new S3({ region: process.env.AWS_REGION as string })\n            );\n            container.registerInstance(S3Bucket, process.env.S3_BUCKET as string);\n            container.registerInstance(S3AssetDeliveryConfig, {\n                presignedUrlTtl: params.presignedUrlTtl ?? 3600,\n                imageResizeWidths: params.imageResizeWidths ?? [\n                    128, 384, 640, 750, 828, 1080, 1200, 1920, 2048, 3840\n                ],\n                assetStreamingMaxSize: params.assetStreamingMaxSize ?? 4718592\n            });\n\n            container.register(S3AssetResolverImpl);\n            container.register(S3OutputStrategyImpl);\n            container.register(SharpTransformImpl);\n        }\n    });\n};\n"],"names":["createS3AssetDeliveryFeature","params","createFeature","container","S3Client","S3","process","S3Bucket","S3AssetDeliveryConfig","S3AssetResolverImpl","S3OutputStrategyImpl","SharpTransformImpl"],"mappings":";;;;;;AAQO,MAAMA,+BAA+B,CAACC,SAA8B,CAAC,CAAC,GAClEC,cAAc;QACjB,MAAM;QACN,UAASC,SAAS;YACdA,UAAU,gBAAgB,CACtBC,UACA,IAAIC,GAAG;gBAAE,QAAQC,QAAQ,GAAG,CAAC,UAAU;YAAW;YAEtDH,UAAU,gBAAgB,CAACI,UAAUD,QAAQ,GAAG,CAAC,SAAS;YAC1DH,UAAU,gBAAgB,CAACK,uBAAuB;gBAC9C,iBAAiBP,OAAO,eAAe,IAAI;gBAC3C,mBAAmBA,OAAO,iBAAiB,IAAI;oBAC3C;oBAAK;oBAAK;oBAAK;oBAAK;oBAAK;oBAAM;oBAAM;oBAAM;oBAAM;iBACpD;gBACD,uBAAuBA,OAAO,qBAAqB,IAAI;YAC3D;YAEAE,UAAU,QAAQ,CAACM;YACnBN,UAAU,QAAQ,CAACO;YACnBP,UAAU,QAAQ,CAACQ;QACvB;IACJ"}

package/assetDelivery/index.js

@@ -6,5 +6,3 @@ 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/s3/S3AssetResolver.d.ts

@@ -9,3 +9,6 @@ export declare class S3AssetResolver implements AssetResolver {
     constructor(keyValueStore: GlobalKeyValueStore.Interface, s3: S3, bucket: string);
     resolve(request: AssetRequest): Promise<Asset | undefined>;
 }
+export declare const S3AssetResolverImpl: typeof S3AssetResolver & {
+    __abstraction: import("@webiny/di").Abstraction<AssetResolver>;
+};

package/assetDelivery/s3/S3AssetResolver.js

@@ -1,29 +1,39 @@
 import { Asset } from "@webiny/api-file-manager";
+import { AssetResolver } from "@webiny/api-file-manager/features/assetDelivery/abstractions.js";
+import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/index.js";
 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) {
-    const fileId = ObjectKey.from(request.getKey()).id();
-    const result = await this.keyValueStore.get(`FileManager/File/${fileId}/Metadata`);
-    if (result.isFail()) {
-      return undefined;
+import { S3Bucket, S3Client } from "../abstractions.js";
+class S3AssetResolver {
+    constructor(keyValueStore, s3, bucket){
+        this.keyValueStore = keyValueStore;
+        this.s3 = s3;
+        this.bucket = bucket;
+    }
+    async resolve(request) {
+        const fileId = ObjectKey.from(request.getKey()).id();
+        const result = await this.keyValueStore.get(`FileManager/File/${fileId}/Metadata`);
+        if (result.isFail()) return;
+        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;
     }
-    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;
-  }
 }
+const S3AssetResolverImpl = AssetResolver.createImplementation({
+    implementation: S3AssetResolver,
+    dependencies: [
+        GlobalKeyValueStore,
+        S3Client,
+        S3Bucket
+    ]
+});
+export { S3AssetResolver, S3AssetResolverImpl };
 
 //# sourceMappingURL=S3AssetResolver.js.map

package/assetDelivery/s3/S3AssetResolver.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"file":"assetDelivery/s3/S3AssetResolver.js","sources":["../../../src/assetDelivery/s3/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 { AssetResolver as AssetResolverAbstraction } from \"@webiny/api-file-manager/features/assetDelivery/abstractions.js\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\nimport { S3ContentsReader } from \"~/assetDelivery/index.js\";\nimport { ObjectKey } from \"~/assetDelivery/threatDetection/ObjectKey.js\";\nimport { S3Client, S3Bucket } from \"~/assetDelivery/abstractions.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\nexport const S3AssetResolverImpl = AssetResolverAbstraction.createImplementation({\n    implementation: S3AssetResolver,\n    dependencies: [GlobalKeyValueStore, S3Client, S3Bucket]\n});\n"],"names":["S3AssetResolver","keyValueStore","s3","bucket","request","fileId","ObjectKey","result","metadata","asset","Asset","S3ContentsReader","S3AssetResolverImpl","AssetResolverAbstraction","GlobalKeyValueStore","S3Client","S3Bucket"],"mappings":";;;;;;AAiBO,MAAMA;IACT,YACYC,aAA4C,EAC5CC,EAAM,EACNC,MAAc,CACxB;aAHUF,aAAa,GAAbA;aACAC,EAAE,GAAFA;aACAC,MAAM,GAANA;IACT;IAEH,MAAM,QAAQC,OAAqB,EAA8B;QAC7D,MAAMC,SAASC,UAAU,IAAI,CAACF,QAAQ,MAAM,IAAI,EAAE;QAClD,MAAMG,SAAS,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CACvC,CAAC,iBAAiB,EAAEF,OAAO,SAAS,CAAC;QAGzC,IAAIE,OAAO,MAAM,IACb;QAGJ,MAAMC,WAAWD,OAAO,KAAK;QAE7B,MAAME,QAAQ,IAAIC,MAAM;YACpB,IAAIF,SAAS,EAAE;YACf,QAAQA,SAAS,MAAM;YACvB,MAAMA,SAAS,IAAI;YACnB,aAAaA,SAAS,WAAW;YACjC,KAAKA,SAAS,SAAS;QAC3B;QAEAC,MAAM,iBAAiB,CAAC,IAAIE,iBAAiB,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM;QAEjE,OAAOF;IACX;AACJ;AAEO,MAAMG,sBAAsBC,cAAAA,oBAA6C,CAAC;IAC7E,gBAAgBb;IAChB,cAAc;QAACc;QAAqBC;QAAUC;KAAS;AAC3D"}

package/assetDelivery/s3/S3ContentsReader.js

@@ -1,20 +1,17 @@
-export class S3ContentsReader {
-  constructor(s3, bucket) {
-    this.s3 = s3;
-    this.bucket = bucket;
-  }
-  async read(asset) {
-    const {
-      Body
-    } = await this.s3.getObject({
-      Bucket: this.bucket,
-      Key: asset.getKey()
-    });
-    if (!Body) {
-      throw Error(`Unable to read ${asset.getKey()}!`);
+class S3ContentsReader {
+    constructor(s3, bucket){
+        this.s3 = s3;
+        this.bucket = bucket;
+    }
+    async read(asset) {
+        const { Body } = await this.s3.getObject({
+            Bucket: this.bucket,
+            Key: asset.getKey()
+        });
+        if (!Body) throw Error(`Unable to read ${asset.getKey()}!`);
+        return Buffer.from(await Body.transformToByteArray());
     }
-    return Buffer.from(await Body.transformToByteArray());
-  }
 }
+export { 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"],"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":[]}
+{"version":3,"file":"assetDelivery/s3/S3ContentsReader.js","sources":["../../../src/assetDelivery/s3/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"],"names":["S3ContentsReader","s3","bucket","asset","Body","Error","Buffer"],"mappings":"AAGO,MAAMA;IAIT,YAAYC,EAAM,EAAEC,MAAc,CAAE;QAChC,IAAI,CAAC,EAAE,GAAGD;QACV,IAAI,CAAC,MAAM,GAAGC;IAClB;IAEA,MAAM,KAAKC,KAAY,EAAmB;QACtC,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC;YACrC,QAAQ,IAAI,CAAC,MAAM;YACnB,KAAKD,MAAM,MAAM;QACrB;QAEA,IAAI,CAACC,MACD,MAAMC,MAAM,CAAC,eAAe,EAAEF,MAAM,MAAM,GAAG,CAAC,CAAC;QAGnD,OAAOG,OAAO,IAAI,CAAC,MAAMF,KAAK,oBAAoB;IACtD;AACJ"}

package/assetDelivery/s3/S3ErrorAssetReply.js

@@ -1,13 +1,14 @@
 import { AssetReply } from "@webiny/api-file-manager";
-export class S3ErrorAssetReply extends AssetReply {
-  constructor(message) {
-    super({
-      code: 400,
-      body: () => ({
-        error: message
-      })
-    });
-  }
+class S3ErrorAssetReply extends AssetReply {
+    constructor(message){
+        super({
+            code: 400,
+            body: ()=>({
+                    error: message
+                })
+        });
+    }
 }
+export { S3ErrorAssetReply };
 
 //# sourceMappingURL=S3ErrorAssetReply.js.map

package/assetDelivery/s3/S3ErrorAssetReply.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"file":"assetDelivery/s3/S3ErrorAssetReply.js","sources":["../../../src/assetDelivery/s3/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"],"names":["S3ErrorAssetReply","AssetReply","message"],"mappings":";AAEO,MAAMA,0BAA0BC;IACnC,YAAYC,OAAe,CAAE;QACzB,KAAK,CAAC;YACF,MAAM;YACN,MAAM,IAAO;oBAAE,OAAOA;gBAAQ;QAClC;IACJ;AACJ"}

package/assetDelivery/s3/S3OutputStrategy.d.ts

@@ -1,15 +1,15 @@
 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.
- */
+import type { IS3AssetDeliveryConfig } from "../../assetDelivery/abstractions.js";
 export declare class S3OutputStrategy implements AssetOutputStrategy {
     private readonly s3;
     private readonly bucket;
     private readonly presignedUrlTtl;
     private readonly assetStreamingMaxSize;
-    constructor(s3: S3, bucket: string, presignedUrlTtl: number, assetStreamingMaxSize: number);
+    constructor(s3: S3, bucket: string, config: IS3AssetDeliveryConfig);
     output(asset: Asset): Promise<AssetReply>;
     protected getPresignedUrl(asset: Asset): Promise<string>;
 }
+export declare const S3OutputStrategyImpl: typeof S3OutputStrategy & {
+    __abstraction: import("@webiny/di").Abstraction<AssetOutputStrategy>;
+};

package/assetDelivery/s3/S3OutputStrategy.js

@@ -1,34 +1,40 @@
+import { AssetOutputStrategy } from "@webiny/api-file-manager/features/assetDelivery/abstractions.js";
 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.
- */
-export class S3OutputStrategy {
-  constructor(s3, bucket, presignedUrlTtl, assetStreamingMaxSize) {
-    this.assetStreamingMaxSize = assetStreamingMaxSize;
-    this.presignedUrlTtl = presignedUrlTtl;
-    this.s3 = s3;
-    this.bucket = bucket;
-  }
-  async output(asset) {
-    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);
+import { S3AssetDeliveryConfig, S3Bucket, S3Client } from "../abstractions.js";
+class S3OutputStrategy {
+    constructor(s3, bucket, config){
+        this.s3 = s3;
+        this.bucket = bucket;
+        this.presignedUrlTtl = config.presignedUrlTtl;
+        this.assetStreamingMaxSize = config.assetStreamingMaxSize;
+    }
+    async output(asset) {
+        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);
+        }
+        console.log(`Asset size is smaller than ${this.assetStreamingMaxSize}; streaming directly from Lambda function.`);
+        return new S3StreamAssetReply(asset);
+    }
+    getPresignedUrl(asset) {
+        return getSignedUrl(this.s3, new GetObjectCommand({
+            Bucket: this.bucket,
+            Key: asset.getKey()
+        }), {
+            expiresIn: this.presignedUrlTtl
+        });
     }
-    console.log(`Asset size is smaller than ${this.assetStreamingMaxSize}; streaming directly from Lambda function.`);
-    return new S3StreamAssetReply(asset);
-  }
-  getPresignedUrl(asset) {
-    return getSignedUrl(this.s3, new GetObjectCommand({
-      Bucket: this.bucket,
-      Key: asset.getKey()
-    }), {
-      expiresIn: this.presignedUrlTtl
-    });
-  }
 }
+const S3OutputStrategyImpl = AssetOutputStrategy.createImplementation({
+    implementation: S3OutputStrategy,
+    dependencies: [
+        S3Client,
+        S3Bucket,
+        S3AssetDeliveryConfig
+    ]
+});
+export { S3OutputStrategy, S3OutputStrategyImpl };
 
 //# sourceMappingURL=S3OutputStrategy.js.map

package/assetDelivery/s3/S3OutputStrategy.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"file":"assetDelivery/s3/S3OutputStrategy.js","sources":["../../../src/assetDelivery/s3/S3OutputStrategy.ts"],"sourcesContent":["import type { Asset, AssetOutputStrategy, AssetReply } from \"@webiny/api-file-manager\";\nimport { AssetOutputStrategy as AssetOutputStrategyAbstraction } from \"@webiny/api-file-manager/features/assetDelivery/abstractions.js\";\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\";\nimport { S3Client, S3Bucket, S3AssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\nimport type { IS3AssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\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, config: IS3AssetDeliveryConfig) {\n        this.s3 = s3;\n        this.bucket = bucket;\n        this.presignedUrlTtl = config.presignedUrlTtl;\n        this.assetStreamingMaxSize = config.assetStreamingMaxSize;\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\nexport const S3OutputStrategyImpl = AssetOutputStrategyAbstraction.createImplementation({\n    implementation: S3OutputStrategy,\n    dependencies: [S3Client, S3Bucket, S3AssetDeliveryConfig]\n});\n"],"names":["S3OutputStrategy","s3","bucket","config","asset","console","S3RedirectAssetReply","S3StreamAssetReply","getSignedUrl","GetObjectCommand","S3OutputStrategyImpl","AssetOutputStrategyAbstraction","S3Client","S3Bucket","S3AssetDeliveryConfig"],"mappings":";;;;;AASO,MAAMA;IAMT,YAAYC,EAAM,EAAEC,MAAc,EAAEC,MAA8B,CAAE;QAChE,IAAI,CAAC,EAAE,GAAGF;QACV,IAAI,CAAC,MAAM,GAAGC;QACd,IAAI,CAAC,eAAe,GAAGC,OAAO,eAAe;QAC7C,IAAI,CAAC,qBAAqB,GAAGA,OAAO,qBAAqB;IAC7D;IAEA,MAAM,OAAOC,KAAY,EAAuB;QAC5C,IAAIA,MAAM,OAAO,KAAK,IAAI,CAAC,qBAAqB,EAAE;YAC9CC,QAAQ,GAAG,CACP,CAAC,2BAA2B,EAAE,IAAI,CAAC,qBAAqB,CAAC,oCAAoC,CAAC;YAGlG,OAAO,IAAIC,qBACP,MAAM,IAAI,CAAC,eAAe,CAACF,QAC3B,IAAI,CAAC,eAAe;QAE5B;QAEAC,QAAQ,GAAG,CACP,CAAC,2BAA2B,EAAE,IAAI,CAAC,qBAAqB,CAAC,0CAA0C,CAAC;QAExG,OAAO,IAAIE,mBAAmBH;IAClC;IAEU,gBAAgBA,KAAY,EAAE;QACpC,OAAOI,aACH,IAAI,CAAC,EAAE,EACP,IAAIC,iBAAiB;YACjB,QAAQ,IAAI,CAAC,MAAM;YACnB,KAAKL,MAAM,MAAM;QACrB,IACA;YAAE,WAAW,IAAI,CAAC,eAAe;QAAC;IAE1C;AACJ;AAEO,MAAMM,uBAAuBC,oBAAAA,oBAAmD,CAAC;IACpF,gBAAgBX;IAChB,cAAc;QAACY;QAAUC;QAAUC;KAAsB;AAC7D"}

package/assetDelivery/s3/S3RedirectAssetReply.js

@@ -1,16 +1,17 @@
 import { AssetReply } from "@webiny/api-file-manager";
 import { ResponseHeaders } from "@webiny/handler";
-export class S3RedirectAssetReply extends AssetReply {
-  constructor(url, cacheDuration) {
-    super({
-      code: 301,
-      headers: ResponseHeaders.create({
-        location: url,
-        "cache-control": "public, max-age=" + cacheDuration
-      }),
-      body: () => ""
-    });
-  }
+class S3RedirectAssetReply extends AssetReply {
+    constructor(url, cacheDuration){
+        super({
+            code: 301,
+            headers: ResponseHeaders.create({
+                location: url,
+                "cache-control": "public, max-age=" + cacheDuration
+            }),
+            body: ()=>""
+        });
+    }
 }
+export { S3RedirectAssetReply };
 
 //# sourceMappingURL=S3RedirectAssetReply.js.map

package/assetDelivery/s3/S3RedirectAssetReply.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"file":"assetDelivery/s3/S3RedirectAssetReply.js","sources":["../../../src/assetDelivery/s3/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"],"names":["S3RedirectAssetReply","AssetReply","url","cacheDuration","ResponseHeaders"],"mappings":";;AAGO,MAAMA,6BAA6BC;IACtC,YAAYC,GAAW,EAAEC,aAAqB,CAAE;QAC5C,KAAK,CAAC;YACF,MAAM;YACN,SAASC,gBAAgB,MAAM,CAAC;gBAC5B,UAAUF;gBACV,iBAAiB,qBAAqBC;YAC1C;YACA,MAAM,IAAM;QAChB;IACJ;AACJ"}

package/assetDelivery/s3/S3StreamAssetReply.js

@@ -1,16 +1,17 @@
 import { AssetReply } from "@webiny/api-file-manager";
 import { ResponseHeaders } from "@webiny/handler";
-export class S3StreamAssetReply extends AssetReply {
-  constructor(asset) {
-    super({
-      code: 200,
-      headers: ResponseHeaders.create({
-        "cache-control": `public, max-age=${86400 * 365}`,
-        "content-type": asset.getContentType()
-      }),
-      body: () => asset.getContents()
-    });
-  }
+class S3StreamAssetReply extends AssetReply {
+    constructor(asset){
+        super({
+            code: 200,
+            headers: ResponseHeaders.create({
+                "cache-control": "public, max-age=31536000",
+                "content-type": asset.getContentType()
+            }),
+            body: ()=>asset.getContents()
+        });
+    }
 }
+export { S3StreamAssetReply };
 
 //# sourceMappingURL=S3StreamAssetReply.js.map

package/assetDelivery/s3/S3StreamAssetReply.js.map

@@ -1 +1 @@
-{"version":3,"names":["AssetReply","ResponseHeaders","S3StreamAssetReply","constructor","asset","code","headers","create","getContentType","body","getContents"],"sources":["S3StreamAssetReply.ts"],"sourcesContent":["import type { Asset } from \"@webiny/api-file-manager\";\nimport { AssetReply } from \"@webiny/api-file-manager\";\nimport { ResponseHeaders } from \"@webiny/handler\";\n\nexport class S3StreamAssetReply extends AssetReply {\n    constructor(asset: Asset) {\n        super({\n            code: 200,\n            headers: ResponseHeaders.create({\n                \"cache-control\": `public, max-age=${86400 * 365}`,\n                \"content-type\": asset.getContentType()\n            }),\n            body: () => asset.getContents()\n        });\n    }\n}\n"],"mappings":"AACA,SAASA,UAAU,QAAQ,0BAA0B;AACrD,SAASC,eAAe,QAAQ,iBAAiB;AAEjD,OAAO,MAAMC,kBAAkB,SAASF,UAAU,CAAC;EAC/CG,WAAWA,CAACC,KAAY,EAAE;IACtB,KAAK,CAAC;MACFC,IAAI,EAAE,GAAG;MACTC,OAAO,EAAEL,eAAe,CAACM,MAAM,CAAC;QAC5B,eAAe,EAAE,mBAAmB,KAAK,GAAG,GAAG,EAAE;QACjD,cAAc,EAAEH,KAAK,CAACI,cAAc,CAAC;MACzC,CAAC,CAAC;MACFC,IAAI,EAAEA,CAAA,KAAML,KAAK,CAACM,WAAW,CAAC;IAClC,CAAC,CAAC;EACN;AACJ","ignoreList":[]}
+{"version":3,"file":"assetDelivery/s3/S3StreamAssetReply.js","sources":["../../../src/assetDelivery/s3/S3StreamAssetReply.ts"],"sourcesContent":["import type { Asset } from \"@webiny/api-file-manager\";\nimport { AssetReply } from \"@webiny/api-file-manager\";\nimport { ResponseHeaders } from \"@webiny/handler\";\n\nexport class S3StreamAssetReply extends AssetReply {\n    constructor(asset: Asset) {\n        super({\n            code: 200,\n            headers: ResponseHeaders.create({\n                \"cache-control\": `public, max-age=${86400 * 365}`,\n                \"content-type\": asset.getContentType()\n            }),\n            body: () => asset.getContents()\n        });\n    }\n}\n"],"names":["S3StreamAssetReply","AssetReply","asset","ResponseHeaders"],"mappings":";;AAIO,MAAMA,2BAA2BC;IACpC,YAAYC,KAAY,CAAE;QACtB,KAAK,CAAC;YACF,MAAM;YACN,SAASC,gBAAgB,MAAM,CAAC;gBAC5B,iBAAiB;gBACjB,gBAAgBD,MAAM,cAAc;YACxC;YACA,MAAM,IAAMA,MAAM,WAAW;QACjC;IACJ;AACJ"}

package/assetDelivery/s3/SharpTransform.d.ts

@@ -1,13 +1,11 @@
 import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
 import type { Asset, AssetRequest, AssetTransformationStrategy } from "@webiny/api-file-manager";
-interface SharpTransformationParams {
-    s3: S3;
-    bucket: string;
-    imageResizeWidths: number[];
-}
+import type { IS3AssetDeliveryConfig } from "../../assetDelivery/abstractions.js";
 export declare class SharpTransform implements AssetTransformationStrategy {
-    private readonly params;
-    constructor(params: SharpTransformationParams);
+    private readonly s3;
+    private readonly bucket;
+    private readonly imageResizeWidths;
+    constructor(s3: S3, bucket: string, config: IS3AssetDeliveryConfig);
     transform(assetRequest: AssetRequest, asset: Asset): Promise<Asset>;
     private transformAsset;
     private optimizeAsset;
@@ -15,4 +13,6 @@ export declare class SharpTransform implements AssetTransformationStrategy {
     private optimizePng;
     private optimizeJpeg;
 }
-export {};
+export declare const SharpTransformImpl: typeof SharpTransform & {
+    __abstraction: import("@webiny/di").Abstraction<AssetTransformationStrategy>;
+};