@itsliaaa/baileys 0.1.29 → 0.1.30

package/README.md

@@ -382,6 +382,28 @@ sock.sendMessage(jid, {
 })
 ```
 
+#### 👥 Group Invite
+
+```javascript
+const groupJid = '1201111111111@g.us'
+const groupName = '@itsliaaa/baileys'
+const inviteCode = groupUrl
+   .split('chat.whatsapp.com/')[1]?
+   .split('?')[0]
+
+sock.sendMessage(jid, {
+   groupInvite: {
+      inviteCode,
+      inviteExpiration: Date.now() + 86400000,
+      text: '👋🏻 Hello, we invite you to join our group.',
+      jid: groupJid,
+      subject: groupName,
+   }
+}, {
+   quoted: message
+})
+```
+
 #### 📊 Poll
 
 ```javascript

package/lib/Utils/messages.js

@@ -82,31 +82,24 @@ const assertColor = async (color) => {
         return assertedColor;
     }
 };
+// Lia@Changes 21-04-26 --- Refactor prepareWAMessageMedia function
 export const prepareWAMessageMedia = async (message, options) => {
     const logger = options.logger;
-    let mediaType;
-    for (const key of MEDIA_KEYS) {
-        if (key in message) {
-            mediaType = key;
-        }
-    }
+    const mediaType = MEDIA_KEYS.find(key => key in message);
     if (!mediaType) {
         throw new Boom('Invalid media type', { statusCode: 400 });
     }
-    const uploadData = {
-        ...message,
-        media: message[mediaType]
-    };
+    const uploadData = { ...message };
+    const mediaPayload = uploadData[mediaType];
+    delete uploadData[mediaType]; 
     if (uploadData.image || uploadData.video) {
         uploadData.annotations = mediaAnnotation;
     }
-    delete uploadData[mediaType];
-    // check if cacheable + generate cache key
-    const cacheableKey = typeof uploadData.media === 'object' &&
-        'url' in uploadData.media &&
-        !!uploadData.media.url &&
+    const cacheableKey = typeof mediaPayload === 'object' &&
+        'url' in mediaPayload &&
+        !!mediaPayload.url &&
         !!options.mediaCache &&
-        mediaType + ':' + uploadData.media.url;
+        `${mediaType}:${mediaPayload.url}`;
     if (mediaType === 'document' && !uploadData.fileName) {
         uploadData.fileName = LIBRARY_NAME;
     }
@@ -119,7 +112,7 @@ export const prepareWAMessageMedia = async (message, options) => {
             logger?.debug({ cacheableKey }, 'got media cache hit');
             const obj = proto.Message.decode(mediaBuff);
             const key = `${mediaType}Message`;
-            Object.assign(obj[key], { ...uploadData, media: undefined });
+            Object.assign(obj[key], uploadData); 
             return obj;
         }
     }
@@ -129,142 +122,118 @@ export const prepareWAMessageMedia = async (message, options) => {
     const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true && typeof uploadData.waveform === 'undefined';
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation || requiresWaveformProcessing;
+    let mediaUrl,
+        directPath,
+        thumbnailDirectPath,
+        thumbnailSha256,
+        fileSha256,
+        fileLength,
+        mediaKey,
+        fileEncSha256;
     // Lia@Changes 06-02-26 --- Add few support for sending media to newsletter (⁠≧⁠▽⁠≦⁠)
     if (isNewsletter) {
         logger?.info({ key: cacheableKey }, 'Preparing raw media for newsletter');
-        const { filePath, fileSha256, fileLength } = await getRawMediaUploadData(uploadData.media, options.mediaTypeOverride || mediaType, logger);
+        const rawData = await getRawMediaUploadData(mediaPayload, options.mediaTypeOverride || mediaType, logger);
+        fileSha256 = rawData.fileSha256;
+        fileLength = rawData.fileLength;
+        const filePath = rawData.filePath;
         const fileSha256B64 = fileSha256.toString('base64');
-        const [{ mediaUrl, directPath, thumbnailDirectPath, thumbnailSha256 }] = await Promise.all([
-            (async () => {
-                const result = options.upload(filePath, {
-                    fileEncSha256B64: fileSha256B64,
-                    mediaType,
-                    timeoutMs: options.mediaUploadTimeoutMs,
-                    newsletter: isNewsletter
-                });
-                logger?.debug({ mediaType, cacheableKey }, 'uploaded media');
-                return result;
-            })(),
+        const [uploadResult] = await Promise.all([
+            options.upload(filePath, {
+                fileEncSha256B64: fileSha256B64,
+                mediaType,
+                timeoutMs: options.mediaUploadTimeoutMs,
+                newsletter: true
+            }),
             (async () => {
                 try {
                     if (requiresThumbnailComputation) {
                         const { thumbnail } = await generateThumbnail(filePath, mediaType, options);
                         uploadData.jpegThumbnail = thumbnail;
-                        logger?.debug('generated thumbnail');
                     }
                     if (requiresDurationComputation) {
                         uploadData.seconds = await getAudioDuration(filePath);
-                        logger?.debug('computed audio duration');
                     }
                 }
                 catch (error) {
                     logger?.warn({ trace: error.stack }, 'failed to obtain extra info');
                 }
             })()
-        ]).finally(async () => {
-            try {
-                await fs.unlink(filePath);
-                logger?.debug('removed tmp files');
-            }
-            catch (error) {
-                logger?.warn('failed to remove tmp file');
-            }
-        });
-        delete uploadData.media;
-        const obj = proto.Message.create({
-            // todo: add more support here
-            [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
-                url: mediaUrl,
-                directPath,
-                fileSha256,
-                fileLength,
-                thumbnailDirectPath,
-                thumbnailSha256,
-                ...uploadData
-            })
-        });
-        if (uploadData.ptv) {
-            obj.ptvMessage = obj.videoMessage;
-            delete obj.videoMessage;
-        }
-        if (obj.stickerMessage) {
-            obj.stickerMessage.stickerSentTs = Date.now();
-        }
-        if (cacheableKey) {
-            logger?.debug({ cacheableKey }, 'set cache');
-            await options.mediaCache.set(cacheableKey, WAProto.Message.encode(obj).finish());
-        }
-        return obj;
+        ]);
+        // todo: add more support here
+        mediaUrl = uploadResult.mediaUrl;
+        directPath = uploadResult.directPath;
+        thumbnailDirectPath = uploadResult.thumbnailDirectPath;
+        thumbnailSha256 = uploadResult.thumbnailSha256;
+        fs.unlink(filePath).catch(() => logger?.warn('failed to remove tmp file'));
     }
-    const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await encryptedStream(uploadData.media, options.mediaTypeOverride || mediaType, {
-        logger,
-        saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
-        opts: options.options
-    });
-    const fileEncSha256B64 = fileEncSha256.toString('base64');
-    const [{ mediaUrl, directPath }] = await Promise.all([
-        (async () => {
-            const result = await options.upload(encFilePath, {
+    else {
+        const encryptedData = await encryptedStream(mediaPayload, options.mediaTypeOverride || mediaType, {
+            logger,
+            saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
+            opts: options.options
+        });
+        mediaKey = encryptedData.mediaKey;
+        fileEncSha256 = encryptedData.fileEncSha256;
+        fileSha256 = encryptedData.fileSha256;
+        fileLength = encryptedData.fileLength;
+        const encFilePath = encryptedData.encFilePath;
+        const originalFilePath = encryptedData.originalFilePath;
+        const fileEncSha256B64 = fileEncSha256.toString('base64');
+        const [uploadResult] = await Promise.all([
+            options.upload(encFilePath, {
                 fileEncSha256B64,
                 mediaType,
                 timeoutMs: options.mediaUploadTimeoutMs
-            });
-            logger?.debug({ mediaType, cacheableKey }, 'uploaded media');
-            return result;
-        })(),
-        (async () => {
-            try {
-                if (requiresThumbnailComputation) {
-                    const { thumbnail, originalImageDimensions } = await generateThumbnail(originalFilePath, mediaType, options);
-                    uploadData.jpegThumbnail = thumbnail;
-                    if (!uploadData.width && originalImageDimensions) {
-                        uploadData.width = originalImageDimensions.width;
-                        uploadData.height = originalImageDimensions.height;
-                        logger?.debug('set dimensions');
+            }),
+            (async () => {
+                try {
+                    if (requiresThumbnailComputation) {
+                        const { thumbnail, originalImageDimensions } = await generateThumbnail(originalFilePath, mediaType, options);
+                        uploadData.jpegThumbnail = thumbnail;
+                        if (!uploadData.width && originalImageDimensions) {
+                            uploadData.width = originalImageDimensions.width;
+                            uploadData.height = originalImageDimensions.height;
+                        }
+                    }
+                    if (requiresDurationComputation) {
+                        uploadData.seconds = await getAudioDuration(originalFilePath);
+                    }
+                    if (requiresWaveformProcessing) {
+                        uploadData.waveform = await getAudioWaveform(originalFilePath, logger);
+                    }
+                    if (requiresAudioBackground) {
+                        uploadData.backgroundArgb = await assertColor(options.backgroundColor);
                     }
-                    logger?.debug('generated thumbnail');
-                }
-                if (requiresDurationComputation) {
-                    uploadData.seconds = await getAudioDuration(originalFilePath);
-                    logger?.debug('computed audio duration');
-                }
-                if (requiresWaveformProcessing) {
-                    uploadData.waveform = await getAudioWaveform(originalFilePath, logger);
-                    logger?.debug('processed waveform');
                 }
-                if (requiresAudioBackground) {
-                    uploadData.backgroundArgb = await assertColor(options.backgroundColor);
-                    logger?.debug('computed backgroundColor audio status');
+                catch (error) {
+                    logger?.warn({ trace: error.stack }, 'failed to obtain extra info');
                 }
-            }
-            catch (error) {
-                logger?.warn({ trace: error.stack }, 'failed to obtain extra info');
-            }
-        })()
-    ]).finally(async () => {
-        try {
-            await fs.unlink(encFilePath);
-            if (originalFilePath) {
-                await fs.unlink(originalFilePath);
-            }
-            logger?.debug('removed tmp files');
-        }
-        catch (error) {
-            logger?.warn('failed to remove tmp file');
-        }
-    });
-    delete uploadData.media;
+            })()
+        ]);
+        mediaUrl = uploadResult.mediaUrl;
+        directPath = uploadResult.directPath;
+        fs.unlink(encFilePath).catch(() => logger?.warn('failed to remove tmp file'));
+        fs.unlink(originalFilePath).catch(() => logger?.warn('failed to remove tmp file'));
+    }
+    const messagePayload = {
+        url: mediaUrl,
+        directPath,
+        fileSha256,
+        fileLength,
+        ...uploadData
+    };
+    if (isNewsletter) {
+        messagePayload.thumbnailDirectPath = thumbnailDirectPath;
+        messagePayload.thumbnailSha256 = thumbnailSha256;
+    }
+    else {
+        messagePayload.mediaKey = mediaKey;
+        messagePayload.fileEncSha256 = fileEncSha256;
+        messagePayload.mediaKeyTimestamp = unixTimestampSeconds();
+    }
     const obj = proto.Message.create({
-        [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject({
-            url: mediaUrl,
-            directPath,
-            mediaKey,
-            fileEncSha256,
-            fileSha256,
-            fileLength,
-            mediaKeyTimestamp: unixTimestampSeconds(),
-            ...uploadData
-        })
+        [`${mediaType}Message`]: MessageTypeProto[mediaType].fromObject(messagePayload)
     });
     if (uploadData.ptv) {
         obj.ptvMessage = obj.videoMessage;
@@ -274,8 +243,8 @@ export const prepareWAMessageMedia = async (message, options) => {
         obj.stickerMessage.stickerSentTs = Date.now();
     }
     if (cacheableKey) {
-        logger?.debug({ cacheableKey }, 'set cache');
-        await options.mediaCache.set(cacheableKey, WAProto.Message.encode(obj).finish());
+        logger?.debug({ cacheableKey }, 'set cache (background)');
+        options.mediaCache.set(cacheableKey, WAProto.Message.encode(obj).finish()).catch(() => {}); 
     }
     return obj;
 };
@@ -524,8 +493,8 @@ const prepareStickerPackMessage = async (message, options) => {
     }
     const content = obj;
     if (cacheableKey) {
-        options.logger?.debug({ cacheableKey }, 'set cache');
-        await options.mediaCache.set(cacheableKey, WAProto.Message.StickerPackMessage.encode(content).finish());
+        options.logger?.debug({ cacheableKey }, 'set cache (background)');
+        options.mediaCache.set(cacheableKey, WAProto.Message.StickerPackMessage.encode(content).finish());
     }
     return WAProto.Message.StickerPackMessage.fromObject(content);
 };
@@ -1319,6 +1288,12 @@ export const generateWAMessageContent = async (message, options) => {
         }
         m = { invoiceMessage };
     }
+    if (shouldIncludeReportingToken(m)) {
+        m.messageContextInfo = m.messageContextInfo || {};
+        if (!m.messageContextInfo.messageSecret) {
+            m.messageContextInfo.messageSecret = randomBytes(32);
+        }
+    }
     // Lia@Changes 31-01-26 --- Add direct externalAdReply access (no need to create contextInfo first)
     if (hasOptionalProperty(message, 'externalAdReply') && !!message.externalAdReply) {
         const messageType = Object.keys(m)[0];
@@ -1336,9 +1311,9 @@ export const generateWAMessageContent = async (message, options) => {
             mediaType: content.mediaType || 1,
             mediaUrl: content.url,
             renderLargerThumbnail: content.largeThumbnail,
-            sourceUrl: content.url + '?update=' + Date.now(),
+            sourceUrl: content.url,
             thumbnail: content.thumbnail,
-            thumbnailUrl: content.url,
+            thumbnailUrl: content.url + '?update=' + Date.now(),
             title: content.title || LIBRARY_NAME
         };
         delete externalAdReply.subTitle;
@@ -1434,12 +1409,6 @@ export const generateWAMessageContent = async (message, options) => {
             }
         }
     }
-    if (shouldIncludeReportingToken(m)) {
-        m.messageContextInfo = m.messageContextInfo || {};
-        if (!m.messageContextInfo.messageSecret) {
-            m.messageContextInfo.messageSecret = randomBytes(32);
-        }
-    }
     return proto.Message.create(m);
 };
 export const generateWAMessageFromContent = (jid, message, options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@itsliaaa/baileys",
-   "version": "0.1.29",
+   "version": "0.1.30",
    "description": "Enhanced Baileys v7 with fixed newsletter media upload, plus support for interactive messages, albums, and more message types.",
    "main": "lib/index.js",
    "type": "module",