@webiny/api-file-manager-server 6.6.0-alpha.0 → 6.6.0-alpha.1

package/assetDelivery/LazyLocalSharpTransform.d.ts

@@ -0,0 +1,33 @@
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import { GetFileUseCase } from "@webiny/api-file-manager/features/file/GetFile/index.js";
+import type { IAssetTypeHandler } from "@webiny/api-file-manager/features/assetDelivery/abstractions/AssetType.js";
+import type { Asset } from "@webiny/api-file-manager/delivery/AssetDelivery/Asset.js";
+import type { AssetRequest } from "@webiny/api-file-manager/delivery/AssetDelivery/AssetRequest.js";
+import type { ILocalAssetDeliveryConfig } from "../assetDelivery/abstractions.js";
+/**
+ * Defers loading `sharp` until an image is actually transformed. Server counterpart of
+ * `api-file-manager-s3`'s `LazySharpTransform`.
+ *
+ * The dynamic import is deliberate — it keeps `sharp` out of the main bundle (note the
+ * `webpackChunkName`). That import is async and DI resolution is not, which is why this used to be
+ * a per-request `RequestContextInitializer` that imported the module and then registered the real
+ * handler. `IAssetTypeHandler` has a single async method, so the import can be awaited there
+ * instead.
+ *
+ * The constructed handler IS memoized: the initializer registered it `.inSingletonScope()`, and
+ * nothing below caches the instance (Node caches the module, not the object built from it).
+ */
+declare class LazyLocalSharpTransform implements IAssetTypeHandler {
+    private readonly storagePath;
+    private readonly config;
+    private readonly identityContext;
+    private readonly getFile;
+    private handler;
+    constructor(storagePath: string, config: ILocalAssetDeliveryConfig, identityContext: IdentityContext.Interface, getFile: GetFileUseCase.Interface);
+    private resolveHandler;
+    handle(assetRequest: AssetRequest, asset: Asset): Promise<Asset>;
+}
+export declare const LazyLocalSharpTransformImpl: typeof LazyLocalSharpTransform & {
+    __abstraction: import("@webiny/di").Abstraction<IAssetTypeHandler>;
+};
+export {};

package/assetDelivery/LazyLocalSharpTransform.js

@@ -0,0 +1,32 @@
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import { GetFileUseCase } from "@webiny/api-file-manager/features/file/GetFile/index.js";
+import { ImageAssetTypeHandler } from "@webiny/api-file-manager/features/assetDelivery/assetTypes/image/index.js";
+import { LocalAssetDeliveryConfig, LocalStoragePath } from "./abstractions.js";
+class LazyLocalSharpTransform {
+    constructor(storagePath, config, identityContext, getFile){
+        this.storagePath = storagePath;
+        this.config = config;
+        this.identityContext = identityContext;
+        this.getFile = getFile;
+        this.handler = null;
+    }
+    resolveHandler() {
+        if (!this.handler) this.handler = import("./LocalSharpTransform.js").then(({ LocalSharpTransform })=>new LocalSharpTransform(this.storagePath, this.config, this.identityContext, this.getFile));
+        return this.handler;
+    }
+    async handle(assetRequest, asset) {
+        return (await this.resolveHandler()).handle(assetRequest, asset);
+    }
+}
+const LazyLocalSharpTransformImpl = ImageAssetTypeHandler.createImplementation({
+    implementation: LazyLocalSharpTransform,
+    dependencies: [
+        LocalStoragePath,
+        LocalAssetDeliveryConfig,
+        IdentityContext,
+        GetFileUseCase
+    ]
+});
+export { LazyLocalSharpTransformImpl };
+
+//# sourceMappingURL=LazyLocalSharpTransform.js.map

package/assetDelivery/LazyLocalSharpTransform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assetDelivery/LazyLocalSharpTransform.js","sources":["../../src/assetDelivery/LazyLocalSharpTransform.ts"],"sourcesContent":["import { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { GetFileUseCase } from \"@webiny/api-file-manager/features/file/GetFile/index.js\";\nimport { ImageAssetTypeHandler } from \"@webiny/api-file-manager/features/assetDelivery/assetTypes/image/index.js\";\nimport type { IAssetTypeHandler } from \"@webiny/api-file-manager/features/assetDelivery/abstractions/AssetType.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 { LocalAssetDeliveryConfig, LocalStoragePath } from \"~/assetDelivery/abstractions.js\";\nimport type { ILocalAssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\n\n/**\n * Defers loading `sharp` until an image is actually transformed. Server counterpart of\n * `api-file-manager-s3`'s `LazySharpTransform`.\n *\n * The dynamic import is deliberate — it keeps `sharp` out of the main bundle (note the\n * `webpackChunkName`). That import is async and DI resolution is not, which is why this used to be\n * a per-request `RequestContextInitializer` that imported the module and then registered the real\n * handler. `IAssetTypeHandler` has a single async method, so the import can be awaited there\n * instead.\n *\n * The constructed handler IS memoized: the initializer registered it `.inSingletonScope()`, and\n * nothing below caches the instance (Node caches the module, not the object built from it).\n */\nclass LazyLocalSharpTransform implements IAssetTypeHandler {\n    private handler: Promise<IAssetTypeHandler> | null = null;\n\n    constructor(\n        private readonly storagePath: string,\n        private readonly config: ILocalAssetDeliveryConfig,\n        private readonly identityContext: IdentityContext.Interface,\n        private readonly getFile: GetFileUseCase.Interface\n    ) {}\n\n    private resolveHandler(): Promise<IAssetTypeHandler> {\n        if (!this.handler) {\n            this.handler = import(\n                /* webpackChunkName: \"localAssetDelivery\" */ \"./LocalSharpTransform.js\"\n            ).then(\n                ({ LocalSharpTransform }) =>\n                    new LocalSharpTransform(\n                        this.storagePath,\n                        this.config,\n                        this.identityContext,\n                        this.getFile\n                    )\n            );\n        }\n        return this.handler;\n    }\n\n    async handle(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        return (await this.resolveHandler()).handle(assetRequest, asset);\n    }\n}\n\nexport const LazyLocalSharpTransformImpl = ImageAssetTypeHandler.createImplementation({\n    implementation: LazyLocalSharpTransform,\n    dependencies: [LocalStoragePath, LocalAssetDeliveryConfig, IdentityContext, GetFileUseCase]\n});\n"],"names":["LazyLocalSharpTransform","storagePath","config","identityContext","getFile","LocalSharpTransform","assetRequest","asset","LazyLocalSharpTransformImpl","ImageAssetTypeHandler","LocalStoragePath","LocalAssetDeliveryConfig","IdentityContext","GetFileUseCase"],"mappings":";;;;AAsBA,MAAMA;IAGF,YACqBC,WAAmB,EACnBC,MAAiC,EACjCC,eAA0C,EAC1CC,OAAiC,CACpD;aAJmBH,WAAW,GAAXA;aACAC,MAAM,GAANA;aACAC,eAAe,GAAfA;aACAC,OAAO,GAAPA;aANb,OAAO,GAAsC;IAOlD;IAEK,iBAA6C;QACjD,IAAI,CAAC,IAAI,CAAC,OAAO,EACb,IAAI,CAAC,OAAO,GAAG,MAAM,CAAN,4BAEb,IAAI,CACF,CAAC,EAAEC,mBAAmB,EAAE,GACpB,IAAIA,oBACA,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,OAAO;QAI5B,OAAO,IAAI,CAAC,OAAO;IACvB;IAEA,MAAM,OAAOC,YAA0B,EAAEC,KAAY,EAAkB;QACnE,OAAQ,OAAM,IAAI,CAAC,cAAc,EAAC,EAAG,MAAM,CAACD,cAAcC;IAC9D;AACJ;AAEO,MAAMC,8BAA8BC,sBAAsB,oBAAoB,CAAC;IAClF,gBAAgBT;IAChB,cAAc;QAACU;QAAkBC;QAA0BC;QAAiBC;KAAe;AAC/F"}

package/assetDelivery/LocalSharpTransform.d.ts

@@ -1,18 +1,24 @@
-import { AssetTransformationStrategy as AssetTransformationStrategyAbstraction } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
-import { FileManagerServerConfig } from "../features/FileManagerServerConfig/abstractions.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 type { IAssetTypeHandler } from "@webiny/api-file-manager/features/assetDelivery/abstractions/AssetType.js";
+import type { Asset } from "@webiny/api-file-manager/delivery/AssetDelivery/Asset.js";
+import type { AssetRequest } from "@webiny/api-file-manager/delivery/AssetDelivery/AssetRequest.js";
 import type { ILocalAssetDeliveryConfig } from "../assetDelivery/abstractions.js";
