@webiny/api-file-manager-s3 6.4.0-beta.1 → 6.4.0-beta.3

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,37 +1,12 @@
-import { createAssetDelivery, 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";
+import { createAssetDelivery } from "@webiny/api-file-manager";
+import { createRegisterExtensionPlugin } from "@webiny/handler";
+import { createS3AssetDeliveryFeature } from "./feature.js";
 const assetDeliveryConfig = (params)=>{
-    const bucket = process.env.S3_BUCKET;
-    const region = process.env.AWS_REGION;
-    const { presignedUrlTtl = 3600, imageResizeWidths = [
-        128,
-        384,
-        640,
-        750,
-        828,
-        1080,
-        1200,
-        1920,
-        2048,
-        3840
-    ], assetStreamingMaxSize = 4718592 } = params;
+    const feature = createS3AssetDeliveryFeature(params);
     return [
         createAssetDelivery(),
-        createAssetDeliveryConfig((config)=>{
-            const s3 = new S3({
-                region
-            });
-            config.decorateAssetResolver(({ container })=>new S3AssetResolver(container.resolve(GlobalKeyValueStore), s3, bucket));
-            config.decorateAssetOutputStrategy(()=>new S3OutputStrategy(s3, bucket, presignedUrlTtl, assetStreamingMaxSize));
-            config.decorateAssetTransformationStrategy(()=>new SharpTransform({
-                    s3,
-                    bucket,
-                    imageResizeWidths
-                }));
+        createRegisterExtensionPlugin((context)=>{
+            feature.register(context.container);
         })
     ];
 };

package/assetDelivery/assetDeliveryConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetDelivery/assetDeliveryConfig.js","sources":["../../src/assetDelivery/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"],"names":["assetDeliveryConfig","params","bucket","process","region","presignedUrlTtl","imageResizeWidths","assetStreamingMaxSize","createBaseAssetDelivery","createAssetDeliveryConfig","config","s3","S3","container","S3AssetResolver","GlobalKeyValueStore","S3OutputStrategy","SharpTransform"],"mappings":";;;;;;AAWO,MAAMA,sBAAsB,CAACC;IAChC,MAAMC,SAASC,QAAQ,GAAG,CAAC,SAAS;IACpC,MAAMC,SAASD,QAAQ,GAAG,CAAC,UAAU;IAErC,MAAM,EAEFE,kBAAkB,IAAI,EACtBC,oBAAoB;QAAC;QAAK;QAAK;QAAK;QAAK;QAAK;QAAM;QAAM;QAAM;QAAM;KAAK,EAK3EC,wBAAwB,OAAO,EAClC,GAAGN;IAEJ,OAAO;QAEHO;QAEAC,0BAA0BC,CAAAA;YACtB,MAAMC,KAAK,IAAIC,GAAG;gBAAER;YAAO;YAE3BM,OAAO,qBAAqB,CAAC,CAAC,EAAEG,SAAS,EAAE,GAEhC,IAAIC,gBAAgBD,UAAU,OAAO,CAACE,sBAAsBJ,IAAIT;YAG3EQ,OAAO,2BAA2B,CAAC,IACxB,IAAIM,iBAAiBL,IAAIT,QAAQG,iBAAiBE;YAG7DG,OAAO,mCAAmC,CAAC,IAChC,IAAIO,eAAe;oBAAEN;oBAAIT;oBAAQI;gBAAkB;QAElE;KACH;AACL"}
+{"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/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/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,6 +1,9 @@
 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";
+import { S3Bucket, S3Client } from "../abstractions.js";
 class S3AssetResolver {
     constructor(keyValueStore, s3, bucket){
         this.keyValueStore = keyValueStore;
@@ -23,6 +26,14 @@ class S3AssetResolver {
         return asset;
     }
 }
-export { S3AssetResolver };
+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,"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 { 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"],"names":["S3AssetResolver","keyValueStore","s3","bucket","request","fileId","ObjectKey","result","metadata","asset","Asset","S3ContentsReader"],"mappings":";;;AAeO,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"}
+{"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/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,12 +1,14 @@
+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";
+import { S3AssetDeliveryConfig, S3Bucket, S3Client } from "../abstractions.js";
 class S3OutputStrategy {
-    constructor(s3, bucket, presignedUrlTtl, assetStreamingMaxSize){
-        this.assetStreamingMaxSize = assetStreamingMaxSize;
-        this.presignedUrlTtl = presignedUrlTtl;
+    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) {
@@ -25,6 +27,14 @@ class S3OutputStrategy {
         });
     }
 }
-export { S3OutputStrategy };
+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,"file":"assetDelivery/s3/S3OutputStrategy.js","sources":["../../../src/assetDelivery/s3/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"],"names":["S3OutputStrategy","s3","bucket","presignedUrlTtl","assetStreamingMaxSize","asset","console","S3RedirectAssetReply","S3StreamAssetReply","getSignedUrl","GetObjectCommand"],"mappings":";;;AAUO,MAAMA;IAMT,YAAYC,EAAM,EAAEC,MAAc,EAAEC,eAAuB,EAAEC,qBAA6B,CAAE;QACxF,IAAI,CAAC,qBAAqB,GAAGA;QAC7B,IAAI,CAAC,eAAe,GAAGD;QACvB,IAAI,CAAC,EAAE,GAAGF;QACV,IAAI,CAAC,MAAM,GAAGC;IAClB;IAEA,MAAM,OAAOG,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"}
+{"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/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>;
+};

package/assetDelivery/s3/SharpTransform.js

@@ -1,11 +1,15 @@
 import sharp from "sharp";
+import { AssetTransformationStrategy } from "@webiny/api-file-manager/features/assetDelivery/abstractions.js";
 import { WidthCollection } from "./transformation/WidthCollection.js";
 import { CallableContentsReader } from "./transformation/CallableContentsReader.js";
 import { AssetKeyGenerator } from "./transformation/AssetKeyGenerator.js";
+import { S3AssetDeliveryConfig, S3Bucket, S3Client } from "../abstractions.js";
 import * as __rspack_external__transformation_utils_js_d3dc8821 from "./transformation/utils.js";
 class SharpTransform {
-    constructor(params){
-        this.params = params;
+    constructor(s3, bucket, config){
+        this.s3 = s3;
+        this.bucket = bucket;
+        this.imageResizeWidths = config.imageResizeWidths;
     }
     async transform(assetRequest, asset) {
         if (!__rspack_external__transformation_utils_js_d3dc8821.SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension())) {
@@ -19,12 +23,11 @@ class SharpTransform {
     }
     async transformAsset(asset, options) {
         if (options.width) {
-            const { s3, bucket } = this.params;
             const assetKey = new AssetKeyGenerator(asset);
             const transformedAssetKey = assetKey.getTransformedImageKey(options);
             try {
-                const { Body } = await s3.getObject({
-                    Bucket: bucket,
+                const { Body } = await this.s3.getObject({
+                    Bucket: this.bucket,
                     Key: transformedAssetKey
                 });
                 if (!Body) throw new Error("Missing image body!");
@@ -40,7 +43,7 @@ class SharpTransform {
                 return newAsset;
             } catch  {
                 const optimizedImage = await this.optimizeAsset(asset);
-                const widths = new WidthCollection(this.params.imageResizeWidths);
+                const widths = new WidthCollection(this.imageResizeWidths);
                 const width = widths.getClosestOrMax(options.width);
                 console.log(`Resize the asset (width: ${width})`);
                 const buffer = await optimizedImage.getContents();
@@ -54,8 +57,8 @@ class SharpTransform {
                     size: transformedBuffer.length
                 });
                 newAsset.setContentsReader(new CallableContentsReader(()=>transformedBuffer));
-                await s3.putObject({
-                    Bucket: bucket,
+                await this.s3.putObject({
+                    Bucket: this.bucket,
                     Key: transformedAssetKey,
                     ContentType: newAsset.getContentType(),
                     Body: await newAsset.getContents()
@@ -70,7 +73,6 @@ class SharpTransform {
         return asset;
     }
     async optimizeAsset(asset) {
-        const { s3, bucket } = this.params;
         console.log("Optimize asset", {
             id: asset.getId(),
             key: asset.getKey(),
@@ -80,8 +82,8 @@ class SharpTransform {
         const assetKey = new AssetKeyGenerator(asset);
         const optimizedAssetKey = assetKey.getOptimizedImageKey();
         try {
-            const { Body } = await s3.getObject({
-                Bucket: bucket,
+            const { Body } = await this.s3.getObject({
+                Bucket: this.bucket,
                 Key: optimizedAssetKey
             });
             if (!Body) throw new Error("Missing image body!");
@@ -111,8 +113,8 @@ class SharpTransform {
                 size: optimizedBuffer.length
             });
             newAsset.setContentsReader(new CallableContentsReader(()=>optimizedBuffer));
-            await s3.putObject({
-                Bucket: bucket,
+            await this.s3.putObject({
+                Bucket: this.bucket,
                 Key: optimizedAssetKey,
                 ContentType: newAsset.getContentType(),
                 Body: await newAsset.getContents()
@@ -147,6 +149,14 @@ class SharpTransform {
         });
     }
 }
-export { SharpTransform };
+const SharpTransformImpl = AssetTransformationStrategy.createImplementation({
+    implementation: SharpTransform,
+    dependencies: [
+        S3Client,
+        S3Bucket,
+        S3AssetDeliveryConfig
+    ]
+});
+export { SharpTransform, SharpTransformImpl };
 
 //# sourceMappingURL=SharpTransform.js.map

package/assetDelivery/s3/SharpTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetDelivery/s3/SharpTransform.js","sources":["../../../src/assetDelivery/s3/SharpTransform.ts"],"sourcesContent":["import sharp from \"sharp\";\nimport type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type {\n    Asset,\n    AssetRequest,\n    AssetRequestOptions,\n    AssetTransformationStrategy\n} from \"@webiny/api-file-manager\";\nimport { WidthCollection } from \"./transformation/WidthCollection.js\";\nimport * as utils from \"./transformation/utils.js\";\nimport { CallableContentsReader } from \"./transformation/CallableContentsReader.js\";\nimport { AssetKeyGenerator } from \"./transformation/AssetKeyGenerator.js\";\n\ninterface SharpTransformationParams {\n    s3: S3;\n    bucket: string;\n    imageResizeWidths: number[];\n}\n\nexport class SharpTransform implements AssetTransformationStrategy {\n    private readonly params: SharpTransformationParams;\n\n    constructor(params: SharpTransformationParams) {\n        this.params = params;\n    }\n\n    async transform(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        if (!utils.SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension())) {\n            console.log(\n                `Transformations/optimizations of ${asset.getContentType()} assets are not supported. Skipping.`\n            );\n            return asset;\n        }\n\n        // `original` is part of the request, but it won't even get to this point in the execution.\n        // oxlint-disable-next-line typescript/no-unused-vars\n        const { original, ...options } = assetRequest.getOptions();\n\n        const transformedAsset = asset.clone();\n\n        if (Object.keys(options).length > 0) {\n            // Transformations were requested.\n            return this.transformAsset(transformedAsset, options);\n        }\n\n        // Return an optimized asset.\n        return this.optimizeAsset(transformedAsset);\n    }\n\n    private async transformAsset(asset: Asset, options: Omit<AssetRequestOptions, \"original\">) {\n        if (options.width) {\n            const { s3, bucket } = this.params;\n\n            const assetKey = new AssetKeyGenerator(asset);\n            const transformedAssetKey = assetKey.getTransformedImageKey(options);\n\n            try {\n                const { Body } = await s3.getObject({\n                    Bucket: bucket,\n                    Key: transformedAssetKey\n                });\n\n                if (!Body) {\n                    throw new Error(`Missing image body!`);\n                }\n\n                const buffer = Buffer.from(await Body.transformToByteArray());\n\n                const newAsset = asset.withProps({ size: buffer.length });\n                newAsset.setContentsReader(new CallableContentsReader(() => buffer));\n\n                console.log(`Return a previously transformed asset`, {\n                    key: transformedAssetKey,\n                    size: newAsset.getSize()\n                });\n\n                return newAsset;\n            } catch {\n                const optimizedImage = await this.optimizeAsset(asset);\n\n                const widths = new WidthCollection(this.params.imageResizeWidths);\n                const width = widths.getClosestOrMax(options.width);\n\n                /**\n                 * `width` is the only transformation we currently support.\n                 */\n                console.log(`Resize the asset (width: ${width})`);\n                const buffer = await optimizedImage.getContents();\n                const transformedBuffer = await sharp(buffer, {\n                    animated: this.isAssetAnimated(asset)\n                })\n                    .withMetadata()\n                    .resize({ width, withoutEnlargement: true })\n                    .toBuffer();\n\n                /**\n                 * Transformations are applied to the optimized image.\n                 */\n                const newAsset = asset.withProps({ size: transformedBuffer.length });\n                newAsset.setContentsReader(new CallableContentsReader(() => transformedBuffer));\n\n                await s3.putObject({\n                    Bucket: bucket,\n                    Key: transformedAssetKey,\n                    ContentType: newAsset.getContentType(),\n                    Body: await newAsset.getContents()\n                });\n\n                console.log(`Return the resized asset`, {\n                    key: transformedAssetKey,\n                    size: newAsset.getSize()\n                });\n\n                return newAsset;\n            }\n        }\n\n        return asset;\n    }\n\n    private async optimizeAsset(asset: Asset) {\n        const { s3, bucket } = this.params;\n\n        console.log(\"Optimize asset\", {\n            id: asset.getId(),\n            key: asset.getKey(),\n            size: asset.getSize(),\n            type: asset.getContentType()\n        });\n\n        const assetKey = new AssetKeyGenerator(asset);\n        const optimizedAssetKey = assetKey.getOptimizedImageKey();\n\n        try {\n            const { Body } = await s3.getObject({\n                Bucket: bucket,\n                Key: optimizedAssetKey\n            });\n\n            if (!Body) {\n                throw new Error(`Missing image body!`);\n            }\n\n            console.log(\"Return a previously optimized asset\", optimizedAssetKey);\n\n            const buffer = Buffer.from(await Body.transformToByteArray());\n\n            const newAsset = asset.withProps({ size: buffer.length });\n            newAsset.setContentsReader(new CallableContentsReader(() => buffer));\n\n            return newAsset;\n        } catch {\n            console.log(\"Create an optimized version of the original asset\", asset.getKey());\n            // If not found, create an optimized version of the original asset.\n            const buffer = await asset.getContents();\n\n            const optimizationMap: Record<string, ((buffer: Buffer) => sharp.Sharp) | undefined> = {\n                \"image/png\": (buffer: Buffer) => this.optimizePng(buffer),\n                \"image/jpeg\": (buffer: Buffer) => this.optimizeJpeg(buffer),\n                \"image/jpg\": (buffer: Buffer) => this.optimizeJpeg(buffer)\n            };\n\n            const optimization = optimizationMap[asset.getContentType()];\n\n            if (!optimization) {\n                console.log(`No optimizations defined for ${asset.getContentType()}`);\n                return asset;\n            }\n\n            const optimizedBuffer = await optimization(buffer).toBuffer();\n\n            console.log(\"Optimized asset size\", optimizedBuffer.length);\n\n            const newAsset = asset.withProps({ size: optimizedBuffer.length });\n            newAsset.setContentsReader(new CallableContentsReader(() => optimizedBuffer));\n\n            await s3.putObject({\n                Bucket: bucket,\n                Key: optimizedAssetKey,\n                ContentType: newAsset.getContentType(),\n                Body: await newAsset.getContents()\n            });\n\n            return newAsset;\n        }\n    }\n\n    private isAssetAnimated(asset: Asset) {\n        return [\"gif\", \"webp\"].includes(asset.getExtension());\n    }\n\n    private optimizePng(buffer: Buffer) {\n        return sharp(buffer)\n            .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n            .png({ compressionLevel: 9, adaptiveFiltering: true, force: true })\n            .withMetadata();\n    }\n\n    private optimizeJpeg(buffer: Buffer) {\n        return sharp(buffer)\n            .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n            .withMetadata()\n            .toFormat(\"jpeg\", { quality: 90 });\n    }\n}\n"],"names":["SharpTransform","params","assetRequest","asset","utils","console","original","options","transformedAsset","Object","s3","bucket","assetKey","AssetKeyGenerator","transformedAssetKey","Body","Error","buffer","Buffer","newAsset","CallableContentsReader","optimizedImage","widths","WidthCollection","width","transformedBuffer","sharp","optimizedAssetKey","optimizationMap","optimization","optimizedBuffer"],"mappings":"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"}
+{"version":3,"file":"assetDelivery/s3/SharpTransform.js","sources":["../../../src/assetDelivery/s3/SharpTransform.ts"],"sourcesContent":["import sharp from \"sharp\";\nimport type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type {\n    Asset,\n    AssetRequest,\n    AssetRequestOptions,\n    AssetTransformationStrategy\n} from \"@webiny/api-file-manager\";\nimport { AssetTransformationStrategy as AssetTransformationStrategyAbstraction } from \"@webiny/api-file-manager/features/assetDelivery/abstractions.js\";\nimport { WidthCollection } from \"./transformation/WidthCollection.js\";\nimport * as utils from \"./transformation/utils.js\";\nimport { CallableContentsReader } from \"./transformation/CallableContentsReader.js\";\nimport { AssetKeyGenerator } from \"./transformation/AssetKeyGenerator.js\";\nimport { S3Client, S3Bucket, S3AssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\nimport type { IS3AssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\n\nexport class SharpTransform implements AssetTransformationStrategy {\n    private readonly s3: S3;\n    private readonly bucket: string;\n    private readonly imageResizeWidths: number[];\n\n    constructor(s3: S3, bucket: string, config: IS3AssetDeliveryConfig) {\n        this.s3 = s3;\n        this.bucket = bucket;\n        this.imageResizeWidths = config.imageResizeWidths;\n    }\n\n    async transform(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        if (!utils.SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension())) {\n            console.log(\n                `Transformations/optimizations of ${asset.getContentType()} assets are not supported. Skipping.`\n            );\n            return asset;\n        }\n\n        // oxlint-disable-next-line typescript/no-unused-vars\n        const { original, ...options } = assetRequest.getOptions();\n\n        const transformedAsset = asset.clone();\n\n        if (Object.keys(options).length > 0) {\n            return this.transformAsset(transformedAsset, options);\n        }\n\n        return this.optimizeAsset(transformedAsset);\n    }\n\n    private async transformAsset(asset: Asset, options: Omit<AssetRequestOptions, \"original\">) {\n        if (options.width) {\n            const assetKey = new AssetKeyGenerator(asset);\n            const transformedAssetKey = assetKey.getTransformedImageKey(options);\n\n            try {\n                const { Body } = await this.s3.getObject({\n                    Bucket: this.bucket,\n                    Key: transformedAssetKey\n                });\n\n                if (!Body) {\n                    throw new Error(`Missing image body!`);\n                }\n\n                const buffer = Buffer.from(await Body.transformToByteArray());\n\n                const newAsset = asset.withProps({ size: buffer.length });\n                newAsset.setContentsReader(new CallableContentsReader(() => buffer));\n\n                console.log(`Return a previously transformed asset`, {\n                    key: transformedAssetKey,\n                    size: newAsset.getSize()\n                });\n\n                return newAsset;\n            } catch {\n                const optimizedImage = await this.optimizeAsset(asset);\n\n                const widths = new WidthCollection(this.imageResizeWidths);\n                const width = widths.getClosestOrMax(options.width);\n\n                console.log(`Resize the asset (width: ${width})`);\n                const buffer = await optimizedImage.getContents();\n                const transformedBuffer = await sharp(buffer, {\n                    animated: this.isAssetAnimated(asset)\n                })\n                    .withMetadata()\n                    .resize({ width, withoutEnlargement: true })\n                    .toBuffer();\n\n                const newAsset = asset.withProps({ size: transformedBuffer.length });\n                newAsset.setContentsReader(new CallableContentsReader(() => transformedBuffer));\n\n                await this.s3.putObject({\n                    Bucket: this.bucket,\n                    Key: transformedAssetKey,\n                    ContentType: newAsset.getContentType(),\n                    Body: await newAsset.getContents()\n                });\n\n                console.log(`Return the resized asset`, {\n                    key: transformedAssetKey,\n                    size: newAsset.getSize()\n                });\n\n                return newAsset;\n            }\n        }\n\n        return asset;\n    }\n\n    private async optimizeAsset(asset: Asset) {\n        console.log(\"Optimize asset\", {\n            id: asset.getId(),\n            key: asset.getKey(),\n            size: asset.getSize(),\n            type: asset.getContentType()\n        });\n\n        const assetKey = new AssetKeyGenerator(asset);\n        const optimizedAssetKey = assetKey.getOptimizedImageKey();\n\n        try {\n            const { Body } = await this.s3.getObject({\n                Bucket: this.bucket,\n                Key: optimizedAssetKey\n            });\n\n            if (!Body) {\n                throw new Error(`Missing image body!`);\n            }\n\n            console.log(\"Return a previously optimized asset\", optimizedAssetKey);\n\n            const buffer = Buffer.from(await Body.transformToByteArray());\n\n            const newAsset = asset.withProps({ size: buffer.length });\n            newAsset.setContentsReader(new CallableContentsReader(() => buffer));\n\n            return newAsset;\n        } catch {\n            console.log(\"Create an optimized version of the original asset\", asset.getKey());\n            const buffer = await asset.getContents();\n\n            const optimizationMap: Record<string, ((buffer: Buffer) => sharp.Sharp) | undefined> = {\n                \"image/png\": (buffer: Buffer) => this.optimizePng(buffer),\n                \"image/jpeg\": (buffer: Buffer) => this.optimizeJpeg(buffer),\n                \"image/jpg\": (buffer: Buffer) => this.optimizeJpeg(buffer)\n            };\n\n            const optimization = optimizationMap[asset.getContentType()];\n\n            if (!optimization) {\n                console.log(`No optimizations defined for ${asset.getContentType()}`);\n                return asset;\n            }\n\n            const optimizedBuffer = await optimization(buffer).toBuffer();\n\n            console.log(\"Optimized asset size\", optimizedBuffer.length);\n\n            const newAsset = asset.withProps({ size: optimizedBuffer.length });\n            newAsset.setContentsReader(new CallableContentsReader(() => optimizedBuffer));\n\n            await this.s3.putObject({\n                Bucket: this.bucket,\n                Key: optimizedAssetKey,\n                ContentType: newAsset.getContentType(),\n                Body: await newAsset.getContents()\n            });\n\n            return newAsset;\n        }\n    }\n\n    private isAssetAnimated(asset: Asset) {\n        return [\"gif\", \"webp\"].includes(asset.getExtension());\n    }\n\n    private optimizePng(buffer: Buffer) {\n        return sharp(buffer)\n            .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n            .png({ compressionLevel: 9, adaptiveFiltering: true, force: true })\n            .withMetadata();\n    }\n\n    private optimizeJpeg(buffer: Buffer) {\n        return sharp(buffer)\n            .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n            .withMetadata()\n            .toFormat(\"jpeg\", { quality: 90 });\n    }\n}\n\nexport const SharpTransformImpl = AssetTransformationStrategyAbstraction.createImplementation({\n    implementation: SharpTransform,\n    dependencies: [S3Client, S3Bucket, S3AssetDeliveryConfig]\n});\n"],"names":["SharpTransform","s3","bucket","config","assetRequest","asset","utils","console","original","options","transformedAsset","Object","assetKey","AssetKeyGenerator","transformedAssetKey","Body","Error","buffer","Buffer","newAsset","CallableContentsReader","optimizedImage","widths","WidthCollection","width","transformedBuffer","sharp","optimizedAssetKey","optimizationMap","optimization","optimizedBuffer","SharpTransformImpl","AssetTransformationStrategyAbstraction","S3Client","S3Bucket","S3AssetDeliveryConfig"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-file-manager-s3",
-	"version": "6.4.0-beta.1",
+	"version": "6.4.0-beta.3",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -14,20 +14,20 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api": "6.4.0-beta.1",
-		"@webiny/api-core": "6.4.0-beta.1",
-		"@webiny/api-file-manager": "6.4.0-beta.1",
-		"@webiny/api-websockets": "6.4.0-beta.1",
-		"@webiny/aws-sdk": "6.4.0-beta.1",
-		"@webiny/feature": "6.4.0-beta.1",
-		"@webiny/handler": "6.4.0-beta.1",
-		"@webiny/handler-aws": "6.4.0-beta.1",
-		"@webiny/handler-graphql": "6.4.0-beta.1",
-		"@webiny/plugins": "6.4.0-beta.1",
-		"@webiny/tasks": "6.4.0-beta.1",
-		"@webiny/utils": "6.4.0-beta.1",
-		"@webiny/validation": "6.4.0-beta.1",
-		"exifreader": "4.39.0",
+		"@webiny/api": "6.4.0-beta.3",
+		"@webiny/api-core": "6.4.0-beta.3",
+		"@webiny/api-file-manager": "6.4.0-beta.3",
+		"@webiny/api-websockets": "6.4.0-beta.3",
+		"@webiny/aws-sdk": "6.4.0-beta.3",
+		"@webiny/feature": "6.4.0-beta.3",
+		"@webiny/handler": "6.4.0-beta.3",
+		"@webiny/handler-aws": "6.4.0-beta.3",
+		"@webiny/handler-graphql": "6.4.0-beta.3",
+		"@webiny/plugins": "6.4.0-beta.3",
+		"@webiny/tasks": "6.4.0-beta.3",
+		"@webiny/utils": "6.4.0-beta.3",
+		"@webiny/validation": "6.4.0-beta.3",
+		"exifreader": "4.39.1",
 		"mime": "4.1.0",
 		"object-hash": "3.0.0",
 		"p-map": "7.0.4",
@@ -36,7 +36,7 @@
 		"sharp": "0.34.5"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "6.4.0-beta.1",
+		"@webiny/build-tools": "6.4.0-beta.3",
 		"rimraf": "6.1.3",
 		"typescript": "6.0.3",
 		"vitest": "4.1.6"
@@ -45,5 +45,5 @@
 		"access": "public",
 		"directory": "dist"
 	},
-	"gitHead": "73237b8243693038c072bae1c0b783387448cbbe"
+	"gitHead": "2e58681d4344024bfb60e6180338e2f154ec87f0"
 }