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

package/assetDelivery/s3/S3StreamAssetReply.js

@@ -1,16 +1,10 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.S3StreamAssetReply = void 0;
-var _apiFileManager = require("@webiny/api-file-manager");
-var _handler = require("@webiny/handler");
-class S3StreamAssetReply extends _apiFileManager.AssetReply {
+import { AssetReply } from "@webiny/api-file-manager";
+import { ResponseHeaders } from "@webiny/handler";
+export class S3StreamAssetReply extends AssetReply {
   constructor(asset) {
     super({
       code: 200,
-      headers: _handler.ResponseHeaders.create({
+      headers: ResponseHeaders.create({
         "cache-control": `public, max-age=${86400 * 365}`,
         "content-type": asset.getContentType()
       }),
@@ -18,6 +12,5 @@ class S3StreamAssetReply extends _apiFileManager.AssetReply {
     });
   }
 }
-exports.S3StreamAssetReply = S3StreamAssetReply;
 
 //# sourceMappingURL=S3StreamAssetReply.js.map

package/assetDelivery/s3/S3StreamAssetReply.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiFileManager","require","_handler","S3StreamAssetReply","AssetReply","constructor","asset","code","headers","ResponseHeaders","create","getContentType","body","getContents","exports"],"sources":["S3StreamAssetReply.ts"],"sourcesContent":["import { Asset, AssetReply } from \"@webiny/api-file-manager\";\nimport { ResponseHeaders } from \"@webiny/handler\";\n\nexport class S3StreamAssetReply extends AssetReply {\n    constructor(asset: Asset) {\n        super({\n            code: 200,\n            headers: ResponseHeaders.create({\n                \"cache-control\": `public, max-age=${86400 * 365}`,\n                \"content-type\": asset.getContentType()\n            }),\n            body: () => asset.getContents()\n        });\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAEO,MAAME,kBAAkB,SAASC,0BAAU,CAAC;EAC/CC,WAAWA,CAACC,KAAY,EAAE;IACtB,KAAK,CAAC;MACFC,IAAI,EAAE,GAAG;MACTC,OAAO,EAAEC,wBAAe,CAACC,MAAM,CAAC;QAC5B,eAAe,EAAG,mBAAkB,KAAK,GAAG,GAAI,EAAC;QACjD,cAAc,EAAEJ,KAAK,CAACK,cAAc,CAAC;MACzC,CAAC,CAAC;MACFC,IAAI,EAAEA,CAAA,KAAMN,KAAK,CAACO,WAAW,CAAC;IAClC,CAAC,CAAC;EACN;AACJ;AAACC,OAAA,CAAAX,kBAAA,GAAAA,kBAAA","ignoreList":[]}
+{"version":3,"names":["AssetReply","ResponseHeaders","S3StreamAssetReply","constructor","asset","code","headers","create","getContentType","body","getContents"],"sources":["S3StreamAssetReply.ts"],"sourcesContent":["import type { Asset } from \"@webiny/api-file-manager\";\nimport { AssetReply } from \"@webiny/api-file-manager\";\nimport { ResponseHeaders } from \"@webiny/handler\";\n\nexport class S3StreamAssetReply extends AssetReply {\n    constructor(asset: Asset) {\n        super({\n            code: 200,\n            headers: ResponseHeaders.create({\n                \"cache-control\": `public, max-age=${86400 * 365}`,\n                \"content-type\": asset.getContentType()\n            }),\n            body: () => asset.getContents()\n        });\n    }\n}\n"],"mappings":"AACA,SAASA,UAAU,QAAQ,0BAA0B;AACrD,SAASC,eAAe,QAAQ,iBAAiB;AAEjD,OAAO,MAAMC,kBAAkB,SAASF,UAAU,CAAC;EAC/CG,WAAWA,CAACC,KAAY,EAAE;IACtB,KAAK,CAAC;MACFC,IAAI,EAAE,GAAG;MACTC,OAAO,EAAEL,eAAe,CAACM,MAAM,CAAC;QAC5B,eAAe,EAAE,mBAAmB,KAAK,GAAG,GAAG,EAAE;QACjD,cAAc,EAAEH,KAAK,CAACI,cAAc,CAAC;MACzC,CAAC,CAAC;MACFC,IAAI,EAAEA,CAAA,KAAML,KAAK,CAACM,WAAW,CAAC;IAClC,CAAC,CAAC;EACN;AACJ","ignoreList":[]}

package/assetDelivery/s3/SharpTransform.d.ts

@@ -1,5 +1,5 @@
-import { S3 } from "@webiny/aws-sdk/client-s3";
-import { Asset, AssetRequest, AssetTransformationStrategy } from "@webiny/api-file-manager";
+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;

package/assetDelivery/s3/SharpTransform.js

@@ -1,22 +1,15 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SharpTransform = void 0;
-var _sharp = _interopRequireDefault(require("sharp"));
-var _WidthCollection = require("./transformation/WidthCollection");
-var utils = _interopRequireWildcard(require("./transformation/utils"));
-var _CallableContentsReader = require("./transformation/CallableContentsReader");
-var _AssetKeyGenerator = require("./transformation/AssetKeyGenerator");
-class SharpTransform {
+import sharp from "sharp";
+import { WidthCollection } from "./transformation/WidthCollection.js";
+import * as utils from "./transformation/utils.js";
+import { CallableContentsReader } from "./transformation/CallableContentsReader.js";
+import { AssetKeyGenerator } from "./transformation/AssetKeyGenerator.js";
+export class SharpTransform {
   constructor(params) {
     this.params = params;
   }
   async transform(assetRequest, asset) {
     if (!utils.SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension())) {
+      console.log(`Transformations/optimizations of ${asset.getContentType()} assets are not supported. Skipping.`);
       return asset;
     }
 
@@ -41,7 +34,7 @@ class SharpTransform {
         s3,
         bucket
       } = this.params;
-      const assetKey = new _AssetKeyGenerator.AssetKeyGenerator(asset);
+      const assetKey = new AssetKeyGenerator(asset);
       const transformedAssetKey = assetKey.getTransformedImageKey(options);
       try {
         const {
@@ -54,32 +47,50 @@ class SharpTransform {
           throw new Error(`Missing image body!`);
         }
         const buffer = Buffer.from(await Body.transformToByteArray());
-        asset.setContentsReader(new _CallableContentsReader.CallableContentsReader(() => buffer));
-      } catch (e) {
+        const newAsset = asset.withProps({
+          size: buffer.length
+        });
+        newAsset.setContentsReader(new CallableContentsReader(() => buffer));
+        console.log(`Return a previously transformed asset`, {
+          key: transformedAssetKey,
+          size: newAsset.getSize()
+        });
+        return newAsset;
+      } catch {
         const optimizedImage = await this.optimizeAsset(asset);
-        const widths = new _WidthCollection.WidthCollection(this.params.imageResizeWidths);
+        const widths = new WidthCollection(this.params.imageResizeWidths);
         const width = widths.getClosestOrMax(options.width);
 
         /**
          * `width` is the only transformation we currently support.
          */
+        console.log(`Resize the asset (width: ${width})`);
         const buffer = await optimizedImage.getContents();
-        const transformedBuffer = (0, _sharp.default)(buffer, {
+        const transformedBuffer = await sharp(buffer, {
           animated: this.isAssetAnimated(asset)
-        }).resize({
-          width
+        }).withMetadata().resize({
+          width,
+          withoutEnlargement: true
         }).toBuffer();
 
         /**
          * Transformations are applied to the optimized image.
          */
-        asset.setContentsReader(new _CallableContentsReader.CallableContentsReader(() => transformedBuffer));
+        const newAsset = asset.withProps({
+          size: transformedBuffer.length
+        });
+        newAsset.setContentsReader(new CallableContentsReader(() => transformedBuffer));
         await s3.putObject({
           Bucket: bucket,
           Key: transformedAssetKey,
-          ContentType: asset.getContentType(),
-          Body: await asset.getContents()
+          ContentType: newAsset.getContentType(),
+          Body: await newAsset.getContents()
+        });
+        console.log(`Return the resized asset`, {
+          key: transformedAssetKey,
+          size: newAsset.getSize()
         });
+        return newAsset;
       }
     }
     return asset;
@@ -89,7 +100,13 @@ class SharpTransform {
       s3,
       bucket
     } = this.params;
-    const assetKey = new _AssetKeyGenerator.AssetKeyGenerator(asset);
+    console.log("Optimize asset", {
+      id: asset.getId(),
+      key: asset.getKey(),
+      size: asset.getSize(),
+      type: asset.getContentType()
+    });
+    const assetKey = new AssetKeyGenerator(asset);
     const optimizedAssetKey = assetKey.getOptimizedImageKey();
     try {
       const {
@@ -101,9 +118,15 @@ class SharpTransform {
       if (!Body) {
         throw new Error(`Missing image body!`);
       }
+      console.log("Return a previously optimized asset", optimizedAssetKey);
       const buffer = Buffer.from(await Body.transformToByteArray());
-      asset.setContentsReader(new _CallableContentsReader.CallableContentsReader(() => buffer));
-    } catch (e) {
+      const newAsset = asset.withProps({
+        size: buffer.length
+      });
+      newAsset.setContentsReader(new CallableContentsReader(() => buffer));
+      return newAsset;
+    } catch {
+      console.log("Create an optimized version of the original asset", asset.getKey());
       // If not found, create an optimized version of the original asset.
       const buffer = await asset.getContents();
       const optimizationMap = {
@@ -113,25 +136,29 @@ class SharpTransform {
       };
       const optimization = optimizationMap[asset.getContentType()];
       if (!optimization) {
-        console.log(`no optimizations defined for ${asset.getContentType()}`);
+        console.log(`No optimizations defined for ${asset.getContentType()}`);
         return asset;
       }
-      const optimizedBuffer = optimization(buffer).toBuffer();
-      asset.setContentsReader(new _CallableContentsReader.CallableContentsReader(() => optimizedBuffer));
+      const optimizedBuffer = await optimization(buffer).toBuffer();
+      console.log("Optimized asset size", optimizedBuffer.length);
+      const newAsset = asset.withProps({
+        size: optimizedBuffer.length
+      });
+      newAsset.setContentsReader(new CallableContentsReader(() => optimizedBuffer));
       await s3.putObject({
         Bucket: bucket,
         Key: optimizedAssetKey,
-        ContentType: asset.getContentType(),
-        Body: await asset.getContents()
+        ContentType: newAsset.getContentType(),
+        Body: await newAsset.getContents()
       });
+      return newAsset;
     }
-    return asset;
   }
   isAssetAnimated(asset) {
     return ["gif", "webp"].includes(asset.getExtension());
   }
   optimizePng(buffer) {
-    return (0, _sharp.default)(buffer).resize({
+    return sharp(buffer).resize({
       width: 2560,
       withoutEnlargement: true,
       fit: "inside"
@@ -142,15 +169,14 @@ class SharpTransform {
     }).withMetadata();
   }
   optimizeJpeg(buffer) {
-    return (0, _sharp.default)(buffer).resize({
+    return sharp(buffer).resize({
       width: 2560,
       withoutEnlargement: true,
       fit: "inside"
-    }).toFormat("jpeg", {
+    }).withMetadata().toFormat("jpeg", {
       quality: 90
     });
   }
 }
-exports.SharpTransform = SharpTransform;
 
 //# sourceMappingURL=SharpTransform.js.map

package/assetDelivery/s3/SharpTransform.js.map

@@ -1 +1 @@
-{"version":3,"names":["_sharp","_interopRequireDefault","require","_WidthCollection","utils","_interopRequireWildcard","_CallableContentsReader","_AssetKeyGenerator","SharpTransform","constructor","params","transform","assetRequest","asset","SUPPORTED_TRANSFORMABLE_IMAGES","includes","getExtension","original","options","getOptions","transformedAsset","clone","Object","keys","length","transformAsset","optimizeAsset","width","s3","bucket","assetKey","AssetKeyGenerator","transformedAssetKey","getTransformedImageKey","Body","getObject","Bucket","Key","Error","buffer","Buffer","from","transformToByteArray","setContentsReader","CallableContentsReader","e","optimizedImage","widths","WidthCollection","imageResizeWidths","getClosestOrMax","getContents","transformedBuffer","sharp","animated","isAssetAnimated","resize","toBuffer","putObject","ContentType","getContentType","optimizedAssetKey","getOptimizedImageKey","optimizationMap","optimizePng","optimizeJpeg","optimization","console","log","optimizedBuffer","withoutEnlargement","fit","png","compressionLevel","adaptiveFiltering","force","withMetadata","toFormat","quality","exports"],"sources":["SharpTransform.ts"],"sourcesContent":["import sharp from \"sharp\";\nimport { S3 } from \"@webiny/aws-sdk/client-s3\";\nimport {\n    Asset,\n    AssetRequest,\n    AssetRequestOptions,\n    AssetTransformationStrategy\n} from \"@webiny/api-file-manager\";\nimport { WidthCollection } from \"./transformation/WidthCollection\";\nimport * as utils from \"./transformation/utils\";\nimport { CallableContentsReader } from \"./transformation/CallableContentsReader\";\nimport { AssetKeyGenerator } from \"./transformation/AssetKeyGenerator\";\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            return asset;\n        }\n\n        // `original` is part of the request, but it won't even get to this point in the execution.\n        // eslint-disable-next-line @typescript-eslint/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                asset.setContentsReader(new CallableContentsReader(() => buffer));\n            } catch (e) {\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                const buffer = await optimizedImage.getContents();\n                const transformedBuffer = sharp(buffer, { animated: this.isAssetAnimated(asset) })\n                    .resize({ width })\n                    .toBuffer();\n\n                /**\n                 * Transformations are applied to the optimized image.\n                 */\n                asset.setContentsReader(new CallableContentsReader(() => transformedBuffer));\n\n                await s3.putObject({\n                    Bucket: bucket,\n                    Key: transformedAssetKey,\n                    ContentType: asset.getContentType(),\n                    Body: await asset.getContents()\n                });\n            }\n        }\n\n        return asset;\n    }\n\n    private async optimizeAsset(asset: Asset) {\n        const { s3, bucket } = this.params;\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            const buffer = Buffer.from(await Body.transformToByteArray());\n\n            asset.setContentsReader(new CallableContentsReader(() => buffer));\n        } catch (e) {\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 = optimization(buffer).toBuffer();\n\n            asset.setContentsReader(new CallableContentsReader(() => optimizedBuffer));\n\n            await s3.putObject({\n                Bucket: bucket,\n                Key: optimizedAssetKey,\n                ContentType: asset.getContentType(),\n                Body: await asset.getContents()\n            });\n        }\n\n        return asset;\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            .toFormat(\"jpeg\", { quality: 90 });\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["sharp","WidthCollection","utils","CallableContentsReader","AssetKeyGenerator","SharpTransform","constructor","params","transform","assetRequest","asset","SUPPORTED_TRANSFORMABLE_IMAGES","includes","getExtension","console","log","getContentType","original","options","getOptions","transformedAsset","clone","Object","keys","length","transformAsset","optimizeAsset","width","s3","bucket","assetKey","transformedAssetKey","getTransformedImageKey","Body","getObject","Bucket","Key","Error","buffer","Buffer","from","transformToByteArray","newAsset","withProps","size","setContentsReader","key","getSize","optimizedImage","widths","imageResizeWidths","getClosestOrMax","getContents","transformedBuffer","animated","isAssetAnimated","withMetadata","resize","withoutEnlargement","toBuffer","putObject","ContentType","id","getId","getKey","type","optimizedAssetKey","getOptimizedImageKey","optimizationMap","optimizePng","optimizeJpeg","optimization","optimizedBuffer","fit","png","compressionLevel","adaptiveFiltering","force","toFormat","quality"],"sources":["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        // eslint-disable-next-line @typescript-eslint/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"],"mappings":"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","ignoreList":[]}

package/assetDelivery/s3/transformation/AssetKeyGenerator.d.ts

@@ -1,4 +1,4 @@
-import { Asset } from "@webiny/api-file-manager";
+import type { Asset } from "@webiny/api-file-manager";
 export declare class AssetKeyGenerator {
     private utils;
     private asset;

package/assetDelivery/s3/transformation/AssetKeyGenerator.js

@@ -1,16 +1,8 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.AssetKeyGenerator = void 0;
-var newUtils = _interopRequireWildcard(require("./utils"));
-var legacyUtils = _interopRequireWildcard(require("./legacyUtils"));
-class AssetKeyGenerator {
+import * as newUtils from "./utils.js";
+export class AssetKeyGenerator {
   constructor(asset) {
     this.asset = asset;
-    this.utils = asset.getKey().includes("/") ? newUtils : legacyUtils;
+    this.utils = newUtils;
   }
   getOptimizedImageKey() {
     return this.utils.getImageKey({
@@ -24,6 +16,5 @@ class AssetKeyGenerator {
     });
   }
 }
-exports.AssetKeyGenerator = AssetKeyGenerator;
 
 //# sourceMappingURL=AssetKeyGenerator.js.map

package/assetDelivery/s3/transformation/AssetKeyGenerator.js.map

@@ -1 +1 @@
-{"version":3,"names":["newUtils","_interopRequireWildcard","require","legacyUtils","AssetKeyGenerator","constructor","asset","utils","getKey","includes","getOptimizedImageKey","getImageKey","key","getTransformedImageKey","transformations","exports"],"sources":["AssetKeyGenerator.ts"],"sourcesContent":["import { Asset } from \"@webiny/api-file-manager\";\nimport * as newUtils from \"./utils\";\nimport * as legacyUtils from \"./legacyUtils\";\n\nexport class AssetKeyGenerator {\n    private utils: typeof newUtils;\n    private asset: Asset;\n\n    constructor(asset: Asset) {\n        this.asset = asset;\n        this.utils = asset.getKey().includes(\"/\") ? newUtils : legacyUtils;\n    }\n\n    getOptimizedImageKey() {\n        return this.utils.getImageKey({ key: this.asset.getKey() });\n    }\n    getTransformedImageKey(transformations: Record<string, any>) {\n        return this.utils.getImageKey({ key: this.asset.getKey(), transformations });\n    }\n}\n"],"mappings":";;;;;;;AACA,IAAAA,QAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,WAAA,GAAAF,uBAAA,CAAAC,OAAA;AAEO,MAAME,iBAAiB,CAAC;EAI3BC,WAAWA,CAACC,KAAY,EAAE;IACtB,IAAI,CAACA,KAAK,GAAGA,KAAK;IAClB,IAAI,CAACC,KAAK,GAAGD,KAAK,CAACE,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,GAAG,CAAC,GAAGT,QAAQ,GAAGG,WAAW;EACtE;EAEAO,oBAAoBA,CAAA,EAAG;IACnB,OAAO,IAAI,CAACH,KAAK,CAACI,WAAW,CAAC;MAAEC,GAAG,EAAE,IAAI,CAACN,KAAK,CAACE,MAAM,CAAC;IAAE,CAAC,CAAC;EAC/D;EACAK,sBAAsBA,CAACC,eAAoC,EAAE;IACzD,OAAO,IAAI,CAACP,KAAK,CAACI,WAAW,CAAC;MAAEC,GAAG,EAAE,IAAI,CAACN,KAAK,CAACE,MAAM,CAAC,CAAC;MAAEM;IAAgB,CAAC,CAAC;EAChF;AACJ;AAACC,OAAA,CAAAX,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"names":["newUtils","AssetKeyGenerator","constructor","asset","utils","getOptimizedImageKey","getImageKey","key","getKey","getTransformedImageKey","transformations"],"sources":["AssetKeyGenerator.ts"],"sourcesContent":["import type { Asset } from \"@webiny/api-file-manager\";\nimport * as newUtils from \"./utils.js\";\n\nexport class AssetKeyGenerator {\n    private utils: typeof newUtils;\n    private asset: Asset;\n\n    constructor(asset: Asset) {\n        this.asset = asset;\n        this.utils = newUtils;\n    }\n\n    getOptimizedImageKey() {\n        return this.utils.getImageKey({ key: this.asset.getKey() });\n    }\n    getTransformedImageKey(transformations: Record<string, any>) {\n        return this.utils.getImageKey({ key: this.asset.getKey(), transformations });\n    }\n}\n"],"mappings":"AACA,OAAO,KAAKA,QAAQ;AAEpB,OAAO,MAAMC,iBAAiB,CAAC;EAI3BC,WAAWA,CAACC,KAAY,EAAE;IACtB,IAAI,CAACA,KAAK,GAAGA,KAAK;IAClB,IAAI,CAACC,KAAK,GAAGJ,QAAQ;EACzB;EAEAK,oBAAoBA,CAAA,EAAG;IACnB,OAAO,IAAI,CAACD,KAAK,CAACE,WAAW,CAAC;MAAEC,GAAG,EAAE,IAAI,CAACJ,KAAK,CAACK,MAAM,CAAC;IAAE,CAAC,CAAC;EAC/D;EACAC,sBAAsBA,CAACC,eAAoC,EAAE;IACzD,OAAO,IAAI,CAACN,KAAK,CAACE,WAAW,CAAC;MAAEC,GAAG,EAAE,IAAI,CAACJ,KAAK,CAACK,MAAM,CAAC,CAAC;MAAEE;IAAgB,CAAC,CAAC;EAChF;AACJ","ignoreList":[]}

package/assetDelivery/s3/transformation/CallableContentsReader.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" />
-import { AssetContentsReader } from "@webiny/api-file-manager";
+import type { AssetContentsReader } from "@webiny/api-file-manager";
 interface ContentsCallable {
     (): Promise<Buffer> | Buffer;
 }

package/assetDelivery/s3/transformation/CallableContentsReader.js

@@ -1,10 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CallableContentsReader = void 0;
-class CallableContentsReader {
+export class CallableContentsReader {
   constructor(callable) {
     this.callable = callable;
   }
@@ -12,6 +6,5 @@ class CallableContentsReader {
     return this.callable();
   }
 }
-exports.CallableContentsReader = CallableContentsReader;
 
 //# sourceMappingURL=CallableContentsReader.js.map

package/assetDelivery/s3/transformation/CallableContentsReader.js.map

@@ -1 +1 @@
-{"version":3,"names":["CallableContentsReader","constructor","callable","read","exports"],"sources":["CallableContentsReader.ts"],"sourcesContent":["import { AssetContentsReader } from \"@webiny/api-file-manager\";\n\ninterface ContentsCallable {\n    (): Promise<Buffer> | Buffer;\n}\n\nexport class CallableContentsReader implements AssetContentsReader {\n    private readonly callable: ContentsCallable;\n\n    constructor(callable: ContentsCallable) {\n        this.callable = callable;\n    }\n\n    async read(): Promise<Buffer> {\n        return this.callable();\n    }\n}\n"],"mappings":";;;;;;AAMO,MAAMA,sBAAsB,CAAgC;EAG/DC,WAAWA,CAACC,QAA0B,EAAE;IACpC,IAAI,CAACA,QAAQ,GAAGA,QAAQ;EAC5B;EAEA,MAAMC,IAAIA,CAAA,EAAoB;IAC1B,OAAO,IAAI,CAACD,QAAQ,CAAC,CAAC;EAC1B;AACJ;AAACE,OAAA,CAAAJ,sBAAA,GAAAA,sBAAA","ignoreList":[]}
+{"version":3,"names":["CallableContentsReader","constructor","callable","read"],"sources":["CallableContentsReader.ts"],"sourcesContent":["import type { AssetContentsReader } from \"@webiny/api-file-manager\";\n\ninterface ContentsCallable {\n    (): Promise<Buffer> | Buffer;\n}\n\nexport class CallableContentsReader implements AssetContentsReader {\n    private readonly callable: ContentsCallable;\n\n    constructor(callable: ContentsCallable) {\n        this.callable = callable;\n    }\n\n    async read(): Promise<Buffer> {\n        return this.callable();\n    }\n}\n"],"mappings":"AAMA,OAAO,MAAMA,sBAAsB,CAAgC;EAG/DC,WAAWA,CAACC,QAA0B,EAAE;IACpC,IAAI,CAACA,QAAQ,GAAGA,QAAQ;EAC5B;EAEA,MAAMC,IAAIA,CAAA,EAAoB;IAC1B,OAAO,IAAI,CAACD,QAAQ,CAAC,CAAC;EAC1B;AACJ","ignoreList":[]}

package/assetDelivery/s3/transformation/WidthCollection.js

@@ -1,10 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.WidthCollection = void 0;
-class WidthCollection {
+export class WidthCollection {
   constructor(values) {
     this.values = values.sort((a, b) => a - b);
   }
@@ -22,6 +16,5 @@ class WidthCollection {
     return gteGivenValue.length > 0 ? gteGivenValue[0] : this.max();
   }
 }
-exports.WidthCollection = WidthCollection;
 
 //# sourceMappingURL=WidthCollection.js.map

package/assetDelivery/s3/transformation/WidthCollection.js.map

@@ -1 +1 @@
-{"version":3,"names":["WidthCollection","constructor","values","sort","a","b","max","Math","min","getClosestOrMax","value","gteGivenValue","filter","w","length","exports"],"sources":["WidthCollection.ts"],"sourcesContent":["export class WidthCollection {\n    private readonly values: number[];\n\n    constructor(values: number[]) {\n        this.values = values.sort((a, b) => a - b);\n    }\n\n    max() {\n        return Math.max(...this.values);\n    }\n\n    min() {\n        return Math.min(...this.values);\n    }\n\n    getClosestOrMax(value: number | undefined): number {\n        if (!value) {\n            return this.max();\n        }\n        const gteGivenValue = this.values.filter(w => w >= value);\n        return gteGivenValue.length > 0 ? gteGivenValue[0] : this.max();\n    }\n}\n"],"mappings":";;;;;;AAAO,MAAMA,eAAe,CAAC;EAGzBC,WAAWA,CAACC,MAAgB,EAAE;IAC1B,IAAI,CAACA,MAAM,GAAGA,MAAM,CAACC,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKD,CAAC,GAAGC,CAAC,CAAC;EAC9C;EAEAC,GAAGA,CAAA,EAAG;IACF,OAAOC,IAAI,CAACD,GAAG,CAAC,GAAG,IAAI,CAACJ,MAAM,CAAC;EACnC;EAEAM,GAAGA,CAAA,EAAG;IACF,OAAOD,IAAI,CAACC,GAAG,CAAC,GAAG,IAAI,CAACN,MAAM,CAAC;EACnC;EAEAO,eAAeA,CAACC,KAAyB,EAAU;IAC/C,IAAI,CAACA,KAAK,EAAE;MACR,OAAO,IAAI,CAACJ,GAAG,CAAC,CAAC;IACrB;IACA,MAAMK,aAAa,GAAG,IAAI,CAACT,MAAM,CAACU,MAAM,CAACC,CAAC,IAAIA,CAAC,IAAIH,KAAK,CAAC;IACzD,OAAOC,aAAa,CAACG,MAAM,GAAG,CAAC,GAAGH,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAACL,GAAG,CAAC,CAAC;EACnE;AACJ;AAACS,OAAA,CAAAf,eAAA,GAAAA,eAAA","ignoreList":[]}
+{"version":3,"names":["WidthCollection","constructor","values","sort","a","b","max","Math","min","getClosestOrMax","value","gteGivenValue","filter","w","length"],"sources":["WidthCollection.ts"],"sourcesContent":["export class WidthCollection {\n    private readonly values: number[];\n\n    constructor(values: number[]) {\n        this.values = values.sort((a, b) => a - b);\n    }\n\n    max() {\n        return Math.max(...this.values);\n    }\n\n    min() {\n        return Math.min(...this.values);\n    }\n\n    getClosestOrMax(value: number | undefined): number {\n        if (!value) {\n            return this.max();\n        }\n        const gteGivenValue = this.values.filter(w => w >= value);\n        return gteGivenValue.length > 0 ? gteGivenValue[0] : this.max();\n    }\n}\n"],"mappings":"AAAA,OAAO,MAAMA,eAAe,CAAC;EAGzBC,WAAWA,CAACC,MAAgB,EAAE;IAC1B,IAAI,CAACA,MAAM,GAAGA,MAAM,CAACC,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKD,CAAC,GAAGC,CAAC,CAAC;EAC9C;EAEAC,GAAGA,CAAA,EAAG;IACF,OAAOC,IAAI,CAACD,GAAG,CAAC,GAAG,IAAI,CAACJ,MAAM,CAAC;EACnC;EAEAM,GAAGA,CAAA,EAAG;IACF,OAAOD,IAAI,CAACC,GAAG,CAAC,GAAG,IAAI,CAACN,MAAM,CAAC;EACnC;EAEAO,eAAeA,CAACC,KAAyB,EAAU;IAC/C,IAAI,CAACA,KAAK,EAAE;MACR,OAAO,IAAI,CAACJ,GAAG,CAAC,CAAC;IACrB;IACA,MAAMK,aAAa,GAAG,IAAI,CAACT,MAAM,CAACU,MAAM,CAACC,CAAC,IAAIA,CAAC,IAAIH,KAAK,CAAC;IACzD,OAAOC,aAAa,CAACG,MAAM,GAAG,CAAC,GAAGH,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAACL,GAAG,CAAC,CAAC;EACnE;AACJ","ignoreList":[]}

package/assetDelivery/s3/transformation/utils.d.ts

@@ -1,6 +1,4 @@
 declare const SUPPORTED_TRANSFORMABLE_IMAGES: string[];
-declare const OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = "img-o-t-";
-declare const OPTIMIZED_IMAGE_PREFIX = "img-o-";
 declare const getOptimizedImageKeyPrefix: (key: string) => string;
 declare const getOptimizedTransformedImageKeyPrefix: (key: string, transformationsHash: string) => string;
 interface GetImageKeyParams {
@@ -8,4 +6,4 @@ interface GetImageKeyParams {
     transformations?: any;
 }
 declare const getImageKey: ({ key, transformations }: GetImageKeyParams) => string;
-export { SUPPORTED_TRANSFORMABLE_IMAGES, OPTIMIZED_TRANSFORMED_IMAGE_PREFIX, OPTIMIZED_IMAGE_PREFIX, getImageKey, getOptimizedImageKeyPrefix, getOptimizedTransformedImageKeyPrefix };
+export { SUPPORTED_TRANSFORMABLE_IMAGES, getImageKey, getOptimizedImageKeyPrefix, getOptimizedTransformedImageKeyPrefix };

package/assetDelivery/s3/transformation/utils.js

@@ -1,24 +1,28 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getOptimizedTransformedImageKeyPrefix = exports.getOptimizedImageKeyPrefix = exports.getImageKey = exports.SUPPORTED_TRANSFORMABLE_IMAGES = exports.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = exports.OPTIMIZED_IMAGE_PREFIX = void 0;
-var _objectHash = _interopRequireDefault(require("object-hash"));
-const SUPPORTED_TRANSFORMABLE_IMAGES = exports.SUPPORTED_TRANSFORMABLE_IMAGES = ["jpg", "jpeg", "png", "webp"];
-const OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = exports.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = "img-o-t-";
-const OPTIMIZED_IMAGE_PREFIX = exports.OPTIMIZED_IMAGE_PREFIX = "img-o-";
+import objectHash from "object-hash";
+import path from "node:path";
+const SUPPORTED_TRANSFORMABLE_IMAGES = ["jpg", "jpeg", "png", "webp"];
+const parseKey = key => {
+  const filename = path.basename(key);
+  const dirname = path.dirname(key);
+  return {
+    filename,
+    dirname
+  };
+};
 const getOptimizedImageKeyPrefix = key => {
-  const [id, name] = key.split("/");
-  return `${id}/${OPTIMIZED_IMAGE_PREFIX}${name}`;
+  const {
+    filename,
+    dirname
+  } = parseKey(key);
+  return `${dirname}/optimized/${filename}`;
 };
-exports.getOptimizedImageKeyPrefix = getOptimizedImageKeyPrefix;
 const getOptimizedTransformedImageKeyPrefix = (key, transformationsHash) => {
-  const [id, name] = key.split("/");
-  return `${id}/${OPTIMIZED_TRANSFORMED_IMAGE_PREFIX}${transformationsHash}-${name}`;
+  const {
+    filename,
+    dirname
+  } = parseKey(key);
+  return `${dirname}/optimized/${transformationsHash}-${filename}`;
 };
-exports.getOptimizedTransformedImageKeyPrefix = getOptimizedTransformedImageKeyPrefix;
 const getImageKey = ({
   key,
   transformations
@@ -26,8 +30,8 @@ const getImageKey = ({
   if (!transformations) {
     return getOptimizedImageKeyPrefix(key);
   }
-  return getOptimizedTransformedImageKeyPrefix(key, (0, _objectHash.default)(transformations));
+  return getOptimizedTransformedImageKeyPrefix(key, objectHash(transformations));
 };
-exports.getImageKey = getImageKey;
+export { SUPPORTED_TRANSFORMABLE_IMAGES, getImageKey, getOptimizedImageKeyPrefix, getOptimizedTransformedImageKeyPrefix };
 
 //# sourceMappingURL=utils.js.map

package/assetDelivery/s3/transformation/utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["_objectHash","_interopRequireDefault","require","SUPPORTED_TRANSFORMABLE_IMAGES","exports","OPTIMIZED_TRANSFORMED_IMAGE_PREFIX","OPTIMIZED_IMAGE_PREFIX","getOptimizedImageKeyPrefix","key","id","name","split","getOptimizedTransformedImageKeyPrefix","transformationsHash","getImageKey","transformations","objectHash"],"sources":["utils.ts"],"sourcesContent":["import objectHash from \"object-hash\";\n\nconst SUPPORTED_TRANSFORMABLE_IMAGES = [\"jpg\", \"jpeg\", \"png\", \"webp\"];\nconst OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = \"img-o-t-\";\nconst OPTIMIZED_IMAGE_PREFIX = \"img-o-\";\n\nconst getOptimizedImageKeyPrefix = (key: string): string => {\n    const [id, name] = key.split(\"/\");\n    return `${id}/${OPTIMIZED_IMAGE_PREFIX}${name}`;\n};\n\nconst getOptimizedTransformedImageKeyPrefix = (\n    key: string,\n    transformationsHash: string\n): string => {\n    const [id, name] = key.split(\"/\");\n    return `${id}/${OPTIMIZED_TRANSFORMED_IMAGE_PREFIX}${transformationsHash}-${name}`;\n};\n\ninterface GetImageKeyParams {\n    key: string;\n    transformations?: any;\n}\n\nconst getImageKey = ({ key, transformations }: GetImageKeyParams): string => {\n    if (!transformations) {\n        return getOptimizedImageKeyPrefix(key);\n    }\n\n    return getOptimizedTransformedImageKeyPrefix(key, objectHash(transformations));\n};\n\nexport {\n    SUPPORTED_TRANSFORMABLE_IMAGES,\n    OPTIMIZED_TRANSFORMED_IMAGE_PREFIX,\n    OPTIMIZED_IMAGE_PREFIX,\n    getImageKey,\n    getOptimizedImageKeyPrefix,\n    getOptimizedTransformedImageKeyPrefix\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,MAAMC,8BAA8B,GAAAC,OAAA,CAAAD,8BAAA,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;AACrE,MAAME,kCAAkC,GAAAD,OAAA,CAAAC,kCAAA,GAAG,UAAU;AACrD,MAAMC,sBAAsB,GAAAF,OAAA,CAAAE,sBAAA,GAAG,QAAQ;AAEvC,MAAMC,0BAA0B,GAAIC,GAAW,IAAa;EACxD,MAAM,CAACC,EAAE,EAAEC,IAAI,CAAC,GAAGF,GAAG,CAACG,KAAK,CAAC,GAAG,CAAC;EACjC,OAAQ,GAAEF,EAAG,IAAGH,sBAAuB,GAAEI,IAAK,EAAC;AACnD,CAAC;AAACN,OAAA,CAAAG,0BAAA,GAAAA,0BAAA;AAEF,MAAMK,qCAAqC,GAAGA,CAC1CJ,GAAW,EACXK,mBAA2B,KAClB;EACT,MAAM,CAACJ,EAAE,EAAEC,IAAI,CAAC,GAAGF,GAAG,CAACG,KAAK,CAAC,GAAG,CAAC;EACjC,OAAQ,GAAEF,EAAG,IAAGJ,kCAAmC,GAAEQ,mBAAoB,IAAGH,IAAK,EAAC;AACtF,CAAC;AAACN,OAAA,CAAAQ,qCAAA,GAAAA,qCAAA;AAOF,MAAME,WAAW,GAAGA,CAAC;EAAEN,GAAG;EAAEO;AAAmC,CAAC,KAAa;EACzE,IAAI,CAACA,eAAe,EAAE;IAClB,OAAOR,0BAA0B,CAACC,GAAG,CAAC;EAC1C;EAEA,OAAOI,qCAAqC,CAACJ,GAAG,EAAE,IAAAQ,mBAAU,EAACD,eAAe,CAAC,CAAC;AAClF,CAAC;AAACX,OAAA,CAAAU,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["objectHash","path","SUPPORTED_TRANSFORMABLE_IMAGES","parseKey","key","filename","basename","dirname","getOptimizedImageKeyPrefix","getOptimizedTransformedImageKeyPrefix","transformationsHash","getImageKey","transformations"],"sources":["utils.ts"],"sourcesContent":["import objectHash from \"object-hash\";\nimport path from \"node:path\";\n\nconst SUPPORTED_TRANSFORMABLE_IMAGES = [\"jpg\", \"jpeg\", \"png\", \"webp\"];\n\nconst parseKey = (key: string) => {\n    const filename = path.basename(key);\n    const dirname = path.dirname(key);\n\n    return { filename, dirname };\n};\n\nconst getOptimizedImageKeyPrefix = (key: string): string => {\n    const { filename, dirname } = parseKey(key);\n\n    return `${dirname}/optimized/${filename}`;\n};\n\nconst getOptimizedTransformedImageKeyPrefix = (\n    key: string,\n    transformationsHash: string\n): string => {\n    const { filename, dirname } = parseKey(key);\n\n    return `${dirname}/optimized/${transformationsHash}-${filename}`;\n};\n\ninterface GetImageKeyParams {\n    key: string;\n    transformations?: any;\n}\n\nconst getImageKey = ({ key, transformations }: GetImageKeyParams): string => {\n    if (!transformations) {\n        return getOptimizedImageKeyPrefix(key);\n    }\n\n    return getOptimizedTransformedImageKeyPrefix(key, objectHash(transformations));\n};\n\nexport {\n    SUPPORTED_TRANSFORMABLE_IMAGES,\n    getImageKey,\n    getOptimizedImageKeyPrefix,\n    getOptimizedTransformedImageKeyPrefix\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,aAAa;AACpC,OAAOC,IAAI,MAAM,WAAW;AAE5B,MAAMC,8BAA8B,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;AAErE,MAAMC,QAAQ,GAAIC,GAAW,IAAK;EAC9B,MAAMC,QAAQ,GAAGJ,IAAI,CAACK,QAAQ,CAACF,GAAG,CAAC;EACnC,MAAMG,OAAO,GAAGN,IAAI,CAACM,OAAO,CAACH,GAAG,CAAC;EAEjC,OAAO;IAAEC,QAAQ;IAAEE;EAAQ,CAAC;AAChC,CAAC;AAED,MAAMC,0BAA0B,GAAIJ,GAAW,IAAa;EACxD,MAAM;IAAEC,QAAQ;IAAEE;EAAQ,CAAC,GAAGJ,QAAQ,CAACC,GAAG,CAAC;EAE3C,OAAO,GAAGG,OAAO,cAAcF,QAAQ,EAAE;AAC7C,CAAC;AAED,MAAMI,qCAAqC,GAAGA,CAC1CL,GAAW,EACXM,mBAA2B,KAClB;EACT,MAAM;IAAEL,QAAQ;IAAEE;EAAQ,CAAC,GAAGJ,QAAQ,CAACC,GAAG,CAAC;EAE3C,OAAO,GAAGG,OAAO,cAAcG,mBAAmB,IAAIL,QAAQ,EAAE;AACpE,CAAC;AAOD,MAAMM,WAAW,GAAGA,CAAC;EAAEP,GAAG;EAAEQ;AAAmC,CAAC,KAAa;EACzE,IAAI,CAACA,eAAe,EAAE;IAClB,OAAOJ,0BAA0B,CAACJ,GAAG,CAAC;EAC1C;EAEA,OAAOK,qCAAqC,CAACL,GAAG,EAAEJ,UAAU,CAACY,eAAe,CAAC,CAAC;AAClF,CAAC;AAED,SACIV,8BAA8B,EAC9BS,WAAW,EACXH,0BAA0B,EAC1BC,qCAAqC","ignoreList":[]}

package/assetDelivery/threatDetection/ObjectKey.d.ts

@@ -0,0 +1,7 @@
+export declare class ObjectKey {
+    private bucketKey;
+    static from(key: string): ObjectKey;
+    private constructor();
+    id(): string;
+    relativeKey(): string;
+}

package/assetDelivery/threatDetection/ObjectKey.js

@@ -0,0 +1,17 @@
+export class ObjectKey {
+  static from(key) {
+    return new ObjectKey(key);
+  }
+  constructor(key) {
+    this.bucketKey = key;
+  }
+  id() {
+    const [id] = this.relativeKey().split("/");
+    return id;
+  }
+  relativeKey() {
+    return this.bucketKey.replace(/^tenants\/[^/]+\/files\//, "");
+  }
+}
+
+//# sourceMappingURL=ObjectKey.js.map

package/assetDelivery/threatDetection/ObjectKey.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ObjectKey","from","key","constructor","bucketKey","id","relativeKey","split","replace"],"sources":["ObjectKey.ts"],"sourcesContent":["export class ObjectKey {\n    private bucketKey: string;\n\n    static from(key: string) {\n        return new ObjectKey(key);\n    }\n\n    private constructor(key: string) {\n        this.bucketKey = key;\n    }\n\n    id() {\n        const [id] = this.relativeKey().split(\"/\");\n        return id;\n    }\n\n    relativeKey() {\n        return this.bucketKey.replace(/^tenants\\/[^/]+\\/files\\//, \"\");\n    }\n}\n"],"mappings":"AAAA,OAAO,MAAMA,SAAS,CAAC;EAGnB,OAAOC,IAAIA,CAACC,GAAW,EAAE;IACrB,OAAO,IAAIF,SAAS,CAACE,GAAG,CAAC;EAC7B;EAEQC,WAAWA,CAACD,GAAW,EAAE;IAC7B,IAAI,CAACE,SAAS,GAAGF,GAAG;EACxB;EAEAG,EAAEA,CAAA,EAAG;IACD,MAAM,CAACA,EAAE,CAAC,GAAG,IAAI,CAACC,WAAW,CAAC,CAAC,CAACC,KAAK,CAAC,GAAG,CAAC;IAC1C,OAAOF,EAAE;EACb;EAEAC,WAAWA,CAAA,EAAG;IACV,OAAO,IAAI,CAACF,SAAS,CAACI,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC;EACjE;AACJ","ignoreList":[]}

package/assetDelivery/threatDetection/createThreatDetectionEventHandler.d.ts

@@ -0,0 +1,2 @@
+import type { GuardDutyEvent } from "./types.js";
+export declare const createThreatDetectionEventHandler: () => (import("@webiny/handler").HandlerOnRequestPlugin<import("@webiny/handler/types.js").Context> | import("@webiny/handler-aws").EventBridgeEventHandler<"GuardDuty Malware Protection Object Scan Result", GuardDutyEvent, any>)[];

package/assetDelivery/threatDetection/createThreatDetectionEventHandler.js

@@ -0,0 +1,51 @@
+import { createEventBridgeEventHandler } from "@webiny/handler-aws";
+import { createHandlerOnRequest } from "@webiny/handler";
+import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/index.js";
+import { processThreatScanResult } from "./processThreatScanResult.js";
+import { ObjectKey } from "./ObjectKey.js";
+const detailType = "GuardDuty Malware Protection Object Scan Result";
+export const createThreatDetectionEventHandler = () => {
+  const handlerOnRequest = createHandlerOnRequest(async (request, _, context) => {
+    const payload = request.body;
+    if (payload["detail-type"] !== detailType) {
+      return;
+    }
+    const objectKey = payload.detail.s3ObjectDetails.objectKey;
+    const keyValueStore = context.container.resolve(GlobalKeyValueStore);
+    try {
+      // Extract file id from the absolute S3 object key
+      const fileId = ObjectKey.from(objectKey).id();
+      const result = await keyValueStore.get(`FileManager/File/${fileId}/Metadata`);
+      if (result.isFail()) {
+        return;
+      }
+      request.headers = {
+        ...request.headers,
+        "x-tenant": result.value.tenant
+      };
+    } catch {
+      // If metadata can't be loaded, we ignore the file.
+      // Most likely it's because the file is a rendition of the original file,
+      // so we don't need to do anything with it.
+    }
+  });
+  // Guard Duty event handler.
+  const threatScanEventHandler = createEventBridgeEventHandler(async ({
+    payload,
+    next,
+    ...rest
+  }) => {
+    const context = rest.context;
+    const threatDetectionEnabled = context.wcp.canUseFileManagerThreatDetection();
+    if (!threatDetectionEnabled || payload["detail-type"] !== detailType) {
+      return next();
+    }
+    await processThreatScanResult(context, payload.detail);
+  });
+
+  // Assign a human-readable name for easier debugging.
+  threatScanEventHandler.name = threatScanEventHandler.type + ".threatDetectionEventHandler";
+  return [handlerOnRequest, threatScanEventHandler];
+};
+
+//# sourceMappingURL=createThreatDetectionEventHandler.js.map

package/assetDelivery/threatDetection/createThreatDetectionEventHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createEventBridgeEventHandler","createHandlerOnRequest","GlobalKeyValueStore","processThreatScanResult","ObjectKey","detailType","createThreatDetectionEventHandler","handlerOnRequest","request","_","context","payload","body","objectKey","detail","s3ObjectDetails","keyValueStore","container","resolve","fileId","from","id","result","get","isFail","headers","value","tenant","threatScanEventHandler","next","rest","threatDetectionEnabled","wcp","canUseFileManagerThreatDetection","name","type"],"sources":["createThreatDetectionEventHandler.ts"],"sourcesContent":["import { createEventBridgeEventHandler } from \"@webiny/handler-aws\";\nimport { createHandlerOnRequest } from \"@webiny/handler\";\nimport type { EventBridgeEvent } from \"@webiny/aws-sdk/types/index.js\";\nimport type { ApiCoreContext } from \"@webiny/api-core/types/core.js\";\nimport { GlobalKeyValueStore } from \"@webiny/api-core/features/keyValueStore/index.js\";\nimport type { GuardDutyEvent } from \"./types.js\";\nimport { processThreatScanResult } from \"./processThreatScanResult.js\";\nimport { ObjectKey } from \"./ObjectKey.js\";\n\nconst detailType = \"GuardDuty Malware Protection Object Scan Result\";\n\nexport const createThreatDetectionEventHandler = () => {\n    const handlerOnRequest = createHandlerOnRequest(async (request, _, context) => {\n        const payload = request.body as EventBridgeEvent<string, GuardDutyEvent>;\n\n        if (payload[\"detail-type\"] !== detailType) {\n            return;\n        }\n\n        const objectKey = payload.detail.s3ObjectDetails.objectKey;\n        const keyValueStore = context.container.resolve(GlobalKeyValueStore);\n\n        try {\n            // Extract file id from the absolute S3 object key\n            const fileId = ObjectKey.from(objectKey).id();\n            const result = await keyValueStore.get<{ tenant: string }>(\n                `FileManager/File/${fileId}/Metadata`\n            );\n\n            if (result.isFail()) {\n                return;\n            }\n\n            request.headers = {\n                ...request.headers,\n                \"x-tenant\": result.value.tenant\n            };\n        } catch {\n            // If metadata can't be loaded, we ignore the file.\n            // Most likely it's because the file is a rendition of the original file,\n            // so we don't need to do anything with it.\n        }\n    });\n    // Guard Duty event handler.\n    const threatScanEventHandler = createEventBridgeEventHandler<typeof detailType, GuardDutyEvent>(\n        async ({ payload, next, ...rest }) => {\n            const context = rest.context as ApiCoreContext;\n\n            const threatDetectionEnabled = context.wcp.canUseFileManagerThreatDetection();\n\n            if (!threatDetectionEnabled || payload[\"detail-type\"] !== detailType) {\n                return next();\n            }\n\n            await processThreatScanResult(context, payload.detail);\n        }\n    );\n\n    // Assign a human-readable name for easier debugging.\n    threatScanEventHandler.name = threatScanEventHandler.type + \".threatDetectionEventHandler\";\n\n    return [handlerOnRequest, threatScanEventHandler];\n};\n"],"mappings":"AAAA,SAASA,6BAA6B,QAAQ,qBAAqB;AACnE,SAASC,sBAAsB,QAAQ,iBAAiB;AAGxD,SAASC,mBAAmB,QAAQ,kDAAkD;AAEtF,SAASC,uBAAuB;AAChC,SAASC,SAAS;AAElB,MAAMC,UAAU,GAAG,iDAAiD;AAEpE,OAAO,MAAMC,iCAAiC,GAAGA,CAAA,KAAM;EACnD,MAAMC,gBAAgB,GAAGN,sBAAsB,CAAC,OAAOO,OAAO,EAAEC,CAAC,EAAEC,OAAO,KAAK;IAC3E,MAAMC,OAAO,GAAGH,OAAO,CAACI,IAAgD;IAExE,IAAID,OAAO,CAAC,aAAa,CAAC,KAAKN,UAAU,EAAE;MACvC;IACJ;IAEA,MAAMQ,SAAS,GAAGF,OAAO,CAACG,MAAM,CAACC,eAAe,CAACF,SAAS;IAC1D,MAAMG,aAAa,GAAGN,OAAO,CAACO,SAAS,CAACC,OAAO,CAAChB,mBAAmB,CAAC;IAEpE,IAAI;MACA;MACA,MAAMiB,MAAM,GAAGf,SAAS,CAACgB,IAAI,CAACP,SAAS,CAAC,CAACQ,EAAE,CAAC,CAAC;MAC7C,MAAMC,MAAM,GAAG,MAAMN,aAAa,CAACO,GAAG,CAClC,oBAAoBJ,MAAM,WAC9B,CAAC;MAED,IAAIG,MAAM,CAACE,MAAM,CAAC,CAAC,EAAE;QACjB;MACJ;MAEAhB,OAAO,CAACiB,OAAO,GAAG;QACd,GAAGjB,OAAO,CAACiB,OAAO;QAClB,UAAU,EAAEH,MAAM,CAACI,KAAK,CAACC;MAC7B,CAAC;IACL,CAAC,CAAC,MAAM;MACJ;MACA;MACA;IAAA;EAER,CAAC,CAAC;EACF;EACA,MAAMC,sBAAsB,GAAG5B,6BAA6B,CACxD,OAAO;IAAEW,OAAO;IAAEkB,IAAI;IAAE,GAAGC;EAAK,CAAC,KAAK;IAClC,MAAMpB,OAAO,GAAGoB,IAAI,CAACpB,OAAyB;IAE9C,MAAMqB,sBAAsB,GAAGrB,OAAO,CAACsB,GAAG,CAACC,gCAAgC,CAAC,CAAC;IAE7E,IAAI,CAACF,sBAAsB,IAAIpB,OAAO,CAAC,aAAa,CAAC,KAAKN,UAAU,EAAE;MAClE,OAAOwB,IAAI,CAAC,CAAC;IACjB;IAEA,MAAM1B,uBAAuB,CAACO,OAAO,EAAEC,OAAO,CAACG,MAAM,CAAC;EAC1D,CACJ,CAAC;;EAED;EACAc,sBAAsB,CAACM,IAAI,GAAGN,sBAAsB,CAACO,IAAI,GAAG,8BAA8B;EAE1F,OAAO,CAAC5B,gBAAgB,EAAEqB,sBAAsB,CAAC;AACrD,CAAC","ignoreList":[]}

package/assetDelivery/threatDetection/createThreatDetectionPluginLoader.d.ts

@@ -0,0 +1,2 @@
+import type { PluginFactory } from "@webiny/plugins/types.js";
+export declare const createThreatDetectionPluginLoader: (cb: PluginFactory) => PluginFactory;

package/assetDelivery/threatDetection/createThreatDetectionPluginLoader.js

@@ -0,0 +1,6 @@
+import { createConditionalPluginFactory } from "@webiny/api";
+export const createThreatDetectionPluginLoader = cb => {
+  return createConditionalPluginFactory(() => process.env.WEBINY_FUNCTION_TYPE === "threat-detection-event-handler", cb);
+};
+
+//# sourceMappingURL=createThreatDetectionPluginLoader.js.map

package/assetDelivery/threatDetection/createThreatDetectionPluginLoader.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createConditionalPluginFactory","createThreatDetectionPluginLoader","cb","process","env","WEBINY_FUNCTION_TYPE"],"sources":["createThreatDetectionPluginLoader.ts"],"sourcesContent":["import type { PluginFactory } from \"@webiny/plugins/types.js\";\nimport { createConditionalPluginFactory } from \"@webiny/api\";\n\nexport const createThreatDetectionPluginLoader = (cb: PluginFactory) => {\n    return createConditionalPluginFactory(\n        () => process.env.WEBINY_FUNCTION_TYPE === \"threat-detection-event-handler\",\n        cb\n    );\n};\n"],"mappings":"AACA,SAASA,8BAA8B,QAAQ,aAAa;AAE5D,OAAO,MAAMC,iCAAiC,GAAIC,EAAiB,IAAK;EACpE,OAAOF,8BAA8B,CACjC,MAAMG,OAAO,CAACC,GAAG,CAACC,oBAAoB,KAAK,gCAAgC,EAC3EH,EACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/assetDelivery/threatDetection/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./createThreatDetectionEventHandler.js";
+export * from "./createThreatDetectionPluginLoader.js";