@duvdu-v1/duvdu 1.1.205 → 1.1.207

package/build/models/User.model.js

@@ -70,7 +70,8 @@ const userSchema = new mongoose_1.Schema({
         color: { type: String, default: null },
     },
     projectsView: { type: Number, default: 0 },
-    haveInvitation: { type: Boolean, default: false }
+    haveInvitation: { type: Boolean, default: false },
+    faceRecognition: { type: String, default: null },
 }, {
     timestamps: true,
     collection: model_names_1.MODELS.user,
@@ -80,6 +81,8 @@ const userSchema = new mongoose_1.Schema({
                 ret.coverImage = process.env.BUCKET_HOST + '/' + ret.coverImage;
             if (ret.profileImage)
                 ret.profileImage = process.env.BUCKET_HOST + '/' + ret.profileImage;
+            if (ret.faceRecognition)
+                ret.faceRecognition = process.env.BUCKET_HOST + '/' + ret.faceRecognition;
         },
     },
 })

package/build/types/User.d.ts

@@ -103,4 +103,5 @@ export interface Iuser {
     };
     projectsView: number;
     haveInvitation: boolean;
+    faceRecognition: string | null;
 }

package/build/utils/bucket.js

@@ -39,17 +39,16 @@ class Bucket {
     }
     saveBucketFiles(folder, ...files) {
         return __awaiter(this, void 0, void 0, function* () {
-            const CHUNK_SIZE = 5 * 1024 * 1024; // 5MB chunks (AWS minimum)
+            const CHUNK_SIZE = 20 * 1024 * 1024; // 20MB chunks for better performance
+            const MAX_PARALLEL_CHUNKS = 4; // Control parallel uploads
             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);
-                // Use regular upload for small files (less than 15MB)
-                if (fileSize < CHUNK_SIZE * 3) {
+                if (fileSize < CHUNK_SIZE) {
                     return this.uploadSmallFile(folder, file, contentType);
                 }
-                // Use multipart upload for large files
                 let multipartUpload;
                 try {
                     // Initiate multipart upload
@@ -69,37 +68,19 @@ class Bucket {
                     });
                     const uploadId = multipartUpload.UploadId;
                     const parts = [];
-                    const fileStream = fs_1.default.createReadStream(filePath, { highWaterMark: CHUNK_SIZE });
-                    let partNumber = 1;
-                    let buffer = Buffer.alloc(0);
+                    const fileStream = fs_1.default.createReadStream(filePath);
+                    // Prepare chunks for parallel upload
+                    const chunks = [];
+                    let currentChunk = Buffer.alloc(0);
                     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;
-                            buffer = Buffer.concat([buffer, chunk]);
-                            // Upload when buffer reaches CHUNK_SIZE or it's the last chunk
-                            if (buffer.length >= CHUNK_SIZE || partNumber * CHUNK_SIZE >= fileSize) {
-                                const partData = yield new Promise((resolve, reject) => {
-                                    this.s3.uploadPart({
-                                        Bucket: this.bucketName,
-                                        Key: `${folder}/${file.filename}`,
-                                        PartNumber: partNumber,
-                                        UploadId: uploadId,
-                                        Body: buffer,
-                                    }, (err, data) => {
-                                        if (err)
-                                            reject(err);
-                                        else
-                                            resolve(data);
-                                    });
-                                });
-                                parts.push({
-                                    PartNumber: partNumber,
-                                    ETag: partData.ETag
-                                });
-                                buffer = Buffer.alloc(0);
-                                partNumber++;
+                            currentChunk = Buffer.concat([currentChunk, chunk]);
+                            if (currentChunk.length >= CHUNK_SIZE) {
+                                chunks.push(Buffer.from(currentChunk));
+                                currentChunk = Buffer.alloc(0);
                             }
                         }
                     }
@@ -110,6 +91,35 @@ class Bucket {
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
+                    if (currentChunk.length > 0) {
+                        chunks.push(Buffer.from(currentChunk));
+                    }
+                    // Upload chunks in parallel batches
+                    for (let i = 0; i < chunks.length; i += MAX_PARALLEL_CHUNKS) {
+                        const batch = chunks.slice(i, i + MAX_PARALLEL_CHUNKS);
+                        const partUploads = batch.map((chunkBuffer, index) => {
+                            const partNumber = i + index + 1;
+                            return new Promise((resolve, reject) => {
+                                this.s3.uploadPart({
+                                    Bucket: this.bucketName,
+                                    Key: `${folder}/${file.filename}`,
+                                    PartNumber: partNumber,
+                                    UploadId: uploadId,
+                                    Body: chunkBuffer,
+                                }, (err, data) => {
+                                    if (err)
+                                        reject(err);
+                                    else
+                                        resolve({
+                                            PartNumber: partNumber,
+                                            ETag: data.ETag
+                                        });
+                                });
+                            });
+                        });
+                        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({
@@ -132,7 +142,7 @@ class Bucket {
                             this.s3.abortMultipartUpload({
                                 Bucket: this.bucketName,
                                 Key: `${folder}/${file.filename}`,
-                                UploadId: multipartUpload.UploadId // Add non-null assertion here
+                                UploadId: multipartUpload.UploadId
                             }, () => resolve(null));
                         });
                     }
@@ -170,7 +180,7 @@ class Bucket {
     }
     removeBucketFiles(...filePaths) {
         return __awaiter(this, void 0, void 0, function* () {
-            const BATCH_SIZE = 1000; // AWS limit is 1000 objects per delete operation
+            const BATCH_SIZE = 1000;
             for (let i = 0; i < filePaths.length; i += BATCH_SIZE) {
                 const batch = filePaths.slice(i, i + BATCH_SIZE);
                 yield new Promise((resolve, reject) => {
@@ -189,61 +199,12 @@ class Bucket {
     }
     getContentType(filename) {
         const ext = path_1.default.extname(filename).toLowerCase();
-        switch (ext) {
-            // Video Types
-            case '.mp4':
-                return 'video/mp4';
-            case '.webm':
-                return 'video/webm';
-            case '.ogg':
-                return 'video/ogg';
-            case '.avi':
-                return 'video/x-msvideo';
-            case '.mov':
-                return 'video/quicktime';
-            case '.wmv':
-                return 'video/x-ms-wmv';
-            case '.mkv':
-                return 'video/x-matroska';
-            case '.flv':
-                return 'video/x-flv';
-            // Audio Types
-            case '.mp3':
-                return 'audio/mpeg';
-            case '.wav':
-                return 'audio/wav';
-            case '.aac':
-                return 'audio/aac';
-            case '.flac':
-                return 'audio/flac';
-            case '.m4a':
-                return 'audio/x-m4a';
-            case '.wma':
-                return 'audio/x-ms-wma';
-            // Image Types
-            case '.jpg':
-            case '.jpeg':
-                return 'image/jpeg';
-            case '.png':
-                return 'image/png';
-            case '.gif':
-                return 'image/gif';
-            case '.bmp':
-                return 'image/bmp';
-            case '.webp':
-                return 'image/webp';
-            case '.svg':
-                return 'image/svg+xml';
-            case '.tiff':
-            case '.tif':
-                return 'image/tiff';
-            // PDF and other document types
-            case '.pdf':
-                return 'application/pdf';
-            // Default fallback
-            default:
-                return 'application/octet-stream'; // Fallback for unknown types
+        for (const category of Object.values(MIME_TYPES)) {
+            if (ext in category) {
+                return category[ext];
+            }
         }
+        return 'application/octet-stream';
     }
     validateFace(imageKey) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -259,7 +220,6 @@ class Bucket {
                     Attributes: ['ALL']
                 };
                 const result = yield this.rekognition.detectFaces(params).promise();
-                // Check if exactly one face is detected
                 if (!result.FaceDetails || result.FaceDetails.length === 0) {
                     return {
                         isValid: false,
@@ -269,25 +229,22 @@ class Bucket {
                 if (result.FaceDetails.length > 1) {
                     return {
                         isValid: false,
-                        error: { en: 'Multiple faces detected in the image', ar: 'تم الكشف عن أكثر من وجه ف�� الصورة' }
+                        error: { en: 'Multiple faces detected in the image', ar: 'تم الكشف عن أكثر من وجه في الصورة' }
                     };
                 }
                 const face = result.FaceDetails[0];
-                // Stricter confidence threshold (95%)
                 if (!face.Confidence || face.Confidence < 95) {
                     return {
                         isValid: false,
                         error: { en: 'Image quality is not sufficient', ar: 'جودة الصورة غير كافية' }
                     };
                 }
-                // Check for sunglasses or eyeglasses
                 if (((_a = face.Sunglasses) === null || _a === void 0 ? void 0 : _a.Value) || ((_b = face.Eyeglasses) === null || _b === void 0 ? void 0 : _b.Value)) {
                     return {
                         isValid: false,
                         error: { en: 'Please remove glasses or sunglasses', ar: 'يرجى إزالة النظارات أو النظارات الشمسية' }
                     };
                 }
-                // Check if eyes are open with higher confidence
                 const leftEyeOpen = ((_c = face.EyesOpen) === null || _c === void 0 ? void 0 : _c.Value) && ((_e = (_d = face.EyesOpen) === null || _d === void 0 ? void 0 : _d.Confidence) !== null && _e !== void 0 ? _e : 0) > 95;
                 const rightEyeOpen = ((_f = face.EyesOpen) === null || _f === void 0 ? void 0 : _f.Value) && ((_h = (_g = face.EyesOpen) === null || _g === void 0 ? void 0 : _g.Confidence) !== null && _h !== void 0 ? _h : 0) > 95;
                 if (!leftEyeOpen || !rightEyeOpen) {
@@ -296,16 +253,14 @@ class Bucket {
                         error: { en: 'Eyes must be fully open and clearly visible', ar: 'يجب أن تكون العينين مفتوحتين بالكامل وواضحتين' }
                     };
                 }
-                // Check for mouth open
                 if ((_j = face.MouthOpen) === null || _j === void 0 ? void 0 : _j.Value) {
                     return {
                         isValid: false,
                         error: { en: 'Mouth should be closed', ar: 'يجب أن يكون الفم مغلقاً' }
                     };
                 }
-                // Stricter face orientation check
                 const pose = face.Pose;
-                const poseThreshold = 15; // Stricter threshold (15 degrees)
+                const poseThreshold = 15;
                 if (Math.abs((pose === null || pose === void 0 ? void 0 : pose.Pitch) || 0) > poseThreshold ||
                     Math.abs((pose === null || pose === void 0 ? void 0 : pose.Roll) || 0) > poseThreshold ||
                     Math.abs((pose === null || pose === void 0 ? void 0 : pose.Yaw) || 0) > poseThreshold) {
@@ -314,14 +269,12 @@ class Bucket {
                         error: { en: 'Face must be directly facing the camera', ar: 'يجب أن يكون الوجه مواجهاً للكاميرا مباشرة' }
                     };
                 }
-                // Check for facial occlusions
                 if ((_k = face.FaceOccluded) === null || _k === void 0 ? void 0 : _k.Value) {
                     return {
                         isValid: false,
                         error: { en: 'Face must be fully visible without any coverings', ar: 'يجب أن يكون الوجه مرئياً بالكامل بدون أي أغطية' }
                     };
                 }
-                // Check for neutral expression
                 if ((_l = face.Smile) === null || _l === void 0 ? void 0 : _l.Value) {
                     return {
                         isValid: false,
@@ -341,3 +294,37 @@ class Bucket {
     }
 }
 exports.Bucket = Bucket;
+const MIME_TYPES = {
+    video: {
+        '.mp4': 'video/mp4',
+        '.webm': 'video/webm',
+        '.ogg': 'video/ogg',
+        '.avi': 'video/x-msvideo',
+        '.mov': 'video/quicktime',
+        '.wmv': 'video/x-ms-wmv',
+        '.mkv': 'video/x-matroska',
+        '.flv': 'video/x-flv'
+    },
+    audio: {
+        '.mp3': 'audio/mpeg',
+        '.wav': 'audio/wav',
+        '.aac': 'audio/aac',
+        '.flac': 'audio/flac',
+        '.m4a': 'audio/x-m4a',
+        '.wma': 'audio/x-ms-wma'
+    },
+    image: {
+        '.jpg': 'image/jpeg',
+        '.jpeg': 'image/jpeg',
+        '.png': 'image/png',
+        '.gif': 'image/gif',
+        '.bmp': 'image/bmp',
+        '.webp': 'image/webp',
+        '.svg': 'image/svg+xml',
+        '.tiff': 'image/tiff',
+        '.tif': 'image/tiff'
+    },
+    document: {
+        '.pdf': 'application/pdf'
+    }
+};

package/package.json

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