@duvdu-v1/duvdu 1.1.213 → 1.1.215

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

@@ -1,8 +1,10 @@
+/// <reference types="qs" />
+/// <reference types="express" />
 import multer from 'multer';
-interface uploadOptions {
+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) => 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

@@ -4,32 +4,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.globalUploadMiddleware = void 0;
-/* eslint-disable indent */
-const path_1 = __importDefault(require("path"));
 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.diskStorage({
-        destination: path_1.default.resolve(`media/${folder}`),
-        filename(req, file, callback) {
-            callback(null, `${(0, uuid_1.v4)()}.${file.originalname.split('.').at(-1)}`);
-        },
-    }),
-    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);
+    };
+    return (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'));
+                }
+            },
+    }).any();
+};
 exports.globalUploadMiddleware = globalUploadMiddleware;

package/build/utils/bucket.js

@@ -8,19 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bucket = void 0;
-const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
 class Bucket {
@@ -39,74 +31,55 @@ class Bucket {
     }
     saveBucketFiles(folder, ...files) {
         return __awaiter(this, void 0, void 0, function* () {
-            const CHUNK_SIZE = 50 * 1024 * 1024; // 50MB chunks
-            const MAX_PARALLEL_CHUNKS = 8; // Increased parallel uploads
+            const CHUNK_SIZE = 20 * 1024 * 1024;
+            const MAX_PARALLEL_FILES = 30;
             const MAX_RETRIES = 3;
-            yield Promise.all(files.map((file) => __awaiter(this, void 0, void 0, function* () {
-                var _a, e_1, _b, _c;
-                const filePath = path_1.default.resolve(`media/${folder}/${file.filename}`);
-                const fileSize = fs_1.default.statSync(filePath).size;
-                const contentType = this.getContentType(file.filename);
-                if (fileSize < CHUNK_SIZE) {
-                    return this.uploadSmallFile(folder, file, contentType);
-                }
-                let multipartUpload;
-                try {
-                    // Initiate multipart upload
-                    multipartUpload = yield new Promise((resolve, reject) => {
-                        this.s3.createMultipartUpload({
-                            Bucket: this.bucketName,
-                            Key: `${folder}/${file.filename}`,
-                            ContentType: contentType,
-                            ContentDisposition: 'inline',
-                            ServerSideEncryption: 'AES256',
-                        }, (err, data) => {
-                            if (err)
-                                reject(err);
-                            else
-                                resolve(data);
-                        });
-                    });
-                    const uploadId = multipartUpload.UploadId;
-                    const parts = [];
-                    // Prepare chunks for upload
-                    const chunks = [];
-                    let chunkIndex = 0;
-                    const fileStream = fs_1.default.createReadStream(filePath, {
-                        highWaterMark: CHUNK_SIZE // Optimize read buffer size
-                    });
+            // Process files in parallel batches
+            for (let i = 0; i < files.length; i += MAX_PARALLEL_FILES) {
+                const fileBatch = files.slice(i, i + MAX_PARALLEL_FILES);
+                yield Promise.all(fileBatch.map((file) => __awaiter(this, void 0, void 0, function* () {
+                    const contentType = this.getContentType(file.filename);
+                    const fileSize = file.size;
+                    if (fileSize < CHUNK_SIZE) {
+                        return this.uploadSmallFile(folder, file, contentType);
+                    }
+                    let multipartUpload;
                     try {
-                        for (var _d = true, fileStream_1 = __asyncValues(fileStream), fileStream_1_1; fileStream_1_1 = yield fileStream_1.next(), _a = fileStream_1_1.done, !_a; _d = true) {
-                            _c = fileStream_1_1.value;
-                            _d = false;
-                            const chunk = _c;
-                            chunks.push({
-                                buffer: Buffer.from(chunk),
-                                index: chunkIndex++
+                        // Initiate multipart upload
+                        multipartUpload = yield new Promise((resolve, reject) => {
+                            this.s3.createMultipartUpload({
+                                Bucket: this.bucketName,
+                                Key: `${folder}/${file.filename}`,
+                                ContentType: contentType,
+                                ContentDisposition: 'inline',
+                                ServerSideEncryption: 'AES256',
+                            }, (err, data) => {
+                                if (err)
+                                    reject(err);
+                                else
+                                    resolve(data);
                             });
+                        });
+                        const uploadId = multipartUpload.UploadId;
+                        const parts = [];
+                        // Split buffer into chunks
+                        const buffer = file.buffer;
+                        const chunks = [];
+                        for (let i = 0; i < buffer.length; i += CHUNK_SIZE) {
+                            chunks.push(buffer.slice(i, i + CHUNK_SIZE));
                         }
-                    }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                    finally {
-                        try {
-                            if (!_d && !_a && (_b = fileStream_1.return)) yield _b.call(fileStream_1);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                    }
-                    // Upload chunks in parallel batches with retry logic
-                    for (let i = 0; i < chunks.length; i += MAX_PARALLEL_CHUNKS) {
-                        const batch = chunks.slice(i, i + MAX_PARALLEL_CHUNKS);
-                        const partUploads = batch.map(({ buffer, index }) => {
+                        // Upload chunks
+                        const partUploads = chunks.map((chunk, index) => {
                             const partNumber = index + 1;
                             const uploadChunkWithRetry = (retryCount = 0) => __awaiter(this, void 0, void 0, function* () {
                                 try {
-                                    return yield new Promise((resolve, reject) => {
+                                    const uploadPromise = new Promise((resolve, reject) => {
                                         this.s3.uploadPart({
                                             Bucket: this.bucketName,
                                             Key: `${folder}/${file.filename}`,
                                             PartNumber: partNumber,
                                             UploadId: uploadId,
-                                            Body: buffer,
+                                            Body: chunk,
                                         }, (err, data) => {
                                             if (err)
                                                 reject(err);
@@ -117,10 +90,13 @@ class Bucket {
                                                 });
                                         });
                                     });
+                                    const timeoutPromise = new Promise((_, reject) => {
+                                        setTimeout(() => reject(new Error('Upload timeout')), 30000);
+                                    });
+                                    return yield Promise.race([uploadPromise, timeoutPromise]);
                                 }
                                 catch (error) {
                                     if (retryCount < MAX_RETRIES) {
-                                        // Exponential backoff
                                         yield new Promise(resolve => setTimeout(resolve, Math.pow(2, retryCount) * 1000));
                                         return uploadChunkWithRetry(retryCount + 1);
                                     }
@@ -131,63 +107,54 @@ class Bucket {
                         });
                         const completedParts = yield Promise.all(partUploads);
                         parts.push(...completedParts.sort((a, b) => { var _a, _b; return ((_a = a.PartNumber) !== null && _a !== void 0 ? _a : 0) - ((_b = b.PartNumber) !== null && _b !== void 0 ? _b : 0); }));
-                    }
-                    // Complete multipart upload
-                    yield new Promise((resolve, reject) => {
-                        this.s3.completeMultipartUpload({
-                            Bucket: this.bucketName,
-                            Key: `${folder}/${file.filename}`,
-                            UploadId: uploadId,
-                            MultipartUpload: { Parts: parts }
-                        }, (err, data) => {
-                            if (err)
-                                reject(err);
-                            else
-                                resolve(data);
-                        });
-                    });
-                }
-                catch (error) {
-                    // Attempt to abort multipart upload if it fails
-                    if (multipartUpload === null || multipartUpload === void 0 ? void 0 : multipartUpload.UploadId) {
-                        yield new Promise((resolve) => {
-                            this.s3.abortMultipartUpload({
+                        // Complete multipart upload
+                        yield new Promise((resolve, reject) => {
+                            this.s3.completeMultipartUpload({
                                 Bucket: this.bucketName,
                                 Key: `${folder}/${file.filename}`,
-                                UploadId: multipartUpload.UploadId
-                            }, () => resolve(null));
+                                UploadId: uploadId,
+                                MultipartUpload: { Parts: parts }
+                            }, (err, data) => {
+                                if (err)
+                                    reject(err);
+                                else
+                                    resolve(data);
+                            });
                         });
                     }
-                    throw error;
-                }
-            })));
+                    catch (error) {
+                        if (multipartUpload === null || multipartUpload === void 0 ? void 0 : multipartUpload.UploadId) {
+                            yield new Promise((resolve) => {
+                                this.s3.abortMultipartUpload({
+                                    Bucket: this.bucketName,
+                                    Key: `${folder}/${file.filename}`,
+                                    UploadId: multipartUpload.UploadId
+                                }, () => resolve(null));
+                            });
+                        }
+                        throw error;
+                    }
+                })));
+            }
         });
     }
     uploadSmallFile(folder, file, contentType) {
         return __awaiter(this, void 0, void 0, function* () {
-            const fileStream = fs_1.default.createReadStream(path_1.default.resolve(`media/${folder}/${file.filename}`));
-            try {
-                yield new Promise((resolve, reject) => {
-                    this.s3.putObject({
-                        Bucket: this.bucketName,
-                        Key: `${folder}/${file.filename}`,
-                        Body: fileStream,
-                        ContentDisposition: 'inline',
-                        ContentType: contentType,
-                        ServerSideEncryption: 'AES256',
-                    }, (err, data) => {
-                        fileStream.destroy();
-                        if (err)
-                            reject(err);
-                        else
-                            resolve(data);
-                    });
+            yield new Promise((resolve, reject) => {
+                this.s3.putObject({
+                    Bucket: this.bucketName,
+                    Key: `${folder}/${file.filename}`,
+                    Body: file.buffer,
+                    ContentDisposition: 'inline',
+                    ContentType: contentType,
+                    ServerSideEncryption: 'AES256',
+                }, (err, data) => {
+                    if (err)
+                        reject(err);
+                    else
+                        resolve(data);
                 });
-            }
-            catch (error) {
-                fileStream.destroy();
-                throw error;
-            }
+            });
         });
     }
     removeBucketFiles(...filePaths) {

package/package.json

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