@rexxhayanasi/elaina-baileys 1.1.7 → 1.1.8

package/lib/Utils/messages.js

@@ -101,20 +101,20 @@ const prepareWAMessageMedia = async (message, options) => {
         media: message[mediaType]
     };
     delete uploadData[mediaType];
-    // check if cacheable + generate cache key
+    
     const cacheableKey = typeof uploadData.media === 'object' &&
         ('url' in uploadData.media) &&
         !!uploadData.media.url &&
         !!options.mediaCache && (
-    // generate the key
-    mediaType + ':' + uploadData.media.url.toString());
+            mediaType + ':' + uploadData.media.url.toString());
+            
     if (mediaType === 'document' && !uploadData.fileName) {
         uploadData.fileName = 'file';
     }
     if (!uploadData.mimetype) {
         uploadData.mimetype = MIMETYPE_MAP[mediaType];
     }
-    // check for cache hit
+    
     if (cacheableKey) {
         const mediaBuff = options.mediaCache.get(cacheableKey);
         if (mediaBuff) {
@@ -125,19 +125,77 @@ const prepareWAMessageMedia = async (message, options) => {
             return obj;
         }
     }
+
+    const isNewsletter = (0, WABinary_1.isJidNewsletter)(options.jid);
+
+    if (isNewsletter) {
+        logger === null || logger === void 0 ? void 0 : logger.debug({ key: cacheableKey }, 'Preparing raw media for newsletter');
+        
+        const { bodyPath, fileSha256, fileLength, didSaveToTmpPath } = await (0, messages_media_1.prepareStream)(
+            uploadData.media, 
+            options.mediaTypeOverride || mediaType, 
+            { logger, opts: options.options }
+        );
+
+        const fileEncSha256B64 = fileSha256.toString('base64');
+        
+        const { mediaUrl, directPath } = await options.upload(bodyPath, { 
+            fileEncSha256B64, 
+            mediaType, 
+            timeoutMs: options.mediaUploadTimeoutMs 
+        });
+
+        if (didSaveToTmpPath && bodyPath) {
+            try {
+                await fs_1.promises.unlink(bodyPath);
+            } catch (error) {
+                logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
+            }
+        }
+
+        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;
+        }
+
+        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());
+        }
+
+        return obj;
+    }
+
     const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
     const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') &&
         (typeof uploadData['jpegThumbnail'] === 'undefined');
     const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true;
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
-    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, } = await (options.newsletter ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+    
+    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, } = await (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options
     });
-    // url safe Base64 encode the SHA256 hash of the body
-    const fileEncSha256B64 = (options.newsletter ? fileSha256 : fileEncSha256 !== null && fileEncSha256 !== void 0 ? fileEncSha256 : fileSha256).toString('base64');
+    
+    const fileEncSha256B64 = (fileEncSha256 !== null && fileEncSha256 !== void 0 ? fileEncSha256 : fileSha256).toString('base64');
+    
     const [{ mediaUrl, directPath, handle }] = await Promise.all([
         (async () => {
             const result = await options.upload(encWriteStream, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
@@ -174,11 +232,10 @@ const prepareWAMessageMedia = async (message, options) => {
             }
         })(),
     ])
-        .finally(async () => {
+    .finally(async () => {
         if (!Buffer.isBuffer(encWriteStream)) {
             encWriteStream.destroy();
         }
-        // remove tmp files
         if (didSaveToTmpPath && bodyPath) {
             try {
                 await fs_1.promises.access(bodyPath);
@@ -190,6 +247,7 @@ const prepareWAMessageMedia = async (message, options) => {
             }
         }
     });
+
     const obj = Types_1.WAProto.Message.fromObject({
         [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
             url: handle ? undefined : mediaUrl,
@@ -203,10 +261,13 @@ const prepareWAMessageMedia = async (message, options) => {
             media: undefined
         })
     });
+
+
     if (uploadData.ptv) {
         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());
@@ -398,11 +459,11 @@ const generateWAMessageContent = async (message, options) => {
         }
     }
         else if ('ptv' in message && message.ptv) {
-        const { videoMessage } = await (0, exports.prepareWAMessageMedia)({ 
+        const { ptvMessage } = await (0, exports.prepareWAMessageMedia)({ 
             video: message.ptv, 
-            ptv: true           
+            ptv: true 
         }, options);
-        m.ptvMessage = videoMessage;
+        m.ptvMessage = ptvMessage;
     }
     else if ('product' in message) {
         const { imageMessage } = await (0, exports.prepareWAMessageMedia)({ image: message.product.productImage }, options);
@@ -1225,4 +1286,4 @@ const prepareStickerPackMessage = async (stickerPack, options) => {
 
     return { stickerPackMessage };
 };
-exports.prepareStickerPackMessage = prepareStickerPackMessage;
+exports.prepareStickerPackMessage = prepareStickerPackMessage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys",