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

package/assetDelivery/s3/SharpTransform.js

@@ -1,85 +1,104 @@
 import sharp from "sharp";
-import { AssetTransformationStrategy } from "@webiny/api-file-manager/features/assetDelivery/abstractions.js";
-import { WidthCollection } from "./transformation/WidthCollection.js";
-import { CallableContentsReader } from "./transformation/CallableContentsReader.js";
-import { AssetKeyGenerator } from "./transformation/AssetKeyGenerator.js";
+import { 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 { extractFramedRegion, transformImageBuffer } from "@webiny/api-file-manager/features/assetDelivery/assetTypes/image/transformImage.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";
-import * as __rspack_external__transformation_utils_js_9257ec9a from "./transformation/utils.js";
+const hasTransform = (options)=>void 0 !== options.width || void 0 !== options.format || void 0 !== options.quality;
 class SharpTransform {
-    constructor(s3, bucket, config){
+    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;
     }
-    async transform(assetRequest, asset) {
-        if (!__rspack_external__transformation_utils_js_9257ec9a.SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension())) {
-            console.log(`Transformations/optimizations of ${asset.getContentType()} assets are not supported. Skipping.`);
-            return asset;
-        }
-        const { original, ...options } = assetRequest.getOptions();
+    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 (Object.keys(options).length > 0) return this.transformAsset(transformedAsset, options);
-        return this.optimizeAsset(transformedAsset);
+        if (hasTransform(options)) return this.transformAsset(transformedAsset, options, framing);
+        return this.optimizeAsset(transformedAsset, framing);
     }
-    async transformAsset(asset, options) {
-        if (options.width) {
-            const assetKey = new AssetKeyGenerator(asset);
-            const transformedAssetKey = assetKey.getTransformedImageKey(options);
-            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
-                });
-                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(this.imageResizeWidths);
-                const width = widths.getClosestOrMax(options.width);
-                console.log(`Resize the asset (width: ${width})`);
-                const buffer = await optimizedImage.getContents();
-                const transformedBuffer = await sharp(buffer, {
-                    animated: this.isAssetAnimated(asset)
-                }).withMetadata().resize({
-                    width,
-                    withoutEnlargement: true
-                }).toBuffer();
-                const newAsset = asset.withProps({
-                    size: transformedBuffer.length
-                });
-                newAsset.setContentsReader(new CallableContentsReader(()=>transformedBuffer));
-                await this.s3.putObject({
-                    Bucket: this.bucket,
-                    Key: transformedAssetKey,
-                    ContentType: newAsset.getContentType(),
-                    Body: await newAsset.getContents()
-                });
-                console.log("Return the resized asset", {
-                    key: transformedAssetKey,
-                    size: newAsset.getSize()
-                });
-                return newAsset;
-            }
+    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 { buffer: transformedBuffer, contentType: outputContentType } = await transformImageBuffer({
+                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;
         }
-        return asset;
     }
