@ackplus/nest-file-storage 1.1.23 → 2.0.0

package/dist/lib/drivers/s3.driver.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.S3Driver = void 0;
+const path_1 = require("path");
+const driver_util_1 = require("./driver.util");
+class S3Driver {
+    deps;
+    options;
+    keyDefaults;
+    client;
+    bucket;
+    constructor(deps, options) {
+        this.deps = deps;
+        this.options = options;
+        this.bucket = options.bucket;
+        this.keyDefaults = { fileName: options.fileName, fileDist: options.fileDist, prefix: options.prefix };
+        this.client = new deps.sdk.S3({
+            region: options.region,
+            ...(options.endpoint ? { endpoint: options.endpoint } : {}),
+            credentials: {
+                accessKeyId: options.accessKeyId,
+                secretAccessKey: options.secretAccessKey,
+            },
+            ...(options.clientOptions ?? {}),
+        });
+    }
+    getUrl(key) {
+        if (!key)
+            return '';
+        if (this.options.cloudFrontUrl) {
+            return `${(0, driver_util_1.stripTrailingSlash)(this.options.cloudFrontUrl)}/${key}`;
+        }
+        return `https://${this.bucket}.s3.amazonaws.com/${key}`;
+    }
+    async getSignedUrl(key, options = {}) {
+        if (!key)
+            return '';
+        const { expiresIn, ...commandOverrides } = options;
+        const command = new this.deps.sdk.GetObjectCommand({
+            Bucket: this.bucket,
+            Key: key,
+            ...commandOverrides,
+        });
+        return this.deps.getSignedUrl(this.client, command, expiresIn != null ? { expiresIn } : {});
+    }
+    async getFile(key) {
+        if (!key)
+            throw new Error('Key is required to fetch the file from S3.');
+        const data = await this.client.send(new this.deps.sdk.GetObjectCommand({ Bucket: this.bucket, Key: key }));
+        const body = data.Body;
+        if (!body)
+            throw new Error('Empty response received from S3.');
+        if (typeof body.transformToByteArray === 'function') {
+            return Buffer.from(await body.transformToByteArray());
+        }
+        return (0, driver_util_1.streamToBuffer)(body);
+    }
+    async putFile(content, key, meta = {}) {
+        const fileName = (0, path_1.basename)(key);
+        const safeAscii = fileName.replace(/[^\x20-\x7E]/g, '_').replace(/["\\]/g, '_');
+        const encodedFileName = encodeURIComponent(fileName);
+        const { contentType, ...extra } = meta;
+        await this.client.send(new this.deps.sdk.PutObjectCommand({
+            Bucket: this.bucket,
+            Key: key,
+            Body: content,
+            ...(contentType ? { ContentType: contentType } : {}),
+            ContentDisposition: `inline; filename="${safeAscii}"; filename*=UTF-8''${encodedFileName}`,
+            ...extra,
+        }));
+        return {
+            originalName: fileName,
+            fileName,
+            size: content.length,
+            key,
+            fullPath: key,
+            url: this.getUrl(key),
+        };
+    }
+    async deleteFile(key) {
+        if (!key)
+            throw new Error('File key is required for deletion.');
+        await this.client.send(new this.deps.sdk.DeleteObjectCommand({ Bucket: this.bucket, Key: key }));
+    }
+    async copyFile(sourceKey, destKey) {
+        await this.client.send(new this.deps.sdk.CopyObjectCommand({
+            Bucket: this.bucket,
+            CopySource: `/${this.bucket}/${sourceKey}`,
+            Key: destKey,
+        }));
+        const head = await this.client.send(new this.deps.sdk.HeadObjectCommand({ Bucket: this.bucket, Key: destKey }));
+        return {
+            originalName: (0, path_1.basename)(destKey),
+            fileName: (0, path_1.basename)(destKey),
+            size: head.ContentLength ?? 0,
+            key: destKey,
+            fullPath: destKey,
+            url: this.getUrl(destKey),
+        };
+    }
+}
+exports.S3Driver = S3Driver;
+//# sourceMappingURL=s3.driver.js.map

package/dist/lib/drivers/s3.driver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3.driver.js","sourceRoot":"","sources":["../../../src/lib/drivers/s3.driver.ts"],"names":[],"mappings":";;;AAEA,+BAAgC;AAIhC,+CAAmE;AASnE,MAAa,QAAQ;IAMI;IACA;IANZ,WAAW,CAAa;IAChB,MAAM,CAAW;IACjB,MAAM,CAAS;IAEhC,YACqB,IAAkB,EAClB,OAAwB;QADxB,SAAI,GAAJ,IAAI,CAAc;QAClB,YAAO,GAAP,OAAO,CAAiB;QAEzC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;QAGtG,IAAI,CAAC,MAAM,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,WAAW,EAAE;gBACT,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,eAAe,EAAE,OAAO,CAAC,eAAe;aAC3C;YACD,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;SACnC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,GAAW;QACd,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC;QACpB,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC7B,OAAO,GAAG,IAAA,gCAAkB,EAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,GAAG,EAAE,CAAC;QACtE,CAAC;QACD,OAAO,WAAW,IAAI,CAAC,MAAM,qBAAqB,GAAG,EAAE,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW,EAAE,UAA4B,EAAE;QAC1D,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,CAAC;QACpB,MAAM,EAAE,SAAS,EAAE,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC;QACnD,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC;YAC/C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,GAAG;YACR,GAAG,gBAAgB;SACtB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CACzB,IAAI,CAAC,MAAe,EACpB,OAAO,EACP,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CACzC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW;QACrB,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAC/B,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CACxE,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,IAEH,CAAC;QAChB,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAC/D,IAAI,OAAO,IAAI,CAAC,oBAAoB,KAAK,UAAU,EAAE,CAAC;YAClD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,IAAA,4BAAc,EAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAe,EAAE,GAAW,EAAE,OAAoB,EAAE;QAC9D,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAChF,MAAM,eAAe,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC;QAEvC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAClB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC;YAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,OAAO;YACb,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,kBAAkB,EAAE,qBAAqB,SAAS,uBAAuB,eAAe,EAAE;YAC1F,GAAI,KAAiC;SACxC,CAAC,CACL,CAAC;QAGF,OAAO;YACH,YAAY,EAAE,QAAQ;YACtB,QAAQ;YACR,IAAI,EAAE,OAAO,CAAC,MAAM;YACpB,GAAG;YACH,QAAQ,EAAE,GAAG;YACb,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;SACxB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QACxB,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAChE,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAClB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAC3E,CAAC;IACN,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,SAAiB,EAAE,OAAe;QAC7C,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAClB,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC;YAChC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,UAAU,EAAE,IAAI,IAAI,CAAC,MAAM,IAAI,SAAS,EAAE;YAC1C,GAAG,EAAE,OAAO;SACf,CAAC,CACL,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAC/B,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAC7E,CAAC;QACF,OAAO;YACH,YAAY,EAAE,IAAA,eAAQ,EAAC,OAAO,CAAC;YAC/B,QAAQ,EAAE,IAAA,eAAQ,EAAC,OAAO,CAAC;YAC3B,IAAI,EAAE,IAAI,CAAC,aAAa,IAAI,CAAC;YAC7B,GAAG,EAAE,OAAO;YACZ,QAAQ,EAAE,OAAO;YACjB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;SAC5B,CAAC;IACN,CAAC;CACJ;AAtHD,4BAsHC"}

package/dist/lib/file-storage.service.d.ts

@@ -1,7 +1,18 @@
-import { FileStorageEnum, FileStorageModuleOptions } from './types';
+import type { DriverRegistry, ResolvedDriver } from './driver-registry';
+import type { PutFileMeta, SignedUrlOptions, StorageDriver, UploadedFile } from './drivers/driver.interface';
 export declare class FileStorageService {
-    private static options;
-    static setOptions(options: FileStorageModuleOptions): void;
-    static getOptions(): FileStorageModuleOptions;
-    static getStorage(storageType?: FileStorageEnum): Promise<import("./types").Storage>;
+    private readonly registry;
+    constructor(registry: DriverRegistry);
+    getRegistry(): DriverRegistry;
+    getDriver(name?: string): Promise<StorageDriver>;
+    getTenantDriver(tenantId: string): Promise<ResolvedDriver>;
+    putFile(content: Buffer, key: string, meta?: PutFileMeta): Promise<UploadedFile>;
+    getFile(key: string): Promise<Buffer>;
+    deleteFile(key: string): Promise<void>;
+    copyFile(sourceKey: string, destKey: string): Promise<UploadedFile>;
+    getUrl(key: string): Promise<string>;
+    getSignedUrl(key: string, options?: SignedUrlOptions): Promise<string>;
+    static getStorage(name?: string): Promise<StorageDriver>;
+    static setOptions(_options: unknown): void;
+    static getOptions(): undefined;
 }

package/dist/lib/file-storage.service.js

@@ -1,29 +1,67 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileStorageService = void 0;
-const storage_factory_1 = require("./storage.factory");
-class FileStorageService {
-    static options;
-    static setOptions(options) {
-        FileStorageService.options = options;
+const common_1 = require("@nestjs/common");
+const constants_1 = require("./constants");
+const registry_holder_1 = require("./registry-holder");
+let FileStorageService = class FileStorageService {
+    registry;
+    constructor(registry) {
+        this.registry = registry;
+    }
+    getRegistry() {
+        return this.registry;
+    }
+    getDriver(name) {
+        return this.registry.get(name);
+    }
+    getTenantDriver(tenantId) {
+        return this.registry.getTenantDriver(tenantId);
+    }
+    async putFile(content, key, meta) {
+        return (await this.getDriver()).putFile(content, key, meta);
+    }
+    async getFile(key) {
+        return (await this.getDriver()).getFile(key);
+    }
+    async deleteFile(key) {
+        return (await this.getDriver()).deleteFile(key);
+    }
+    async copyFile(sourceKey, destKey) {
+        return (await this.getDriver()).copyFile(sourceKey, destKey);
+    }
+    async getUrl(key) {
+        return (await this.getDriver()).getUrl(key);
+    }
+    async getSignedUrl(key, options) {
+        const driver = await this.getDriver();
+        return driver.getSignedUrl ? driver.getSignedUrl(key, options) : driver.getUrl(key);
+    }
+    static async getStorage(name) {
+        return registry_holder_1.FileStorageRegistryHolder.get().get(name);
+    }
+    static setOptions(_options) {
     }
     static getOptions() {
-        return FileStorageService.options;
-    }
-    static async getStorage(storageType) {
-        const options = this.getOptions();
-        if ('storageFactory' in options) {
-            const classOptions = options;
-            const StorageClass = await classOptions.storageFactory();
-            return new StorageClass(classOptions.options);
-        }
-        const configOptions = options;
-        if (!storageType) {
-            storageType = configOptions.storage;
-        }
-        const config = configOptions[`${storageType}Config`];
-        return await storage_factory_1.StorageFactory.createStorage(storageType, config);
-    }
-}
+        return undefined;
+    }
+};
 exports.FileStorageService = FileStorageService;
+exports.FileStorageService = FileStorageService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(constants_1.FILE_STORAGE_REGISTRY)),
+    __metadata("design:paramtypes", [Function])
+], FileStorageService);
 //# sourceMappingURL=file-storage.service.js.map

