@devshopapp/common 1.0.15 → 1.0.17

package/build/src/constants/global.d.ts

@@ -1,3 +1,4 @@
+export declare const UPLOADS_DIRECTORY = "uploads/";
 export interface JwtPayload {
     email: string;
     userId: string;

package/build/src/constants/global.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../../src/constants/global.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../../src/constants/global.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAE5C,MAAM,WAAW,UAAU;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB"}

package/build/src/constants/global.js

@@ -1,2 +1,2 @@
-export {};
+export const UPLOADS_DIRECTORY = "uploads/";
 //# sourceMappingURL=global.js.map

package/build/src/constants/global.js.map

@@ -1 +1 @@
-{"version":3,"file":"global.js","sourceRoot":"","sources":["../../../src/constants/global.ts"],"names":[],"mappings":""}
+{"version":3,"file":"global.js","sourceRoot":"","sources":["../../../src/constants/global.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG,UAAU,CAAC"}

package/build/src/middlewares/uploader.d.ts

@@ -1,16 +1,45 @@
-import type { Request } from "express";
-import multer, { type FileFilterCallback } from "multer";
-export interface UploaderMiddlewareOptionsI {
+import type { RequestHandler } from "express";
+export interface UploadOptions {
     fieldName?: string;
-    types?: Array<string>;
+    allowedMimeTypes?: string[];
+    maxFileSize?: number;
+    maxFiles?: number;
+    uploadDirectory?: string;
+    preserveExtension?: boolean;
+}
+export declare class UploadError extends Error {
+    statusCode: number;
+    constructor(message: string);
 }
 export declare class Uploader {
-    uploadDirectory?: string | undefined;
-    defaultUploadDirectory: string;
+    private readonly uploadDirectory?;
+    private readonly DEFAULT_UPLOAD_DIR;
+    private readonly DEFAULT_MAX_FILE_SIZE;
+    private readonly DEFAULT_MAX_FILES;
     constructor(uploadDirectory?: string | undefined);
-    fileFilter: (types?: Array<string>) => (req: Request, file: Express.Multer.File, cb: FileFilterCallback) => void;
-    storage: multer.StorageEngine;
-    uploadMultipleFiles(options?: UploaderMiddlewareOptionsI): import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
-    uploadSingleFile(options?: UploaderMiddlewareOptionsI): import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+    /**
+     * Ensure upload directory exists
+     */
+    private ensureDirectoryExists;
+    /**
+     * Generate cryptographically secure filename
+     */
+    private generateFilename;
+    /**
+     * Validate mime type
+     */
+    private buildFileFilter;
+    /**
+     * Build storage engine
+     */
+    private buildStorage;
+    /**
+     * Upload multiple files
+     */
+    uploadMultipleFiles(options?: UploadOptions): RequestHandler;
+    /**
+     * Upload single file
+     */
+    uploadSingleFile(options?: UploadOptions): RequestHandler;
 }
 //# sourceMappingURL=uploader.d.ts.map

package/build/src/middlewares/uploader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../src/middlewares/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,MAAM,EAAE,EAAE,KAAK,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAEzD,MAAM,WAAW,0BAA0B;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACzB;AAED,qBAAa,QAAQ;IAGE,eAAe,CAAC,EAAE,MAAM;IAFpC,sBAAsB,SAAc;gBAExB,eAAe,CAAC,EAAE,MAAM,YAAA;IAEpC,UAAU,GAAI,QAAQ,KAAK,CAAC,MAAM,CAAC,MAC9B,KAAK,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,kBAAkB,UAa1E;IAEM,OAAO,uBAQZ;IAEF,mBAAmB,CAAC,OAAO,CAAC,EAAE,0BAA0B;IAKxD,gBAAgB,CAAC,OAAO,CAAC,EAAE,0BAA0B;CAIxD"}
+{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../../src/middlewares/uploader.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAW,cAAc,EAAE,MAAM,SAAS,CAAC;AAEvD,MAAM,WAAW,aAAa;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,qBAAa,WAAY,SAAQ,KAAK;IAClC,UAAU,SAAO;gBAEL,OAAO,EAAE,MAAM;CAQ9B;AAED,qBAAa,QAAQ;IAML,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IAJ7C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2B;IAC9D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAmB;IACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAK;gBAEV,eAAe,CAAC,EAAE,MAAM,YAAA;IAErD;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAUxB;;OAEG;IACH,OAAO,CAAC,eAAe;IAmBvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAqBpB;;OAEG;IACI,mBAAmB,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,cAAc;IAenE;;OAEG;IACI,gBAAgB,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,cAAc;CAcnE"}

package/build/src/middlewares/uploader.js

@@ -1,42 +1,109 @@
+import fs from "fs";
+import path from "path";
+import crypto from "crypto";
 import multer, {} from "multer";
+export class UploadError extends Error {
+    statusCode = 400;
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, UploadError.prototype);
+    }
+}
 export class Uploader {
     uploadDirectory;
-    defaultUploadDirectory = '/uploads';
+    DEFAULT_UPLOAD_DIR = path.resolve("uploads");
+    DEFAULT_MAX_FILE_SIZE = 5 * 1024 * 1024; // 5 MB
+    DEFAULT_MAX_FILES = 5;
     constructor(uploadDirectory) {
         this.uploadDirectory = uploadDirectory;
     }
-    fileFilter = (types) => {
+    /**
+     * Ensure upload directory exists
+     */
+    ensureDirectoryExists(directory) {
+        if (!fs.existsSync(directory)) {
+            fs.mkdirSync(directory, {
+                recursive: true
+            });
+        }
+    }
+    /**
+     * Generate cryptographically secure filename
+     */
+    generateFilename(originalName, preserveExtension = true) {
+        const randomName = crypto.randomBytes(32).toString("hex");
+        if (!preserveExtension) {
+            return randomName;
+        }
+        const extension = path.extname(originalName);
+        return `${randomName}${extension}`;
+    }
+    /**
+     * Validate mime type
+     */
+    buildFileFilter(allowedMimeTypes) {
         return (req, file, cb) => {
-            const type = file.mimetype;
-            if (!types)
-                return cb(null, true);
-            if (types.length <= 0)
+            if (!allowedMimeTypes || allowedMimeTypes.length === 0) {
                 return cb(null, true);
-            if (types.some((accepted) => accepted === type)) {
+            }
+            const isAllowed = allowedMimeTypes.includes(file.mimetype);
+            // if (!isAllowed) { return cb(new UploadError(`Unsupported file type: ${file.mimetype}`));}
+            // cb(null, true);
+            if (isAllowed) {
                 cb(null, true);
             }
             else {
-                req.uploaderError = new Error(`we only accept the following types: ${types.join(', ')}`);
+                req.uploaderError = new UploadError(`Unsupported file type: ${file.mimetype}`);
                 cb(null, false);
             }
         };
-    };
-    storage = multer.diskStorage({
-        destination: (req, file, cb) => {
-            cb(null, this.uploadDirectory || this.defaultUploadDirectory);
-        },
-        filename: (req, file, cb) => {
-            const uniqueSuffix = Date.now() + '-' + Math.round(Math.random() * 1E9);
-            cb(null, `${file.fieldname}${uniqueSuffix}`);
-        }
-    });
+    }
+    /**
+     * Build storage engine
+     */
+    buildStorage(directory, preserveExtension) {
+        this.ensureDirectoryExists(directory);
+        return multer.diskStorage({
+            destination: (req, file, cb) => {
+                cb(null, directory);
+            },
+            filename: (req, file, cb) => {
+                try {
+                    const filename = this.generateFilename(file.originalname, preserveExtension);
+                    cb(null, filename);
+                }
+                catch (err) {
+                    cb(err, "");
+                }
+            }
+        });
+    }
+    /**
+     * Upload multiple files
+     */
     uploadMultipleFiles(options) {
-        return multer({ storage: this.storage, fileFilter: this.fileFilter(options?.types) })
-            .array(options?.fieldName || 'file');
+        const uploadDir = options?.uploadDirectory || this.uploadDirectory || this.DEFAULT_UPLOAD_DIR;
+        return multer({
+            storage: this.buildStorage(uploadDir, options?.preserveExtension ?? true),
+            fileFilter: this.buildFileFilter(options?.allowedMimeTypes),
+            limits: {
+                fileSize: options?.maxFileSize || this.DEFAULT_MAX_FILE_SIZE,
+                files: options?.maxFiles || this.DEFAULT_MAX_FILES
+            }
+        }).array(options?.fieldName || "files");
     }
+    /**
+     * Upload single file
+     */
     uploadSingleFile(options) {
-        return multer({ storage: this.storage, fileFilter: this.fileFilter(options?.types) })
-            .single(options?.fieldName || 'file');
+        const uploadDir = options?.uploadDirectory || this.uploadDirectory || this.DEFAULT_UPLOAD_DIR;
+        return multer({
+            storage: this.buildStorage(uploadDir, options?.preserveExtension ?? true),
+            fileFilter: this.buildFileFilter(options?.allowedMimeTypes),
+            limits: {
+                fileSize: options?.maxFileSize || this.DEFAULT_MAX_FILE_SIZE
+            }
+        }).single(options?.fieldName || "file");
     }
 }
 //# sourceMappingURL=uploader.js.map

package/build/src/middlewares/uploader.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../src/middlewares/uploader.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,EAAE,EAA2B,MAAM,QAAQ,CAAC;AAOzD,MAAM,OAAO,QAAQ;IAGE;IAFZ,sBAAsB,GAAG,UAAU,CAAC;IAE3C,YAAmB,eAAwB;QAAxB,oBAAe,GAAf,eAAe,CAAS;IAAG,CAAC;IAExC,UAAU,GAAG,CAAC,KAAqB,EAAE,EAAE;QAC1C,OAAO,CAAC,GAAY,EAAE,IAAyB,EAAE,EAAsB,EAAE,EAAE;YACvE,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC;YAE3B,IAAI,CAAC,KAAK;gBAAE,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAClC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;gBAAE,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAE7C,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,QAAgB,EAAE,EAAE,CAAC,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC;gBACtD,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACnB,CAAC;iBAAM,CAAC;gBACJ,GAAG,CAAC,aAAa,GAAG,IAAI,KAAK,CAAC,uCAAuC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACzF,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACpB,CAAC;QACL,CAAC,CAAA;IACL,CAAC,CAAA;IAEM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;QAChC,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;YAC3B,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,IAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAChE,CAAC;QACD,QAAQ,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;YACxB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;YACxE,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,GAAG,YAAY,EAAE,CAAC,CAAC;QACjD,CAAC;KACJ,CAAC,CAAA;IAEF,mBAAmB,CAAC,OAAoC;QACpD,OAAO,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;aAChF,KAAK,CAAC,OAAO,EAAE,SAAS,IAAI,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,gBAAgB,CAAC,OAAoC;QACjD,OAAO,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;aAChF,MAAM,CAAC,OAAO,EAAE,SAAS,IAAI,MAAM,CAAC,CAAC;IAC9C,CAAC;CACJ"}
+{"version":3,"file":"uploader.js","sourceRoot":"","sources":["../../../src/middlewares/uploader.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devshopapp/common",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "A common utils package for the different services in the shopping application",
   "type": "module",
   "types": "./build/src/index.d.ts",