-    async optimizeAsset(asset) {
+    async optimizeAsset(asset, framing) {
         console.log("Optimize asset", {
             id: asset.getId(),
             key: asset.getKey(),
             size: asset.getSize(),
             type: asset.getContentType()
         });
-        const assetKey = new AssetKeyGenerator(asset);
+        const assetKey = AssetKeyGenerator.create(asset, framing);
         const optimizedAssetKey = assetKey.getOptimizedImageKey();
         try {
             const { Body } = await this.s3.getObject({
@@ -92,27 +111,30 @@ class SharpTransform {
             const newAsset = asset.withProps({
                 size: buffer.length
             });
-            newAsset.setContentsReader(new CallableContentsReader(()=>buffer));
+            newAsset.setContentsReader(CallableContentsReader.create(()=>buffer));
             return newAsset;
         } catch  {
             console.log("Create an optimized version of the original asset", asset.getKey());
-            const buffer = await asset.getContents();
+            let buffer = await asset.getContents();
+            const framed = await extractFramedRegion(buffer, framing);
+            const cropped = framed !== buffer;
+            buffer = framed;
             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) {
+            if (!optimization && !cropped) {
                 console.log(`No optimizations defined for ${asset.getContentType()}`);
                 return asset;
             }
-            const optimizedBuffer = await optimization(buffer).toBuffer();
-            console.log("Optimized asset size", optimizedBuffer.length);
+            const finalBuffer = optimization ? await optimization(buffer).toBuffer() : buffer;
+            console.log("Optimized asset size", finalBuffer.length);
             const newAsset = asset.withProps({
-                size: optimizedBuffer.length
+                size: finalBuffer.length
             });
-            newAsset.setContentsReader(new CallableContentsReader(()=>optimizedBuffer));
+            newAsset.setContentsReader(CallableContentsReader.create(()=>finalBuffer));
             await this.s3.putObject({
                 Bucket: this.bucket,
                 Key: optimizedAssetKey,
@@ -149,12 +171,14 @@ class SharpTransform {
         });
     }
 }
-const SharpTransformImpl = AssetTransformationStrategy.createImplementation({
+const SharpTransformImpl = ImageAssetTypeHandler.createImplementation({
     implementation: SharpTransform,
     dependencies: [
         S3Client,
         S3Bucket,
-        S3AssetDeliveryConfig
+        S3AssetDeliveryConfig,
+        IdentityContext,
+        GetFileUseCase
     ]
 });
 export { SharpTransform, SharpTransformImpl };

package/assetDelivery/s3/SharpTransform.js.map

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

package/assetDelivery/threatDetection/createThreatDetectionEventHandler.d.ts

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

package/assetDelivery/threatDetection/createThreatDetectionEventHandler.js

@@ -1,17 +1,18 @@
 import { createEventBridgeEventHandler } from "@webiny/handler-aws";
 import { createHandlerOnRequest } from "@webiny/handler";
 import { GlobalKeyValueStore } from "@webiny/api-core/features/keyValueStore/index.js";
+import { ObjectKey } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 import { processThreatScanResult } from "./processThreatScanResult.js";
-import { ObjectKey } from "./ObjectKey.js";
 const detailType = "GuardDuty Malware Protection Object Scan Result";
 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 s3ObjectKey = payload.detail.s3ObjectDetails.objectKey;
+        const objectKey = context.container.resolve(ObjectKey);
         const keyValueStore = context.container.resolve(GlobalKeyValueStore);
         try {
-            const fileId = ObjectKey.from(objectKey).id();
+            const fileId = objectKey.from(s3ObjectKey).id();
             const result = await keyValueStore.get(`FileManager/File/${fileId}/Metadata`);
             if (result.isFail()) return;
             request.headers = {

package/assetDelivery/threatDetection/createThreatDetectionEventHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetDelivery/threatDetection/createThreatDetectionEventHandler.js","sources":["../../../src/assetDelivery/threatDetection/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"],"names":["detailType","createThreatDetectionEventHandler","handlerOnRequest","createHandlerOnRequest","request","_","context","payload","objectKey","keyValueStore","GlobalKeyValueStore","fileId","ObjectKey","result","threatScanEventHandler","createEventBridgeEventHandler","next","rest","threatDetectionEnabled","processThreatScanResult"],"mappings":";;;;;AASA,MAAMA,aAAa;AAEZ,MAAMC,oCAAoC;IAC7C,MAAMC,mBAAmBC,uBAAuB,OAAOC,SAASC,GAAGC;QAC/D,MAAMC,UAAUH,QAAQ,IAAI;QAE5B,IAAIG,OAAO,CAAC,cAAc,KAAKP,YAC3B;QAGJ,MAAMQ,YAAYD,QAAQ,MAAM,CAAC,eAAe,CAAC,SAAS;QAC1D,MAAME,gBAAgBH,QAAQ,SAAS,CAAC,OAAO,CAACI;QAEhD,IAAI;YAEA,MAAMC,SAASC,UAAU,IAAI,CAACJ,WAAW,EAAE;YAC3C,MAAMK,SAAS,MAAMJ,cAAc,GAAG,CAClC,CAAC,iBAAiB,EAAEE,OAAO,SAAS,CAAC;YAGzC,IAAIE,OAAO,MAAM,IACb;YAGJT,QAAQ,OAAO,GAAG;gBACd,GAAGA,QAAQ,OAAO;gBAClB,YAAYS,OAAO,KAAK,CAAC,MAAM;YACnC;QACJ,EAAE,OAAM,CAIR;IACJ;IAEA,MAAMC,yBAAyBC,8BAC3B,OAAO,EAAER,OAAO,EAAES,IAAI,EAAE,GAAGC,MAAM;QAC7B,MAAMX,UAAUW,KAAK,OAAO;QAE5B,MAAMC,yBAAyBZ,QAAQ,GAAG,CAAC,gCAAgC;QAE3E,IAAI,CAACY,0BAA0BX,OAAO,CAAC,cAAc,KAAKP,YACtD,OAAOgB;QAGX,MAAMG,wBAAwBb,SAASC,QAAQ,MAAM;IACzD;IAIJO,uBAAuB,IAAI,GAAGA,uBAAuB,IAAI,GAAG;IAE5D,OAAO;QAACZ;QAAkBY;KAAuB;AACrD"}
+{"version":3,"file":"assetDelivery/threatDetection/createThreatDetectionEventHandler.js","sources":["../../../src/assetDelivery/threatDetection/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 { ObjectKey } from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\nimport type { GuardDutyEvent } from \"./types.js\";\nimport { processThreatScanResult } from \"./processThreatScanResult.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 s3ObjectKey = payload.detail.s3ObjectDetails.objectKey;\n        const objectKey = context.container.resolve(ObjectKey);\n        const keyValueStore = context.container.resolve(GlobalKeyValueStore);\n\n        try {\n            const fileId = objectKey.from(s3ObjectKey).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"],"names":["detailType","createThreatDetectionEventHandler","handlerOnRequest","createHandlerOnRequest","request","_","context","payload","s3ObjectKey","objectKey","ObjectKey","keyValueStore","GlobalKeyValueStore","fileId","result","threatScanEventHandler","createEventBridgeEventHandler","next","rest","threatDetectionEnabled","processThreatScanResult"],"mappings":";;;;;AASA,MAAMA,aAAa;AAEZ,MAAMC,oCAAoC;IAC7C,MAAMC,mBAAmBC,uBAAuB,OAAOC,SAASC,GAAGC;QAC/D,MAAMC,UAAUH,QAAQ,IAAI;QAE5B,IAAIG,OAAO,CAAC,cAAc,KAAKP,YAC3B;QAGJ,MAAMQ,cAAcD,QAAQ,MAAM,CAAC,eAAe,CAAC,SAAS;QAC5D,MAAME,YAAYH,QAAQ,SAAS,CAAC,OAAO,CAACI;QAC5C,MAAMC,gBAAgBL,QAAQ,SAAS,CAAC,OAAO,CAACM;QAEhD,IAAI;YACA,MAAMC,SAASJ,UAAU,IAAI,CAACD,aAAa,EAAE;YAC7C,MAAMM,SAAS,MAAMH,cAAc,GAAG,CAClC,CAAC,iBAAiB,EAAEE,OAAO,SAAS,CAAC;YAGzC,IAAIC,OAAO,MAAM,IACb;YAGJV,QAAQ,OAAO,GAAG;gBACd,GAAGA,QAAQ,OAAO;gBAClB,YAAYU,OAAO,KAAK,CAAC,MAAM;YACnC;QACJ,EAAE,OAAM,CAIR;IACJ;IAEA,MAAMC,yBAAyBC,8BAC3B,OAAO,EAAET,OAAO,EAAEU,IAAI,EAAE,GAAGC,MAAM;QAC7B,MAAMZ,UAAUY,KAAK,OAAO;QAE5B,MAAMC,yBAAyBb,QAAQ,GAAG,CAAC,gCAAgC;QAE3E,IAAI,CAACa,0BAA0BZ,OAAO,CAAC,cAAc,KAAKP,YACtD,OAAOiB;QAGX,MAAMG,wBAAwBd,SAASC,QAAQ,MAAM;IACzD;IAIJQ,uBAAuB,IAAI,GAAGA,uBAAuB,IAAI,GAAG;IAE5D,OAAO;QAACb;QAAkBa;KAAuB;AACrD"}

package/assetDelivery/threatDetection/processThreatScanResult.js

@@ -1,22 +1,24 @@
 import { UpdateFileUseCase } from "@webiny/api-file-manager/features/file/UpdateFile/index.js";
 import { DeleteFileUseCase } from "@webiny/api-file-manager/features/file/DeleteFile/index.js";
-import { WebsocketService } from "@webiny/api-websockets/features/WebsocketService/index.js";
-import { ObjectKey } from "./ObjectKey.js";
+import { WebsocketsListConnectionsUseCase, WebsocketsSendToConnectionsUseCase } from "@webiny/api-websockets/exports/api.js";
+import { ObjectKey } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
 import { GetFileUseCase } from "@webiny/api-file-manager/features/file/GetFile/index.js";
 const processThreatScanResult = async (context, eventDetail)=>{
-    const websocketService = context.container.resolve(WebsocketService);
+    const objectKey = context.container.resolve(ObjectKey);
+    const listConnections = context.container.resolve(WebsocketsListConnectionsUseCase);
+    const sendToConnections = context.container.resolve(WebsocketsSendToConnectionsUseCase);
     const getFile = context.container.resolve(GetFileUseCase);
     const updateFile = context.container.resolve(UpdateFileUseCase);
     const deleteFile = context.container.resolve(DeleteFileUseCase);
     await context.security.withoutAuthorization(async ()=>{
         const scanStatus = eventDetail.scanResultDetails.scanResultStatus;
         const s3Object = eventDetail.s3ObjectDetails;
-        const fileId = ObjectKey.from(s3Object.objectKey).id();
+        const fileId = objectKey.from(s3Object.objectKey).id();
         const fileResult = await getFile.execute(fileId);
         if (fileResult.isFail()) return;
         const file = fileResult.value;
         let allConnections = [];
-        const connectionsResult = await websocketService.listConnections();
+        const connectionsResult = await listConnections.execute();
         if (connectionsResult.isOk()) allConnections = connectionsResult.value;
         if ("NO_THREATS_FOUND" === scanStatus) {
             const newTags = file.tags.filter((tag)=>"threatScanInProgress" !== tag);
@@ -24,7 +26,7 @@ const processThreatScanResult = async (context, eventDetail)=>{
                 id: file.id,
                 tags: newTags
             });
-            await websocketService.sendToConnections(allConnections, {
+            await sendToConnections.execute(allConnections, {
                 action: "fm.threatScan.noThreatFound",
                 data: {
                     id: file.id,
@@ -35,7 +37,7 @@ const processThreatScanResult = async (context, eventDetail)=>{
         }
         if ("THREATS_FOUND" === scanStatus) {
             await deleteFile.execute(file.id);
-            await websocketService.sendToConnections(allConnections, {
+            await sendToConnections.execute(allConnections, {
                 action: "fm.threatScan.threatDetected",
                 data: {
                     id: file.id,
@@ -45,7 +47,7 @@ const processThreatScanResult = async (context, eventDetail)=>{
             return;
         }
         await deleteFile.execute(file.id);
-        await websocketService.sendToConnections(allConnections, {
+        await sendToConnections.execute(allConnections, {
             action: "fm.threatScan.unsupported",
             data: {
                 id: file.id,

package/assetDelivery/threatDetection/processThreatScanResult.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetDelivery/threatDetection/processThreatScanResult.js","sources":["../../../src/assetDelivery/threatDetection/processThreatScanResult.ts"],"sourcesContent":["import type { ApiCoreContext } from \"@webiny/api-core/types/core.js\";\nimport { UpdateFileUseCase } from \"@webiny/api-file-manager/features/file/UpdateFile/index.js\";\nimport { DeleteFileUseCase } from \"@webiny/api-file-manager/features/file/DeleteFile/index.js\";\nimport { WebsocketService } from \"@webiny/api-websockets/features/WebsocketService/index.js\";\nimport type { GuardDutyEvent } from \"./types.js\";\nimport { ObjectKey } from \"./ObjectKey.js\";\nimport { GetFileUseCase } from \"@webiny/api-file-manager/features/file/GetFile/index.js\";\n\nexport const processThreatScanResult = async (\n    context: ApiCoreContext,\n    eventDetail: GuardDutyEvent\n) => {\n    const websocketService = context.container.resolve(WebsocketService);\n    const getFile = context.container.resolve(GetFileUseCase);\n    const updateFile = context.container.resolve(UpdateFileUseCase);\n    const deleteFile = context.container.resolve(DeleteFileUseCase);\n\n    await context.security.withoutAuthorization(async () => {\n        const scanStatus = eventDetail.scanResultDetails.scanResultStatus;\n        const s3Object = eventDetail.s3ObjectDetails;\n\n        const fileId = ObjectKey.from(s3Object.objectKey).id();\n        const fileResult = await getFile.execute(fileId);\n\n        if (fileResult.isFail()) {\n            return;\n        }\n\n        const file = fileResult.value;\n\n        let allConnections: WebsocketService.Connection[] = [];\n        const connectionsResult = await websocketService.listConnections();\n        if (connectionsResult.isOk()) {\n            allConnections = connectionsResult.value;\n        }\n\n        if (scanStatus === \"NO_THREATS_FOUND\") {\n            const newTags = file.tags.filter(tag => tag !== \"threatScanInProgress\");\n            await updateFile.execute({\n                id: file.id,\n                tags: newTags\n            });\n\n            await websocketService.sendToConnections(allConnections, {\n                action: \"fm.threatScan.noThreatFound\",\n                data: {\n                    id: file.id,\n                    tags: newTags\n                }\n            });\n\n            return;\n        }\n\n        if (scanStatus === \"THREATS_FOUND\") {\n            // Delete the infected file.\n            await deleteFile.execute(file.id);\n\n            await websocketService.sendToConnections(allConnections, {\n                action: \"fm.threatScan.threatDetected\",\n                data: {\n                    id: file.id,\n                    name: file.name\n                }\n            });\n\n            return;\n        }\n\n        // For all other outcomes, we delete the file, until better logic is implemented.\n        await deleteFile.execute(file.id);\n\n        await websocketService.sendToConnections(allConnections, {\n            action: \"fm.threatScan.unsupported\",\n            data: {\n                id: file.id,\n                name: file.name\n            }\n        });\n    });\n};\n"],"names":["processThreatScanResult","context","eventDetail","websocketService","WebsocketService","getFile","GetFileUseCase","updateFile","UpdateFileUseCase","deleteFile","DeleteFileUseCase","scanStatus","s3Object","fileId","ObjectKey","fileResult","file","allConnections","connectionsResult","newTags","tag"],"mappings":";;;;;AAQO,MAAMA,0BAA0B,OACnCC,SACAC;IAEA,MAAMC,mBAAmBF,QAAQ,SAAS,CAAC,OAAO,CAACG;IACnD,MAAMC,UAAUJ,QAAQ,SAAS,CAAC,OAAO,CAACK;IAC1C,MAAMC,aAAaN,QAAQ,SAAS,CAAC,OAAO,CAACO;IAC7C,MAAMC,aAAaR,QAAQ,SAAS,CAAC,OAAO,CAACS;IAE7C,MAAMT,QAAQ,QAAQ,CAAC,oBAAoB,CAAC;QACxC,MAAMU,aAAaT,YAAY,iBAAiB,CAAC,gBAAgB;QACjE,MAAMU,WAAWV,YAAY,eAAe;QAE5C,MAAMW,SAASC,UAAU,IAAI,CAACF,SAAS,SAAS,EAAE,EAAE;QACpD,MAAMG,aAAa,MAAMV,QAAQ,OAAO,CAACQ;QAEzC,IAAIE,WAAW,MAAM,IACjB;QAGJ,MAAMC,OAAOD,WAAW,KAAK;QAE7B,IAAIE,iBAAgD,EAAE;QACtD,MAAMC,oBAAoB,MAAMf,iBAAiB,eAAe;QAChE,IAAIe,kBAAkB,IAAI,IACtBD,iBAAiBC,kBAAkB,KAAK;QAG5C,IAAIP,AAAe,uBAAfA,YAAmC;YACnC,MAAMQ,UAAUH,KAAK,IAAI,CAAC,MAAM,CAACI,CAAAA,MAAOA,AAAQ,2BAARA;YACxC,MAAMb,WAAW,OAAO,CAAC;gBACrB,IAAIS,KAAK,EAAE;gBACX,MAAMG;YACV;YAEA,MAAMhB,iBAAiB,iBAAiB,CAACc,gBAAgB;gBACrD,QAAQ;gBACR,MAAM;oBACF,IAAID,KAAK,EAAE;oBACX,MAAMG;gBACV;YACJ;YAEA;QACJ;QAEA,IAAIR,AAAe,oBAAfA,YAAgC;YAEhC,MAAMF,WAAW,OAAO,CAACO,KAAK,EAAE;YAEhC,MAAMb,iBAAiB,iBAAiB,CAACc,gBAAgB;gBACrD,QAAQ;gBACR,MAAM;oBACF,IAAID,KAAK,EAAE;oBACX,MAAMA,KAAK,IAAI;gBACnB;YACJ;YAEA;QACJ;QAGA,MAAMP,WAAW,OAAO,CAACO,KAAK,EAAE;QAEhC,MAAMb,iBAAiB,iBAAiB,CAACc,gBAAgB;YACrD,QAAQ;YACR,MAAM;gBACF,IAAID,KAAK,EAAE;gBACX,MAAMA,KAAK,IAAI;YACnB;QACJ;IACJ;AACJ"}
+{"version":3,"file":"assetDelivery/threatDetection/processThreatScanResult.js","sources":["../../../src/assetDelivery/threatDetection/processThreatScanResult.ts"],"sourcesContent":["import type { ApiCoreContext } from \"@webiny/api-core/types/core.js\";\nimport { UpdateFileUseCase } from \"@webiny/api-file-manager/features/file/UpdateFile/index.js\";\nimport { DeleteFileUseCase } from \"@webiny/api-file-manager/features/file/DeleteFile/index.js\";\nimport {\n    WebsocketsListConnectionsUseCase,\n    WebsocketsSendToConnectionsUseCase,\n    ConnectionRegistry\n} from \"@webiny/api-websockets/exports/api.js\";\nimport { ObjectKey } from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\nimport type { GuardDutyEvent } from \"./types.js\";\nimport { GetFileUseCase } from \"@webiny/api-file-manager/features/file/GetFile/index.js\";\n\nexport const processThreatScanResult = async (\n    context: ApiCoreContext,\n    eventDetail: GuardDutyEvent\n) => {\n    const objectKey = context.container.resolve(ObjectKey);\n    const listConnections = context.container.resolve(WebsocketsListConnectionsUseCase);\n    const sendToConnections = context.container.resolve(WebsocketsSendToConnectionsUseCase);\n    const getFile = context.container.resolve(GetFileUseCase);\n    const updateFile = context.container.resolve(UpdateFileUseCase);\n    const deleteFile = context.container.resolve(DeleteFileUseCase);\n\n    await context.security.withoutAuthorization(async () => {\n        const scanStatus = eventDetail.scanResultDetails.scanResultStatus;\n        const s3Object = eventDetail.s3ObjectDetails;\n\n        const fileId = objectKey.from(s3Object.objectKey).id();\n        const fileResult = await getFile.execute(fileId);\n\n        if (fileResult.isFail()) {\n            return;\n        }\n\n        const file = fileResult.value;\n\n        let allConnections: ConnectionRegistry.Data[] = [];\n        const connectionsResult = await listConnections.execute();\n        if (connectionsResult.isOk()) {\n            allConnections = connectionsResult.value;\n        }\n\n        if (scanStatus === \"NO_THREATS_FOUND\") {\n            const newTags = file.tags.filter(tag => tag !== \"threatScanInProgress\");\n            await updateFile.execute({\n                id: file.id,\n                tags: newTags\n            });\n\n            await sendToConnections.execute(allConnections, {\n                action: \"fm.threatScan.noThreatFound\",\n                data: {\n                    id: file.id,\n                    tags: newTags\n                }\n            });\n\n            return;\n        }\n\n        if (scanStatus === \"THREATS_FOUND\") {\n            // Delete the infected file.\n            await deleteFile.execute(file.id);\n\n            await sendToConnections.execute(allConnections, {\n                action: \"fm.threatScan.threatDetected\",\n                data: {\n                    id: file.id,\n                    name: file.name\n                }\n            });\n\n            return;\n        }\n\n        // For all other outcomes, we delete the file, until better logic is implemented.\n        await deleteFile.execute(file.id);\n\n        await sendToConnections.execute(allConnections, {\n            action: \"fm.threatScan.unsupported\",\n            data: {\n                id: file.id,\n                name: file.name\n            }\n        });\n    });\n};\n"],"names":["processThreatScanResult","context","eventDetail","objectKey","ObjectKey","listConnections","WebsocketsListConnectionsUseCase","sendToConnections","WebsocketsSendToConnectionsUseCase","getFile","GetFileUseCase","updateFile","UpdateFileUseCase","deleteFile","DeleteFileUseCase","scanStatus","s3Object","fileId","fileResult","file","allConnections","connectionsResult","newTags","tag"],"mappings":";;;;;AAYO,MAAMA,0BAA0B,OACnCC,SACAC;IAEA,MAAMC,YAAYF,QAAQ,SAAS,CAAC,OAAO,CAACG;IAC5C,MAAMC,kBAAkBJ,QAAQ,SAAS,CAAC,OAAO,CAACK;IAClD,MAAMC,oBAAoBN,QAAQ,SAAS,CAAC,OAAO,CAACO;IACpD,MAAMC,UAAUR,QAAQ,SAAS,CAAC,OAAO,CAACS;IAC1C,MAAMC,aAAaV,QAAQ,SAAS,CAAC,OAAO,CAACW;IAC7C,MAAMC,aAAaZ,QAAQ,SAAS,CAAC,OAAO,CAACa;IAE7C,MAAMb,QAAQ,QAAQ,CAAC,oBAAoB,CAAC;QACxC,MAAMc,aAAab,YAAY,iBAAiB,CAAC,gBAAgB;QACjE,MAAMc,WAAWd,YAAY,eAAe;QAE5C,MAAMe,SAASd,UAAU,IAAI,CAACa,SAAS,SAAS,EAAE,EAAE;QACpD,MAAME,aAAa,MAAMT,QAAQ,OAAO,CAACQ;QAEzC,IAAIC,WAAW,MAAM,IACjB;QAGJ,MAAMC,OAAOD,WAAW,KAAK;QAE7B,IAAIE,iBAA4C,EAAE;QAClD,MAAMC,oBAAoB,MAAMhB,gBAAgB,OAAO;QACvD,IAAIgB,kBAAkB,IAAI,IACtBD,iBAAiBC,kBAAkB,KAAK;QAG5C,IAAIN,AAAe,uBAAfA,YAAmC;YACnC,MAAMO,UAAUH,KAAK,IAAI,CAAC,MAAM,CAACI,CAAAA,MAAOA,AAAQ,2BAARA;YACxC,MAAMZ,WAAW,OAAO,CAAC;gBACrB,IAAIQ,KAAK,EAAE;gBACX,MAAMG;YACV;YAEA,MAAMf,kBAAkB,OAAO,CAACa,gBAAgB;gBAC5C,QAAQ;gBACR,MAAM;oBACF,IAAID,KAAK,EAAE;oBACX,MAAMG;gBACV;YACJ;YAEA;QACJ;QAEA,IAAIP,AAAe,oBAAfA,YAAgC;YAEhC,MAAMF,WAAW,OAAO,CAACM,KAAK,EAAE;YAEhC,MAAMZ,kBAAkB,OAAO,CAACa,gBAAgB;gBAC5C,QAAQ;gBACR,MAAM;oBACF,IAAID,KAAK,EAAE;oBACX,MAAMA,KAAK,IAAI;gBACnB;YACJ;YAEA;QACJ;QAGA,MAAMN,WAAW,OAAO,CAACM,KAAK,EAAE;QAEhC,MAAMZ,kBAAkB,OAAO,CAACa,gBAAgB;YAC5C,QAAQ;YACR,MAAM;gBACF,IAAID,KAAK,EAAE;gBACX,MAAMA,KAAK,IAAI;YACnB;QACJ;IACJ;AACJ"}

package/assetDelivery/types.d.ts

@@ -1,5 +1,8 @@
+import type { ImageFormat } from "@webiny/api-file-manager/features/assetDelivery/transformation/index.js";
 export type AssetDeliveryParams = {
     imageResizeWidths?: number[];
+    /** Per-format encoder quality (1-100). Merged over the built-in defaults. */
+    imageQuality?: Partial<Record<ImageFormat, number>>;
     /**
      * BE CAREFUL!
      * Setting this to more than 1 hour may cause your URLs to still expire before the desired expiration time.

package/features/CompleteMultiPartUpload/CompleteMultiPartUploadUseCase.d.ts

@@ -0,0 +1,8 @@
+import { CompleteMultiPartUploadUseCase } from "@webiny/api-file-manager/features/upload/CompleteMultiPartUpload/index.js";
+declare class CompleteMultiPartUploadUseCaseImpl implements CompleteMultiPartUploadUseCase.Interface {
+    execute(params: CompleteMultiPartUploadUseCase.Params): Promise<void>;
+}
+export declare const CompleteMultiPartUploadUseCaseImplementation: typeof CompleteMultiPartUploadUseCaseImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-file-manager/features/upload/CompleteMultiPartUpload/abstractions").ICompleteMultiPartUploadUseCase>;
+};
+export {};

package/features/CompleteMultiPartUpload/CompleteMultiPartUploadUseCase.js

@@ -0,0 +1,51 @@
+import { CompleteMultipartUploadCommand, ListPartsCommand, S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import { CompleteMultiPartUploadUseCase } from "@webiny/api-file-manager/features/upload/CompleteMultiPartUpload/index.js";
+const EMPTY_MARKER_VALUES = [
+    void 0,
+    "0"
+];
+class CompleteMultiPartUploadUseCaseImpl {
+    async execute(params) {
+        const bucket = String(process.env.S3_BUCKET);
+        const s3Client = new S3({
+            region: process.env.AWS_REGION
+        });
+        const uploadParams = {
+            Bucket: bucket,
+            Key: params.fileKey,
+            UploadId: params.uploadId
+        };
+        const allParts = await getAllUploadParts(s3Client, uploadParams);
+        const command = new CompleteMultipartUploadCommand({
+            ...uploadParams,
+            MultipartUpload: {
+                Parts: allParts
+            }
+        });
+        await s3Client.send(command);
+    }
+}
+async function getAllUploadParts(s3Client, params) {
+    const parts = [];
+    let marker;
+    while(true){
+        const { Parts, PartNumberMarker } = await s3Client.send(new ListPartsCommand({
+            ...params,
+            PartNumberMarker: marker
+        }));
+        if (Parts) Parts.forEach((part)=>parts.push(part));
+        marker = PartNumberMarker || void 0;
+        if (EMPTY_MARKER_VALUES.includes(marker)) break;
+    }
+    return parts.map((part)=>({
+            ETag: part.ETag,
+            PartNumber: part.PartNumber
+        }));
+}
+const CompleteMultiPartUploadUseCaseImplementation = CompleteMultiPartUploadUseCase.createImplementation({
+    implementation: CompleteMultiPartUploadUseCaseImpl,
+    dependencies: []
+});
+export { CompleteMultiPartUploadUseCaseImplementation };
+
+//# sourceMappingURL=CompleteMultiPartUploadUseCase.js.map

package/features/CompleteMultiPartUpload/CompleteMultiPartUploadUseCase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/CompleteMultiPartUpload/CompleteMultiPartUploadUseCase.js","sources":["../../../src/features/CompleteMultiPartUpload/CompleteMultiPartUploadUseCase.ts"],"sourcesContent":["import type { Part } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type { ListPartsOutput } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { ListPartsCommand } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { CompleteMultipartUploadCommand } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { CompleteMultiPartUploadUseCase } from \"@webiny/api-file-manager/features/upload/CompleteMultiPartUpload/index.js\";\n\nconst EMPTY_MARKER_VALUES = [undefined, \"0\"];\n\nclass CompleteMultiPartUploadUseCaseImpl implements CompleteMultiPartUploadUseCase.Interface {\n    public async execute(params: CompleteMultiPartUploadUseCase.Params): Promise<void> {\n        const bucket = String(process.env.S3_BUCKET);\n        const s3Client = new S3({ region: process.env.AWS_REGION });\n\n        const uploadParams = {\n            Bucket: bucket,\n            Key: params.fileKey,\n            UploadId: params.uploadId\n        };\n\n        const allParts = await getAllUploadParts(s3Client, uploadParams);\n\n        const command = new CompleteMultipartUploadCommand({\n            ...uploadParams,\n            MultipartUpload: { Parts: allParts }\n        });\n\n        await s3Client.send(command);\n    }\n}\n\ninterface GetAllUploadPartsParams {\n    Bucket: string;\n    Key: string;\n    UploadId: string;\n}\n\nasync function getAllUploadParts(s3Client: S3, params: GetAllUploadPartsParams) {\n    const parts: Part[] = [];\n\n    let marker: string | undefined = undefined;\n    while (true) {\n        const { Parts, PartNumberMarker }: ListPartsOutput = await s3Client.send(\n            new ListPartsCommand({\n                ...params,\n                PartNumberMarker: marker\n            })\n        );\n\n        if (Parts) {\n            Parts.forEach(part => parts.push(part));\n        }\n\n        marker = PartNumberMarker || undefined;\n        if (EMPTY_MARKER_VALUES.includes(marker)) {\n            break;\n        }\n    }\n\n    return parts.map(part => ({\n        ETag: part.ETag as string,\n        PartNumber: part.PartNumber as number\n    }));\n}\n\nexport const CompleteMultiPartUploadUseCaseImplementation =\n    CompleteMultiPartUploadUseCase.createImplementation({\n        implementation: CompleteMultiPartUploadUseCaseImpl,\n        dependencies: []\n    });\n"],"names":["EMPTY_MARKER_VALUES","undefined","CompleteMultiPartUploadUseCaseImpl","params","bucket","String","process","s3Client","S3","uploadParams","allParts","getAllUploadParts","command","CompleteMultipartUploadCommand","parts","marker","Parts","PartNumberMarker","ListPartsCommand","part","CompleteMultiPartUploadUseCaseImplementation","CompleteMultiPartUploadUseCase"],"mappings":";;AAOA,MAAMA,sBAAsB;IAACC;IAAW;CAAI;AAE5C,MAAMC;IACF,MAAa,QAAQC,MAA6C,EAAiB;QAC/E,MAAMC,SAASC,OAAOC,QAAQ,GAAG,CAAC,SAAS;QAC3C,MAAMC,WAAW,IAAIC,GAAG;YAAE,QAAQF,QAAQ,GAAG,CAAC,UAAU;QAAC;QAEzD,MAAMG,eAAe;YACjB,QAAQL;YACR,KAAKD,OAAO,OAAO;YACnB,UAAUA,OAAO,QAAQ;QAC7B;QAEA,MAAMO,WAAW,MAAMC,kBAAkBJ,UAAUE;QAEnD,MAAMG,UAAU,IAAIC,+BAA+B;YAC/C,GAAGJ,YAAY;YACf,iBAAiB;gBAAE,OAAOC;YAAS;QACvC;QAEA,MAAMH,SAAS,IAAI,CAACK;IACxB;AACJ;AAQA,eAAeD,kBAAkBJ,QAAY,EAAEJ,MAA+B;IAC1E,MAAMW,QAAgB,EAAE;IAExB,IAAIC;IACJ,MAAO,KAAM;QACT,MAAM,EAAEC,KAAK,EAAEC,gBAAgB,EAAE,GAAoB,MAAMV,SAAS,IAAI,CACpE,IAAIW,iBAAiB;YACjB,GAAGf,MAAM;YACT,kBAAkBY;QACtB;QAGJ,IAAIC,OACAA,MAAM,OAAO,CAACG,CAAAA,OAAQL,MAAM,IAAI,CAACK;QAGrCJ,SAASE,oBAAoBhB;QAC7B,IAAID,oBAAoB,QAAQ,CAACe,SAC7B;IAER;IAEA,OAAOD,MAAM,GAAG,CAACK,CAAAA,OAAS;YACtB,MAAMA,KAAK,IAAI;YACf,YAAYA,KAAK,UAAU;QAC/B;AACJ;AAEO,MAAMC,+CACTC,+BAA+B,oBAAoB,CAAC;IAChD,gBAAgBnB;IAChB,cAAc,EAAE;AACpB"}

package/features/CompleteMultiPartUpload/feature.d.ts

@@ -0,0 +1,4 @@
+export declare const CompleteMultiPartUploadFeature: {
+    name: string;
+    register(container: import("@webiny/di").Container): void;
+};

package/features/CompleteMultiPartUpload/feature.js

@@ -0,0 +1,11 @@
+import { createFeature } from "@webiny/feature/api";
+import { CompleteMultiPartUploadUseCaseImplementation } from "./CompleteMultiPartUploadUseCase.js";
+const CompleteMultiPartUploadFeature = createFeature({
+    name: "FileManagerS3/CompleteMultiPartUpload",
+    register (container) {
+        container.register(CompleteMultiPartUploadUseCaseImplementation);
+    }
+});
+export { CompleteMultiPartUploadFeature };
+
+//# sourceMappingURL=feature.js.map

package/features/CompleteMultiPartUpload/feature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/CompleteMultiPartUpload/feature.js","sources":["../../../src/features/CompleteMultiPartUpload/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { CompleteMultiPartUploadUseCaseImplementation } from \"./CompleteMultiPartUploadUseCase.js\";\n\nexport const CompleteMultiPartUploadFeature = createFeature({\n    name: \"FileManagerS3/CompleteMultiPartUpload\",\n    register(container) {\n        container.register(CompleteMultiPartUploadUseCaseImplementation);\n    }\n});\n"],"names":["CompleteMultiPartUploadFeature","createFeature","container","CompleteMultiPartUploadUseCaseImplementation"],"mappings":";;AAGO,MAAMA,iCAAiCC,cAAc;IACxD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;IACvB;AACJ"}

package/features/CreateMultiPartUpload/CreateMultiPartUploadUseCase.d.ts

@@ -0,0 +1,9 @@
+import { CreateMultiPartUploadUseCase } from "@webiny/api-file-manager/features/upload/CreateMultiPartUpload/index.js";
+import type { CreateMultiPartUploadResult } from "@webiny/api-file-manager/features/upload/types.js";
+declare class CreateMultiPartUploadUseCaseImpl implements CreateMultiPartUploadUseCase.Interface {
+    execute(params: CreateMultiPartUploadUseCase.Params): Promise<CreateMultiPartUploadResult>;
+}
+export declare const CreateMultiPartUploadUseCaseImplementation: typeof CreateMultiPartUploadUseCaseImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-file-manager/features/upload/CreateMultiPartUpload/abstractions").ICreateMultiPartUploadUseCase>;
+};
+export {};

package/features/CreateMultiPartUpload/CreateMultiPartUploadUseCase.js

@@ -0,0 +1,40 @@
+import { S3, UploadPartCommand, getSignedUrl } from "@webiny/aws-sdk/client-s3/index.js";
+import { CreateMultiPartUploadUseCase } from "@webiny/api-file-manager/features/upload/CreateMultiPartUpload/index.js";
+class CreateMultiPartUploadUseCaseImpl {
+    async execute(params) {
+        const { file, numberOfParts } = params;
+        const bucket = String(process.env.S3_BUCKET);
+        const s3Client = new S3({
+            region: process.env.AWS_REGION
+        });
+        const s3Params = {
+            Bucket: bucket,
+            Key: file.key
+        };
+        const { UploadId } = await s3Client.createMultipartUpload(s3Params);
+        const parts = await Promise.all(Array.from({
+            length: numberOfParts
+        }).map((_, index)=>getSignedUrl(s3Client, new UploadPartCommand({
+                ...s3Params,
+                UploadId,
+                PartNumber: index + 1
+            }), {
+                expiresIn: 86400
+            }).then((url)=>({
+                    url,
+                    partNumber: index + 1
+                }))));
+        return {
+            file,
+            uploadId: UploadId,
+            parts
+        };
+    }
+}
+const CreateMultiPartUploadUseCaseImplementation = CreateMultiPartUploadUseCase.createImplementation({
+    implementation: CreateMultiPartUploadUseCaseImpl,
+    dependencies: []
+});
+export { CreateMultiPartUploadUseCaseImplementation };
+
+//# sourceMappingURL=CreateMultiPartUploadUseCase.js.map

package/features/CreateMultiPartUpload/CreateMultiPartUploadUseCase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/CreateMultiPartUpload/CreateMultiPartUploadUseCase.js","sources":["../../../src/features/CreateMultiPartUpload/CreateMultiPartUploadUseCase.ts"],"sourcesContent":["import { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { getSignedUrl } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { UploadPartCommand } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { CreateMultiPartUploadUseCase } from \"@webiny/api-file-manager/features/upload/CreateMultiPartUpload/index.js\";\nimport type { CreateMultiPartUploadResult } from \"@webiny/api-file-manager/features/upload/types.js\";\n\nclass CreateMultiPartUploadUseCaseImpl implements CreateMultiPartUploadUseCase.Interface {\n    public async execute(\n        params: CreateMultiPartUploadUseCase.Params\n    ): Promise<CreateMultiPartUploadResult> {\n        const { file, numberOfParts } = params;\n\n        const bucket = String(process.env.S3_BUCKET);\n        const s3Client = new S3({ region: process.env.AWS_REGION });\n        const s3Params = { Bucket: bucket, Key: file.key };\n\n        const { UploadId } = await s3Client.createMultipartUpload(s3Params);\n\n        const parts = await Promise.all(\n            Array.from({ length: numberOfParts }).map((_, index) => {\n                return getSignedUrl(\n                    s3Client,\n                    new UploadPartCommand({ ...s3Params, UploadId, PartNumber: index + 1 }),\n                    { expiresIn: 86400 }\n                ).then(url => ({\n                    url,\n                    partNumber: index + 1\n                }));\n            })\n        );\n\n        return {\n            file,\n            uploadId: UploadId as string,\n            parts\n        };\n    }\n}\n\nexport const CreateMultiPartUploadUseCaseImplementation =\n    CreateMultiPartUploadUseCase.createImplementation({\n        implementation: CreateMultiPartUploadUseCaseImpl,\n        dependencies: []\n    });\n"],"names":["CreateMultiPartUploadUseCaseImpl","params","file","numberOfParts","bucket","String","process","s3Client","S3","s3Params","UploadId","parts","Promise","Array","_","index","getSignedUrl","UploadPartCommand","url","CreateMultiPartUploadUseCaseImplementation","CreateMultiPartUploadUseCase"],"mappings":";;AAMA,MAAMA;IACF,MAAa,QACTC,MAA2C,EACP;QACpC,MAAM,EAAEC,IAAI,EAAEC,aAAa,EAAE,GAAGF;QAEhC,MAAMG,SAASC,OAAOC,QAAQ,GAAG,CAAC,SAAS;QAC3C,MAAMC,WAAW,IAAIC,GAAG;YAAE,QAAQF,QAAQ,GAAG,CAAC,UAAU;QAAC;QACzD,MAAMG,WAAW;YAAE,QAAQL;YAAQ,KAAKF,KAAK,GAAG;QAAC;QAEjD,MAAM,EAAEQ,QAAQ,EAAE,GAAG,MAAMH,SAAS,qBAAqB,CAACE;QAE1D,MAAME,QAAQ,MAAMC,QAAQ,GAAG,CAC3BC,MAAM,IAAI,CAAC;YAAE,QAAQV;QAAc,GAAG,GAAG,CAAC,CAACW,GAAGC,QACnCC,aACHT,UACA,IAAIU,kBAAkB;gBAAE,GAAGR,QAAQ;gBAAEC;gBAAU,YAAYK,QAAQ;YAAE,IACrE;gBAAE,WAAW;YAAM,GACrB,IAAI,CAACG,CAAAA,MAAQ;oBACXA;oBACA,YAAYH,QAAQ;gBACxB;QAIR,OAAO;YACHb;YACA,UAAUQ;YACVC;QACJ;IACJ;AACJ;AAEO,MAAMQ,6CACTC,6BAA6B,oBAAoB,CAAC;IAC9C,gBAAgBpB;IAChB,cAAc,EAAE;AACpB"}

package/features/CreateMultiPartUpload/feature.d.ts

@@ -0,0 +1,4 @@
+export declare const CreateMultiPartUploadFeature: {
+    name: string;
+    register(container: import("@webiny/di").Container): void;
+};