package/dist/lib/file-storage.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-storage.service.js","sourceRoot":"","sources":["../../src/lib/file-storage.service.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AAInD,MAAa,kBAAkB;IAEnB,MAAM,CAAC,OAAO,CAA2B;IAEjD,MAAM,CAAC,UAAU,CAAC,OAAiC;QAC/C,kBAAkB,CAAC,OAAO,GAAG,OAAO,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,UAAU;QACb,OAAO,kBAAkB,CAAC,OAAO,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,WAA6B;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAGlC,IAAI,gBAAgB,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,YAAY,GAAG,OAAkC,CAAC;YACxD,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;YACzD,OAAO,IAAI,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC;QAGD,MAAM,aAAa,GAAG,OAAmC,CAAC;QAC1D,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC;QACxC,CAAC;QACD,MAAM,MAAM,GAAI,aAAqB,CAAC,GAAG,WAAW,QAAQ,CAAC,CAAC;QAC9D,OAAO,MAAM,gCAAc,CAAC,aAAa,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;CAEJ;AA/BD,gDA+BC"}
+{"version":3,"file":"file-storage.service.js","sourceRoot":"","sources":["../../src/lib/file-storage.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAEpD,2CAAoD;AAGpD,uDAA8D;AAYvD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IACiC;IAA5D,YAA4D,QAAwB;QAAxB,aAAQ,GAAR,QAAQ,CAAgB;IAAG,CAAC;IAGxF,WAAW;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAGD,SAAS,CAAC,IAAa;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAGD,eAAe,CAAC,QAAgB;QAC5B,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAe,EAAE,GAAW,EAAE,IAAkB;QAC1D,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW;QACrB,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW;QACxB,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,SAAiB,EAAE,OAAe;QAC7C,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW;QACpB,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW,EAAE,OAA0B;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACxF,CAAC;IAMD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,IAAa;QACjC,OAAO,2CAAyB,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAGD,MAAM,CAAC,UAAU,CAAC,QAAiB;IAEnC,CAAC;IAGD,MAAM,CAAC,UAAU;QACb,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ,CAAA;AA5DY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;IAEI,WAAA,IAAA,eAAM,EAAC,iCAAqB,CAAC,CAAA;;GADjC,kBAAkB,CA4D9B"}

package/dist/lib/index.d.ts

@@ -1,5 +1,12 @@
 export * from './nest-file-storage.module';
+export * from './constants';
 export * from './types';
-export * from './storage.factory';
-export * from './interceptor/file-storage.interceptor';
 export * from './file-storage.service';
+export * from './interceptor/file-storage.interceptor';
+export * from './driver-registry';
+export * from './registry-holder';
+export { localDriver, s3Driver, azureDriver, defineDriver } from './drivers';
+export * from './validation';
+export * from './tenant/tenant-from';
+export { DriverMulterEngine, joinKey } from './multer/driver-multer-engine';
+export type { EngineKeyOptions } from './multer/driver-multer-engine';

package/dist/lib/index.js

@@ -14,9 +14,22 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.joinKey = exports.DriverMulterEngine = exports.defineDriver = exports.azureDriver = exports.s3Driver = exports.localDriver = void 0;
 __exportStar(require("./nest-file-storage.module"), exports);
+__exportStar(require("./constants"), exports);
 __exportStar(require("./types"), exports);
-__exportStar(require("./storage.factory"), exports);
-__exportStar(require("./interceptor/file-storage.interceptor"), exports);
 __exportStar(require("./file-storage.service"), exports);
+__exportStar(require("./interceptor/file-storage.interceptor"), exports);
+__exportStar(require("./driver-registry"), exports);
+__exportStar(require("./registry-holder"), exports);
+var drivers_1 = require("./drivers");
+Object.defineProperty(exports, "localDriver", { enumerable: true, get: function () { return drivers_1.localDriver; } });
+Object.defineProperty(exports, "s3Driver", { enumerable: true, get: function () { return drivers_1.s3Driver; } });
+Object.defineProperty(exports, "azureDriver", { enumerable: true, get: function () { return drivers_1.azureDriver; } });
+Object.defineProperty(exports, "defineDriver", { enumerable: true, get: function () { return drivers_1.defineDriver; } });
+__exportStar(require("./validation"), exports);
+__exportStar(require("./tenant/tenant-from"), exports);
+var driver_multer_engine_1 = require("./multer/driver-multer-engine");
+Object.defineProperty(exports, "DriverMulterEngine", { enumerable: true, get: function () { return driver_multer_engine_1.DriverMulterEngine; } });
+Object.defineProperty(exports, "joinKey", { enumerable: true, get: function () { return driver_multer_engine_1.joinKey; } });
 //# sourceMappingURL=index.js.map

package/dist/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6DAA2C;AAC3C,0CAAwB;AACxB,oDAAkC;AAClC,yEAAuD;AACvD,yDAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,6DAA2C;AAC3C,8CAA4B;AAG5B,0CAAwB;AAGxB,yDAAuC;AACvC,yEAAuD;AACvD,oDAAkC;AAClC,oDAAkC;AAGlC,qCAA6E;AAApE,sGAAA,WAAW,OAAA;AAAE,mGAAA,QAAQ,OAAA;AAAE,sGAAA,WAAW,OAAA;AAAE,uGAAA,YAAY,OAAA;AAGzD,+CAA6B;AAG7B,uDAAqC;AAGrC,sEAA4E;AAAnE,0HAAA,kBAAkB,OAAA;AAAE,+GAAA,OAAO,OAAA"}

package/dist/lib/interceptor/file-storage.interceptor.d.ts

@@ -1,7 +1,7 @@
 import { NestInterceptor } from '@nestjs/common';
 import { Request } from 'express';
-import multer from 'multer';
-import { FileStorageEnum, StorageOptions, UploadedFile } from '../types';
+import type { UploadedFile } from '../drivers/driver.interface';
+import { UploadValidation } from '../validation';
 export type MulterFileWithStorageMeta = Express.Multer.File & Partial<Pick<UploadedFile, 'key' | 'url' | 'fullPath'>>;
 export type FileUploadConfig = {
     type: 'single' | 'array' | 'fields';
@@ -13,17 +13,14 @@ export type FileUploadConfig = {
     }[];
 };
 export type FileStorageInterceptorOptions = {
-    fileName?: (file: Express.Multer.File, req?: Request) => string;
-    fileDist?: (file: Express.Multer.File, req?: Request) => string;
+    driver?: string | ((req: Request) => string);
+    fileName?: (file: Express.Multer.File, req?: Request) => string | Promise<string>;
+    fileDist?: (file: Express.Multer.File, req?: Request) => string | Promise<string>;
     prefix?: string;
-    storageType?: FileStorageEnum;
-    storageOptions?: StorageOptions;
+    validation?: UploadValidation;
     mapToRequestBody?: (file: UploadedFile | UploadedFile[], fieldName: string, req?: Request) => unknown | Promise<unknown>;
     overwriteBodyField?: boolean;
-    multerOptions?: (req: Request, fileConfig: FileUploadConfig) => {
-        limits?: multer.Options['limits'];
-        fileFilter?: multer.Options['fileFilter'];
-    };
     afterUpload?: (req: Request, fileConfig: FileUploadConfig) => void | Promise<void>;
+    tenant?: false;
 };
 export declare function FileStorageInterceptor(fileConfig: FileUploadConfig | string, interceptorOptions?: FileStorageInterceptorOptions): NestInterceptor;

package/dist/lib/interceptor/file-storage.interceptor.js

@@ -1,38 +1,59 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileStorageInterceptor = FileStorageInterceptor;
-const multer_1 = __importDefault(require("multer"));
-const file_storage_service_1 = require("../file-storage.service");
-const storage_factory_1 = require("../storage.factory");
-const types_1 = require("../types");
-function getStorageConfig(storageType, options) {
-    switch (storageType) {
-        case types_1.FileStorageEnum.LOCAL:
-            return options.localConfig;
-        case types_1.FileStorageEnum.S3:
-            return options.s3Config;
-        case types_1.FileStorageEnum.AZURE:
-            return options.azureConfig;
-    }
-}
+const common_1 = require("@nestjs/common");
+const multer_1 = __importStar(require("multer"));
+const driver_multer_engine_1 = require("../multer/driver-multer-engine");
+const registry_holder_1 = require("../registry-holder");
+const validation_1 = require("../validation");
 function mapFileObject(file) {
     const withMeta = file;
-    const fileName = withMeta.filename ?? withMeta.fileName ?? file.originalname;
+    const fileName = withMeta.fileName ?? withMeta.filename ?? file.originalname;
     const originalName = file.originalname ?? withMeta.originalName ?? fileName;
-    const fullPath = withMeta.fullPath ?? file.path ?? withMeta.key ?? '';
+    const fullPath = withMeta.fullPath ?? withMeta.path ?? withMeta.key ?? '';
     return {
-        fieldName: file.fieldname,
+        key: withMeta.key ?? '',
+        url: withMeta.url ?? '',
         originalName,
         fileName,
-        mimetype: file.mimetype,
         size: file.size,
-        key: withMeta.key ?? '',
-        url: withMeta.url ?? '',
-        encoding: file.encoding,
+        mimetype: file.mimetype,
+        fieldName: file.fieldname,
         fullPath,
+        encoding: file.encoding,
     };
 }
 function collectArrayFiles(files, fieldName) {
@@ -58,20 +79,14 @@ function shouldSetBodyField(request, fieldName, overwriteBodyField) {
 async function applyFileKeyMapping(request, fileConfig, interceptorOptions) {
     const overwrite = interceptorOptions?.overwriteBodyField !== false;
     const mapCallback = interceptorOptions?.mapToRequestBody ??
-        ((file) => {
-            if (Array.isArray(file)) {
-                return file.map((f) => f.key);
-            }
-            return file.key;
-        });
+        ((file) => Array.isArray(file) ? file.map((f) => f.key) : file.key);
     if (fileConfig.type === 'single') {
         const file = request.file;
         if (file) {
             const fieldName = fileConfig.fieldName || 'file';
             if (!shouldSetBodyField(request, fieldName, overwrite))
                 return;
-            const mappedFile = mapFileObject(file);
-            request.body[fieldName] = await mapCallback(mappedFile, fieldName, request);
+            request.body[fieldName] = await mapCallback(mapFileObject(file), fieldName, request);
         }
     }
     else if (fileConfig.type === 'array') {
@@ -87,109 +102,99 @@ async function applyFileKeyMapping(request, fileConfig, interceptorOptions) {
             files = [];
         }
         if (files.length > 0 && shouldSetBodyField(request, fieldName, overwrite)) {
-            const mappedFiles = files.map(f => mapFileObject(f));
-            request.body[fieldName] = await mapCallback(mappedFiles, fieldName, request);
+            request.body[fieldName] = await mapCallback(files.map(mapFileObject), fieldName, request);
         }
     }
     else if (fileConfig.type === 'fields') {
         const files = request.files;
         if (files) {
-            for (let index = 0; index < Object.keys(files).length; index++) {
-                const fieldName = Object.keys(files)[index];
+            for (const fieldName of Object.keys(files)) {
                 if (!shouldSetBodyField(request, fieldName, overwrite))
                     continue;
-                const mappedFiles = files[fieldName].map(f => mapFileObject(f));
-                request.body[fieldName] = await mapCallback(mappedFiles, fieldName, request);
+                request.body[fieldName] = await mapCallback(files[fieldName].map(mapFileObject), fieldName, request);
             }
         }
     }
 }
-function FileStorageInterceptor(fileConfig, interceptorOptions) {
-    if (typeof fileConfig === 'string') {
-        fileConfig = {
-            type: 'single',
-            fieldName: fileConfig,
-        };
+function buildMulterMiddleware(upload, fileConfig) {
+    switch (fileConfig.type) {
+        case 'single':
+            if (!fileConfig.fieldName)
+                throw new Error('fieldName is required for single file upload.');
+            return upload.single(fileConfig.fieldName);
+        case 'array': {
+            if (!fileConfig.fieldName)
+                throw new Error('fieldName is required for array file upload.');
+            const maxCount = fileConfig.maxCount ?? 10;
+            const baseName = fileConfig.fieldName;
+            const fields = [
+                { name: baseName, maxCount },
+                ...Array.from({ length: maxCount }, (_, i) => ({ name: `${baseName}[${i}]`, maxCount: 1 })),
+            ];
+            return upload.fields(fields);
+        }
+        case 'fields':
+            if (!fileConfig.fields || !Array.isArray(fileConfig.fields)) {
+                throw new Error('fields array is required for multiple fields file upload.');
+            }
+            return upload.fields(fileConfig.fields);
+        default:
+            throw new Error('Invalid file upload type. Use "single", "array", or "fields".');
+    }
+}
+function normalizeUploadError(err, validation) {
+    if (err instanceof multer_1.MulterError) {
+        if (err.code === 'LIMIT_FILE_SIZE')
+            return new validation_1.FileTooLargeException(validation?.maxSize);
+        if (err.code === 'LIMIT_FILE_COUNT' || err.code === 'LIMIT_PART_COUNT') {
+            return new validation_1.TooManyFilesException(validation?.maxFiles);
+        }
+        if (err.code === 'LIMIT_UNEXPECTED_FILE') {
+            return new common_1.BadRequestException(`Unexpected file field "${err.field ?? ''}".`);
+        }
     }
+    return err;
+}
+function FileStorageInterceptor(fileConfig, interceptorOptions) {
+    const config = typeof fileConfig === 'string' ? { type: 'single', fieldName: fileConfig } : fileConfig;
     return {
         async intercept(context, next) {
-            const options = file_storage_service_1.FileStorageService.getOptions();
             const request = context.switchToHttp().getRequest();
             const response = context.switchToHttp().getResponse();
-            let storageType;
-            let storageConfig;
-            if ('storage' in options) {
-                storageType = interceptorOptions?.storageType ?? options.storage;
-                storageConfig = getStorageConfig(storageType, options);
-            }
-            else {
-                storageType = interceptorOptions?.storageType ?? types_1.FileStorageEnum.LOCAL;
-                storageConfig = {};
-            }
-            const storageOptions = {
-                ...storageConfig,
-                ...(interceptorOptions?.storageOptions ?? {}),
-                fileName: interceptorOptions?.fileName ?? storageConfig?.fileName,
-                fileDist: (file, req) => {
-                    return (interceptorOptions?.fileDist?.(file, req) ??
-                        storageConfig?.fileDist?.(file, req) ??
-                        '');
-                },
-                prefix: interceptorOptions?.prefix ?? storageConfig?.prefix,
-            };
-            const storage = await storage_factory_1.StorageFactory.createStorage(storageType, storageOptions);
-            const extra = interceptorOptions?.multerOptions?.(request, fileConfig);
-            const multerInstance = (0, multer_1.default)({
-                storage,
-                ...(extra?.limits ? { limits: extra.limits } : {}),
-                ...(extra?.fileFilter ? { fileFilter: extra.fileFilter } : {}),
+            const registry = registry_holder_1.FileStorageRegistryHolder.get();
+            const { driver, prefix: tenantPrefix } = await registry.resolveForRequest(request, {
+                driver: interceptorOptions?.driver,
+                tenant: interceptorOptions?.tenant,
             });
-            let multerMiddleware;
-            switch (fileConfig.type) {
-                case 'single':
-                    if (!fileConfig.fieldName) {
-                        throw new Error('fieldName is required for single file upload.');
-                    }
-                    multerMiddleware = multerInstance.single(fileConfig.fieldName);
-                    break;
-                case 'array': {
-                    if (!fileConfig.fieldName) {
-                        throw new Error('fieldName is required for multiple file upload.');
-                    }
-                    const maxCount = fileConfig.maxCount ?? 10;
-                    const baseName = fileConfig.fieldName;
-                    const fields = [
-                        { name: baseName, maxCount },
-                        ...Array.from({ length: maxCount }, (_, i) => ({ name: `${baseName}[${i}]`, maxCount: 1 })),
-                    ];
-                    multerMiddleware = multerInstance.fields(fields);
-                    break;
-                }
-                case 'fields':
-                    if (!fileConfig.fields || !Array.isArray(fileConfig.fields)) {
-                        throw new Error('fields array is required for multiple fields file upload.');
-                    }
-                    multerMiddleware = multerInstance.fields(fileConfig.fields);
-                    break;
-                default:
-                    throw new Error('Invalid file upload type. Use "single", "array", or "fields".');
-            }
+            const validation = (0, validation_1.mergeValidation)(registry.defaultValidation, interceptorOptions?.validation);
+            const prefix = (0, driver_multer_engine_1.joinKey)(tenantPrefix, interceptorOptions?.prefix) || undefined;
+            const engine = new driver_multer_engine_1.DriverMulterEngine(driver, {
+                fileName: interceptorOptions?.fileName,
+                fileDist: interceptorOptions?.fileDist,
+                prefix,
+            });
+            const upload = (0, multer_1.default)({
+                storage: engine,
+                ...((0, validation_1.toMulterLimits)(validation) ? { limits: (0, validation_1.toMulterLimits)(validation) } : {}),
+                ...((0, validation_1.buildFileFilter)(validation) ? { fileFilter: (0, validation_1.buildFileFilter)(validation) } : {}),
+            });
+            const middleware = buildMulterMiddleware(upload, config);
             await new Promise((resolve, reject) => {
-                multerMiddleware(request, response, (err) => {
-                    if (err) {
-                        if (err instanceof Error)
-                            return reject(err);
-                        return reject(new Error(typeof err === 'string' ? err : JSON.stringify(err)));
-                    }
-                    resolve();
+                middleware(request, response, (err) => {
+                    if (!err)
+                        return resolve();
+                    const mapped = normalizeUploadError(err, validation);
+                    if (mapped instanceof Error)
+                        return reject(mapped);
+                    return reject(new Error(typeof mapped === 'string' ? mapped : JSON.stringify(mapped)));
                 });
             });
             if (interceptorOptions?.afterUpload) {
-                await interceptorOptions.afterUpload(request, fileConfig);
+                await interceptorOptions.afterUpload(request, config);
             }
-            await applyFileKeyMapping(request, fileConfig, interceptorOptions);
+            await applyFileKeyMapping(request, config, interceptorOptions);
             return next.handle();
-        }
+        },
     };
 }
 //# sourceMappingURL=file-storage.interceptor.js.map