@rexxhayanasi/elaina-baileys 1.2.1-rc.1 → 1.2.1-rc.2

package/lib/Utils/messages.js

@@ -107,68 +107,80 @@ const prepareWAMessageMedia = async (message, options) => {
         }
     }
 
-    // --- [MULAI] LOGIKA KHUSUS NEWSLETTER (WHISKEYSOCKETS ADAPTATION) ---
-    const isNewsletter = !!options.jid && (0, WABinary_1.isJidNewsletter)(options.jid);
+const isNewsletter = !!options.jid && (0, WABinary_1.isJidNewsletter)(options.jid);
 
-    if (isNewsletter) {
-        logger === null || logger === void 0 ? void 0 : logger.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
-        
-        // 1. Dapatkan file mentah (RAW) menggunakan fungsi yang baru kita buat di messages-media.js
-        const { filePath, fileSha256, fileLength } = await (0, messages_media_1.getRawMediaUploadData)(
-            uploadData.media,
-            options.mediaTypeOverride || mediaType,
-            logger
-        );
+if (isNewsletter) {
+    logger === null || logger === void 0 ? void 0 : logger.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
 
-        const fileSha256B64 = fileSha256.toString('base64');
-        
-        // 2. Upload Stream Mentah
-        // Kita buat ReadStream dari filePath agar kompatibel dengan sistem upload Baileys v6
-        const streamToUpload = (0, fs_1.createReadStream)(filePath);
-        
-        const { mediaUrl, directPath } = await options.upload(streamToUpload, {
-            fileEncSha256B64: fileSha256B64,
-            mediaType: mediaType,
-            timeoutMs: options.mediaUploadTimeoutMs
-        });
+    const { filePath, fileSha256, fileLength } = await (0, messages_media_1.getRawMediaUploadData)(
+        uploadData.media,
+        options.mediaTypeOverride || mediaType,
+        logger
+    );
 
-        // Hapus file temp setelah upload selesai
-        await fs_1.promises.unlink(filePath);
+    const fileSha256B64 = fileSha256.toString('base64');
 
-        // 3. Buat Objek Pesan
-        const obj = Types_1.WAProto.Message.fromObject({
-            [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
-                url: mediaUrl,
-                directPath,
-                fileSha256,
-                fileLength,
-                ...uploadData,
-                media: undefined
-            })
-        });
+    try {
+        if (mediaType === 'video' || mediaType === 'image') {
+            const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(filePath, mediaType, options);
+            uploadData.jpegThumbnail = thumbnail;
 
-        // 4. Ubah tipe pesan jadi PTV jika flag aktif
-        if (uploadData.ptv) {
-            obj.ptvMessage = obj.videoMessage;
-            delete obj.videoMessage;
+            if (!uploadData.width && originalImageDimensions) {
+                uploadData.width = originalImageDimensions.width;
+                uploadData.height = originalImageDimensions.height;
+            }
         }
 
-        // Handle sticker timestamp
-        if (obj.stickerMessage) {
-            obj.stickerMessage.stickerSentTs = Date.now();
+        if (mediaType === 'audio' || mediaType === 'video') {
+            if (typeof uploadData.seconds === 'undefined') {
+                uploadData.seconds = await (0, messages_media_1.getAudioDuration)(filePath);
+            }
         }
 
-        if (cacheableKey) {
-            logger === null || logger === void 0 ? void 0 : logger.debug({ cacheableKey }, 'set cache');
-            options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
+        if (mediaType === 'audio' && uploadData.ptt === true) {
+            uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(filePath, logger);
         }
+    } catch (err) {
+        logger === null || logger === void 0 ? void 0 : logger.warn({ trace: err.stack }, 'Failed to generate metadata for newsletter media');
+    }
+
+    const streamToUpload = (0, fs_1.createReadStream)(filePath);
+
+    const { mediaUrl, directPath } = await options.upload(streamToUpload, {
+        fileEncSha256B64: fileSha256B64,
+        mediaType: mediaType,
+        timeoutMs: options.mediaUploadTimeoutMs
+    });
+
+    await fs_1.promises.unlink(filePath);
+
+    const obj = Types_1.WAProto.Message.fromObject({
+        [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
+            url: mediaUrl,
+            directPath,
+            fileSha256,
+            fileLength,
+            ...uploadData,
+            media: undefined
+        })
+    });
+
+    if (uploadData.ptv) {
+        obj.ptvMessage = obj.videoMessage;
+        delete obj.videoMessage;
+    }
 
-        return obj;
+    if (obj.stickerMessage) {
+        obj.stickerMessage.stickerSentTs = Date.now();
     }
-    // --- [SELESAI] LOGIKA NEWSLETTER ---
 
+    if (cacheableKey) {
+        logger === null || logger === void 0 ? void 0 : logger.debug({ cacheableKey }, 'set cache');
+        options.mediaCache.set(cacheableKey, Types_1.WAProto.Message.encode(obj).finish());
+    }
 
-    // --- LOGIKA LAMA (E2E / CHAT BIASA) ---
+    return obj;
+}
     const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
     const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') &&
         (typeof uploadData['jpegThumbnail'] === 'undefined');
@@ -176,7 +188,6 @@ const prepareWAMessageMedia = async (message, options) => {
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
     
-    // Enkripsi standar
     const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, } = await (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
@@ -225,7 +236,7 @@ const prepareWAMessageMedia = async (message, options) => {
         if (!Buffer.isBuffer(encWriteStream)) {
             encWriteStream.destroy();
         }
-        // remove tmp files
+        
         if (didSaveToTmpPath && bodyPath) {
             try {
                 await fs_1.promises.access(bodyPath);
@@ -290,7 +301,7 @@ const generateForwardMessageContent = (message, forceForward) => {
     if (!content) {
         throw new boom_1.Boom('no content in message', { statusCode: 400 });
     }
-    // hacky copy
+    
     content = (0, exports.normalizeMessageContent)(content);
     content = WAProto_1.proto.Message.decode(WAProto_1.proto.Message.encode(content).finish());
     let key = Object.keys(content)[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.2.1-rc.1",
+  "version": "1.2.1-rc.2",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys",