@duvdu-v1/duvdu 1.1.214 → 1.1.216

package/build/middlewares/global-upload.middleware.d.ts

@@ -1,8 +1,16 @@
+/// <reference types="qs" />
+/// <reference types="express" />
 import multer from 'multer';
 interface UploadOptions {
     fileTypes?: string[];
     maxSize?: number;
     fileFilter?(req: Request, file: Express.Multer.File, callback: multer.FileFilterCallback): void;
 }
-export declare const globalUploadMiddleware: (folder: string, options?: UploadOptions) => multer.Multer;
+export declare const globalUploadMiddleware: (folder: string, options?: UploadOptions) => {
+    single: (fieldName: string) => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+    array: (fieldName: string, maxCount?: number | undefined) => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+    fields: (fields: readonly multer.Field[]) => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+    none: () => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+    any: () => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+};
 export {};

package/build/middlewares/global-upload.middleware.js

@@ -1,59 +1,63 @@
 "use strict";
-// /* eslint-disable indent */
-// import path from 'path';
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.globalUploadMiddleware = void 0;
-// import multer from 'multer';
-// import { v4 } from 'uuid';
-// import { BadRequestError } from '../errors/bad-request-error';
-// interface uploadOptions {
-//   fileTypes?: string[];
-//   maxSize?: number;
-//   fileFilter?(req: Request, file: Express.Multer.File, callback: multer.FileFilterCallback): void;
-// }
-// export const globalUploadMiddleware = (folder: string, options?: uploadOptions) =>
-//   multer({
-//     storage: multer.diskStorage({
-//       destination: path.resolve(`media/${folder}`),
-//       filename(req, file, callback) {
-//         callback(null, `${v4()}.${file.originalname.split('.').at(-1)}`);
-//       },
-//     }),
-//     limits: { fileSize: options?.maxSize || 3 * 1024 * 1024 }, // 3MB
-//     fileFilter: options?.fileFilter
-//       ? (options.fileFilter as any)
-//       : function fileFilter(req, file, callback) {
-//           if (!options?.fileTypes) {
-//             if (!file.mimetype.startsWith('image'))
-//               return callback(new BadRequestError('invalid file format'));
-//             return callback(null, true);
-//           }
-//           if (options?.fileTypes?.some((type) => file.mimetype.startsWith(type)))
-//             return callback(null, true);
-//           else return callback(new BadRequestError('invalid file format'));
-//         },
-//   });
 const multer_1 = __importDefault(require("multer"));
+const uuid_1 = require("uuid");
 const bad_request_error_1 = require("../errors/bad-request-error");
-const globalUploadMiddleware = (folder, options) => (0, multer_1.default)({
-    storage: multer_1.default.memoryStorage(),
-    limits: { fileSize: (options === null || options === void 0 ? void 0 : options.maxSize) || 3 * 1024 * 1024 }, // 3MB
-    fileFilter: (options === null || options === void 0 ? void 0 : options.fileFilter)
-        ? options.fileFilter
-        : function fileFilter(req, file, callback) {
-            var _a;
-            if (!(options === null || options === void 0 ? void 0 : options.fileTypes)) {
-                if (!file.mimetype.startsWith('image'))
-                    return callback(new bad_request_error_1.BadRequestError('invalid file format'));
-                return callback(null, true);
-            }
-            if ((_a = options === null || options === void 0 ? void 0 : options.fileTypes) === null || _a === void 0 ? void 0 : _a.some((type) => file.mimetype.startsWith(type)))
-                return callback(null, true);
-            else
-                return callback(new bad_request_error_1.BadRequestError('invalid file format'));
+const generateUniqueFileName = (originalname) => {
+    const timestamp = Date.now();
+    const uuid = (0, uuid_1.v4)().slice(0, 8);
+    const extension = originalname.split('.').pop();
+    return `${timestamp}-${uuid}.${extension}`;
+};
+const globalUploadMiddleware = (folder, options) => {
+    const storage = multer_1.default.memoryStorage();
+    // Extend memory storage to include filename generation
+    const customStorage = Object.create(storage);
+    customStorage._handleFile = function (req, file, cb) {
+        // Generate unique filename before storing
+        file.filename = generateUniqueFileName(file.originalname);
+        // Call original memory storage handler
+        storage._handleFile(req, file, cb);
+    };
+    const upload = (0, multer_1.default)({
+        storage: customStorage,
+        limits: {
+            fileSize: (options === null || options === void 0 ? void 0 : options.maxSize) || 3 * 1024 * 1024 // 3MB default
         },
-});
+        fileFilter: (options === null || options === void 0 ? void 0 : options.fileFilter)
+            ? options.fileFilter
+            : function fileFilter(req, file, callback) {
+                var _a;
+                if (!(options === null || options === void 0 ? void 0 : options.fileTypes)) {
+                    if (!file.mimetype.startsWith('image')) {
+                        return callback(new bad_request_error_1.BadRequestError({
+                            en: 'Invalid file format',
+                            ar: 'صيغة الملف غير صالحة'
+                        }, 'en'));
+                    }
+                    return callback(null, true);
+                }
+                if ((_a = options === null || options === void 0 ? void 0 : options.fileTypes) === null || _a === void 0 ? void 0 : _a.some((type) => file.mimetype.startsWith(type))) {
+                    return callback(null, true);
+                }
+                else {
+                    return callback(new bad_request_error_1.BadRequestError({
+                        en: 'Invalid file format',
+                        ar: 'صيغة الملف غير صالحة'
+                    }, 'en'));
+                }
+            },
+    });
+    return {
+        single: upload.single.bind(upload),
+        array: upload.array.bind(upload),
+        fields: upload.fields.bind(upload),
+        none: upload.none.bind(upload),
+        any: upload.any.bind(upload)
+    };
+};
 exports.globalUploadMiddleware = globalUploadMiddleware;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duvdu-v1/duvdu",
-  "version": "1.1.214",
+  "version": "1.1.216",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [