@rexxhayanasi/elaina-baileys 1.2.1-rc.3 → 1.2.1-rc.5

package/lib/Utils/messages-media.js

@@ -573,7 +573,10 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
     }
 };
 exports.prepareStream = prepareStream;
-const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
+const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts, isNewsletter } = {}) => {
+    if (isNewsletter) {
+        throw new Error('encryptedStream must not be used for newsletter media');
+    }
     const { stream, type } = await (0, exports.getStream)(media, opts);
     logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
     const mediaKey = Crypto.randomBytes(32);

package/lib/Utils/messages.js

@@ -108,10 +108,14 @@ const prepareWAMessageMedia = async (message, options) => {
     }
 
     const isNewsletter = !!options.jid && (0, WABinary_1.isJidNewsletter)(options.jid);
+    
+    if (isNewsletter && mediaType === 'audio') {
+    uploadData.mimetype = 'audio/mp4';
+}
 
     if (isNewsletter) {
         logger === null || logger === void 0 ? void 0 : logger.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
-
+        
         const { filePath, fileSha256, fileLength } = await (0, messages_media_1.getRawMediaUploadData)(
             uploadData.media,
             options.mediaTypeOverride || mediaType,
@@ -119,68 +123,47 @@ const prepareWAMessageMedia = async (message, options) => {
         );
 
         const fileSha256B64 = fileSha256.toString('base64');
+const uploadInput = filePath;
 
-        try {
-            if (mediaType === 'video' || mediaType === 'image') {
-                const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(filePath, mediaType, options);
-                if (!uploadData.jpegThumbnail) uploadData.jpegThumbnail = thumbnail;
+const { mediaUrl, directPath } = await options.upload(uploadInput, {
+    fileEncSha256B64: fileSha256B64,
+    mediaType
+});
 
-                if (!uploadData.width && originalImageDimensions) {
-                    uploadData.width = originalImageDimensions.width;
-                    uploadData.height = originalImageDimensions.height;
-                }
-            }
-
-            if (mediaType === 'audio' || mediaType === 'video') {
-                if (typeof uploadData.seconds === 'undefined') {
-                     uploadData.seconds = await (0, messages_media_1.getAudioDuration)(filePath);
-                }
-            }
-
-            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 }, 'Metadata generation failed');
-        }
-
-        const streamToUpload = (0, fs_1.createReadStream)(filePath);
-
-        const uploaded = await options.upload(streamToUpload, {
-            fileEncSha256B64: fileSha256B64,
-            mediaType: mediaType,
-            timeoutMs: options.mediaUploadTimeoutMs
-        });
-
-        await fs_1.promises.unlink(filePath);
-
-        const finalUrl = uploaded.mediaUrl || uploaded.url || `https://mmg.whatsapp.net${uploaded.directPath}`;
+await fs_1.promises.unlink(filePath);
 
         const obj = Types_1.WAProto.Message.fromObject({
             [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
-                url: finalUrl,
-                directPath: uploaded.directPath,
-                mediaKey: undefined,
-                fileEncSha256: undefined,
+                url: mediaUrl,
+                directPath,
                 fileSha256,
                 fileLength,
-                staticUrl: uploaded.handle ? finalUrl : undefined,
                 ...uploadData,
                 media: undefined
             })
         });
+        
+
+if (uploadData.ptv && mediaType === 'video') {
+    obj.ptvMessage = obj.videoMessage;
+    delete obj.videoMessage;
+
+    delete obj.ptvMessage.jpegThumbnail;
+    delete obj.ptvMessage.seconds;
+    delete obj.ptvMessage.gifPlayback;
+    delete obj.ptvMessage.contextInfo;
+    
+    obj.ptvMessage.ptv = true;
+    obj.ptvMessage.mimetype = 'video/mp4';
+}
 
-        if (uploadData.ptv) {
-            obj.ptvMessage = obj.videoMessage;
-            delete obj.videoMessage;
-        }
 
         if (obj.stickerMessage) {
             obj.stickerMessage.stickerSentTs = Date.now();
         }
 
         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());
         }
 
@@ -193,6 +176,7 @@ 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,
@@ -241,7 +225,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);
@@ -268,11 +252,11 @@ const prepareWAMessageMedia = async (message, options) => {
         })
     });
     
-    if (uploadData.ptv) {
-        obj.ptvMessage = obj.videoMessage;
-        delete obj.videoMessage;
-    }
-    
+    if (uploadData.ptv && mediaType === 'video') {
+    obj.ptvMessage = obj.videoMessage;
+    delete obj.videoMessage;
+}
+
     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());
@@ -280,6 +264,7 @@ const prepareWAMessageMedia = async (message, options) => {
     return obj;
 };
 exports.prepareWAMessageMedia = prepareWAMessageMedia;
+
 const prepareDisappearingMessageSettingContent = (ephemeralExpiration) => {
     ephemeralExpiration = ephemeralExpiration || 0;
     const content = {
@@ -306,7 +291,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];
@@ -463,10 +448,6 @@ const generateWAMessageContent = async (message, options) => {
                 break;
         }
     }
-    else if ('ptv' in message && message.ptv) {
-        const { videoMessage } = await (0, exports.prepareWAMessageMedia)({ video: message.video }, options);
-        m.ptvMessage = videoMessage;
-    }
     else if ('product' in message) {
         const { imageMessage } = await (0, exports.prepareWAMessageMedia)({ image: message.product.productImage }, options);
         m.productMessage = Types_1.WAProto.Message.ProductMessage.fromObject({

package/package.json

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