@webiny/api-file-manager-s3 6.4.12-beta.5 → 6.5.0-beta.0

package/assetDelivery/abstractions.d.ts

@@ -1,7 +1,9 @@
 import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import type { ImageFormat } from "@webiny/api-file-manager/features/assetDelivery/transformation/index.js";
 export interface IS3AssetDeliveryConfig {
     presignedUrlTtl: number;
     imageResizeWidths: number[];
+    imageQuality?: Partial<Record<ImageFormat, number>>;
     assetStreamingMaxSize: number;
 }
 export declare const S3AssetDeliveryConfig: import("@webiny/di").Abstraction<IS3AssetDeliveryConfig>;

package/assetDelivery/abstractions.js.map

@@ -1 +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"}
+{"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\";\nimport type { ImageFormat } from \"@webiny/api-file-manager/features/assetDelivery/transformation/index.js\";\n\nexport interface IS3AssetDeliveryConfig {\n    presignedUrlTtl: number;\n    imageResizeWidths: number[];\n    imageQuality?: Partial<Record<ImageFormat, 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":";AAWO,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/handler").RegisterExtensionPlugin<import("@webiny/handler/types").Context> | (import("@webiny/handler").ModifyFastifyPlugin | import("@webiny/handler").RegisterExtensionPlugin<import("@webiny/handler/types").Context>)[])[];
+export declare const assetDeliveryConfig: (params: AssetDeliveryParams) => ((import("@webiny/handler").ModifyFastifyPlugin | import("@webiny/handler").RegisterExtensionPlugin<import("@webiny/handler/types").Context>)[] | import("@webiny/handler").RegisterExtensionPlugin<import("@webiny/handler/types").Context>)[];

package/assetDelivery/createAssetDelivery.js

@@ -1,4 +1,4 @@
-import { createAssetDeliveryPluginLoader } from "@webiny/api-file-manager";
+import { createAssetDeliveryPluginLoader } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 import { createThreatDetectionPluginLoader } from "./threatDetection/index.js";
 const createAssetDelivery = (params = {})=>[
         createAssetDeliveryPluginLoader(()=>import("./assetDeliveryConfig.js").then(({ assetDeliveryConfig })=>assetDeliveryConfig(params))),

package/assetDelivery/createAssetDelivery.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"assetDelivery/createAssetDelivery.js","sources":["../../src/assetDelivery/createAssetDelivery.ts"],"sourcesContent":["import { createAssetDeliveryPluginLoader } from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\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.js

@@ -25,11 +25,12 @@ const createS3AssetDeliveryFeature = (params = {})=>createFeature({
                     2048,
                     3840
                 ],
+                imageQuality: params.imageQuality ?? {},
                 assetStreamingMaxSize: params.assetStreamingMaxSize ?? 4718592
             });
             container.register(S3AssetResolverImpl);
             container.register(S3OutputStrategyImpl);
-            container.register(SharpTransformImpl);
+            container.register(SharpTransformImpl).inSingletonScope();
         }
     });
 export { createS3AssetDeliveryFeature };

package/assetDelivery/feature.js.map

@@ -1 +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"}
+{"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                imageQuality: params.imageQuality ?? {},\n                assetStreamingMaxSize: params.assetStreamingMaxSize ?? 4718592\n            });\n\n            container.register(S3AssetResolverImpl);\n            container.register(S3OutputStrategyImpl);\n            container.register(SharpTransformImpl).inSingletonScope();\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,cAAcA,OAAO,YAAY,IAAI,CAAC;gBACtC,uBAAuBA,OAAO,qBAAqB,IAAI;YAC3D;YAEAE,UAAU,QAAQ,CAACM;YACnBN,UAAU,QAAQ,CAACO;YACnBP,UAAU,QAAQ,CAACQ,oBAAoB,gBAAgB;QAC3D;IACJ"}

package/assetDelivery/index.d.ts

@@ -3,6 +3,5 @@ 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";
+export { CallableContentsReader } from "@webiny/api-file-manager/features/assetDelivery/transformation/index.js";

package/assetDelivery/index.js

@@ -3,6 +3,5 @@ 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";
+export { CallableContentsReader } from "@webiny/api-file-manager/features/assetDelivery/transformation/index.js";

package/assetDelivery/s3/S3AssetResolver.d.ts

@@ -1,14 +1,15 @@
 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 { AssetFactory, AssetResolver as AssetResolverAbstraction, ObjectKey } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/index.js";
-export declare class S3AssetResolver implements AssetResolver {
-    private keyValueStore;
-    private s3;
-    private bucket;
-    constructor(keyValueStore: GlobalKeyValueStore.Interface, s3: S3, bucket: string);
-    resolve(request: AssetRequest): Promise<Asset | undefined>;
+export declare class S3AssetResolver implements AssetResolverAbstraction.Interface {
+    private readonly keyValueStore;
+    private readonly s3;
+    private readonly bucket;
+    private readonly objectKey;
+    private readonly assetFactory;
+    constructor(keyValueStore: GlobalKeyValueStore.Interface, s3: S3, bucket: string, objectKey: ObjectKey.Interface, assetFactory: AssetFactory.Interface);
+    resolve(request: AssetResolverAbstraction.Request): Promise<AssetFactory.Asset | undefined>;
 }
 export declare const S3AssetResolverImpl: typeof S3AssetResolver & {
-    __abstraction: import("@webiny/di").Abstraction<AssetResolver>;
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-file-manager/delivery").AssetResolver>;
 };

package/assetDelivery/s3/S3AssetResolver.js

@@ -1,28 +1,28 @@
-import { Asset } from "@webiny/api-file-manager";
-import { AssetResolver } from "@webiny/api-file-manager/features/assetDelivery/abstractions.js";
+import { AssetFactory, AssetResolver, ObjectKey } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/index.js";
 import { S3ContentsReader } from "../index.js";
-import { ObjectKey } from "../threatDetection/ObjectKey.js";
 import { S3Bucket, S3Client } from "../abstractions.js";
 class S3AssetResolver {
-    constructor(keyValueStore, s3, bucket){
+    constructor(keyValueStore, s3, bucket, objectKey, assetFactory){
         this.keyValueStore = keyValueStore;
         this.s3 = s3;
         this.bucket = bucket;
+        this.objectKey = objectKey;
+        this.assetFactory = assetFactory;
     }
     async resolve(request) {
-        const fileId = ObjectKey.from(request.getKey()).id();
+        const fileId = this.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({
+        const asset = this.assetFactory.create({
             id: metadata.id,
             tenant: metadata.tenant,
             size: metadata.size,
             contentType: metadata.contentType,
             key: metadata.bucketKey
         });
-        asset.setContentsReader(new S3ContentsReader(this.s3, this.bucket));
+        asset.setContentsReader(S3ContentsReader.create(this.s3, this.bucket));
         return asset;
     }
 }
@@ -31,7 +31,9 @@ const S3AssetResolverImpl = AssetResolver.createImplementation({
     dependencies: [
         GlobalKeyValueStore,
         S3Client,
-        S3Bucket
+        S3Bucket,
+        ObjectKey,
+        AssetFactory
     ]
 });
 export { S3AssetResolver, S3AssetResolverImpl };

package/assetDelivery/s3/S3AssetResolver.js.map

@@ -1 +1 @@
-{"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"}
+{"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 {\n    AssetFactory,\n    AssetResolver as AssetResolverAbstraction,\n    ObjectKey\n} from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\nimport { S3ContentsReader } from \"~/assetDelivery/index.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 AssetResolverAbstraction.Interface {\n    constructor(\n        private readonly keyValueStore: GlobalKeyValueStore.Interface,\n        private readonly s3: S3,\n        private readonly bucket: string,\n        private readonly objectKey: ObjectKey.Interface,\n        private readonly assetFactory: AssetFactory.Interface\n    ) {}\n\n    async resolve(\n        request: AssetResolverAbstraction.Request\n    ): Promise<AssetFactory.Asset | undefined> {\n        const fileId = this.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 = this.assetFactory.create({\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(S3ContentsReader.create(this.s3, this.bucket));\n\n        return asset;\n    }\n}\n\nexport const S3AssetResolverImpl = AssetResolverAbstraction.createImplementation({\n    implementation: S3AssetResolver,\n    dependencies: [GlobalKeyValueStore, S3Client, S3Bucket, ObjectKey, AssetFactory]\n});\n"],"names":["S3AssetResolver","keyValueStore","s3","bucket","objectKey","assetFactory","request","fileId","result","metadata","asset","S3ContentsReader","S3AssetResolverImpl","AssetResolverAbstraction","GlobalKeyValueStore","S3Client","S3Bucket","ObjectKey","AssetFactory"],"mappings":";;;;AAkBO,MAAMA;IACT,YACqBC,aAA4C,EAC5CC,EAAM,EACNC,MAAc,EACdC,SAA8B,EAC9BC,YAAoC,CACvD;aALmBJ,aAAa,GAAbA;aACAC,EAAE,GAAFA;aACAC,MAAM,GAANA;aACAC,SAAS,GAATA;aACAC,YAAY,GAAZA;IAClB;IAEH,MAAM,QACFC,OAAyC,EACF;QACvC,MAAMC,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAACD,QAAQ,MAAM,IAAI,EAAE;QACvD,MAAME,SAAS,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CACvC,CAAC,iBAAiB,EAAED,OAAO,SAAS,CAAC;QAGzC,IAAIC,OAAO,MAAM,IACb;QAGJ,MAAMC,WAAWD,OAAO,KAAK;QAE7B,MAAME,QAAQ,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;YACnC,IAAID,SAAS,EAAE;YACf,QAAQA,SAAS,MAAM;YACvB,MAAMA,SAAS,IAAI;YACnB,aAAaA,SAAS,WAAW;YACjC,KAAKA,SAAS,SAAS;QAC3B;QAEAC,MAAM,iBAAiB,CAACC,iBAAiB,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM;QAEpE,OAAOD;IACX;AACJ;AAEO,MAAME,sBAAsBC,cAAAA,oBAA6C,CAAC;IAC7E,gBAAgBb;IAChB,cAAc;QAACc;QAAqBC;QAAUC;QAAUC;QAAWC;KAAa;AACpF"}

package/assetDelivery/s3/S3ContentsReader.d.ts

@@ -1,8 +1,9 @@
 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;
+import { AssetContentsReader } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
+export declare class S3ContentsReader implements AssetContentsReader.Interface {
+    private readonly s3;
     private readonly bucket;
-    constructor(s3: S3, bucket: string);
-    read(asset: Asset): Promise<Buffer>;
+    static create(s3: S3, bucket: string): S3ContentsReader;
+    private constructor();
+    read(asset: AssetContentsReader.Asset): Promise<Buffer>;
 }

package/assetDelivery/s3/S3ContentsReader.js

@@ -1,4 +1,7 @@
 class S3ContentsReader {
+    static create(s3, bucket) {
+        return new S3ContentsReader(s3, bucket);
+    }
     constructor(s3, bucket){
         this.s3 = s3;
         this.bucket = bucket;

package/assetDelivery/s3/S3ContentsReader.js.map

@@ -1 +1 @@
-{"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"}
+{"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 { AssetContentsReader } from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\n\nexport class S3ContentsReader implements AssetContentsReader.Interface {\n    private readonly s3: S3;\n    private readonly bucket: string;\n\n    public static create(s3: S3, bucket: string) {\n        return new S3ContentsReader(s3, bucket);\n    }\n\n    private constructor(s3: S3, bucket: string) {\n        this.s3 = s3;\n        this.bucket = bucket;\n    }\n\n    public async read(asset: AssetContentsReader.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,OAAc,OAAOC,EAAM,EAAEC,MAAc,EAAE;QACzC,OAAO,IAAIF,iBAAiBC,IAAIC;IACpC;IAEA,YAAoBD,EAAM,EAAEC,MAAc,CAAE;QACxC,IAAI,CAAC,EAAE,GAAGD;QACV,IAAI,CAAC,MAAM,GAAGC;IAClB;IAEA,MAAa,KAAKC,KAAgC,EAAmB;QACjE,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.d.ts

@@ -1,4 +1,5 @@
-import { AssetReply } from "@webiny/api-file-manager";
+import { AssetReply } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 export declare class S3ErrorAssetReply extends AssetReply {
-    constructor(message: string);
+    static fromMessage(message: string): S3ErrorAssetReply;
+    private constructor();
 }

package/assetDelivery/s3/S3ErrorAssetReply.js

@@ -1,5 +1,8 @@
-import { AssetReply } from "@webiny/api-file-manager";
+import { AssetReply } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 class S3ErrorAssetReply extends AssetReply {
+    static fromMessage(message) {
+        return new S3ErrorAssetReply(message);
+    }
     constructor(message){
         super({
             code: 400,

package/assetDelivery/s3/S3ErrorAssetReply.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"assetDelivery/s3/S3ErrorAssetReply.js","sources":["../../../src/assetDelivery/s3/S3ErrorAssetReply.ts"],"sourcesContent":["import { AssetReply } from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\n\nexport class S3ErrorAssetReply extends AssetReply {\n    public static fromMessage(message: string) {\n        return new S3ErrorAssetReply(message);\n    }\n\n    private 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,OAAc,YAAYC,OAAe,EAAE;QACvC,OAAO,IAAIF,kBAAkBE;IACjC;IAEA,YAAoBA,OAAe,CAAE;QACjC,KAAK,CAAC;YACF,MAAM;YACN,MAAM,IAAO;oBAAE,OAAOA;gBAAQ;QAClC;IACJ;AACJ"}

package/assetDelivery/s3/S3OutputStrategy.d.ts

@@ -1,15 +1,17 @@
-import type { Asset, AssetOutputStrategy, AssetReply } from "@webiny/api-file-manager";
+import { AssetOutputStrategy as AssetOutputStrategyAbstraction } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import { StreamAssetReply } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 import type { IS3AssetDeliveryConfig } from "../../assetDelivery/abstractions.js";
-export declare class S3OutputStrategy implements AssetOutputStrategy {
+export declare class S3OutputStrategy implements AssetOutputStrategyAbstraction.Interface {
     private readonly s3;
     private readonly bucket;
     private readonly presignedUrlTtl;
     private readonly assetStreamingMaxSize;
-    constructor(s3: S3, bucket: string, config: IS3AssetDeliveryConfig);
-    output(asset: Asset): Promise<AssetReply>;
-    protected getPresignedUrl(asset: Asset): Promise<string>;
+    private readonly streamAssetReply;
+    constructor(s3: S3, bucket: string, config: IS3AssetDeliveryConfig, streamAssetReply: StreamAssetReply.Interface);
+    output(asset: AssetOutputStrategyAbstraction.Asset): Promise<AssetOutputStrategyAbstraction.AssetReply>;
+    protected getPresignedUrl(asset: AssetOutputStrategyAbstraction.Asset): Promise<string>;
 }
 export declare const S3OutputStrategyImpl: typeof S3OutputStrategy & {
-    __abstraction: import("@webiny/di").Abstraction<AssetOutputStrategy>;
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-file-manager/delivery").AssetOutputStrategy>;
 };

package/assetDelivery/s3/S3OutputStrategy.js

@@ -1,14 +1,14 @@
-import { AssetOutputStrategy } from "@webiny/api-file-manager/features/assetDelivery/abstractions.js";
+import { AssetOutputStrategy, StreamAssetReply } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 import { GetObjectCommand, getSignedUrl } from "@webiny/aws-sdk/client-s3/index.js";
 import { S3RedirectAssetReply } from "./S3RedirectAssetReply.js";
-import { S3StreamAssetReply } from "./S3StreamAssetReply.js";
 import { S3AssetDeliveryConfig, S3Bucket, S3Client } from "../abstractions.js";
 class S3OutputStrategy {
-    constructor(s3, bucket, config){
+    constructor(s3, bucket, config, streamAssetReply){
         this.s3 = s3;
         this.bucket = bucket;
         this.presignedUrlTtl = config.presignedUrlTtl;
         this.assetStreamingMaxSize = config.assetStreamingMaxSize;
+        this.streamAssetReply = streamAssetReply;
     }
     async output(asset) {
         if (asset.getSize() > this.assetStreamingMaxSize) {
@@ -16,7 +16,7 @@ class S3OutputStrategy {
             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);
+        return this.streamAssetReply.create(asset);
     }
     getPresignedUrl(asset) {
         return getSignedUrl(this.s3, new GetObjectCommand({
@@ -32,7 +32,8 @@ const S3OutputStrategyImpl = AssetOutputStrategy.createImplementation({
     dependencies: [
         S3Client,
         S3Bucket,
-        S3AssetDeliveryConfig
+        S3AssetDeliveryConfig,
+        StreamAssetReply
     ]
 });
 export { S3OutputStrategy, S3OutputStrategyImpl };

package/assetDelivery/s3/S3OutputStrategy.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"assetDelivery/s3/S3OutputStrategy.js","sources":["../../../src/assetDelivery/s3/S3OutputStrategy.ts"],"sourcesContent":["import { AssetOutputStrategy as AssetOutputStrategyAbstraction } from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\nimport type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { GetObjectCommand, getSignedUrl } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { StreamAssetReply } from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\nimport { S3RedirectAssetReply } from \"~/assetDelivery/s3/S3RedirectAssetReply.js\";\nimport { S3Client, S3Bucket, S3AssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\nimport type { IS3AssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\n\nexport class S3OutputStrategy implements AssetOutputStrategyAbstraction.Interface {\n    private readonly s3: S3;\n    private readonly bucket: string;\n    private readonly presignedUrlTtl: number;\n    private readonly assetStreamingMaxSize: number;\n    private readonly streamAssetReply: StreamAssetReply.Interface;\n\n    constructor(\n        s3: S3,\n        bucket: string,\n        config: IS3AssetDeliveryConfig,\n        streamAssetReply: StreamAssetReply.Interface\n    ) {\n        this.s3 = s3;\n        this.bucket = bucket;\n        this.presignedUrlTtl = config.presignedUrlTtl;\n        this.assetStreamingMaxSize = config.assetStreamingMaxSize;\n        this.streamAssetReply = streamAssetReply;\n    }\n\n    async output(\n        asset: AssetOutputStrategyAbstraction.Asset\n    ): Promise<AssetOutputStrategyAbstraction.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 this.streamAssetReply.create(asset);\n    }\n\n    protected getPresignedUrl(asset: AssetOutputStrategyAbstraction.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, StreamAssetReply]\n});\n"],"names":["S3OutputStrategy","s3","bucket","config","streamAssetReply","asset","console","S3RedirectAssetReply","getSignedUrl","GetObjectCommand","S3OutputStrategyImpl","AssetOutputStrategyAbstraction","S3Client","S3Bucket","S3AssetDeliveryConfig","StreamAssetReply"],"mappings":";;;;AAQO,MAAMA;IAOT,YACIC,EAAM,EACNC,MAAc,EACdC,MAA8B,EAC9BC,gBAA4C,CAC9C;QACE,IAAI,CAAC,EAAE,GAAGH;QACV,IAAI,CAAC,MAAM,GAAGC;QACd,IAAI,CAAC,eAAe,GAAGC,OAAO,eAAe;QAC7C,IAAI,CAAC,qBAAqB,GAAGA,OAAO,qBAAqB;QACzD,IAAI,CAAC,gBAAgB,GAAGC;IAC5B;IAEA,MAAM,OACFC,KAA2C,EACO;QAClD,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,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAACD;IACxC;IAEU,gBAAgBA,KAA2C,EAAE;QACnE,OAAOG,aACH,IAAI,CAAC,EAAE,EACP,IAAIC,iBAAiB;YACjB,QAAQ,IAAI,CAAC,MAAM;YACnB,KAAKJ,MAAM,MAAM;QACrB,IACA;YAAE,WAAW,IAAI,CAAC,eAAe;QAAC;IAE1C;AACJ;AAEO,MAAMK,uBAAuBC,oBAAAA,oBAAmD,CAAC;IACpF,gBAAgBX;IAChB,cAAc;QAACY;QAAUC;QAAUC;QAAuBC;KAAiB;AAC/E"}

package/assetDelivery/s3/S3RedirectAssetReply.d.ts

@@ -1,4 +1,4 @@
-import { AssetReply } from "@webiny/api-file-manager";
+import { AssetReply } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 export declare class S3RedirectAssetReply extends AssetReply {
     constructor(url: string, cacheDuration: number);
 }

package/assetDelivery/s3/S3RedirectAssetReply.js

@@ -1,4 +1,4 @@
-import { AssetReply } from "@webiny/api-file-manager";
+import { AssetReply } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 import { ResponseHeaders } from "@webiny/handler";
 class S3RedirectAssetReply extends AssetReply {
     constructor(url, cacheDuration){

package/assetDelivery/s3/S3RedirectAssetReply.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"assetDelivery/s3/S3RedirectAssetReply.js","sources":["../../../src/assetDelivery/s3/S3RedirectAssetReply.ts"],"sourcesContent":["import { AssetReply } from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\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/SharpTransform.d.ts

@@ -1,12 +1,20 @@
 import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
-import type { Asset, AssetRequest, AssetTransformationStrategy } from "@webiny/api-file-manager";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import { GetFileUseCase } from "@webiny/api-file-manager/features/file/GetFile/index.js";
+import { ImageAssetTypeHandler } from "@webiny/api-file-manager/features/assetDelivery/assetTypes/image/index.js";
+import type { Asset } from "@webiny/api-file-manager/delivery/AssetDelivery/Asset.js";
+import type { AssetRequest } from "@webiny/api-file-manager/delivery/AssetDelivery/AssetRequest.js";
 import type { IS3AssetDeliveryConfig } from "../../assetDelivery/abstractions.js";
-export declare class SharpTransform implements AssetTransformationStrategy {
+export declare class SharpTransform implements ImageAssetTypeHandler.Interface {
     private readonly s3;
     private readonly bucket;
     private readonly imageResizeWidths;
-    constructor(s3: S3, bucket: string, config: IS3AssetDeliveryConfig);
-    transform(assetRequest: AssetRequest, asset: Asset): Promise<Asset>;
+    private readonly imageQuality;
+    private readonly identityContext;
+    private readonly getFile;
+    constructor(s3: S3, bucket: string, config: IS3AssetDeliveryConfig, identityContext: IdentityContext.Interface, getFile: GetFileUseCase.Interface);
+    handle(assetRequest: AssetRequest, asset: Asset): Promise<Asset>;
+    private loadAssetCrop;
     private transformAsset;
     private optimizeAsset;
     private isAssetAnimated;
@@ -14,5 +22,5 @@ export declare class SharpTransform implements AssetTransformationStrategy {
     private optimizeJpeg;
 }
 export declare const SharpTransformImpl: typeof SharpTransform & {
-    __abstraction: import("@webiny/di").Abstraction<AssetTransformationStrategy>;
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-file-manager/features/assetDelivery/abstractions/AssetType").IAssetTypeHandler>;
 };