-declare class AssetTransformationStrategyImpl implements AssetTransformationStrategyAbstraction.Interface {
+export declare class LocalSharpTransform implements IAssetTypeHandler {
     private readonly storagePath;
     private readonly imageResizeWidths;
-    constructor(serverConfig: FileManagerServerConfig.Interface, config: ILocalAssetDeliveryConfig);
-    transform(assetRequest: AssetTransformationStrategyAbstraction.AssetRequest, asset: AssetTransformationStrategyAbstraction.Asset): Promise<AssetTransformationStrategyAbstraction.Asset>;
+    private readonly imageQuality;
+    private readonly identityContext;
+    private readonly getFile;
+    private transformer?;
+    constructor(storagePath: string, config: ILocalAssetDeliveryConfig, identityContext: IdentityContext.Interface, getFile: GetFileUseCase.Interface);
+    private getTransformer;
+    handle(assetRequest: AssetRequest, asset: Asset): Promise<Asset>;
+    private loadAssetCrop;
     private transformAsset;
     private optimizeAsset;
     private isAssetAnimated;
-    private optimizePng;
-    private optimizeJpeg;
 }
-export declare const LocalSharpTransform: typeof AssetTransformationStrategyImpl & {
-    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-file-manager/delivery").AssetTransformationStrategy>;
+export declare const LocalSharpTransformImpl: typeof LocalSharpTransform & {
+    __abstraction: import("@webiny/di").Abstraction<IAssetTypeHandler>;
 };
-export {};

package/assetDelivery/LocalSharpTransform.js

@@ -1,78 +1,105 @@
-import sharp from "sharp";
 import promises from "node:fs/promises";
 import node_path from "node:path";
-import { AssetTransformationStrategy } from "@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js";
-import { LocalAssetDeliveryConfig } from "./abstractions.js";
-import { FileManagerServerConfig } from "../features/FileManagerServerConfig/abstractions.js";
-import * as __rspack_external__webiny_api_file_manager_features_assetDelivery_transformation_index_js_08a35114 from "@webiny/api-file-manager/features/assetDelivery/transformation/index.js";
-class AssetTransformationStrategyImpl {
-    constructor(serverConfig, config){
-        this.storagePath = serverConfig.storagePath;
+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 { LocalAssetDeliveryConfig, LocalStoragePath } from "./abstractions.js";
+const hasTransform = (options)=>void 0 !== options.width || void 0 !== options.format || void 0 !== options.quality;
+class LocalSharpTransform {
+    constructor(storagePath, config, identityContext, getFile){
+        this.storagePath = storagePath;
         this.imageResizeWidths = config.imageResizeWidths;
+        this.imageQuality = {
+            ...DEFAULT_IMAGE_QUALITY,
+            ...config.imageQuality ?? {}
+        };
+        this.identityContext = identityContext;
+        this.getFile = getFile;
     }
-    async transform(assetRequest, asset) {
-        if (!__rspack_external__webiny_api_file_manager_features_assetDelivery_transformation_index_js_08a35114.SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension())) {
-            console.log(`Transformations/optimizations of ${asset.getContentType()} assets are not supported. Skipping.`);
-            return asset;
+    async getTransformer() {
+        if (!this.transformer) {
+            const { SharpTransformer } = await import("@webiny/api-file-manager/features/assetDelivery/assetTypes/image/SharpTransformer.js");
+            this.transformer = new SharpTransformer();
         }
-        const { original, ...options } = assetRequest.getOptions();
+        return this.transformer;
+    }
+    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 = __rspack_external__webiny_api_file_manager_features_assetDelivery_transformation_index_js_08a35114.AssetKeyGenerator.create(asset);
-            const transformedAssetKey = assetKey.getTransformedImageKey(options);
-            const transformedFilePath = node_path.join(this.storagePath, transformedAssetKey);
-            try {
-                const buffer = await promises.readFile(transformedFilePath);
-                const newAsset = asset.withProps({
-                    size: buffer.length
-                });
-                newAsset.setContentsReader(__rspack_external__webiny_api_file_manager_features_assetDelivery_transformation_index_js_08a35114.CallableContentsReader.create(()=>buffer));
-                console.log("Return a previously transformed asset", {
-                    key: transformedAssetKey,
-                    size: newAsset.getSize()
-                });
-                return newAsset;
-            } catch  {
-                const optimizedImage = await this.optimizeAsset(asset);
-                const widths = __rspack_external__webiny_api_file_manager_features_assetDelivery_transformation_index_js_08a35114.WidthCollection.create(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(__rspack_external__webiny_api_file_manager_features_assetDelivery_transformation_index_js_08a35114.CallableContentsReader.create(()=>transformedBuffer));
-                await promises.mkdir(node_path.dirname(transformedFilePath), {
-                    recursive: true
-                });
-                await promises.writeFile(transformedFilePath, 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?.imageEdit;
+        return imageEdit?.crop;
+    }
+    async transformAsset(asset, options, framing) {
+        const assetKey = AssetKeyGenerator.create(asset, framing);
+        const transformedAssetKey = assetKey.getTransformedImageKey(options);
+        const transformedFilePath = node_path.join(this.storagePath, transformedAssetKey);
+        const contentType = options.format ? contentTypeForFormat(options.format) : asset.getContentType();
+        try {
+            const buffer = await promises.readFile(transformedFilePath);
+            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 promises.mkdir(node_path.dirname(transformedFilePath), {
+                recursive: true
+            });
+            await promises.writeFile(transformedFilePath, 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 = __rspack_external__webiny_api_file_manager_features_assetDelivery_transformation_index_js_08a35114.AssetKeyGenerator.create(asset);
+        const assetKey = AssetKeyGenerator.create(asset, framing);
         const optimizedAssetKey = assetKey.getOptimizedImageKey();
         const optimizedFilePath = node_path.join(this.storagePath, optimizedAssetKey);
         try {
@@ -81,27 +108,31 @@ class AssetTransformationStrategyImpl {
             const newAsset = asset.withProps({
                 size: buffer.length
             });
-            newAsset.setContentsReader(__rspack_external__webiny_api_file_manager_features_assetDelivery_transformation_index_js_08a35114.CallableContentsReader.create(()=>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();
-            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()}`);
+            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;
             }
-            const optimizedBuffer = await optimization(buffer).toBuffer();
-            console.log("Optimized asset size", optimizedBuffer.length);
+            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: optimizedBuffer.length
+                size: finalBuffer.length
             });
-            newAsset.setContentsReader(__rspack_external__webiny_api_file_manager_features_assetDelivery_transformation_index_js_08a35114.CallableContentsReader.create(()=>optimizedBuffer));
+            newAsset.setContentsReader(CallableContentsReader.create(()=>finalBuffer));
             await promises.mkdir(node_path.dirname(optimizedFilePath), {
                 recursive: true
             });
@@ -115,34 +146,16 @@ class AssetTransformationStrategyImpl {
             "webp"
         ].includes(asset.getExtension());
     }
-    optimizePng(buffer) {
-        return sharp(buffer).resize({
-            width: 2560,
-            withoutEnlargement: true,
-            fit: "inside"
-        }).png({
-            compressionLevel: 9,
-            adaptiveFiltering: true,
-            force: true
-        }).withMetadata();
-    }
-    optimizeJpeg(buffer) {
-        return sharp(buffer).resize({
-            width: 2560,
-            withoutEnlargement: true,
-            fit: "inside"
-        }).withMetadata().toFormat("jpeg", {
-            quality: 90
-        });
-    }
 }
-const LocalSharpTransform = AssetTransformationStrategy.createImplementation({
-    implementation: AssetTransformationStrategyImpl,
+const LocalSharpTransformImpl = ImageAssetTypeHandler.createImplementation({
+    implementation: LocalSharpTransform,
     dependencies: [
-        FileManagerServerConfig,
-        LocalAssetDeliveryConfig
+        LocalStoragePath,
+        LocalAssetDeliveryConfig,
+        IdentityContext,
+        GetFileUseCase
     ]
 });
-export { LocalSharpTransform };
+export { LocalSharpTransform, LocalSharpTransformImpl };
 
 //# sourceMappingURL=LocalSharpTransform.js.map

package/assetDelivery/LocalSharpTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetDelivery/LocalSharpTransform.js","sources":["../../src/assetDelivery/LocalSharpTransform.ts"],"sourcesContent":["import sharp from \"sharp\";\nimport type { Sharp } from \"sharp\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport type { AssetRequestOptions } from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\nimport { AssetTransformationStrategy as AssetTransformationStrategyAbstraction } from \"@webiny/api-file-manager/exports/api/file-manager/assetDelivery.js\";\nimport { WidthCollection } from \"@webiny/api-file-manager/features/assetDelivery/transformation/index.js\";\nimport * as utils from \"@webiny/api-file-manager/features/assetDelivery/transformation/index.js\";\nimport { CallableContentsReader } from \"@webiny/api-file-manager/features/assetDelivery/transformation/index.js\";\nimport { AssetKeyGenerator } from \"@webiny/api-file-manager/features/assetDelivery/transformation/index.js\";\nimport { LocalAssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\nimport { FileManagerServerConfig } from \"~/features/FileManagerServerConfig/abstractions.js\";\nimport type { ILocalAssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\n\nclass AssetTransformationStrategyImpl implements AssetTransformationStrategyAbstraction.Interface {\n    private readonly storagePath: string;\n    private readonly imageResizeWidths: number[];\n\n    constructor(\n        serverConfig: FileManagerServerConfig.Interface,\n        config: ILocalAssetDeliveryConfig\n    ) {\n        this.storagePath = serverConfig.storagePath;\n        this.imageResizeWidths = config.imageResizeWidths;\n    }\n\n    async transform(\n        assetRequest: AssetTransformationStrategyAbstraction.AssetRequest,\n        asset: AssetTransformationStrategyAbstraction.Asset\n    ): Promise<AssetTransformationStrategyAbstraction.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(\n        asset: AssetTransformationStrategyAbstraction.Asset,\n        options: Omit<AssetRequestOptions, \"original\">\n    ) {\n        if (options.width) {\n            const assetKey = AssetKeyGenerator.create(asset);\n            const transformedAssetKey = assetKey.getTransformedImageKey(options);\n            const transformedFilePath = path.join(this.storagePath, transformedAssetKey);\n\n            try {\n                const buffer = await fs.readFile(transformedFilePath);\n\n                const newAsset = asset.withProps({ size: buffer.length });\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);\n\n                const widths = WidthCollection.create(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(CallableContentsReader.create(() => transformedBuffer));\n\n                await fs.mkdir(path.dirname(transformedFilePath), { recursive: true });\n                await fs.writeFile(transformedFilePath, await newAsset.getContents());\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: AssetTransformationStrategyAbstraction.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 = AssetKeyGenerator.create(asset);\n        const optimizedAssetKey = assetKey.getOptimizedImageKey();\n        const optimizedFilePath = path.join(this.storagePath, optimizedAssetKey);\n\n        try {\n            const buffer = await fs.readFile(optimizedFilePath);\n\n            console.log(\"Return a previously optimized asset\", optimizedAssetKey);\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            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(CallableContentsReader.create(() => optimizedBuffer));\n\n            await fs.mkdir(path.dirname(optimizedFilePath), { recursive: true });\n            await fs.writeFile(optimizedFilePath, await newAsset.getContents());\n\n            return newAsset;\n        }\n    }\n\n    private isAssetAnimated(asset: AssetTransformationStrategyAbstraction.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 LocalSharpTransform = AssetTransformationStrategyAbstraction.createImplementation({\n    implementation: AssetTransformationStrategyImpl,\n    dependencies: [FileManagerServerConfig, LocalAssetDeliveryConfig]\n});\n"],"names":["AssetTransformationStrategyImpl","serverConfig","config","assetRequest","asset","utils","console","original","options","transformedAsset","Object","assetKey","AssetKeyGenerator","transformedAssetKey","transformedFilePath","path","buffer","fs","newAsset","CallableContentsReader","optimizedImage","widths","WidthCollection","width","transformedBuffer","sharp","optimizedAssetKey","optimizedFilePath","optimizationMap","optimization","optimizedBuffer","LocalSharpTransform","AssetTransformationStrategyAbstraction","FileManagerServerConfig","LocalAssetDeliveryConfig"],"mappings":"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"}
+{"version":3,"file":"assetDelivery/LocalSharpTransform.js","sources":["../../src/assetDelivery/LocalSharpTransform.ts"],"sourcesContent":["import fs from \"node:fs/promises\";\nimport path from \"node:path\";\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 { IAssetTypeHandler } from \"@webiny/api-file-manager/features/assetDelivery/abstractions/AssetType.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 { LocalStoragePath } from \"~/assetDelivery/abstractions.js\";\nimport { LocalAssetDeliveryConfig } from \"~/assetDelivery/abstractions.js\";\nimport type { ILocalAssetDeliveryConfig } 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 LocalSharpTransform implements IAssetTypeHandler {\n    private readonly storagePath: 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        storagePath: string,\n        config: ILocalAssetDeliveryConfig,\n        identityContext: IdentityContext.Interface,\n        getFile: GetFileUseCase.Interface\n    ) {\n        this.storagePath = storagePath;\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?.imageEdit 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        const transformedFilePath = path.join(this.storagePath, transformedAssetKey);\n\n        const contentType = options.format\n            ? contentTypeForFormat(options.format)\n            : asset.getContentType();\n\n        try {\n            const buffer = await fs.readFile(transformedFilePath);\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 fs.mkdir(path.dirname(transformedFilePath), { recursive: true });\n            await fs.writeFile(transformedFilePath, await newAsset.getContents());\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        const optimizedFilePath = path.join(this.storagePath, optimizedAssetKey);\n\n        try {\n            const buffer = await fs.readFile(optimizedFilePath);\n\n            console.log(\"Return a previously optimized asset\", optimizedAssetKey);\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 fs.mkdir(path.dirname(optimizedFilePath), { recursive: true });\n            await fs.writeFile(optimizedFilePath, await newAsset.getContents());\n\n            return newAsset;\n        }\n    }\n\n    private isAssetAnimated(asset: Asset) {\n        return [\"gif\", \"webp\"].includes(asset.getExtension());\n    }\n}\n\nexport const LocalSharpTransformImpl = ImageAssetTypeHandler.createImplementation({\n    implementation: LocalSharpTransform,\n    dependencies: [LocalStoragePath, LocalAssetDeliveryConfig, IdentityContext, GetFileUseCase]\n});\n"],"names":["hasTransform","options","undefined","LocalSharpTransform","storagePath","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","transformedFilePath","path","contentType","contentTypeForFormat","buffer","fs","newAsset","CallableContentsReader","console","optimizedImage","baseBuffer","transformer","transformedBuffer","outputContentType","optimizedAssetKey","optimizedFilePath","framed","cropped","canOptimize","finalBuffer","pipeline","LocalSharpTransformImpl","ImageAssetTypeHandler","LocalStoragePath","LocalAssetDeliveryConfig","IdentityContext","GetFileUseCase"],"mappings":"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"}

package/assetDelivery/abstractions.d.ts

@@ -1,5 +1,8 @@
+import type { ImageFormat } from "@webiny/api-file-manager/features/assetDelivery/transformation/index.js";
 export interface ILocalAssetDeliveryConfig {
     imageResizeWidths: number[];
+    imageQuality?: Partial<Record<ImageFormat, number>>;
     assetStreamingMaxSize: number;
 }
 export declare const LocalAssetDeliveryConfig: import("@webiny/di").Abstraction<ILocalAssetDeliveryConfig>;
+export declare const LocalStoragePath: import("@webiny/di").Abstraction<string>;

package/assetDelivery/abstractions.js

@@ -1,5 +1,6 @@
 import { createAbstraction } from "@webiny/feature/api";
 const LocalAssetDeliveryConfig = createAbstraction("AssetDelivery/LocalConfig");
-export { LocalAssetDeliveryConfig };
+const LocalStoragePath = createAbstraction("AssetDelivery/LocalStoragePath");
+export { LocalAssetDeliveryConfig, LocalStoragePath };
 
 //# sourceMappingURL=abstractions.js.map

package/assetDelivery/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetDelivery/abstractions.js","sources":["../../src/assetDelivery/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\n\nexport interface ILocalAssetDeliveryConfig {\n    imageResizeWidths: number[];\n    assetStreamingMaxSize: number;\n}\n\nexport const LocalAssetDeliveryConfig = createAbstraction<ILocalAssetDeliveryConfig>(\n    \"AssetDelivery/LocalConfig\"\n);\n"],"names":["LocalAssetDeliveryConfig","createAbstraction"],"mappings":";AAOO,MAAMA,2BAA2BC,kBACpC"}
+{"version":3,"file":"assetDelivery/abstractions.js","sources":["../../src/assetDelivery/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { ImageFormat } from \"@webiny/api-file-manager/features/assetDelivery/transformation/index.js\";\n\nexport interface ILocalAssetDeliveryConfig {\n    imageResizeWidths: number[];\n    imageQuality?: Partial<Record<ImageFormat, number>>;\n    assetStreamingMaxSize: number;\n}\n\nexport const LocalAssetDeliveryConfig = createAbstraction<ILocalAssetDeliveryConfig>(\n    \"AssetDelivery/LocalConfig\"\n);\n\nexport const LocalStoragePath = createAbstraction<string>(\"AssetDelivery/LocalStoragePath\");\n"],"names":["LocalAssetDeliveryConfig","createAbstraction","LocalStoragePath"],"mappings":";AASO,MAAMA,2BAA2BC,kBACpC;AAGG,MAAMC,mBAAmBD,kBAA0B"}

package/assetDelivery/feature.js

@@ -1,11 +1,12 @@
 import { createFeature } from "@webiny/feature/api";
-import { LocalAssetDeliveryConfig } from "./abstractions.js";
+import { LocalAssetDeliveryConfig, LocalStoragePath } from "./abstractions.js";
 import { LocalAssetResolver } from "./LocalAssetResolver.js";
 import { LocalOutputStrategy } from "./LocalOutputStrategy.js";
-import { LocalSharpTransform } from "./LocalSharpTransform.js";
+import { LazyLocalSharpTransformImpl } from "./LazyLocalSharpTransform.js";
 const createLocalAssetDeliveryFeature = (params = {})=>createFeature({
         name: "AssetDelivery/Local",
         register (container) {
+            container.registerInstance(LocalStoragePath, process.env.WEBINY_LOCAL_STORAGE_PATH);
             container.registerInstance(LocalAssetDeliveryConfig, {
                 imageResizeWidths: params.imageResizeWidths ?? [
                     128,
@@ -19,11 +20,12 @@ const createLocalAssetDeliveryFeature = (params = {})=>createFeature({
                     2048,
                     3840
                 ],
+                imageQuality: params.imageQuality ?? {},
                 assetStreamingMaxSize: params.assetStreamingMaxSize ?? 4718592
             });
             container.register(LocalAssetResolver);
             container.register(LocalOutputStrategy);
-            container.register(LocalSharpTransform);
+            if ("asset-delivery" === process.env.WEBINY_FUNCTION_TYPE) container.register(LazyLocalSharpTransformImpl).inSingletonScope();
         }
     });
 export { createLocalAssetDeliveryFeature };

package/assetDelivery/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetDelivery/feature.js","sources":["../../src/assetDelivery/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { LocalAssetDeliveryConfig } from \"./abstractions.js\";\nimport type { AssetDeliveryParams } from \"./types.js\";\nimport { LocalAssetResolver } from \"./LocalAssetResolver.js\";\nimport { LocalOutputStrategy } from \"./LocalOutputStrategy.js\";\nimport { LocalSharpTransform } from \"./LocalSharpTransform.js\";\n\nexport const createLocalAssetDeliveryFeature = (params: AssetDeliveryParams = {}) => {\n    return createFeature({\n        name: \"AssetDelivery/Local\",\n        register(container) {\n            container.registerInstance(LocalAssetDeliveryConfig, {\n                imageResizeWidths: params.imageResizeWidths ?? [\n                    128, 384, 640, 750, 828, 1080, 1200, 1920, 2048, 3840\n                ],\n                assetStreamingMaxSize: params.assetStreamingMaxSize ?? 4718592\n            });\n\n            container.register(LocalAssetResolver);\n            container.register(LocalOutputStrategy);\n            container.register(LocalSharpTransform);\n        }\n    });\n};\n"],"names":["createLocalAssetDeliveryFeature","params","createFeature","container","LocalAssetDeliveryConfig","LocalAssetResolver","LocalOutputStrategy","LocalSharpTransform"],"mappings":";;;;;AAOO,MAAMA,kCAAkC,CAACC,SAA8B,CAAC,CAAC,GACrEC,cAAc;QACjB,MAAM;QACN,UAASC,SAAS;YACdA,UAAU,gBAAgB,CAACC,0BAA0B;gBACjD,mBAAmBH,OAAO,iBAAiB,IAAI;oBAC3C;oBAAK;oBAAK;oBAAK;oBAAK;oBAAK;oBAAM;oBAAM;oBAAM;oBAAM;iBACpD;gBACD,uBAAuBA,OAAO,qBAAqB,IAAI;YAC3D;YAEAE,UAAU,QAAQ,CAACE;YACnBF,UAAU,QAAQ,CAACG;YACnBH,UAAU,QAAQ,CAACI;QACvB;IACJ"}
+{"version":3,"file":"assetDelivery/feature.js","sources":["../../src/assetDelivery/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { LocalStoragePath } from \"./abstractions.js\";\nimport { LocalAssetDeliveryConfig } from \"./abstractions.js\";\nimport type { AssetDeliveryParams } from \"./types.js\";\nimport { LocalAssetResolver } from \"./LocalAssetResolver.js\";\nimport { LocalOutputStrategy } from \"./LocalOutputStrategy.js\";\nimport { LazyLocalSharpTransformImpl } from \"./LazyLocalSharpTransform.js\";\n\nexport const createLocalAssetDeliveryFeature = (params: AssetDeliveryParams = {}) => {\n    return createFeature({\n        name: \"AssetDelivery/Local\",\n        register(container) {\n            container.registerInstance(\n                LocalStoragePath,\n                process.env.WEBINY_LOCAL_STORAGE_PATH as string\n            );\n            container.registerInstance(LocalAssetDeliveryConfig, {\n                imageResizeWidths: params.imageResizeWidths ?? [\n                    128, 384, 640, 750, 828, 1080, 1200, 1920, 2048, 3840\n                ],\n                imageQuality: params.imageQuality ?? {},\n                assetStreamingMaxSize: params.assetStreamingMaxSize ?? 4718592\n            });\n\n            container.register(LocalAssetResolver);\n            container.register(LocalOutputStrategy);\n\n            if (process.env.WEBINY_FUNCTION_TYPE === \"asset-delivery\") {\n                // Registered eagerly; `sharp` is still loaded lazily, inside the handler.\n                container.register(LazyLocalSharpTransformImpl).inSingletonScope();\n            }\n        }\n    });\n};\n"],"names":["createLocalAssetDeliveryFeature","params","createFeature","container","LocalStoragePath","process","LocalAssetDeliveryConfig","LocalAssetResolver","LocalOutputStrategy","LazyLocalSharpTransformImpl"],"mappings":";;;;;AAQO,MAAMA,kCAAkC,CAACC,SAA8B,CAAC,CAAC,GACrEC,cAAc;QACjB,MAAM;QACN,UAASC,SAAS;YACdA,UAAU,gBAAgB,CACtBC,kBACAC,QAAQ,GAAG,CAAC,yBAAyB;YAEzCF,UAAU,gBAAgB,CAACG,0BAA0B;gBACjD,mBAAmBL,OAAO,iBAAiB,IAAI;oBAC3C;oBAAK;oBAAK;oBAAK;oBAAK;oBAAK;oBAAM;oBAAM;oBAAM;oBAAM;iBACpD;gBACD,cAAcA,OAAO,YAAY,IAAI,CAAC;gBACtC,uBAAuBA,OAAO,qBAAqB,IAAI;YAC3D;YAEAE,UAAU,QAAQ,CAACI;YACnBJ,UAAU,QAAQ,CAACK;YAEnB,IAAIH,AAAqC,qBAArCA,QAAQ,GAAG,CAAC,oBAAoB,EAEhCF,UAAU,QAAQ,CAACM,6BAA6B,gBAAgB;QAExE;IACJ"}

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>>;
     presignedUrlTtl?: number;
     assetStreamingMaxSize?: number;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-file-manager-server",
-	"version": "6.6.0-alpha.0",
+	"version": "6.6.0-alpha.1",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -14,25 +14,25 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api-core": "6.6.0-alpha.0",
-		"@webiny/api-file-manager": "6.6.0-alpha.0",
-		"@webiny/api-graphql": "6.6.0-alpha.0",
-		"@webiny/background-tasks": "6.6.0-alpha.0",
-		"@webiny/event-handler-core": "6.6.0-alpha.0",
-		"@webiny/feature": "6.6.0-alpha.0",
-		"@webiny/handler": "6.6.0-alpha.0",
-		"@webiny/plugins": "6.6.0-alpha.0",
-		"@webiny/utils": "6.6.0-alpha.0",
-		"@webiny/validation": "6.6.0-alpha.0",
-		"exifreader": "4.41.3",
+		"@webiny/api-core": "6.6.0-alpha.1",
+		"@webiny/api-file-manager": "6.6.0-alpha.1",
+		"@webiny/api-graphql": "6.6.0-alpha.1",
+		"@webiny/background-tasks": "6.6.0-alpha.1",
+		"@webiny/event-handler-core": "6.6.0-alpha.1",
+		"@webiny/feature": "6.6.0-alpha.1",
+		"@webiny/handler": "6.6.0-alpha.1",
+		"@webiny/plugins": "6.6.0-alpha.1",
+		"@webiny/utils": "6.6.0-alpha.1",
+		"@webiny/validation": "6.6.0-alpha.1",
+		"exifreader": "4.43.0",
 		"p-map": "7.0.6",
 		"sharp": "0.35.3"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "6.6.0-alpha.0",
+		"@webiny/build-tools": "6.6.0-alpha.1",
 		"rimraf": "6.1.3",
 		"typescript": "7.0.2",
-		"vitest": "4.1.10"
+		"vitest": "4.1.11"
 	},
 	"publishConfig": {
 		"access": "public"

package/routes/UploadPartRoute/UploadPartRoute.d.ts

@@ -1,14 +1,23 @@
-import { HttpRoute } from "@webiny/event-handler-core";
-import type { IHttpRequest, IHttpResponse } from "@webiny/event-handler-core";
+import { HttpRouteDefinition, HttpRouteHandler } from "@webiny/event-handler-core";
 import { FileManagerServerConfig } from "../../features/FileManagerServerConfig/abstractions.js";
-declare class UploadPartRouteImpl implements HttpRoute.Interface {
+declare class UploadPartRouteImpl implements HttpRouteHandler.Interface {
     private readonly config;
-    readonly method = "PUT";
-    readonly path = "/webiny-file-upload/parts";
     constructor(config: FileManagerServerConfig.Interface);
-    handle(request: IHttpRequest): Promise<IHttpResponse>;
+    handle(request: HttpRouteHandler.Request, response: HttpRouteHandler.Response): Promise<import("@webiny/event-handler-core").IHttpResponseBuilder>;
 }
 export declare const UploadPartRoute: typeof UploadPartRouteImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRoute>;
 };
+declare class UploadPartRouteDefinitionImpl implements HttpRouteDefinition.Interface {
+    readonly name = "upload-part";
+    readonly method = "PUT";
+    readonly path = "/webiny-file-upload/parts";
+    readonly handler: typeof UploadPartRouteImpl & {
+        __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRoute>;
+    };
+}
+/** What the router matches on. Zero dependencies, so building it costs nothing. */
+export declare const UploadPartRouteDefinition: typeof UploadPartRouteDefinitionImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRouteDefinition>;
+};
 export {};

package/routes/UploadPartRoute/UploadPartRoute.js

@@ -1,44 +1,42 @@
 import node_path from "node:path";
 import { createHash } from "node:crypto";
 import { mkdir, writeFile } from "node:fs/promises";
-import { HttpRoute } from "@webiny/event-handler-core";
+import { HttpRouteDefinition, HttpRouteHandler } from "@webiny/event-handler-core";
 import { verifyUploadToken } from "../../utils/uploadToken.js";
 import { FileManagerServerConfig } from "../../features/FileManagerServerConfig/abstractions.js";
-import { isPathContained, json, toBuffer } from "../utils.js";
+import { isPathContained, toBuffer } from "../utils.js";
 class UploadPartRouteImpl {
     constructor(config){
         this.config = config;
-        this.method = "PUT";
-        this.path = "/webiny-file-upload/parts";
     }
-    async handle(request) {
+    async handle(request, response) {
         const storagePath = this.config.storagePath;
         const secret = this.config.uploadSecret;
         const query = request.query ?? {};
         const uploadId = query["uploadId"];
         const partNumberStr = query["partNumber"];
         const token = query["token"];
-        if (!uploadId || !partNumberStr || !token) return json(400, {
+        if (!uploadId || !partNumberStr || !token) return response.status(400).json({
             error: "Missing uploadId, partNumber, or token."
         });
         const partNumber = parseInt(partNumberStr, 10);
-        if (isNaN(partNumber) || partNumber < 1) return json(400, {
+        if (isNaN(partNumber) || partNumber < 1) return response.status(400).json({
             error: "Invalid partNumber."
         });
         let payload;
         try {
             payload = verifyUploadToken(token, secret);
         } catch (err) {
-            return json(400, {
+            return response.status(400).json({
                 error: err instanceof Error ? err.message : "Invalid token."
             });
         }
         const expectedKey = `tenants/${payload.tenantId}/multipart/${uploadId}/part-${partNumber}`;
-        if (payload.key !== expectedKey) return json(400, {
+        if (payload.key !== expectedKey) return response.status(400).json({
             error: "Token key mismatch."
         });
         const destPath = node_path.join(storagePath, expectedKey);
-        if (!isPathContained(destPath, storagePath)) return json(400, {
+        if (!isPathContained(destPath, storagePath)) return response.status(400).json({
             error: "Invalid path."
         });
         await mkdir(node_path.dirname(destPath), {
@@ -47,20 +45,27 @@ class UploadPartRouteImpl {
         const body = toBuffer(request.body);
         await writeFile(destPath, body);
         const etag = createHash("md5").update(body).digest("hex");
-        return {
-            statusCode: 200,
-            headers: {
-                ETag: etag
-            }
-        };
+        return response.header("etag", etag);
     }
 }
-const UploadPartRoute = HttpRoute.createImplementation({
+const UploadPartRoute = HttpRouteHandler.createImplementation({
     implementation: UploadPartRouteImpl,
     dependencies: [
         FileManagerServerConfig
     ]
 });
-export { UploadPartRoute };
+class UploadPartRouteDefinitionImpl {
+    constructor(){
+        this.name = "upload-part";
+        this.method = "PUT";
+        this.path = "/webiny-file-upload/parts";
+        this.handler = UploadPartRoute;
+    }
+}
+const UploadPartRouteDefinition = HttpRouteDefinition.createImplementation({
+    implementation: UploadPartRouteDefinitionImpl,
+    dependencies: []
+});
+export { UploadPartRoute, UploadPartRouteDefinition };
 
 //# sourceMappingURL=UploadPartRoute.js.map

package/routes/UploadPartRoute/UploadPartRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes/UploadPartRoute/UploadPartRoute.js","sources":["../../../src/routes/UploadPartRoute/UploadPartRoute.ts"],"sourcesContent":["import path from \"node:path\";\nimport { createHash } from \"node:crypto\";\nimport { mkdir, writeFile } from \"node:fs/promises\";\nimport { HttpRoute } from \"@webiny/event-handler-core\";\nimport type { IHttpRequest, IHttpResponse } from \"@webiny/event-handler-core\";\nimport { verifyUploadToken } from \"~/utils/uploadToken.js\";\nimport { FileManagerServerConfig } from \"~/features/FileManagerServerConfig/abstractions.js\";\nimport { isPathContained, json, toBuffer } from \"../utils.js\";\n\nclass UploadPartRouteImpl implements HttpRoute.Interface {\n    public readonly method = \"PUT\";\n    public readonly path = \"/webiny-file-upload/parts\";\n\n    public constructor(private readonly config: FileManagerServerConfig.Interface) {}\n\n    public async handle(request: IHttpRequest): Promise<IHttpResponse> {\n        const storagePath = this.config.storagePath;\n        const secret = this.config.uploadSecret;\n\n        const query = request.query ?? {};\n        const uploadId = query[\"uploadId\"];\n        const partNumberStr = query[\"partNumber\"];\n        const token = query[\"token\"];\n\n        if (!uploadId || !partNumberStr || !token) {\n            return json(400, { error: \"Missing uploadId, partNumber, or token.\" });\n        }\n\n        const partNumber = parseInt(partNumberStr, 10);\n        if (isNaN(partNumber) || partNumber < 1) {\n            return json(400, { error: \"Invalid partNumber.\" });\n        }\n\n        let payload;\n        try {\n            payload = verifyUploadToken(token, secret);\n        } catch (err) {\n            return json(400, { error: err instanceof Error ? err.message : \"Invalid token.\" });\n        }\n\n        const expectedKey = `tenants/${payload.tenantId}/multipart/${uploadId}/part-${partNumber}`;\n        if (payload.key !== expectedKey) {\n            return json(400, { error: \"Token key mismatch.\" });\n        }\n\n        const destPath = path.join(storagePath, expectedKey);\n        if (!isPathContained(destPath, storagePath)) {\n            return json(400, { error: \"Invalid path.\" });\n        }\n\n        await mkdir(path.dirname(destPath), { recursive: true });\n\n        const body = toBuffer(request.body);\n        await writeFile(destPath, body);\n\n        const etag = createHash(\"md5\").update(body).digest(\"hex\");\n\n        return { statusCode: 200, headers: { ETag: etag } };\n    }\n}\n\nexport const UploadPartRoute = HttpRoute.createImplementation({\n    implementation: UploadPartRouteImpl,\n    dependencies: [FileManagerServerConfig]\n});\n"],"names":["UploadPartRouteImpl","config","request","storagePath","secret","query","uploadId","partNumberStr","token","json","partNumber","parseInt","isNaN","payload","verifyUploadToken","err","Error","expectedKey","destPath","path","isPathContained","mkdir","body","toBuffer","writeFile","etag","createHash","UploadPartRoute","HttpRoute","FileManagerServerConfig"],"mappings":";;;;;;;AASA,MAAMA;IAIF,YAAoCC,MAAyC,CAAE;aAA3CA,MAAM,GAANA;aAHpB,MAAM,GAAG;aACT,IAAI,GAAG;IAEyD;IAEhF,MAAa,OAAOC,OAAqB,EAA0B;QAC/D,MAAMC,cAAc,IAAI,CAAC,MAAM,CAAC,WAAW;QAC3C,MAAMC,SAAS,IAAI,CAAC,MAAM,CAAC,YAAY;QAEvC,MAAMC,QAAQH,QAAQ,KAAK,IAAI,CAAC;QAChC,MAAMI,WAAWD,KAAK,CAAC,WAAW;QAClC,MAAME,gBAAgBF,KAAK,CAAC,aAAa;QACzC,MAAMG,QAAQH,KAAK,CAAC,QAAQ;QAE5B,IAAI,CAACC,YAAY,CAACC,iBAAiB,CAACC,OAChC,OAAOC,KAAK,KAAK;YAAE,OAAO;QAA0C;QAGxE,MAAMC,aAAaC,SAASJ,eAAe;QAC3C,IAAIK,MAAMF,eAAeA,aAAa,GAClC,OAAOD,KAAK,KAAK;YAAE,OAAO;QAAsB;QAGpD,IAAII;QACJ,IAAI;YACAA,UAAUC,kBAAkBN,OAAOJ;QACvC,EAAE,OAAOW,KAAK;YACV,OAAON,KAAK,KAAK;gBAAE,OAAOM,eAAeC,QAAQD,IAAI,OAAO,GAAG;YAAiB;QACpF;QAEA,MAAME,cAAc,CAAC,QAAQ,EAAEJ,QAAQ,QAAQ,CAAC,WAAW,EAAEP,SAAS,MAAM,EAAEI,YAAY;QAC1F,IAAIG,QAAQ,GAAG,KAAKI,aAChB,OAAOR,KAAK,KAAK;YAAE,OAAO;QAAsB;QAGpD,MAAMS,WAAWC,UAAAA,IAAS,CAAChB,aAAac;QACxC,IAAI,CAACG,gBAAgBF,UAAUf,cAC3B,OAAOM,KAAK,KAAK;YAAE,OAAO;QAAgB;QAG9C,MAAMY,MAAMF,UAAAA,OAAY,CAACD,WAAW;YAAE,WAAW;QAAK;QAEtD,MAAMI,OAAOC,SAASrB,QAAQ,IAAI;QAClC,MAAMsB,UAAUN,UAAUI;QAE1B,MAAMG,OAAOC,WAAW,OAAO,MAAM,CAACJ,MAAM,MAAM,CAAC;QAEnD,OAAO;YAAE,YAAY;YAAK,SAAS;gBAAE,MAAMG;YAAK;QAAE;IACtD;AACJ;AAEO,MAAME,kBAAkBC,UAAU,oBAAoB,CAAC;IAC1D,gBAAgB5B;IAChB,cAAc;QAAC6B;KAAwB;AAC3C"}
+{"version":3,"file":"routes/UploadPartRoute/UploadPartRoute.js","sources":["../../../src/routes/UploadPartRoute/UploadPartRoute.ts"],"sourcesContent":["import path from \"node:path\";\nimport { createHash } from \"node:crypto\";\nimport { mkdir, writeFile } from \"node:fs/promises\";\nimport { HttpRouteDefinition, HttpRouteHandler } from \"@webiny/event-handler-core\";\nimport { verifyUploadToken } from \"~/utils/uploadToken.js\";\nimport { FileManagerServerConfig } from \"~/features/FileManagerServerConfig/abstractions.js\";\nimport { isPathContained, toBuffer } from \"../utils.js\";\n\nclass UploadPartRouteImpl implements HttpRouteHandler.Interface {\n    public constructor(private readonly config: FileManagerServerConfig.Interface) {}\n\n    public async handle(request: HttpRouteHandler.Request, response: HttpRouteHandler.Response) {\n        const storagePath = this.config.storagePath;\n        const secret = this.config.uploadSecret;\n\n        const query = request.query ?? {};\n        const uploadId = query[\"uploadId\"];\n        const partNumberStr = query[\"partNumber\"];\n        const token = query[\"token\"];\n\n        if (!uploadId || !partNumberStr || !token) {\n            return response.status(400).json({ error: \"Missing uploadId, partNumber, or token.\" });\n        }\n\n        const partNumber = parseInt(partNumberStr, 10);\n        if (isNaN(partNumber) || partNumber < 1) {\n            return response.status(400).json({ error: \"Invalid partNumber.\" });\n        }\n\n        let payload;\n        try {\n            payload = verifyUploadToken(token, secret);\n        } catch (err) {\n            return response\n                .status(400)\n                .json({ error: err instanceof Error ? err.message : \"Invalid token.\" });\n        }\n\n        const expectedKey = `tenants/${payload.tenantId}/multipart/${uploadId}/part-${partNumber}`;\n        if (payload.key !== expectedKey) {\n            return response.status(400).json({ error: \"Token key mismatch.\" });\n        }\n\n        const destPath = path.join(storagePath, expectedKey);\n        if (!isPathContained(destPath, storagePath)) {\n            return response.status(400).json({ error: \"Invalid path.\" });\n        }\n\n        await mkdir(path.dirname(destPath), { recursive: true });\n\n        const body = toBuffer(request.body);\n        await writeFile(destPath, body);\n\n        const etag = createHash(\"md5\").update(body).digest(\"hex\");\n\n        return response.header(\"etag\", etag);\n    }\n}\n\nexport const UploadPartRoute = HttpRouteHandler.createImplementation({\n    implementation: UploadPartRouteImpl,\n    dependencies: [FileManagerServerConfig]\n});\n\nclass UploadPartRouteDefinitionImpl implements HttpRouteDefinition.Interface {\n    readonly name = \"upload-part\";\n    readonly method = \"PUT\";\n    readonly path = \"/webiny-file-upload/parts\";\n    readonly handler = UploadPartRoute;\n}\n\n/** What the router matches on. Zero dependencies, so building it costs nothing. */\nexport const UploadPartRouteDefinition = HttpRouteDefinition.createImplementation({\n    implementation: UploadPartRouteDefinitionImpl,\n    dependencies: []\n});\n"],"names":["UploadPartRouteImpl","config","request","response","storagePath","secret","query","uploadId","partNumberStr","token","partNumber","parseInt","isNaN","payload","verifyUploadToken","err","Error","expectedKey","destPath","path","isPathContained","mkdir","body","toBuffer","writeFile","etag","createHash","UploadPartRoute","HttpRouteHandler","FileManagerServerConfig","UploadPartRouteDefinitionImpl","UploadPartRouteDefinition","HttpRouteDefinition"],"mappings":";;;;;;;AAQA,MAAMA;IACF,YAAoCC,MAAyC,CAAE;aAA3CA,MAAM,GAANA;IAA4C;IAEhF,MAAa,OAAOC,OAAiC,EAAEC,QAAmC,EAAE;QACxF,MAAMC,cAAc,IAAI,CAAC,MAAM,CAAC,WAAW;QAC3C,MAAMC,SAAS,IAAI,CAAC,MAAM,CAAC,YAAY;QAEvC,MAAMC,QAAQJ,QAAQ,KAAK,IAAI,CAAC;QAChC,MAAMK,WAAWD,KAAK,CAAC,WAAW;QAClC,MAAME,gBAAgBF,KAAK,CAAC,aAAa;QACzC,MAAMG,QAAQH,KAAK,CAAC,QAAQ;QAE5B,IAAI,CAACC,YAAY,CAACC,iBAAiB,CAACC,OAChC,OAAON,SAAS,MAAM,CAAC,KAAK,IAAI,CAAC;YAAE,OAAO;QAA0C;QAGxF,MAAMO,aAAaC,SAASH,eAAe;QAC3C,IAAII,MAAMF,eAAeA,aAAa,GAClC,OAAOP,SAAS,MAAM,CAAC,KAAK,IAAI,CAAC;YAAE,OAAO;QAAsB;QAGpE,IAAIU;QACJ,IAAI;YACAA,UAAUC,kBAAkBL,OAAOJ;QACvC,EAAE,OAAOU,KAAK;YACV,OAAOZ,SACF,MAAM,CAAC,KACP,IAAI,CAAC;gBAAE,OAAOY,eAAeC,QAAQD,IAAI,OAAO,GAAG;YAAiB;QAC7E;QAEA,MAAME,cAAc,CAAC,QAAQ,EAAEJ,QAAQ,QAAQ,CAAC,WAAW,EAAEN,SAAS,MAAM,EAAEG,YAAY;QAC1F,IAAIG,QAAQ,GAAG,KAAKI,aAChB,OAAOd,SAAS,MAAM,CAAC,KAAK,IAAI,CAAC;YAAE,OAAO;QAAsB;QAGpE,MAAMe,WAAWC,UAAAA,IAAS,CAACf,aAAaa;QACxC,IAAI,CAACG,gBAAgBF,UAAUd,cAC3B,OAAOD,SAAS,MAAM,CAAC,KAAK,IAAI,CAAC;YAAE,OAAO;QAAgB;QAG9D,MAAMkB,MAAMF,UAAAA,OAAY,CAACD,WAAW;YAAE,WAAW;QAAK;QAEtD,MAAMI,OAAOC,SAASrB,QAAQ,IAAI;QAClC,MAAMsB,UAAUN,UAAUI;QAE1B,MAAMG,OAAOC,WAAW,OAAO,MAAM,CAACJ,MAAM,MAAM,CAAC;QAEnD,OAAOnB,SAAS,MAAM,CAAC,QAAQsB;IACnC;AACJ;AAEO,MAAME,kBAAkBC,iBAAiB,oBAAoB,CAAC;IACjE,gBAAgB5B;IAChB,cAAc;QAAC6B;KAAwB;AAC3C;AAEA,MAAMC;;aACO,IAAI,GAAG;aACP,MAAM,GAAG;aACT,IAAI,GAAG;aACP,OAAO,GAAGH;;AACvB;AAGO,MAAMI,4BAA4BC,oBAAoB,oBAAoB,CAAC;IAC9E,gBAAgBF;IAChB,cAAc,EAAE;AACpB"}

package/routes/UploadPartRoute/feature.js

@@ -1,9 +1,9 @@
 import { createFeature } from "@webiny/feature/api";
-import { UploadPartRoute } from "./UploadPartRoute.js";
+import { UploadPartRouteDefinition } from "./UploadPartRoute.js";
 const UploadPartRouteFeature = createFeature({
     name: "FileManagerServer/UploadPartRoute",
     register (container) {
-        container.register(UploadPartRoute);
+        container.register(UploadPartRouteDefinition);
     }
 });
 export { UploadPartRouteFeature };

package/routes/UploadPartRoute/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes/UploadPartRoute/feature.js","sources":["../../../src/routes/UploadPartRoute/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { UploadPartRoute } from \"./UploadPartRoute.js\";\n\nexport const UploadPartRouteFeature = createFeature({\n    name: \"FileManagerServer/UploadPartRoute\",\n    register(container) {\n        container.register(UploadPartRoute);\n    }\n});\n"],"names":["UploadPartRouteFeature","createFeature","container","UploadPartRoute"],"mappings":";;AAGO,MAAMA,yBAAyBC,cAAc;IAChD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;IACvB;AACJ"}
+{"version":3,"file":"routes/UploadPartRoute/feature.js","sources":["../../../src/routes/UploadPartRoute/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { UploadPartRouteDefinition } from \"./UploadPartRoute.js\";\n\nexport const UploadPartRouteFeature = createFeature({\n    name: \"FileManagerServer/UploadPartRoute\",\n    register(container) {\n        container.register(UploadPartRouteDefinition);\n    }\n});\n"],"names":["UploadPartRouteFeature","createFeature","container","UploadPartRouteDefinition"],"mappings":";;AAGO,MAAMA,yBAAyBC,cAAc;IAChD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;IACvB;AACJ"}

package/routes/UploadSingleFileRoute/UploadSingleFileRoute.d.ts

@@ -1,14 +1,23 @@
-import { HttpRoute } from "@webiny/event-handler-core";
-import type { IHttpRequest, IHttpResponse } from "@webiny/event-handler-core";
+import { HttpRouteDefinition, HttpRouteHandler } from "@webiny/event-handler-core";
 import { FileManagerServerConfig } from "../../features/FileManagerServerConfig/abstractions.js";
-declare class UploadSingleFileRouteImpl implements HttpRoute.Interface {
+declare class UploadSingleFileRouteImpl implements HttpRouteHandler.Interface {
     private readonly config;
-    readonly method = "POST";
-    readonly path = "/webiny-file-upload";
     constructor(config: FileManagerServerConfig.Interface);
-    handle(request: IHttpRequest): Promise<IHttpResponse>;
+    handle(request: HttpRouteHandler.Request, response: HttpRouteHandler.Response): Promise<import("@webiny/event-handler-core").IHttpResponseBuilder>;
 }
 export declare const UploadSingleFileRoute: typeof UploadSingleFileRouteImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRoute>;
 };
+declare class UploadSingleFileRouteDefinitionImpl implements HttpRouteDefinition.Interface {
+    readonly name = "upload-single-file";
+    readonly method = "POST";
+    readonly path = "/webiny-file-upload";
+    readonly handler: typeof UploadSingleFileRouteImpl & {
+        __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRoute>;
+    };
+}
+/** What the router matches on. Zero dependencies, so building it costs nothing. */
+export declare const UploadSingleFileRouteDefinition: typeof UploadSingleFileRouteDefinitionImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRouteDefinition>;
+};
 export {};

package/routes/UploadSingleFileRoute/UploadSingleFileRoute.js

@@ -1,70 +1,78 @@
 import node_path from "node:path";
 import { mkdir, writeFile } from "node:fs/promises";
-import { HttpRoute } from "@webiny/event-handler-core";
+import { HttpRouteDefinition, HttpRouteHandler } from "@webiny/event-handler-core";
 import { verifyUploadToken } from "../../utils/uploadToken.js";
 import { FileManagerServerConfig } from "../../features/FileManagerServerConfig/abstractions.js";
-import { getBoundary, isPathContained, json, parseMultipart, toBuffer } from "../utils.js";
+import { getBoundary, isPathContained, parseMultipart, toBuffer } from "../utils.js";
 class UploadSingleFileRouteImpl {
     constructor(config){
         this.config = config;
-        this.method = "POST";
-        this.path = "/webiny-file-upload";
     }
-    async handle(request) {
+    async handle(request, response) {
         const storagePath = this.config.storagePath;
         const secret = this.config.uploadSecret;
         const contentType = request.headers["content-type"] ?? request.headers["Content-Type"] ?? "";
         const boundary = getBoundary(contentType);
-        if (!boundary) return json(400, {
+        if (!boundary) return response.status(400).json({
             error: "Expected multipart/form-data with a boundary."
         });
         const { fields, files } = parseMultipart(toBuffer(request.body), boundary);
         const key = fields.find((field)=>"key" === field.name)?.value;
         const token = fields.find((field)=>"token" === field.name)?.value;
         const file = files[0];
-        if (!key || !token) return json(400, {
+        if (!key || !token) return response.status(400).json({
             error: "Missing key or token."
         });
-        if (!file) return json(400, {
+        if (!file) return response.status(400).json({
             error: "No file in request."
         });
         let payload;
         try {
             payload = verifyUploadToken(token, secret);
         } catch (err) {
-            return json(400, {
+            return response.status(400).json({
                 error: err instanceof Error ? err.message : "Invalid token."
             });
         }
-        if (payload.key !== key) return json(400, {
+        if (payload.key !== key) return response.status(400).json({
             error: "Token key mismatch."
         });
         const fileSize = file.data.length;
-        if (payload.uploadMaxFileSize > 0 && fileSize > payload.uploadMaxFileSize) return json(400, {
+        if (payload.uploadMaxFileSize > 0 && fileSize > payload.uploadMaxFileSize) return response.status(400).json({
             error: "File exceeds maximum allowed size."
         });
-        if (payload.uploadMinFileSize > 0 && fileSize < payload.uploadMinFileSize) return json(400, {
+        if (payload.uploadMinFileSize > 0 && fileSize < payload.uploadMinFileSize) return response.status(400).json({
             error: "File is below minimum allowed size."
         });
         const destPath = node_path.join(storagePath, key);
-        if (!isPathContained(destPath, storagePath)) return json(400, {
+        if (!isPathContained(destPath, storagePath)) return response.status(400).json({
             error: "Invalid path."
         });
         await mkdir(node_path.dirname(destPath), {
             recursive: true
         });
         await writeFile(destPath, file.data);
-        return {
-            statusCode: 204
-        };
+        return response.status(204);
     }
 }
-const UploadSingleFileRoute = HttpRoute.createImplementation({
+const UploadSingleFileRoute = HttpRouteHandler.createImplementation({
     implementation: UploadSingleFileRouteImpl,
     dependencies: [
         FileManagerServerConfig
     ]
 });
-export { UploadSingleFileRoute };
+class UploadSingleFileRouteDefinitionImpl {
+    constructor(){
+        this.name = "upload-single-file";
+        this.method = "POST";
+        this.path = "/webiny-file-upload";
+        this.handler = UploadSingleFileRoute;
+    }
+}
+const UploadSingleFileRouteDefinition = HttpRouteDefinition.createImplementation({
+    implementation: UploadSingleFileRouteDefinitionImpl,
+    dependencies: []
+});
+export { UploadSingleFileRoute, UploadSingleFileRouteDefinition };
 
 //# sourceMappingURL=UploadSingleFileRoute.js.map

package/routes/UploadSingleFileRoute/UploadSingleFileRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes/UploadSingleFileRoute/UploadSingleFileRoute.js","sources":["../../../src/routes/UploadSingleFileRoute/UploadSingleFileRoute.ts"],"sourcesContent":["import path from \"node:path\";\nimport { mkdir, writeFile } from \"node:fs/promises\";\nimport { HttpRoute } from \"@webiny/event-handler-core\";\nimport type { IHttpRequest, IHttpResponse } from \"@webiny/event-handler-core\";\nimport { verifyUploadToken } from \"~/utils/uploadToken.js\";\nimport { FileManagerServerConfig } from \"~/features/FileManagerServerConfig/abstractions.js\";\nimport { isPathContained, json, toBuffer, parseMultipart, getBoundary } from \"../utils.js\";\n\nclass UploadSingleFileRouteImpl implements HttpRoute.Interface {\n    public readonly method = \"POST\";\n    public readonly path = \"/webiny-file-upload\";\n\n    public constructor(private readonly config: FileManagerServerConfig.Interface) {}\n\n    public async handle(request: IHttpRequest): Promise<IHttpResponse> {\n        const storagePath = this.config.storagePath;\n        const secret = this.config.uploadSecret;\n\n        const contentType =\n            request.headers[\"content-type\"] ?? request.headers[\"Content-Type\"] ?? \"\";\n        const boundary = getBoundary(contentType);\n        if (!boundary) {\n            return json(400, { error: \"Expected multipart/form-data with a boundary.\" });\n        }\n\n        const { fields, files } = parseMultipart(toBuffer(request.body), boundary);\n        const key = fields.find(field => field.name === \"key\")?.value;\n        const token = fields.find(field => field.name === \"token\")?.value;\n        const file = files[0];\n\n        if (!key || !token) {\n            return json(400, { error: \"Missing key or token.\" });\n        }\n\n        if (!file) {\n            return json(400, { error: \"No file in request.\" });\n        }\n\n        let payload;\n        try {\n            payload = verifyUploadToken(token, secret);\n        } catch (err) {\n            return json(400, { error: err instanceof Error ? err.message : \"Invalid token.\" });\n        }\n\n        if (payload.key !== key) {\n            return json(400, { error: \"Token key mismatch.\" });\n        }\n\n        const fileSize = file.data.length;\n        if (payload.uploadMaxFileSize > 0 && fileSize > payload.uploadMaxFileSize) {\n            return json(400, { error: \"File exceeds maximum allowed size.\" });\n        }\n\n        if (payload.uploadMinFileSize > 0 && fileSize < payload.uploadMinFileSize) {\n            return json(400, { error: \"File is below minimum allowed size.\" });\n        }\n\n        const destPath = path.join(storagePath, key);\n        if (!isPathContained(destPath, storagePath)) {\n            return json(400, { error: \"Invalid path.\" });\n        }\n\n        await mkdir(path.dirname(destPath), { recursive: true });\n        await writeFile(destPath, file.data);\n\n        return { statusCode: 204 };\n    }\n}\n\nexport const UploadSingleFileRoute = HttpRoute.createImplementation({\n    implementation: UploadSingleFileRouteImpl,\n    dependencies: [FileManagerServerConfig]\n});\n"],"names":["UploadSingleFileRouteImpl","config","request","storagePath","secret","contentType","boundary","getBoundary","json","fields","files","parseMultipart","toBuffer","key","field","token","file","payload","verifyUploadToken","err","Error","fileSize","destPath","path","isPathContained","mkdir","writeFile","UploadSingleFileRoute","HttpRoute","FileManagerServerConfig"],"mappings":";;;;;;AAQA,MAAMA;IAIF,YAAoCC,MAAyC,CAAE;aAA3CA,MAAM,GAANA;aAHpB,MAAM,GAAG;aACT,IAAI,GAAG;IAEyD;IAEhF,MAAa,OAAOC,OAAqB,EAA0B;QAC/D,MAAMC,cAAc,IAAI,CAAC,MAAM,CAAC,WAAW;QAC3C,MAAMC,SAAS,IAAI,CAAC,MAAM,CAAC,YAAY;QAEvC,MAAMC,cACFH,QAAQ,OAAO,CAAC,eAAe,IAAIA,QAAQ,OAAO,CAAC,eAAe,IAAI;QAC1E,MAAMI,WAAWC,YAAYF;QAC7B,IAAI,CAACC,UACD,OAAOE,KAAK,KAAK;YAAE,OAAO;QAAgD;QAG9E,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAE,GAAGC,eAAeC,SAASV,QAAQ,IAAI,GAAGI;QACjE,MAAMO,MAAMJ,OAAO,IAAI,CAACK,CAAAA,QAASA,AAAe,UAAfA,MAAM,IAAI,GAAa;QACxD,MAAMC,QAAQN,OAAO,IAAI,CAACK,CAAAA,QAASA,AAAe,YAAfA,MAAM,IAAI,GAAe;QAC5D,MAAME,OAAON,KAAK,CAAC,EAAE;QAErB,IAAI,CAACG,OAAO,CAACE,OACT,OAAOP,KAAK,KAAK;YAAE,OAAO;QAAwB;QAGtD,IAAI,CAACQ,MACD,OAAOR,KAAK,KAAK;YAAE,OAAO;QAAsB;QAGpD,IAAIS;QACJ,IAAI;YACAA,UAAUC,kBAAkBH,OAAOX;QACvC,EAAE,OAAOe,KAAK;YACV,OAAOX,KAAK,KAAK;gBAAE,OAAOW,eAAeC,QAAQD,IAAI,OAAO,GAAG;YAAiB;QACpF;QAEA,IAAIF,QAAQ,GAAG,KAAKJ,KAChB,OAAOL,KAAK,KAAK;YAAE,OAAO;QAAsB;QAGpD,MAAMa,WAAWL,KAAK,IAAI,CAAC,MAAM;QACjC,IAAIC,QAAQ,iBAAiB,GAAG,KAAKI,WAAWJ,QAAQ,iBAAiB,EACrE,OAAOT,KAAK,KAAK;YAAE,OAAO;QAAqC;QAGnE,IAAIS,QAAQ,iBAAiB,GAAG,KAAKI,WAAWJ,QAAQ,iBAAiB,EACrE,OAAOT,KAAK,KAAK;YAAE,OAAO;QAAsC;QAGpE,MAAMc,WAAWC,UAAAA,IAAS,CAACpB,aAAaU;QACxC,IAAI,CAACW,gBAAgBF,UAAUnB,cAC3B,OAAOK,KAAK,KAAK;YAAE,OAAO;QAAgB;QAG9C,MAAMiB,MAAMF,UAAAA,OAAY,CAACD,WAAW;YAAE,WAAW;QAAK;QACtD,MAAMI,UAAUJ,UAAUN,KAAK,IAAI;QAEnC,OAAO;YAAE,YAAY;QAAI;IAC7B;AACJ;AAEO,MAAMW,wBAAwBC,UAAU,oBAAoB,CAAC;IAChE,gBAAgB5B;IAChB,cAAc;QAAC6B;KAAwB;AAC3C"}
+{"version":3,"file":"routes/UploadSingleFileRoute/UploadSingleFileRoute.js","sources":["../../../src/routes/UploadSingleFileRoute/UploadSingleFileRoute.ts"],"sourcesContent":["import path from \"node:path\";\nimport { mkdir, writeFile } from \"node:fs/promises\";\nimport { HttpRouteDefinition, HttpRouteHandler } from \"@webiny/event-handler-core\";\nimport { verifyUploadToken } from \"~/utils/uploadToken.js\";\nimport { FileManagerServerConfig } from \"~/features/FileManagerServerConfig/abstractions.js\";\nimport { isPathContained, toBuffer, parseMultipart, getBoundary } from \"../utils.js\";\n\nclass UploadSingleFileRouteImpl implements HttpRouteHandler.Interface {\n    public constructor(private readonly config: FileManagerServerConfig.Interface) {}\n\n    public async handle(request: HttpRouteHandler.Request, response: HttpRouteHandler.Response) {\n        const storagePath = this.config.storagePath;\n        const secret = this.config.uploadSecret;\n\n        const contentType =\n            request.headers[\"content-type\"] ?? request.headers[\"Content-Type\"] ?? \"\";\n        const boundary = getBoundary(contentType);\n        if (!boundary) {\n            return response\n                .status(400)\n                .json({ error: \"Expected multipart/form-data with a boundary.\" });\n        }\n\n        const { fields, files } = parseMultipart(toBuffer(request.body), boundary);\n        const key = fields.find(field => field.name === \"key\")?.value;\n        const token = fields.find(field => field.name === \"token\")?.value;\n        const file = files[0];\n\n        if (!key || !token) {\n            return response.status(400).json({ error: \"Missing key or token.\" });\n        }\n\n        if (!file) {\n            return response.status(400).json({ error: \"No file in request.\" });\n        }\n\n        let payload;\n        try {\n            payload = verifyUploadToken(token, secret);\n        } catch (err) {\n            return response\n                .status(400)\n                .json({ error: err instanceof Error ? err.message : \"Invalid token.\" });\n        }\n\n        if (payload.key !== key) {\n            return response.status(400).json({ error: \"Token key mismatch.\" });\n        }\n\n        const fileSize = file.data.length;\n        if (payload.uploadMaxFileSize > 0 && fileSize > payload.uploadMaxFileSize) {\n            return response.status(400).json({ error: \"File exceeds maximum allowed size.\" });\n        }\n\n        if (payload.uploadMinFileSize > 0 && fileSize < payload.uploadMinFileSize) {\n            return response.status(400).json({ error: \"File is below minimum allowed size.\" });\n        }\n\n        const destPath = path.join(storagePath, key);\n        if (!isPathContained(destPath, storagePath)) {\n            return response.status(400).json({ error: \"Invalid path.\" });\n        }\n\n        await mkdir(path.dirname(destPath), { recursive: true });\n        await writeFile(destPath, file.data);\n\n        return response.status(204);\n    }\n}\n\nexport const UploadSingleFileRoute = HttpRouteHandler.createImplementation({\n    implementation: UploadSingleFileRouteImpl,\n    dependencies: [FileManagerServerConfig]\n});\n\nclass UploadSingleFileRouteDefinitionImpl implements HttpRouteDefinition.Interface {\n    readonly name = \"upload-single-file\";\n    readonly method = \"POST\";\n    readonly path = \"/webiny-file-upload\";\n    readonly handler = UploadSingleFileRoute;\n}\n\n/** What the router matches on. Zero dependencies, so building it costs nothing. */\nexport const UploadSingleFileRouteDefinition = HttpRouteDefinition.createImplementation({\n    implementation: UploadSingleFileRouteDefinitionImpl,\n    dependencies: []\n});\n"],"names":["UploadSingleFileRouteImpl","config","request","response","storagePath","secret","contentType","boundary","getBoundary","fields","files","parseMultipart","toBuffer","key","field","token","file","payload","verifyUploadToken","err","Error","fileSize","destPath","path","isPathContained","mkdir","writeFile","UploadSingleFileRoute","HttpRouteHandler","FileManagerServerConfig","UploadSingleFileRouteDefinitionImpl","UploadSingleFileRouteDefinition","HttpRouteDefinition"],"mappings":";;;;;;AAOA,MAAMA;IACF,YAAoCC,MAAyC,CAAE;aAA3CA,MAAM,GAANA;IAA4C;IAEhF,MAAa,OAAOC,OAAiC,EAAEC,QAAmC,EAAE;QACxF,MAAMC,cAAc,IAAI,CAAC,MAAM,CAAC,WAAW;QAC3C,MAAMC,SAAS,IAAI,CAAC,MAAM,CAAC,YAAY;QAEvC,MAAMC,cACFJ,QAAQ,OAAO,CAAC,eAAe,IAAIA,QAAQ,OAAO,CAAC,eAAe,IAAI;QAC1E,MAAMK,WAAWC,YAAYF;QAC7B,IAAI,CAACC,UACD,OAAOJ,SACF,MAAM,CAAC,KACP,IAAI,CAAC;YAAE,OAAO;QAAgD;QAGvE,MAAM,EAAEM,MAAM,EAAEC,KAAK,EAAE,GAAGC,eAAeC,SAASV,QAAQ,IAAI,GAAGK;QACjE,MAAMM,MAAMJ,OAAO,IAAI,CAACK,CAAAA,QAASA,AAAe,UAAfA,MAAM,IAAI,GAAa;QACxD,MAAMC,QAAQN,OAAO,IAAI,CAACK,CAAAA,QAASA,AAAe,YAAfA,MAAM,IAAI,GAAe;QAC5D,MAAME,OAAON,KAAK,CAAC,EAAE;QAErB,IAAI,CAACG,OAAO,CAACE,OACT,OAAOZ,SAAS,MAAM,CAAC,KAAK,IAAI,CAAC;YAAE,OAAO;QAAwB;QAGtE,IAAI,CAACa,MACD,OAAOb,SAAS,MAAM,CAAC,KAAK,IAAI,CAAC;YAAE,OAAO;QAAsB;QAGpE,IAAIc;QACJ,IAAI;YACAA,UAAUC,kBAAkBH,OAAOV;QACvC,EAAE,OAAOc,KAAK;YACV,OAAOhB,SACF,MAAM,CAAC,KACP,IAAI,CAAC;gBAAE,OAAOgB,eAAeC,QAAQD,IAAI,OAAO,GAAG;YAAiB;QAC7E;QAEA,IAAIF,QAAQ,GAAG,KAAKJ,KAChB,OAAOV,SAAS,MAAM,CAAC,KAAK,IAAI,CAAC;YAAE,OAAO;QAAsB;QAGpE,MAAMkB,WAAWL,KAAK,IAAI,CAAC,MAAM;QACjC,IAAIC,QAAQ,iBAAiB,GAAG,KAAKI,WAAWJ,QAAQ,iBAAiB,EACrE,OAAOd,SAAS,MAAM,CAAC,KAAK,IAAI,CAAC;YAAE,OAAO;QAAqC;QAGnF,IAAIc,QAAQ,iBAAiB,GAAG,KAAKI,WAAWJ,QAAQ,iBAAiB,EACrE,OAAOd,SAAS,MAAM,CAAC,KAAK,IAAI,CAAC;YAAE,OAAO;QAAsC;QAGpF,MAAMmB,WAAWC,UAAAA,IAAS,CAACnB,aAAaS;QACxC,IAAI,CAACW,gBAAgBF,UAAUlB,cAC3B,OAAOD,SAAS,MAAM,CAAC,KAAK,IAAI,CAAC;YAAE,OAAO;QAAgB;QAG9D,MAAMsB,MAAMF,UAAAA,OAAY,CAACD,WAAW;YAAE,WAAW;QAAK;QACtD,MAAMI,UAAUJ,UAAUN,KAAK,IAAI;QAEnC,OAAOb,SAAS,MAAM,CAAC;IAC3B;AACJ;AAEO,MAAMwB,wBAAwBC,iBAAiB,oBAAoB,CAAC;IACvE,gBAAgB5B;IAChB,cAAc;QAAC6B;KAAwB;AAC3C;AAEA,MAAMC;;aACO,IAAI,GAAG;aACP,MAAM,GAAG;aACT,IAAI,GAAG;aACP,OAAO,GAAGH;;AACvB;AAGO,MAAMI,kCAAkCC,oBAAoB,oBAAoB,CAAC;IACpF,gBAAgBF;IAChB,cAAc,EAAE;AACpB"}

package/routes/UploadSingleFileRoute/feature.js

@@ -1,9 +1,9 @@
 import { createFeature } from "@webiny/feature/api";
-import { UploadSingleFileRoute } from "./UploadSingleFileRoute.js";
+import { UploadSingleFileRouteDefinition } from "./UploadSingleFileRoute.js";
 const UploadSingleFileRouteFeature = createFeature({
     name: "FileManagerServer/UploadSingleFileRoute",
     register (container) {
-        container.register(UploadSingleFileRoute);
+        container.register(UploadSingleFileRouteDefinition);
     }
 });
 export { UploadSingleFileRouteFeature };

package/routes/UploadSingleFileRoute/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes/UploadSingleFileRoute/feature.js","sources":["../../../src/routes/UploadSingleFileRoute/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { UploadSingleFileRoute } from \"./UploadSingleFileRoute.js\";\n\nexport const UploadSingleFileRouteFeature = createFeature({\n    name: \"FileManagerServer/UploadSingleFileRoute\",\n    register(container) {\n        container.register(UploadSingleFileRoute);\n    }\n});\n"],"names":["UploadSingleFileRouteFeature","createFeature","container","UploadSingleFileRoute"],"mappings":";;AAGO,MAAMA,+BAA+BC,cAAc;IACtD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;IACvB;AACJ"}
+{"version":3,"file":"routes/UploadSingleFileRoute/feature.js","sources":["../../../src/routes/UploadSingleFileRoute/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { UploadSingleFileRouteDefinition } from \"./UploadSingleFileRoute.js\";\n\nexport const UploadSingleFileRouteFeature = createFeature({\n    name: \"FileManagerServer/UploadSingleFileRoute\",\n    register(container) {\n        container.register(UploadSingleFileRouteDefinition);\n    }\n});\n"],"names":["UploadSingleFileRouteFeature","createFeature","container","UploadSingleFileRouteDefinition"],"mappings":";;AAGO,MAAMA,+BAA+BC,cAAc;IACtD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;IACvB;AACJ"}

package/routes/utils.d.ts

@@ -1,6 +1,4 @@
-import type { IHttpResponse } from "@webiny/event-handler-core";
 export declare const isPathContained: (filePath: string, storagePath: string) => boolean;
-export declare const json: (statusCode: number, data: unknown) => IHttpResponse;
 export declare const toBuffer: (body: unknown) => Buffer;
 interface MultipartField {
     name: string;

package/routes/utils.js

@@ -4,13 +4,6 @@ const isPathContained = (filePath, storagePath)=>{
     const root = node_path.resolve(storagePath);
     return resolved === root || resolved.startsWith(root + node_path.sep);
 };
-const json = (statusCode, data)=>({
-        statusCode,
-        headers: {
-            "content-type": "application/json"
-        },
-        body: JSON.stringify(data)
-    });
 const toBuffer = (body)=>{
     if (Buffer.isBuffer(body)) return body;
     if (body instanceof Uint8Array) return Buffer.from(body);
@@ -57,6 +50,6 @@ const getBoundary = (contentType)=>{
     const value = match?.[1] ?? match?.[2];
     return value?.trim();
 };
-export { getBoundary, isPathContained, json, parseMultipart, toBuffer };
+export { getBoundary, isPathContained, parseMultipart, toBuffer };
 
 //# sourceMappingURL=utils.js.map

package/routes/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes/utils.js","sources":["../../src/routes/utils.ts"],"sourcesContent":["import path from \"node:path\";\nimport type { IHttpResponse } from \"@webiny/event-handler-core\";\n\nexport const isPathContained = (filePath: string, storagePath: string): boolean => {\n    const resolved = path.resolve(filePath);\n    const root = path.resolve(storagePath);\n    return resolved === root || resolved.startsWith(root + path.sep);\n};\n\nexport const json = (statusCode: number, data: unknown): IHttpResponse => ({\n    statusCode,\n    headers: { \"content-type\": \"application/json\" },\n    body: JSON.stringify(data)\n});\n\n/* Normalise a transport request body into a Buffer. */\nexport const toBuffer = (body: unknown): Buffer => {\n    if (Buffer.isBuffer(body)) {\n        return body;\n    }\n    if (body instanceof Uint8Array) {\n        return Buffer.from(body);\n    }\n    if (typeof body === \"string\") {\n        return Buffer.from(body, \"base64\");\n    }\n    return Buffer.alloc(0);\n};\n\ninterface MultipartField {\n    name: string;\n    value: string;\n}\n\ninterface MultipartFile {\n    name: string;\n    filename: string;\n    data: Buffer;\n}\n\nexport interface MultipartResult {\n    fields: MultipartField[];\n    files: MultipartFile[];\n}\n\n/* Minimal multipart/form-data parser operating on the raw body buffer. */\nexport const parseMultipart = (buffer: Buffer, boundary: string): MultipartResult => {\n    const fields: MultipartField[] = [];\n    const files: MultipartFile[] = [];\n    const separator = Buffer.from(`--${boundary}`);\n\n    let idx = buffer.indexOf(separator);\n    while (idx !== -1) {\n        const next = buffer.indexOf(separator, idx + separator.length);\n        if (next === -1) {\n            break;\n        }\n\n        let part = buffer.subarray(idx + separator.length, next);\n        if (part.subarray(0, 2).toString(\"latin1\") === \"\\r\\n\") {\n            part = part.subarray(2);\n        }\n        if (part.subarray(-2).toString(\"latin1\") === \"\\r\\n\") {\n            part = part.subarray(0, -2);\n        }\n\n        const headerEnd = part.indexOf(\"\\r\\n\\r\\n\");\n        if (headerEnd !== -1) {\n            const rawHeaders = part.subarray(0, headerEnd).toString(\"utf8\");\n            const content = part.subarray(headerEnd + 4);\n\n            const disposition = /content-disposition:[^\\r\\n]*/i.exec(rawHeaders)?.[0] ?? \"\";\n            const name = /name=\"([^\"]*)\"/i.exec(disposition)?.[1];\n            const filename = /filename=\"([^\"]*)\"/i.exec(disposition)?.[1];\n\n            if (name !== undefined) {\n                if (filename !== undefined) {\n                    files.push({ name, filename, data: content });\n                } else {\n                    fields.push({ name, value: content.toString(\"utf8\") });\n                }\n            }\n        }\n\n        idx = next;\n    }\n\n    return { fields, files };\n};\n\nexport const getBoundary = (contentType: string): string | undefined => {\n    const match = /boundary=(?:\"([^\"]+)\"|([^;]+))/i.exec(contentType);\n    const value = match?.[1] ?? match?.[2];\n    return value?.trim();\n};\n"],"names":["isPathContained","filePath","storagePath","resolved","path","root","json","statusCode","data","JSON","toBuffer","body","Buffer","Uint8Array","parseMultipart","buffer","boundary","fields","files","separator","idx","next","part","headerEnd","rawHeaders","content","disposition","name","filename","undefined","getBoundary","contentType","match","value"],"mappings":";AAGO,MAAMA,kBAAkB,CAACC,UAAkBC;IAC9C,MAAMC,WAAWC,UAAAA,OAAY,CAACH;IAC9B,MAAMI,OAAOD,UAAAA,OAAY,CAACF;IAC1B,OAAOC,aAAaE,QAAQF,SAAS,UAAU,CAACE,OAAOD,UAAAA,GAAQ;AACnE;AAEO,MAAME,OAAO,CAACC,YAAoBC,OAAkC;QACvED;QACA,SAAS;YAAE,gBAAgB;QAAmB;QAC9C,MAAME,KAAK,SAAS,CAACD;IACzB;AAGO,MAAME,WAAW,CAACC;IACrB,IAAIC,OAAO,QAAQ,CAACD,OAChB,OAAOA;IAEX,IAAIA,gBAAgBE,YAChB,OAAOD,OAAO,IAAI,CAACD;IAEvB,IAAI,AAAgB,YAAhB,OAAOA,MACP,OAAOC,OAAO,IAAI,CAACD,MAAM;IAE7B,OAAOC,OAAO,KAAK,CAAC;AACxB;AAmBO,MAAME,iBAAiB,CAACC,QAAgBC;IAC3C,MAAMC,SAA2B,EAAE;IACnC,MAAMC,QAAyB,EAAE;IACjC,MAAMC,YAAYP,OAAO,IAAI,CAAC,CAAC,EAAE,EAAEI,UAAU;IAE7C,IAAII,MAAML,OAAO,OAAO,CAACI;IACzB,MAAOC,AAAQ,OAARA,IAAY;QACf,MAAMC,OAAON,OAAO,OAAO,CAACI,WAAWC,MAAMD,UAAU,MAAM;QAC7D,IAAIE,AAAS,OAATA,MACA;QAGJ,IAAIC,OAAOP,OAAO,QAAQ,CAACK,MAAMD,UAAU,MAAM,EAAEE;QACnD,IAAIC,AAA2C,WAA3CA,KAAK,QAAQ,CAAC,GAAG,GAAG,QAAQ,CAAC,WAC7BA,OAAOA,KAAK,QAAQ,CAAC;QAEzB,IAAIA,AAAyC,WAAzCA,KAAK,QAAQ,CAAC,IAAI,QAAQ,CAAC,WAC3BA,OAAOA,KAAK,QAAQ,CAAC,GAAG;QAG5B,MAAMC,YAAYD,KAAK,OAAO,CAAC;QAC/B,IAAIC,AAAc,OAAdA,WAAkB;YAClB,MAAMC,aAAaF,KAAK,QAAQ,CAAC,GAAGC,WAAW,QAAQ,CAAC;YACxD,MAAME,UAAUH,KAAK,QAAQ,CAACC,YAAY;YAE1C,MAAMG,cAAc,gCAAgC,IAAI,CAACF,aAAa,CAAC,EAAE,IAAI;YAC7E,MAAMG,OAAO,kBAAkB,IAAI,CAACD,cAAc,CAAC,EAAE;YACrD,MAAME,WAAW,sBAAsB,IAAI,CAACF,cAAc,CAAC,EAAE;YAE7D,IAAIC,AAASE,WAATF,MACA,IAAIC,AAAaC,WAAbD,UACAV,MAAM,IAAI,CAAC;gBAAES;gBAAMC;gBAAU,MAAMH;YAAQ;iBAE3CR,OAAO,IAAI,CAAC;gBAAEU;gBAAM,OAAOF,QAAQ,QAAQ,CAAC;YAAQ;QAGhE;QAEAL,MAAMC;IACV;IAEA,OAAO;QAAEJ;QAAQC;IAAM;AAC3B;AAEO,MAAMY,cAAc,CAACC;IACxB,MAAMC,QAAQ,kCAAkC,IAAI,CAACD;IACrD,MAAME,QAAQD,OAAO,CAAC,EAAE,IAAIA,OAAO,CAAC,EAAE;IACtC,OAAOC,OAAO;AAClB"}
+{"version":3,"file":"routes/utils.js","sources":["../../src/routes/utils.ts"],"sourcesContent":["import path from \"node:path\";\n\nexport const isPathContained = (filePath: string, storagePath: string): boolean => {\n    const resolved = path.resolve(filePath);\n    const root = path.resolve(storagePath);\n    return resolved === root || resolved.startsWith(root + path.sep);\n};\n\n/* Normalise a transport request body into a Buffer. */\nexport const toBuffer = (body: unknown): Buffer => {\n    if (Buffer.isBuffer(body)) {\n        return body;\n    }\n    if (body instanceof Uint8Array) {\n        return Buffer.from(body);\n    }\n    if (typeof body === \"string\") {\n        return Buffer.from(body, \"base64\");\n    }\n    return Buffer.alloc(0);\n};\n\ninterface MultipartField {\n    name: string;\n    value: string;\n}\n\ninterface MultipartFile {\n    name: string;\n    filename: string;\n    data: Buffer;\n}\n\nexport interface MultipartResult {\n    fields: MultipartField[];\n    files: MultipartFile[];\n}\n\n/* Minimal multipart/form-data parser operating on the raw body buffer. */\nexport const parseMultipart = (buffer: Buffer, boundary: string): MultipartResult => {\n    const fields: MultipartField[] = [];\n    const files: MultipartFile[] = [];\n    const separator = Buffer.from(`--${boundary}`);\n\n    let idx = buffer.indexOf(separator);\n    while (idx !== -1) {\n        const next = buffer.indexOf(separator, idx + separator.length);\n        if (next === -1) {\n            break;\n        }\n\n        let part = buffer.subarray(idx + separator.length, next);\n        if (part.subarray(0, 2).toString(\"latin1\") === \"\\r\\n\") {\n            part = part.subarray(2);\n        }\n        if (part.subarray(-2).toString(\"latin1\") === \"\\r\\n\") {\n            part = part.subarray(0, -2);\n        }\n\n        const headerEnd = part.indexOf(\"\\r\\n\\r\\n\");\n        if (headerEnd !== -1) {\n            const rawHeaders = part.subarray(0, headerEnd).toString(\"utf8\");\n            const content = part.subarray(headerEnd + 4);\n\n            const disposition = /content-disposition:[^\\r\\n]*/i.exec(rawHeaders)?.[0] ?? \"\";\n            const name = /name=\"([^\"]*)\"/i.exec(disposition)?.[1];\n            const filename = /filename=\"([^\"]*)\"/i.exec(disposition)?.[1];\n\n            if (name !== undefined) {\n                if (filename !== undefined) {\n                    files.push({ name, filename, data: content });\n                } else {\n                    fields.push({ name, value: content.toString(\"utf8\") });\n                }\n            }\n        }\n\n        idx = next;\n    }\n\n    return { fields, files };\n};\n\nexport const getBoundary = (contentType: string): string | undefined => {\n    const match = /boundary=(?:\"([^\"]+)\"|([^;]+))/i.exec(contentType);\n    const value = match?.[1] ?? match?.[2];\n    return value?.trim();\n};\n"],"names":["isPathContained","filePath","storagePath","resolved","path","root","toBuffer","body","Buffer","Uint8Array","parseMultipart","buffer","boundary","fields","files","separator","idx","next","part","headerEnd","rawHeaders","content","disposition","name","filename","undefined","getBoundary","contentType","match","value"],"mappings":";AAEO,MAAMA,kBAAkB,CAACC,UAAkBC;IAC9C,MAAMC,WAAWC,UAAAA,OAAY,CAACH;IAC9B,MAAMI,OAAOD,UAAAA,OAAY,CAACF;IAC1B,OAAOC,aAAaE,QAAQF,SAAS,UAAU,CAACE,OAAOD,UAAAA,GAAQ;AACnE;AAGO,MAAME,WAAW,CAACC;IACrB,IAAIC,OAAO,QAAQ,CAACD,OAChB,OAAOA;IAEX,IAAIA,gBAAgBE,YAChB,OAAOD,OAAO,IAAI,CAACD;IAEvB,IAAI,AAAgB,YAAhB,OAAOA,MACP,OAAOC,OAAO,IAAI,CAACD,MAAM;IAE7B,OAAOC,OAAO,KAAK,CAAC;AACxB;AAmBO,MAAME,iBAAiB,CAACC,QAAgBC;IAC3C,MAAMC,SAA2B,EAAE;IACnC,MAAMC,QAAyB,EAAE;IACjC,MAAMC,YAAYP,OAAO,IAAI,CAAC,CAAC,EAAE,EAAEI,UAAU;IAE7C,IAAII,MAAML,OAAO,OAAO,CAACI;IACzB,MAAOC,AAAQ,OAARA,IAAY;QACf,MAAMC,OAAON,OAAO,OAAO,CAACI,WAAWC,MAAMD,UAAU,MAAM;QAC7D,IAAIE,AAAS,OAATA,MACA;QAGJ,IAAIC,OAAOP,OAAO,QAAQ,CAACK,MAAMD,UAAU,MAAM,EAAEE;QACnD,IAAIC,AAA2C,WAA3CA,KAAK,QAAQ,CAAC,GAAG,GAAG,QAAQ,CAAC,WAC7BA,OAAOA,KAAK,QAAQ,CAAC;QAEzB,IAAIA,AAAyC,WAAzCA,KAAK,QAAQ,CAAC,IAAI,QAAQ,CAAC,WAC3BA,OAAOA,KAAK,QAAQ,CAAC,GAAG;QAG5B,MAAMC,YAAYD,KAAK,OAAO,CAAC;QAC/B,IAAIC,AAAc,OAAdA,WAAkB;YAClB,MAAMC,aAAaF,KAAK,QAAQ,CAAC,GAAGC,WAAW,QAAQ,CAAC;YACxD,MAAME,UAAUH,KAAK,QAAQ,CAACC,YAAY;YAE1C,MAAMG,cAAc,gCAAgC,IAAI,CAACF,aAAa,CAAC,EAAE,IAAI;YAC7E,MAAMG,OAAO,kBAAkB,IAAI,CAACD,cAAc,CAAC,EAAE;YACrD,MAAME,WAAW,sBAAsB,IAAI,CAACF,cAAc,CAAC,EAAE;YAE7D,IAAIC,AAASE,WAATF,MACA,IAAIC,AAAaC,WAAbD,UACAV,MAAM,IAAI,CAAC;gBAAES;gBAAMC;gBAAU,MAAMH;YAAQ;iBAE3CR,OAAO,IAAI,CAAC;gBAAEU;gBAAM,OAAOF,QAAQ,QAAQ,CAAC;YAAQ;QAGhE;QAEAL,MAAMC;IACV;IAEA,OAAO;QAAEJ;QAAQC;IAAM;AAC3B;AAEO,MAAMY,cAAc,CAACC;IACxB,MAAMC,QAAQ,kCAAkC,IAAI,CAACD;IACrD,MAAME,QAAQD,OAAO,CAAC,EAAE,IAAIA,OAAO,CAAC,EAAE;IACtC,OAAOC,OAAO;AAClB"}