@webiny/api-file-manager-s3 0.0.0-unstable.eb196ccd2f → 0.0.0-unstable.eb81deee7e

package/assetDelivery/s3/SharpTransform.js

@@ -1,192 +1,173 @@
-"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");
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import { GetFileUseCase } from "@webiny/api-file-manager/features/file/GetFile/index.js";
+import { CallableContentsReader, DEFAULT_IMAGE_QUALITY, contentTypeForFormat } from "@webiny/api-file-manager/features/assetDelivery/transformation/index.js";
+import { normalizeImageOptions } from "@webiny/api-file-manager/features/assetDelivery/assetTypes/image/normalizeImageOptions.js";
+import { AssetKeyGenerator, ImageAssetTypeHandler } from "@webiny/api-file-manager/features/assetDelivery/assetTypes/image/index.js";
+import { S3AssetDeliveryConfig, S3Bucket, S3Client } from "../abstractions.js";
+const hasTransform = (options)=>void 0 !== options.width || void 0 !== options.format || void 0 !== options.quality;
 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;
+    constructor(s3, bucket, config, identityContext, getFile){
+        this.s3 = s3;
+        this.bucket = bucket;
+        this.imageResizeWidths = config.imageResizeWidths;
+        this.imageQuality = {
+            ...DEFAULT_IMAGE_QUALITY,
+            ...config.imageQuality ?? {}
+        };
+        this.identityContext = identityContext;
+        this.getFile = getFile;
     }
-
-    // `original` is part of the request, but it won't even get to this point in the execution.
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const {
-      original,
-      ...options
-    } = assetRequest.getOptions();
-    const transformedAsset = asset.clone();
-    if (Object.keys(options).length > 0) {
-      // Transformations were requested.
-      return this.transformAsset(transformedAsset, options);
+    async getTransformer() {
+        if (!this.transformer) {
+            const { SharpTransformer } = await import("@webiny/api-file-manager/features/assetDelivery/assetTypes/image/SharpTransformer.js");
+            this.transformer = new SharpTransformer();
+        }
+        return this.transformer;
     }
-
-    // Return an optimized asset.
-    return this.optimizeAsset(transformedAsset);
-  }
-  async transformAsset(asset, options) {
-    console.log("Transform asset", options);
-    if (options.width) {
-      const {
-        s3,
-        bucket
-      } = this.params;
-      const assetKey = new _AssetKeyGenerator.AssetKeyGenerator(asset);
-      const transformedAssetKey = assetKey.getTransformedImageKey(options);
-      try {
-        const {
-          Body
-        } = await s3.getObject({
-          Bucket: bucket,
-          Key: transformedAssetKey
-        });
-        if (!Body) {
-          throw new Error(`Missing image body!`);
+    async handle(assetRequest, asset) {
+        const rawQuery = assetRequest.getOptions();
+        const acceptHeader = assetRequest.getContext().accept;
+        const { original, crop, focal, aspectRatio, ...options } = normalizeImageOptions(rawQuery, acceptHeader);
+        const assetCrop = await this.loadAssetCrop(asset.getId());
+        const framing = {
+            crop: crop ?? assetCrop,
+            focal,
+            aspectRatio
+        };
+        const transformedAsset = asset.clone();
+        if (hasTransform(options)) return this.transformAsset(transformedAsset, options, framing);
+        return this.optimizeAsset(transformedAsset, framing);
+    }
+    async loadAssetCrop(fileId) {
+        const result = await this.identityContext.withoutAuthorization(()=>this.getFile.execute(fileId));
+        if (result.isFail()) return;
+        const imageEdit = result.value.metadata?.image;
+        return imageEdit?.crop;
+    }
+    async transformAsset(asset, options, framing) {
+        const assetKey = AssetKeyGenerator.create(asset, framing);
+        const transformedAssetKey = assetKey.getTransformedImageKey(options);
+        const contentType = options.format ? contentTypeForFormat(options.format) : asset.getContentType();
+        try {
+            const { Body } = await this.s3.getObject({
+                Bucket: this.bucket,
+                Key: transformedAssetKey
+            });
+            if (!Body) throw new Error("Missing image body!");
+            const buffer = Buffer.from(await Body.transformToByteArray());
+            const newAsset = asset.withProps({
+                size: buffer.length,
+                contentType
+            });
+            newAsset.setContentsReader(CallableContentsReader.create(()=>buffer));
+            console.log("Return a previously transformed asset", {
+                key: transformedAssetKey,
+                size: newAsset.getSize()
+            });
+            return newAsset;
+        } catch  {
+            const optimizedImage = await this.optimizeAsset(asset, framing);
+            console.log("Transform the asset", options);
+            const baseBuffer = await optimizedImage.getContents();
+            const transformer = await this.getTransformer();
+            const { buffer: transformedBuffer, contentType: outputContentType } = await transformer.transformBuffer({
+                buffer: baseBuffer,
+                animated: this.isAssetAnimated(asset),
+                sourceContentType: asset.getContentType(),
+                widths: this.imageResizeWidths,
+                options,
+                qualityDefaults: this.imageQuality
+            });
+            const newAsset = asset.withProps({
+                size: transformedBuffer.length,
+                contentType: outputContentType
+            });
+            newAsset.setContentsReader(CallableContentsReader.create(()=>transformedBuffer));
+            await this.s3.putObject({
+                Bucket: this.bucket,
+                Key: transformedAssetKey,
+                ContentType: newAsset.getContentType(),
+                Body: await newAsset.getContents()
+            });
+            console.log("Return the transformed asset", {
+                key: transformedAssetKey,
+                size: newAsset.getSize(),
+                contentType: newAsset.getContentType()
+            });
+            return newAsset;
         }
-        const buffer = Buffer.from(await Body.transformToByteArray());
-        const newAsset = asset.withProps({
-          size: buffer.length
-        });
-        newAsset.setContentsReader(new _CallableContentsReader.CallableContentsReader(() => buffer));
-        console.log(`Return a previously transformed asset`, {
-          key: transformedAssetKey,
-          size: newAsset.getSize()
-        });
-        return newAsset;
-      } catch (e) {
-        const optimizedImage = await this.optimizeAsset(asset);
-        const widths = new _WidthCollection.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 = await (0, _sharp.default)(buffer, {
-          animated: this.isAssetAnimated(asset)
-        }).withMetadata().resize({
-          width,
-          withoutEnlargement: true
-        }).toBuffer();
-
-        /**
-         * Transformations are applied to the optimized image.
-         */
-        const newAsset = asset.withProps({
-          size: transformedBuffer.length
-        });
-        newAsset.setContentsReader(new _CallableContentsReader.CallableContentsReader(() => transformedBuffer));
-        await s3.putObject({
-          Bucket: bucket,
-          Key: transformedAssetKey,
-          ContentType: newAsset.getContentType(),
-          Body: await newAsset.getContents()
-        });
-        console.log(`Return the resized asset`, {
-          key: transformedAssetKey,
-          size: newAsset.getSize()
+    }
+    async optimizeAsset(asset, framing) {
+        console.log("Optimize asset", {
+            id: asset.getId(),
+            key: asset.getKey(),
+            size: asset.getSize(),
+            type: asset.getContentType()
         });
-        return newAsset;
-      }
+        const assetKey = AssetKeyGenerator.create(asset, framing);
+        const optimizedAssetKey = assetKey.getOptimizedImageKey();
+        try {
+            const { Body } = await this.s3.getObject({
+                Bucket: this.bucket,
+                Key: optimizedAssetKey
+            });
+            if (!Body) throw new Error("Missing image body!");
+            console.log("Return a previously optimized asset", optimizedAssetKey);
+            const buffer = Buffer.from(await Body.transformToByteArray());
+            const newAsset = asset.withProps({
+                size: buffer.length
+            });
+            newAsset.setContentsReader(CallableContentsReader.create(()=>buffer));
+            return newAsset;
+        } catch  {
+            console.log("Create an optimized version of the original asset", asset.getKey());
+            let buffer = await asset.getContents();
+            const transformer = await this.getTransformer();
+            const framed = await transformer.extractFramedRegion(buffer, framing);
+            const cropped = framed !== buffer;
+            buffer = framed;
+            const contentType = asset.getContentType();
+            const canOptimize = "image/png" === contentType || "image/jpeg" === contentType || "image/jpg" === contentType;
+            if (!canOptimize && !cropped) {
+                console.log(`No optimizations defined for ${contentType}`);
+                return asset;
+            }
+            let finalBuffer = buffer;
+            if (canOptimize) {
+                const pipeline = "image/png" === contentType ? await transformer.optimizePng(buffer) : await transformer.optimizeJpeg(buffer);
+                finalBuffer = await pipeline.toBuffer();
+            }
+            console.log("Optimized asset size", finalBuffer.length);
+            const newAsset = asset.withProps({
+                size: finalBuffer.length
+            });
+            newAsset.setContentsReader(CallableContentsReader.create(()=>finalBuffer));
+            await this.s3.putObject({
+                Bucket: this.bucket,
+                Key: optimizedAssetKey,
+                ContentType: newAsset.getContentType(),
+                Body: await newAsset.getContents()
+            });
+            return newAsset;
+        }
     }
-    return asset;
-  }
-  async optimizeAsset(asset) {
-    const {
-      s3,
-      bucket
-    } = this.params;
-    console.log("Optimize asset", {
-      id: asset.getId(),
-      key: asset.getKey(),
-      size: asset.getSize(),
-      type: asset.getContentType()
-    });
-    const assetKey = new _AssetKeyGenerator.AssetKeyGenerator(asset);
-    const optimizedAssetKey = assetKey.getOptimizedImageKey();
-    try {
-      const {
-        Body
-      } = await s3.getObject({
-        Bucket: bucket,
-        Key: optimizedAssetKey
-      });
-      if (!Body) {
-        throw new Error(`Missing image body!`);
-      }
-      console.log("Return a previously optimized asset", optimizedAssetKey);
-      const buffer = Buffer.from(await Body.transformToByteArray());
-      const newAsset = asset.withProps({
-        size: buffer.length
-      });
-      newAsset.setContentsReader(new _CallableContentsReader.CallableContentsReader(() => buffer));
-      return newAsset;
-    } catch (e) {
-      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 = {
-        "image/png": buffer => this.optimizePng(buffer),
-        "image/jpeg": buffer => this.optimizeJpeg(buffer),
-        "image/jpg": buffer => this.optimizeJpeg(buffer)
-      };
-      const optimization = optimizationMap[asset.getContentType()];
-      if (!optimization) {
-        console.log(`No optimizations defined for ${asset.getContentType()}`);
-        return asset;
-      }
-      const optimizedBuffer = await optimization(buffer).toBuffer();
-      console.log("Optimized asset size", optimizedBuffer.length);
-      const newAsset = asset.withProps({
-        size: optimizedBuffer.length
-      });
-      newAsset.setContentsReader(new _CallableContentsReader.CallableContentsReader(() => optimizedBuffer));
-      await s3.putObject({
-        Bucket: bucket,
-        Key: optimizedAssetKey,
-        ContentType: newAsset.getContentType(),
-        Body: await newAsset.getContents()
-      });
-      return newAsset;
+    isAssetAnimated(asset) {
+        return [
+            "gif",
+            "webp"
+        ].includes(asset.getExtension());
     }
-  }
-  isAssetAnimated(asset) {
-    return ["gif", "webp"].includes(asset.getExtension());
-  }
-  optimizePng(buffer) {
-    return (0, _sharp.default)(buffer).resize({
-      width: 2560,
-      withoutEnlargement: true,
-      fit: "inside"
-    }).png({
-      compressionLevel: 9,
-      adaptiveFiltering: true,
-      force: true
-    }).withMetadata();
-  }
-  optimizeJpeg(buffer) {
-    return (0, _sharp.default)(buffer).resize({
-      width: 2560,
-      withoutEnlargement: true,
-      fit: "inside"
-    }).withMetadata().toFormat("jpeg", {
-      quality: 90
-    });
-  }
 }
-exports.SharpTransform = SharpTransform;
+const SharpTransformImpl = ImageAssetTypeHandler.createImplementation({
+    implementation: SharpTransform,
+    dependencies: [
+        S3Client,
+        S3Bucket,
+        S3AssetDeliveryConfig,
+        IdentityContext,
+        GetFileUseCase
+    ]
+});
+export { SharpTransform, SharpTransformImpl };
 
 //# 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","console","log","getContentType","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","newAsset","withProps","size","setContentsReader","CallableContentsReader","key","getSize","e","optimizedImage","widths","WidthCollection","imageResizeWidths","getClosestOrMax","getContents","transformedBuffer","sharp","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","exports"],"sources":["SharpTransform.ts"],"sourcesContent":["import sharp from \"sharp\";\nimport type { S3 } from \"@webiny/aws-sdk/client-s3\";\nimport type {\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            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        console.log(\"Transform asset\", options);\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 (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                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 (e) {\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":[]}
+{"version":3,"file":"assetDelivery/s3/SharpTransform.js","sources":["../../../src/assetDelivery/s3/SharpTransform.ts"],"sourcesContent":["import type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { GetFileUseCase } from \"@webiny/api-file-manager/features/file/GetFile/index.js\";\nimport {\n    contentTypeForFormat,\n    DEFAULT_IMAGE_QUALITY,\n    type ImageFormat\n} from \"@webiny/api-file-manager/features/assetDelivery/transformation/index.js\";\nimport type {\n    AssetImageEdit,\n    Framing,\n    ImageRequestOptions\n} from \"@webiny/api-file-manager/features/assetDelivery/assetTypes/image/imageTypes.js\";\nimport { normalizeImageOptions } from \"@webiny/api-file-manager/features/assetDelivery/assetTypes/image/normalizeImageOptions.js\";\nimport { CallableContentsReader } from \"@webiny/api-file-manager/features/assetDelivery/transformation/index.js\";\nimport { AssetKeyGenerator } from \"@webiny/api-file-manager/features/assetDelivery/assetTypes/image/index.js\";\nimport { ImageAssetTypeHandler } from \"@webiny/api-file-manager/features/assetDelivery/assetTypes/image/index.js\";\nimport type { Asset } from \"@webiny/api-file-manager/delivery/AssetDelivery/Asset.js\";\nimport type { AssetRequest } from \"@webiny/api-file-manager/delivery/AssetDelivery/AssetRequest.js\";\nimport type { SharpTransformer } from \"@webiny/api-file-manager/features/assetDelivery/assetTypes/image/SharpTransformer.js\";\nimport { S3Client, S3Bucket, S3AssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\nimport type { IS3AssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\n\ntype TransformOptions = Omit<ImageRequestOptions, \"original\" | \"crop\" | \"focal\" | \"aspectRatio\">;\n\nconst hasTransform = (options: TransformOptions): boolean => {\n    return (\n        options.width !== undefined || options.format !== undefined || options.quality !== undefined\n    );\n};\n\nexport class SharpTransform implements ImageAssetTypeHandler.Interface {\n    private readonly s3: S3;\n    private readonly bucket: string;\n    private readonly imageResizeWidths: number[];\n    private readonly imageQuality: Record<ImageFormat, number>;\n    private readonly identityContext: IdentityContext.Interface;\n    private readonly getFile: GetFileUseCase.Interface;\n    private transformer?: SharpTransformer;\n\n    constructor(\n        s3: S3,\n        bucket: string,\n        config: IS3AssetDeliveryConfig,\n        identityContext: IdentityContext.Interface,\n        getFile: GetFileUseCase.Interface\n    ) {\n        this.s3 = s3;\n        this.bucket = bucket;\n        this.imageResizeWidths = config.imageResizeWidths;\n        this.imageQuality = { ...DEFAULT_IMAGE_QUALITY, ...(config.imageQuality ?? {}) };\n        this.identityContext = identityContext;\n        this.getFile = getFile;\n    }\n\n    private async getTransformer(): Promise<SharpTransformer> {\n        if (!this.transformer) {\n            const { SharpTransformer } =\n                await import(\"@webiny/api-file-manager/features/assetDelivery/assetTypes/image/SharpTransformer.js\");\n            this.transformer = new SharpTransformer();\n        }\n        return this.transformer;\n    }\n\n    async handle(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        const rawQuery = assetRequest.getOptions() as Record<string, any>;\n        const acceptHeader = assetRequest.getContext<{ accept?: string }>().accept;\n        // oxlint-disable-next-line typescript/no-unused-vars\n        const { original, crop, focal, aspectRatio, ...options } = normalizeImageOptions(\n            rawQuery,\n            acceptHeader\n        );\n\n        const assetCrop = await this.loadAssetCrop(asset.getId());\n        const framing: Framing = {\n            crop: crop ?? assetCrop,\n            focal,\n            aspectRatio\n        };\n\n        const transformedAsset = asset.clone();\n\n        if (hasTransform(options)) {\n            return this.transformAsset(transformedAsset, options, framing);\n        }\n\n        return this.optimizeAsset(transformedAsset, framing);\n    }\n\n    private async loadAssetCrop(fileId: string) {\n        const result = await this.identityContext.withoutAuthorization(() =>\n            this.getFile.execute(fileId)\n        );\n\n        if (result.isFail()) {\n            return undefined;\n        }\n\n        const imageEdit = result.value.metadata?.image as AssetImageEdit | undefined;\n        return imageEdit?.crop;\n    }\n\n    private async transformAsset(asset: Asset, options: TransformOptions, framing: Framing) {\n        const assetKey = AssetKeyGenerator.create(asset, framing);\n        const transformedAssetKey = assetKey.getTransformedImageKey(options);\n\n        const contentType = options.format\n            ? contentTypeForFormat(options.format)\n            : asset.getContentType();\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, contentType });\n            newAsset.setContentsReader(CallableContentsReader.create(() => 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, framing);\n\n            console.log(`Transform the asset`, options);\n            const baseBuffer = await optimizedImage.getContents();\n            const transformer = await this.getTransformer();\n            const { buffer: transformedBuffer, contentType: outputContentType } =\n                await transformer.transformBuffer({\n                    buffer: baseBuffer,\n                    animated: this.isAssetAnimated(asset),\n                    sourceContentType: asset.getContentType(),\n                    widths: this.imageResizeWidths,\n                    options,\n                    qualityDefaults: this.imageQuality\n                });\n\n            const newAsset = asset.withProps({\n                size: transformedBuffer.length,\n                contentType: outputContentType\n            });\n            newAsset.setContentsReader(CallableContentsReader.create(() => 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 transformed asset`, {\n                key: transformedAssetKey,\n                size: newAsset.getSize(),\n                contentType: newAsset.getContentType()\n            });\n\n            return newAsset;\n        }\n    }\n\n    private async optimizeAsset(asset: Asset, framing: Framing) {\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 = AssetKeyGenerator.create(asset, framing);\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(CallableContentsReader.create(() => buffer));\n\n            return newAsset;\n        } catch {\n            console.log(\"Create an optimized version of the original asset\", asset.getKey());\n            let buffer = await asset.getContents();\n\n            const transformer = await this.getTransformer();\n            const framed = await transformer.extractFramedRegion(buffer, framing);\n            const cropped = framed !== buffer;\n            buffer = framed;\n\n            const contentType = asset.getContentType();\n            const canOptimize =\n                contentType === \"image/png\" ||\n                contentType === \"image/jpeg\" ||\n                contentType === \"image/jpg\";\n\n            if (!canOptimize && !cropped) {\n                console.log(`No optimizations defined for ${contentType}`);\n                return asset;\n            }\n\n            let finalBuffer = buffer;\n            if (canOptimize) {\n                const pipeline =\n                    contentType === \"image/png\"\n                        ? await transformer.optimizePng(buffer)\n                        : await transformer.optimizeJpeg(buffer);\n                finalBuffer = await pipeline.toBuffer();\n            }\n\n            console.log(\"Optimized asset size\", finalBuffer.length);\n\n            const newAsset = asset.withProps({ size: finalBuffer.length });\n            newAsset.setContentsReader(CallableContentsReader.create(() => finalBuffer));\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\nexport const SharpTransformImpl = ImageAssetTypeHandler.createImplementation({\n    implementation: SharpTransform,\n    dependencies: [S3Client, S3Bucket, S3AssetDeliveryConfig, IdentityContext, GetFileUseCase]\n});\n"],"names":["hasTransform","options","undefined","SharpTransform","s3","bucket","config","identityContext","getFile","DEFAULT_IMAGE_QUALITY","SharpTransformer","assetRequest","asset","rawQuery","acceptHeader","original","crop","focal","aspectRatio","normalizeImageOptions","assetCrop","framing","transformedAsset","fileId","result","imageEdit","assetKey","AssetKeyGenerator","transformedAssetKey","contentType","contentTypeForFormat","Body","Error","buffer","Buffer","newAsset","CallableContentsReader","console","optimizedImage","baseBuffer","transformer","transformedBuffer","outputContentType","optimizedAssetKey","framed","cropped","canOptimize","finalBuffer","pipeline","SharpTransformImpl","ImageAssetTypeHandler","S3Client","S3Bucket","S3AssetDeliveryConfig","IdentityContext","GetFileUseCase"],"mappings":"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"}

package/assetDelivery/s3/transformation/AssetKeyGenerator.js

@@ -1,29 +1,21 @@
-"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"));
+import * as __rspack_external__utils_js_a9c81ddd from "./utils.js";
 class AssetKeyGenerator {
-  constructor(asset) {
-    this.asset = asset;
-    this.utils = asset.getKey().includes("/") ? newUtils : legacyUtils;
-  }
-  getOptimizedImageKey() {
-    return this.utils.getImageKey({
-      key: this.asset.getKey()
-    });
-  }
-  getTransformedImageKey(transformations) {
-    return this.utils.getImageKey({
-      key: this.asset.getKey(),
-      transformations
-    });
-  }
+    constructor(asset){
+        this.asset = asset;
+        this.utils = __rspack_external__utils_js_a9c81ddd;
+    }
+    getOptimizedImageKey() {
+        return this.utils.getImageKey({
+            key: this.asset.getKey()
+        });
+    }
+    getTransformedImageKey(transformations) {
+        return this.utils.getImageKey({
+            key: this.asset.getKey(),
+            transformations
+        });
+    }
 }
-exports.AssetKeyGenerator = AssetKeyGenerator;
+export { 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 type { 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,"file":"assetDelivery/s3/transformation/AssetKeyGenerator.js","sources":["../../../../src/assetDelivery/s3/transformation/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"],"names":["AssetKeyGenerator","asset","newUtils","transformations"],"mappings":";AAGO,MAAMA;IAIT,YAAYC,KAAY,CAAE;QACtB,IAAI,CAAC,KAAK,GAAGA;QACb,IAAI,CAAC,KAAK,GAAGC;IACjB;IAEA,uBAAuB;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;YAAE,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM;QAAG;IAC7D;IACA,uBAAuBC,eAAoC,EAAE;QACzD,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;YAAE,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM;YAAIA;QAAgB;IAC9E;AACJ"}

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

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

package/assetDelivery/s3/transformation/CallableContentsReader.js

@@ -1,17 +1,11 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CallableContentsReader = void 0;
 class CallableContentsReader {
-  constructor(callable) {
-    this.callable = callable;
-  }
-  async read() {
-    return this.callable();
-  }
+    constructor(callable){
+        this.callable = callable;
+    }
+    async read() {
+        return this.callable();
+    }
 }
-exports.CallableContentsReader = CallableContentsReader;
+export { 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 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":";;;;;;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,"file":"assetDelivery/s3/transformation/CallableContentsReader.js","sources":["../../../../src/assetDelivery/s3/transformation/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"],"names":["CallableContentsReader","callable"],"mappings":"AAMO,MAAMA;IAGT,YAAYC,QAA0B,CAAE;QACpC,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAM,OAAwB;QAC1B,OAAO,IAAI,CAAC,QAAQ;IACxB;AACJ"}

package/assetDelivery/s3/transformation/WidthCollection.js

@@ -1,27 +1,19 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.WidthCollection = void 0;
 class WidthCollection {
-  constructor(values) {
-    this.values = values.sort((a, b) => a - b);
-  }
-  max() {
-    return Math.max(...this.values);
-  }
-  min() {
-    return Math.min(...this.values);
-  }
-  getClosestOrMax(value) {
-    if (!value) {
-      return this.max();
+    constructor(values){
+        this.values = values.sort((a, b)=>a - b);
+    }
+    max() {
+        return Math.max(...this.values);
+    }
+    min() {
+        return Math.min(...this.values);
+    }
+    getClosestOrMax(value) {
+        if (!value) return this.max();
+        const gteGivenValue = this.values.filter((w)=>w >= value);
+        return gteGivenValue.length > 0 ? gteGivenValue[0] : this.max();
     }
-    const gteGivenValue = this.values.filter(w => w >= value);
-    return gteGivenValue.length > 0 ? gteGivenValue[0] : this.max();
-  }
 }
-exports.WidthCollection = WidthCollection;
+export { 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,"file":"assetDelivery/s3/transformation/WidthCollection.js","sources":["../../../../src/assetDelivery/s3/transformation/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"],"names":["WidthCollection","values","a","b","Math","value","gteGivenValue","w"],"mappings":"AAAO,MAAMA;IAGT,YAAYC,MAAgB,CAAE;QAC1B,IAAI,CAAC,MAAM,GAAGA,OAAO,IAAI,CAAC,CAACC,GAAGC,IAAMD,IAAIC;IAC5C;IAEA,MAAM;QACF,OAAOC,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM;IAClC;IAEA,MAAM;QACF,OAAOA,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM;IAClC;IAEA,gBAAgBC,KAAyB,EAAU;QAC/C,IAAI,CAACA,OACD,OAAO,IAAI,CAAC,GAAG;QAEnB,MAAMC,gBAAgB,IAAI,CAAC,MAAM,CAAC,MAAM,CAACC,CAAAA,IAAKA,KAAKF;QACnD,OAAOC,cAAc,MAAM,GAAG,IAAIA,aAAa,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG;IACjE;AACJ"}

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 };