@genuxofficial/baileys 1.0.0 → 3.0.0

package/lib/Utils/messages.js

@@ -30,6 +30,7 @@ const MessageTypeProto = {
     'sticker': Types_1.WAProto.Message.StickerMessage,
     'document': Types_1.WAProto.Message.DocumentMessage,
 };
+const ButtonType = WAProto_1.proto.Message.ButtonsMessage.HeaderType;
 /**
  * Uses a regex to test whether the string contains a URL, and returns the URL if it does.
  * @param text eg. hello https://google.com
@@ -80,20 +81,17 @@ 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) &&
+        'url' in uploadData.media &&
         !!uploadData.media.url &&
-        !!options.mediaCache && (
-    // generate the key
-    mediaType + ':' + uploadData.media.url.toString());
+        !!options.mediaCache &&
+        (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) {
@@ -105,28 +103,26 @@ const prepareWAMessageMedia = async (message, options) => {
         }
     }
     const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
-    const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') &&
-        (typeof uploadData['jpegThumbnail'] === '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 (0, messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+    const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await (options.newsletter ? messages_media_1.prepareStream : 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 = fileEncSha256.toString('base64');
-    const [{ mediaUrl, directPath }] = await Promise.all([
+    const fileEncSha256B64 = (options.newsletter ? fileSha256 : 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 });
+            const result = await options.upload(encFilePath, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
             logger === null || logger === void 0 ? void 0 : logger.debug({ mediaType, cacheableKey }, 'uploaded media');
             return result;
         })(),
         (async () => {
             try {
                 if (requiresThumbnailComputation) {
-                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(bodyPath, mediaType, options);
+                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(originalFilePath, mediaType, options);
                     uploadData.jpegThumbnail = thumbnail;
                     if (!uploadData.width && originalImageDimensions) {
                         uploadData.width = originalImageDimensions.width;
@@ -136,11 +132,11 @@ const prepareWAMessageMedia = async (message, options) => {
                     logger === null || logger === void 0 ? void 0 : logger.debug('generated thumbnail');
                 }
                 if (requiresDurationComputation) {
-                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(bodyPath);
+                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(originalFilePath);
                     logger === null || logger === void 0 ? void 0 : logger.debug('computed audio duration');
                 }
                 if (requiresWaveformProcessing) {
-                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(bodyPath, logger);
+                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(originalFilePath, logger);
                     logger === null || logger === void 0 ? void 0 : logger.debug('processed waveform');
                 }
                 if (requiresAudioBackground) {
@@ -154,28 +150,26 @@ const prepareWAMessageMedia = async (message, options) => {
         })(),
     ])
         .finally(async () => {
-        encWriteStream.destroy();
-        // remove tmp files
-        if (didSaveToTmpPath && bodyPath) {
-            try {
-                await fs_1.promises.access(bodyPath);
-                await fs_1.promises.unlink(bodyPath);
-                logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp file');
-            }
-            catch (error) {
-                logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
+        try {
+            await fs_1.promises.unlink(encFilePath);
+            if (originalFilePath) {
+                await fs_1.promises.unlink(originalFilePath);
             }
+            logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp files');
+        }
+        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,
+            url: handle ? undefined : mediaUrl,
             directPath,
-            mediaKey,
-            fileEncSha256,
+            mediaKey: mediaKey,
+            fileEncSha256: fileEncSha256,
             fileSha256,
             fileLength,
-            mediaKeyTimestamp: (0, generics_1.unixTimestampSeconds)(),
+            mediaKeyTimestamp: handle ? undefined : (0, generics_1.unixTimestampSeconds)(),
             ...uploadData,
             media: undefined
         })
@@ -238,8 +232,8 @@ const generateForwardMessageContent = (message, forceForward) => {
 };
 exports.generateForwardMessageContent = generateForwardMessageContent;
 const generateWAMessageContent = async (message, options) => {
-    var _a;
-    var _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _p, _q;
     let m = {};
     if ('text' in message) {
         const extContent = { text: message.text };
@@ -248,7 +242,6 @@ const generateWAMessageContent = async (message, options) => {
             urlInfo = await (0, exports.generateLinkPreviewIfRequired)(message.text, options.getUrlInfo, options.logger);
         }
         if (urlInfo) {
-            extContent.canonicalUrl = urlInfo['canonical-url'];
             extContent.matchedText = urlInfo['matched-text'];
             extContent.jpegThumbnail = urlInfo.jpegThumbnail;
             extContent.description = urlInfo.description;
@@ -272,6 +265,10 @@ const generateWAMessageContent = async (message, options) => {
             extContent.font = options.font;
         }
         m.extendedTextMessage = extContent;
+        //WhatsApp always sends secretMessage along with the text message
+        m.messageContextInfo = {
+            messageSecret: (0, crypto_1.randomBytes)(32)
+        };
     }
     else if ('contacts' in message) {
         const contactLen = message.contacts.contacts.length;
@@ -336,6 +333,27 @@ const generateWAMessageContent = async (message, options) => {
         m.pinInChatMessage.senderTimestampMs = Date.now();
         m.messageContextInfo.messageAddOnDurationInSecs = message.type === 1 ? message.time || 86400 : 0;
     }
+    else if ('keep' in message) {
+        m.keepInChatMessage = {};
+        m.keepInChatMessage.key = message.keep;
+        m.keepInChatMessage.keepType = message.type;
+        m.keepInChatMessage.timestampMs = Date.now();
+    }
+    else if ('call' in message) {
+        m = {
+            scheduledCallCreationMessage: {
+                scheduledTimestampMs: (_a = message.call.time) !== null && _a !== void 0 ? _a : Date.now(),
+                callType: (_b = message.call.type) !== null && _b !== void 0 ? _b : 1,
+                title: message.call.title
+            }
+        };
+    }
+    else if ('paymentInvite' in message) {
+        m.paymentInviteMessage = {
+            serviceType: message.paymentInvite.type,
+            expiryTimestamp: message.paymentInvite.expiry
+        };
+    }
     else if ('buttonReply' in message) {
         switch (message.type) {
             case 'template':
@@ -368,12 +386,27 @@ const generateWAMessageContent = async (message, options) => {
             }
         });
     }
+    else if ('order' in message) {
+        m.orderMessage = Types_1.WAProto.Message.OrderMessage.fromObject({
+            orderId: message.order.id,
+            thumbnail: message.order.thumbnail,
+            itemCount: message.order.itemCount,
+            status: message.order.status,
+            surface: message.order.surface,
+            orderTitle: message.order.title,
+            message: message.order.text,
+            sellerJid: message.order.seller,
+            token: message.order.token,
+            totalAmount1000: message.order.amount,
+            totalCurrencyCode: message.order.currency
+        });
+    }
     else if ('listReply' in message) {
         m.listResponseMessage = { ...message.listReply };
     }
     else if ('poll' in message) {
-        (_b = message.poll).selectableCount || (_b.selectableCount = 0);
-        (_c = message.poll).toAnnouncementGroup || (_c.toAnnouncementGroup = false);
+        (_p = message.poll).selectableCount || (_p.selectableCount = 0);
+        (_q = message.poll).toAnnouncementGroup || (_q.toAnnouncementGroup = false);
         if (!Array.isArray(message.poll.values)) {
             throw new boom_1.Boom('Invalid poll values', { statusCode: 400 });
         }
@@ -396,7 +429,7 @@ const generateWAMessageContent = async (message, options) => {
         }
         else {
             if (message.poll.selectableCount > 0) {
-                //poll v3 is for single select polls
+                // poll v3 is for single select polls
                 m.pollCreationMessageV3 = pollCreationMessage;
             }
             else {
@@ -405,6 +438,53 @@ const generateWAMessageContent = async (message, options) => {
             }
         }
     }
+    else if ('event' in message) {
+        m.messageContextInfo = {
+            messageSecret: message.event.messageSecret || (0, crypto_1.randomBytes)(32),
+        };
+        m.eventMessage = { ...message.event };
+    }
+    else if ('inviteAdmin' in message) {
+        m.newsletterAdminInviteMessage = {};
+        m.newsletterAdminInviteMessage.inviteExpiration = message.inviteAdmin.inviteExpiration;
+        m.newsletterAdminInviteMessage.caption = message.inviteAdmin.text;
+        m.newsletterAdminInviteMessage.newsletterJid = message.inviteAdmin.jid;
+        m.newsletterAdminInviteMessage.newsletterName = message.inviteAdmin.subject;
+        m.newsletterAdminInviteMessage.jpegThumbnail = message.inviteAdmin.thumbnail;
+    }
+    else if ('requestPayment' in message) {
+        const sticker = ((_c = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _c === void 0 ? void 0 : _c.sticker) ?
+            await (0, exports.prepareWAMessageMedia)({ sticker: (_d = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _d === void 0 ? void 0 : _d.sticker, ...options }, options)
+            : null;
+        let notes = {};
+        if ((_e = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _e === void 0 ? void 0 : _e.sticker) {
+            notes = {
+                stickerMessage: {
+                    ...sticker === null || sticker === void 0 ? void 0 : sticker.stickerMessage,
+                    contextInfo: (_f = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _f === void 0 ? void 0 : _f.contextInfo
+                }
+            };
+        }
+        else if (message.requestPayment.note) {
+            notes = {
+                extendedTextMessage: {
+                    text: message.requestPayment.note,
+                    contextInfo: (_g = message === null || message === void 0 ? void 0 : message.requestPayment) === null || _g === void 0 ? void 0 : _g.contextInfo,
+                }
+            };
+        }
+        else {
+            throw new boom_1.Boom('Invalid media type', { statusCode: 400 });
+        }
+        m.requestPaymentMessage = Types_1.WAProto.Message.RequestPaymentMessage.fromObject({
+            expiryTimestamp: message.requestPayment.expiry,
+            amount1000: message.requestPayment.amount,
+            currencyCodeIso4217: message.requestPayment.currency,
+            requestFrom: message.requestPayment.from,
+            noteMessage: { ...notes },
+            background: (_h = message.requestPayment.background) !== null && _h !== void 0 ? _h : null,
+        });
+    }
     else if ('sharePhoneNumber' in message) {
         m.protocolMessage = {
             type: WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER
@@ -416,10 +496,162 @@ const generateWAMessageContent = async (message, options) => {
     else {
         m = await (0, exports.prepareWAMessageMedia)(message, options);
     }
+    if ('buttons' in message && !!message.buttons) {
+        const buttonsMessage = {
+            buttons: message.buttons.map(b => ({ ...b, type: WAProto_1.proto.Message.ButtonsMessage.Button.Type.RESPONSE }))
+        };
+        if ('text' in message) {
+            buttonsMessage.contentText = message.text;
+            buttonsMessage.headerType = ButtonType.EMPTY;
+        }
+        else {
+            if ('caption' in message) {
+                buttonsMessage.contentText = message.caption;
+            }
+            const type = Object.keys(m)[0].replace('Message', '').toUpperCase();
+            buttonsMessage.headerType = ButtonType[type];
+            Object.assign(buttonsMessage, m);
+        }
+        if ('title' in message && !!message.title) {
+            buttonsMessage.text = message.title,
+                buttonsMessage.headerType = ButtonType.TEXT;
+        }
+        if ('footer' in message && !!message.footer) {
+            buttonsMessage.footerText = message.footer;
+        }
+        if ('contextInfo' in message && !!message.contextInfo) {
+            buttonsMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            buttonsMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m = { buttonsMessage };
+    }
+    else if ('templateButtons' in message && !!message.templateButtons) {
+        const msg = {
+            hydratedButtons: message.hasOwnProperty("templateButtons") ? message.templateButtons : message.templateButtons
+        };
+        if ('text' in message) {
+            msg.hydratedContentText = message.text;
+        }
+        else {
+            if ('caption' in message) {
+                msg.hydratedContentText = message.caption;
+            }
+            Object.assign(msg, m);
+        }
+        if ('footer' in message && !!message.footer) {
+            msg.hydratedFooterText = message.footer;
+        }
+        m = {
+            templateMessage: {
+                fourRowTemplate: msg,
+                hydratedTemplate: msg
+            }
+        };
+    }
+    if ('sections' in message && !!message.sections) {
+        const listMessage = {
+            sections: message.sections,
+            buttonText: message.buttonText,
+            title: message.title,
+            footerText: message.footer,
+            description: message.text,
+            listType: message.hasOwnProperty('listType') ? message.listType : WAProto_1.proto.Message.ListMessage.ListType.PRODUCT_LIST
+        };
+        m = { listMessage };
+    }
+    if ('interactiveButtons' in message && !!message.interactiveButtons) {
+        const interactiveMessage = {
+            nativeFlowMessage: Types_1.WAProto.Message.InteractiveMessage.NativeFlowMessage.fromObject({
+                buttons: message.interactiveButtons,
+            })
+        };
+        if ('text' in message) {
+            interactiveMessage.body = {
+                text: message.text
+            };
+        }
+        else if ('caption' in message) {
+            interactiveMessage.body = {
+                text: message.caption
+            };
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_j = message === null || message === void 0 ? void 0 : message.media) !== null && _j !== void 0 ? _j : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('footer' in message && !!message.footer) {
+            interactiveMessage.footer = {
+                text: message.footer
+            };
+        }
+        if ('title' in message && !!message.title) {
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_k = message === null || message === void 0 ? void 0 : message.media) !== null && _k !== void 0 ? _k : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('contextInfo' in message && !!message.contextInfo) {
+            interactiveMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            interactiveMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m = { interactiveMessage };
+    }
+    if ('shop' in message && !!message.shop) {
+        const interactiveMessage = {
+            shopStorefrontMessage: Types_1.WAProto.Message.InteractiveMessage.ShopMessage.fromObject({
+                surface: message.shop,
+                id: message.id
+            })
+        };
+        if ('text' in message) {
+            interactiveMessage.body = {
+                text: message.text
+            };
+        }
+        else if ('caption' in message) {
+            interactiveMessage.body = {
+                text: message.caption
+            };
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_l = message === null || message === void 0 ? void 0 : message.media) !== null && _l !== void 0 ? _l : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('footer' in message && !!message.footer) {
+            interactiveMessage.footer = {
+                text: message.footer
+            };
+        }
+        if ('title' in message && !!message.title) {
+            interactiveMessage.header = {
+                title: message.title,
+                subtitle: message.subtitle,
+                hasMediaAttachment: (_m = message === null || message === void 0 ? void 0 : message.media) !== null && _m !== void 0 ? _m : false,
+            };
+            Object.assign(interactiveMessage.header, m);
+        }
+        if ('contextInfo' in message && !!message.contextInfo) {
+            interactiveMessage.contextInfo = message.contextInfo;
+        }
+        if ('mentions' in message && !!message.mentions) {
+            interactiveMessage.contextInfo = { mentionedJid: message.mentions };
+        }
+        m = { interactiveMessage };
+    }
     if ('viewOnce' in message && !!message.viewOnce) {
         m = { viewOnceMessage: { message: m } };
     }
-    if ('mentions' in message && ((_a = message.mentions) === null || _a === void 0 ? void 0 : _a.length)) {
+    if ('mentions' in message && ((_o = message.mentions) === null || _o === void 0 ? void 0 : _o.length)) {
         const [messageType] = Object.keys(m);
         m[messageType].contextInfo = m[messageType] || {};
         m[messageType].contextInfo.mentionedJid = message.mentions;
@@ -452,26 +684,29 @@ const generateWAMessageFromContent = (jid, message, options) => {
     const key = (0, exports.getContentType)(innerMessage);
     const timestamp = (0, generics_1.unixTimestampSeconds)(options.timestamp);
     const { quoted, userJid } = options;
-    if (quoted) {
+    // only set quoted if isn't a newsletter message
+    if (quoted && !(0, WABinary_1.isJidNewsletter)(jid)) {
         const participant = quoted.key.fromMe ? userJid : (quoted.participant || quoted.key.participant || quoted.key.remoteJid);
         let quotedMsg = (0, exports.normalizeMessageContent)(quoted.message);
         const msgType = (0, exports.getContentType)(quotedMsg);
         // strip any redundant properties
-        quotedMsg = WAProto_1.proto.Message.fromObject({ [msgType]: quotedMsg[msgType] });
-        const quotedContent = quotedMsg[msgType];
-        if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
-            delete quotedContent.contextInfo;
-        }
-        const contextInfo = innerMessage[key].contextInfo || {};
-        contextInfo.participant = (0, WABinary_1.jidNormalizedUser)(participant);
-        contextInfo.stanzaId = quoted.key.id;
-        contextInfo.quotedMessage = quotedMsg;
-        // if a participant is quoted, then it must be a group
-        // hence, remoteJid of group must also be entered
-        if (jid !== quoted.key.remoteJid) {
-            contextInfo.remoteJid = quoted.key.remoteJid;
-        }
-        innerMessage[key].contextInfo = contextInfo;
+        if (quotedMsg) {
+            quotedMsg = WAProto_1.proto.Message.fromObject({ [msgType]: quotedMsg[msgType] });
+            const quotedContent = quotedMsg[msgType];
+            if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
+                delete quotedContent.contextInfo;
+            }
+            const contextInfo = innerMessage[key].contextInfo || {};
+            contextInfo.participant = (0, WABinary_1.jidNormalizedUser)(participant);
+            contextInfo.stanzaId = quoted.key.id;
+            contextInfo.quotedMessage = quotedMsg;
+            // if a participant is quoted, then it must be a group
+            // hence, remoteJid of group must also be entered
+            if (jid !== quoted.key.remoteJid) {
+                contextInfo.remoteJid = quoted.key.remoteJid;
+            }
+            innerMessage[key].contextInfo = contextInfo;
+        }
     }
     if (
     // if we want to send a disappearing message
@@ -479,7 +714,9 @@ const generateWAMessageFromContent = (jid, message, options) => {
         // and it's not a protocol message -- delete, toggle disappear message
         key !== 'protocolMessage' &&
         // already not converted to disappearing message
-        key !== 'ephemeralMessage') {
+        key !== 'ephemeralMessage' &&
+        // newsletter not accept disappearing messages
+        !(0, WABinary_1.isJidNewsletter)(jid)) {
         innerMessage[key].contextInfo = {
             ...(innerMessage[key].contextInfo || {}),
             expiration: options.ephemeralExpiration || Defaults_1.WA_DEFAULT_EPHEMERAL,
@@ -491,7 +728,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
         key: {
             remoteJid: jid,
             fromMe: true,
-            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageID)(),
+            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageIDV2)(),
         },
         message: message,
         messageTimestamp: timestamp,
@@ -506,7 +743,7 @@ const generateWAMessage = async (jid, content, options) => {
     var _a;
     // ensure msg ID is with every log
     options.logger = (_a = options === null || options === void 0 ? void 0 : options.logger) === null || _a === void 0 ? void 0 : _a.child({ msgId: options.messageId });
-    return (0, exports.generateWAMessageFromContent)(jid, await (0, exports.generateWAMessageContent)(content, options), options);
+    return (0, exports.generateWAMessageFromContent)(jid, await (0, exports.generateWAMessageContent)(content, { newsletter: (0, WABinary_1.isJidNewsletter)(jid), ...options }), options);
 };
 exports.generateWAMessage = generateWAMessage;
 /** Get the key to access the true type of content */
@@ -543,7 +780,22 @@ const normalizeMessageContent = (content) => {
             || (message === null || message === void 0 ? void 0 : message.documentWithCaptionMessage)
             || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2)
             || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension)
-            || (message === null || message === void 0 ? void 0 : message.editedMessage));
+            || (message === null || message === void 0 ? void 0 : message.editedMessage)
+            || (message === null || message === void 0 ? void 0 : message.groupMentionedMessage)
+            || (message === null || message === void 0 ? void 0 : message.botInvokeMessage)
+            || (message === null || message === void 0 ? void 0 : message.lottieStickerMessage)
+            || (message === null || message === void 0 ? void 0 : message.eventCoverImage)
+            || (message === null || message === void 0 ? void 0 : message.statusMentionMessage)
+            || (message === null || message === void 0 ? void 0 : message.pollCreationOptionImageMessage)
+            || (message === null || message === void 0 ? void 0 : message.associatedChildMessage)
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMentionMessage)
+            || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV4)
+            || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV5)
+            || (message === null || message === void 0 ? void 0 : message.statusAddYours)
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMessage)
+            || (message === null || message === void 0 ? void 0 : message.limitSharingMessage)
+            || (message === null || message === void 0 ? void 0 : message.botTaskMessage)
+            || (message === null || message === void 0 ? void 0 : message.questionMessage));
     }
 };
 exports.normalizeMessageContent = normalizeMessageContent;

package/lib/Utils/noise-handler.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
+import { ILogger } from './logger';
 import { proto } from '../../WAProto';
 import { KeyPair } from '../Types';
 import { BinaryNode } from '../WABinary';
-import { ILogger } from './logger';
 export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }: {
     keyPair: KeyPair;
     NOISE_HEADER: Uint8Array;

package/lib/Utils/process-message.js

@@ -201,7 +201,6 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                     const { peerDataOperationResult } = response;
                     for (const result of peerDataOperationResult) {
                         const { placeholderMessageResendResponse: retryResponse } = result;
-                        //eslint-disable-next-line max-depth
                         if (retryResponse) {
                             const webMessageInfo = WAProto_1.proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes);
                             // wait till another upsert event is available, don't want it to be part of the PDO response message

package/lib/Utils/use-multi-file-auth-state.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useMultiFileAuthState = void 0;
-const async_lock_1 = __importDefault(require("async-lock"));
+const async_mutex_1 = require("async-mutex");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const WAProto_1 = require("../../WAProto");
@@ -13,9 +10,17 @@ const generics_1 = require("./generics");
 // We need to lock files due to the fact that we are using async functions to read and write files
 // https://github.com/WhiskeySockets/Baileys/issues/794
 // https://github.com/nodejs/node/issues/26338
-// Default pending is 1000, set it to infinity
-// https://github.com/rogierschouten/async-lock/issues/63
-const fileLock = new async_lock_1.default({ maxPending: Infinity });
+// Use a Map to store mutexes for each file path
+const fileLocks = new Map();
+// Get or create a mutex for a specific file path
+const getFileLock = (path) => {
+    let mutex = fileLocks.get(path);
+    if (!mutex) {
+        mutex = new async_mutex_1.Mutex();
+        fileLocks.set(path, mutex);
+    }
+    return mutex;
+};
 /**
  * stores the full authentication state in a single folder.
  * Far more efficient than singlefileauthstate
@@ -25,15 +30,31 @@ const fileLock = new async_lock_1.default({ maxPending: Infinity });
  * */
 const useMultiFileAuthState = async (folder) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const writeData = (data, file) => {
+    const writeData = async (data, file) => {
         const filePath = (0, path_1.join)(folder, fixFileName(file));
-        return fileLock.acquire(filePath, () => (0, promises_1.writeFile)((0, path_1.join)(filePath), JSON.stringify(data, generics_1.BufferJSON.replacer)));
+        const mutex = getFileLock(filePath);
+        return mutex.acquire().then(async (release) => {
+            try {
+                await (0, promises_1.writeFile)(filePath, JSON.stringify(data, generics_1.BufferJSON.replacer));
+            }
+            finally {
+                release();
+            }
+        });
     };
     const readData = async (file) => {
         try {
             const filePath = (0, path_1.join)(folder, fixFileName(file));
-            const data = await fileLock.acquire(filePath, () => (0, promises_1.readFile)(filePath, { encoding: 'utf-8' }));
-            return JSON.parse(data, generics_1.BufferJSON.reviver);
+            const mutex = getFileLock(filePath);
+            return await mutex.acquire().then(async (release) => {
+                try {
+                    const data = await (0, promises_1.readFile)(filePath, { encoding: 'utf-8' });
+                    return JSON.parse(data, generics_1.BufferJSON.reviver);
+                }
+                finally {
+                    release();
+                }
+            });
         }
         catch (error) {
             return null;
@@ -42,7 +63,17 @@ const useMultiFileAuthState = async (folder) => {
     const removeData = async (file) => {
         try {
             const filePath = (0, path_1.join)(folder, fixFileName(file));
-            await fileLock.acquire(filePath, () => (0, promises_1.unlink)(filePath));
+            const mutex = getFileLock(filePath);
+            return mutex.acquire().then(async (release) => {
+                try {
+                    await (0, promises_1.unlink)(filePath);
+                }
+                catch (_a) {
+                }
+                finally {
+                    release();
+                }
+            });
         }
         catch (_a) {
         }
@@ -86,7 +117,7 @@ const useMultiFileAuthState = async (folder) => {
                 }
             }
         },
-        saveCreds: () => {
+        saveCreds: async () => {
             return writeData(creds, 'creds.json');
         }
     };

package/lib/Utils/validate-connection.js

@@ -22,9 +22,7 @@ const getUserAgent = (config) => {
         device: 'Desktop',
         osBuildNumber: '0.1',
         localeLanguageIso6391: 'en',
-        mnc: '000',
-        mcc: '000',
-        localeCountryIso31661Alpha2: config.countryCode,
+        localeCountryIso31661Alpha2: config.countryCode
     };
 };
 const PLATFORM_MAP = {