@itsliaaa/baileys 0.1.3 → 0.1.5

package/lib/Defaults/index.js

@@ -2,9 +2,9 @@ import { proto } from '../../WAProto/index.js';
 import { makeLibSignalRepository } from '../Signal/libsignal.js';
 import { Browsers } from '../Utils/browser-utils.js';
 import logger from '../Utils/logger.js';
-const version = [2, 3000, 1034621774];
+const version = [2, 3000, 1033846690];
 export const UNAUTHORIZED_CODES = [401, 403, 419];
-export const BIZ_BOT_SUPPORT_PAYLOAD = '{"version":1,"is_ai_message":true,"should_show_system_message":true,"ticket_id":"7004947587700716","citation_items":[],"ticket_locale":"us"}';
+export const BIZ_BOT_SUPPORT_PAYLOAD = '{"version":1,"is_ai_message":true,"should_show_system_message":false,"ticket_id":"7004947587700716","citation_items":[],"ticket_locale":"us"}';
 export const DEFAULT_ORIGIN = 'https://web.whatsapp.com';
 export const CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';
 export const CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/';

package/lib/Socket/messages-send.js

@@ -1,6 +1,6 @@
 import NodeCache from '@cacheable/node-cache';
-import PQueue from 'p-queue';
 import { Boom } from '@hapi/boom';
+import { randomBytes } from 'crypto';
 import { proto } from '../../WAProto/index.js';
 import { BIZ_BOT_SUPPORT_PAYLOAD, DEFAULT_CACHE_TTLS, OLD_GROUP_ID_REGEX, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
 import { aggregateMessageKeysNotFromMe, assertMediaContent, bindWaitForEvent, decryptMediaRetryData, delay, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessageFromContent, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, hasValidAlbumMedia, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, shouldIncludeBizBinaryNode, unixTimestampSeconds } from '../Utils/index.js';
@@ -11,10 +11,6 @@ import { getMessageReportingToken, shouldIncludeReportingToken } from '../Utils/
 import { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, getBizBinaryNode, isHostedLidUser, isHostedPnUser, isJidGroup, isJidNewsletter, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
 import { makeNewsletterSocket } from './newsletter.js';
-// Lia@Changes 03-02-26 --- Replace process.nextTick with PQueue for upsertMessage to avoid RSS spike... (i guess (⁠ ⁠◜⁠‿⁠◝⁠ ⁠)⁠♡)
-const EMIT_MESSAGE_QUEUE = new PQueue({
-    concurrency: 1
-});
 export const makeMessagesSocket = (config) => {
     const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: httpRequestOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache, maxMsgRetryCount } = config;
     const sock = makeNewsletterSocket(config);
@@ -835,7 +831,9 @@ export const makeMessagesSocket = (config) => {
         }
         if (normalizedMessage.pollCreationMessage ||
             normalizedMessage.pollCreationMessageV2 ||
-            normalizedMessage.pollCreationMessageV3 || normalizedMessage.pollCreationMessageV5 ||
+            normalizedMessage.pollCreationMessageV3 ||
+            normalizedMessage.pollCreationMessageV5 ||
+            normalizedMessage.pollCreationMessageV6 ||
             normalizedMessage.pollUpdateMessage) {
             return 'poll';
         }
@@ -997,7 +995,102 @@ export const makeMessagesSocket = (config) => {
         // Lia@Changes 30-01-26 --- Add support for modifying additionalNodes and additionalAttributes using "options" in sendMessage()
         sendMessage: async (jid, content, options = {}) => {
             const userJid = authState.creds.me.id;
-            if ('disappearingMessagesInChat' in content && isJidGroup(jid)) {
+            // Lia@Changes 13-03-26 --- Add status mentions!
+            if (Array.isArray(jid)) {
+                const { delayMs = 1500 } = options;
+                const allUsers = new Set();
+                const fullMsg = await generateWAMessage('status@broadcast', content, {
+                    logger,
+                    userJid,
+                    upload: waUploadToServer,
+                    mediaCache: config.mediaCache,
+                    options: config.options,
+                    ...options,
+                    messageId: generateMessageIDV2(userJid)
+                });
+                for (const id of jid) {
+                    if (isJidGroup(id)) {
+                        try {
+                            const groupData = (cachedGroupMetadata ? await cachedGroupMetadata(id) : null) || await groupMetadata(id);
+                            for (const participant of groupData.participants) {
+                                if (allUsers.has(participant.id))
+                                    continue;
+                                allUsers.add(participant.id);
+                            }
+                        }
+                        catch (error) {
+                            logger.error(`Error getting metadata group from ${id}: ${error}`);
+                        }
+                    }
+                    else if (!allUsers.has(id)) {
+                        allUsers.add(id);
+                    }
+                }
+                await relayMessage('status@broadcast', fullMsg.message, {
+                    messageId: fullMsg.key.id,
+                    statusJidList: Array.from(allUsers),
+                    additionalNodes: [
+                        {
+                            tag: 'meta',
+                            attrs: {},
+                            content: [
+                                {
+                                    tag: 'mentioned_users',
+                                    attrs: {},
+                                    content: jid.map(id => ({
+                                        tag: 'to',
+                                        attrs: { jid: id },
+                                        content: undefined
+                                    }))
+                                }
+                            ]
+                        }
+                    ]
+                });
+                if (config.emitOwnEvents) {
+                    process.nextTick(async () => {
+                        await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                    });
+                }
+                for (const id of jid) {
+                    const isGroup = isJidGroup(id)
+                    const sendType = isGroup ? 'groupStatusMentionMessage' : 'statusMentionMessage';
+                    const mentionMsg = generateWAMessageFromContent(id, {
+                        messageContextInfo: {
+                            messageSecret: randomBytes(32)
+                        },
+                        [sendType]: {
+                            message: {
+                                protocolMessage: {
+                                    key: fullMsg.key,
+                                    type: 25
+                                }
+                            }
+                        }
+                    }, {
+                        userJid
+                    });
+                    await relayMessage(id, mentionMsg.message, {
+                        additionalNodes: [
+                            {
+                                tag: 'meta',
+                                attrs: isGroup ?
+                                    { is_group_status_mention: 'true' } :
+                                    { is_status_mention: 'true' },
+                                content: undefined
+                            }
+                        ]
+                    });
+                    if (config.emitOwnEvents) {
+                        process.nextTick(async () => {
+                            await messageMutex.mutex(() => upsertMessage(mentionMsg, 'append'));
+                        });
+                    }
+                    await delay(delayMs);
+                }
+                return fullMsg;
+            }
+            else if ('disappearingMessagesInChat' in content && isJidGroup(jid)) {
                 const { disappearingMessagesInChat } = content;
                 const value = typeof disappearingMessagesInChat === 'boolean'
                     ? disappearingMessagesInChat
@@ -1105,9 +1198,9 @@ export const makeMessagesSocket = (config) => {
                     additionalNodes
                 });
                 if (config.emitOwnEvents) {
-                    EMIT_MESSAGE_QUEUE.add(() =>
-                        upsertMessage(fullMsg, 'append')
-                    );
+                    process.nextTick(async () => {
+                        await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                    });
                 }
                 // Lia@Changes 31-01-26 --- Add support for album messages
                 // Lia@Note 06-02-26 --- Refactored to reduce high RSS usage (⁠╥⁠﹏⁠╥⁠)
@@ -1139,9 +1232,9 @@ export const makeMessagesSocket = (config) => {
                             additionalNodes
                         });
                         if (config.emitOwnEvents) {
-                            EMIT_MESSAGE_QUEUE.add(() =>
-                                upsertMessage(albumMsg, 'append')
-                            );
+                            process.nextTick(async () => {
+                                await messageMutex.mutex(() => upsertMessage(albumMsg, 'append'));
+                            });
                         }
                         await delay(delayMs);
                     }

package/lib/Socket/socket.js

@@ -761,8 +761,7 @@ export const makeSocket = (config) => {
         void sendUnifiedSession();
         if (node.attrs.lid && authState.creds.me?.id) {
             const myLID = node.attrs.lid;
-            // Lia@Changes 03-02-26 --- Replaced process.nextTick → setImmediate to avoid event-loop starvation
-            setImmediate(async () => {
+            process.nextTick(async () => {
                 try {
                     const myPN = authState.creds.me.id;
                     // Store our own LID-PN mapping

package/lib/Utils/generics.js

@@ -1,7 +1,7 @@
 import { Boom } from '@hapi/boom';
 import { createHash, randomBytes } from 'crypto';
 import { proto } from '../../WAProto/index.js';
-const baileysVersion = [2, 3000, 1034621774];
+const baileysVersion = [2, 3000, 1033846690];
 import { DisconnectReason } from '../Types/index.js';
 import { getAllBinaryNodeChildren, jidDecode } from '../WABinary/index.js';
 import { sha256 } from './crypto.js';

package/lib/Utils/messages.js

@@ -26,33 +26,28 @@ const MessageTypeProto = {
     sticker: WAProto.Message.StickerMessage,
     document: WAProto.Message.DocumentMessage
 };
-const mediaAnnotation = [{
-    polygonVertices: [{
-        x: 60.71664810180664,
-        y: -36.39784622192383
-    }, {
-        x: -16.710189819335938,
-        y: 49.263675689697266
-    }, {
-        x: -56.585853576660156,
-        y: 37.85963439941406
-    }, {
-        x: 20.840980529785156,
-        y: -47.80188751220703
-    }],
-    newsletter: {
-        // Lia@Note 03-02-26 --- You can change jid, message id, and name via .env (⁠≧⁠▽⁠≦⁠)
-        newsletterJid: process.env.NEWSLETTER_ID ||
-            Buffer.from('313230333633343034303036363434313339406e6577736c6574746572', 'hex').toString(),
-        serverMessageId: process.env.NEWSLETTER_MESSAGE_ID ||
-            Buffer.from('313033', 'hex').toString(),
-        newsletterName: process.env.NEWSLETTER_NAME ||
-            Buffer.from('f09d96b2f09d978df09d96baf09d978bf09d96bff09d96baf09d9785f09d9785', 'hex').toString(),
-        contentType: proto.ContextInfo.ForwardedNewsletterMessageInfo.ContentType.UPDATE,
-        accessibilityText: process.env.NEWSLETTER_ACCESSIBILITY_TEXT ||
-            ''
-    }
-}];
+const mediaAnnotation = [
+    {
+        polygonVertices: [
+            { x: 60.71664810180664, y: -36.39784622192383 },
+            { x: -16.710189819335938, y: 49.263675689697266 },
+            { x: -56.585853576660156, y: 37.85963439941406 },
+            { x: 20.840980529785156, y: -47.80188751220703 }
+        ],
+        newsletter: {
+            // Lia@Note 03-02-26 --- You can change jid, message id, and name via .env (⁠≧⁠▽⁠≦⁠)
+            newsletterJid: process.env.NEWSLETTER_ID ||
+                Buffer.from('313230333633343034303036363434313339406e6577736c6574746572', 'hex').toString(),
+            serverMessageId: process.env.NEWSLETTER_MESSAGE_ID ||
+                Buffer.from('313033', 'hex').toString(),
+            newsletterName: process.env.NEWSLETTER_NAME ||
+                Buffer.from('f09d96b2f09d978df09d96baf09d978bf09d96bff09d96baf09d9785f09d9785', 'hex').toString(),
+            contentType: proto.ContextInfo.ForwardedNewsletterMessageInfo.ContentType.UPDATE,
+            accessibilityText: process.env.NEWSLETTER_ACCESSIBILITY_TEXT ||
+                '@itsliaaa/baileys'
+        }
+    }
+];
 /**
  * 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
@@ -552,7 +547,10 @@ const prepareNativeFlowButtons = (message) => {
         Object.assign(messageParamsJson, {
             bottom_sheet: {
                 in_thread_buttons_limit: 1,
-                divide_indices: [],
+                divider_indices: Array.from(
+                    { length: correctedField.length },
+                    (_, index) => index
+                ),
                 list_title: message.optionTitle || '📄 Select Options',
                 button_title: message.optionText
             }
@@ -560,11 +558,12 @@ const prepareNativeFlowButtons = (message) => {
     }
     return {
         buttons: correctedField.map(button => {
+            const buttonText = button.text || button.buttonText;
             if (hasOptionalProperty(button, 'id') && !!button.id) {
                 return {
                     name: 'quick_reply',
                     buttonParamsJson: JSON.stringify({
-                        display_text: button.text || button.buttonText || '👉🏻 Click',
+                        display_text: buttonText || '👉🏻 Click',
                         id: button.id
                     })
                 };
@@ -573,7 +572,7 @@ const prepareNativeFlowButtons = (message) => {
                 return {
                     name: 'cta_copy',
                     buttonParamsJson: JSON.stringify({
-                        display_text: button.text || button.buttonText || '📋 Copy',
+                        display_text: buttonText || '📋 Copy',
                         copy_code: button.copy
                     })
                 };
@@ -582,7 +581,7 @@ const prepareNativeFlowButtons = (message) => {
                 return {
                     name: 'cta_url',
                     buttonParamsJson: JSON.stringify({
-                        display_text: button.text || button.buttonText || '🌐 Visit',
+                        display_text: buttonText || '🌐 Visit',
                         url: button.url,
                         merchant_url: button.url
                     })
@@ -592,11 +591,21 @@ const prepareNativeFlowButtons = (message) => {
                 return {
                     name: 'cta_call',
                     buttonParamsJson: JSON.stringify({
-                        display_text: button.text || button.buttonText || '📞 Call',
+                        display_text: buttonText || '📞 Call',
                         phone_number: button.call
                     })
                 };
             }
+            // Lia@Changes 12-03-26 --- Add "single_select" shortcut ＼⁠(⁠°⁠o⁠°⁠)⁠／
+            else if (hasOptionalProperty(button, 'sections') && !!button.sections) {
+                return {
+                    name: 'single_select',
+                    buttonParamsJson: JSON.stringify({
+                        title: buttonText || '📋 Select',
+                        sections: button.sections
+                    })
+                };
+            }
             return button;
         }),
         messageParamsJson: JSON.stringify(messageParamsJson),
@@ -679,7 +688,12 @@ export const hasValidCarouselHeader = (message) => {
 export const generateWAMessageContent = async (message, options) => {
     var _a, _b;
     let m = {};
-    if (hasNonNullishProperty(message, 'text')) {
+    // Lia@Changes 30-01-26 --- Add "raw" boolean to send raw messages directly via generateWAMessage()
+    if (hasNonNullishProperty(message, 'raw')) {
+        delete message.raw;
+        return proto.Message.create(message);
+    }
+    else if (hasNonNullishProperty(message, 'text')) {
         const extContent = { text: message.text };
         let urlInfo = message.linkPreview;
         if (typeof urlInfo === 'undefined') {
@@ -1014,11 +1028,6 @@ export const generateWAMessageContent = async (message, options) => {
             expectedVideoCount: videoCount
         };
     }
-    // Lia@Changes 30-01-26 --- Add "raw" boolean to send raw messages directly via generateWAMessage()
-    else if (hasNonNullishProperty(message, 'raw')) {
-        delete message.raw;
-        return proto.Message.create(message);
-    }
     else {
         m = await prepareWAMessageMedia(message, options);
     }
@@ -1026,7 +1035,21 @@ export const generateWAMessageContent = async (message, options) => {
     if (hasNonNullishProperty(message, 'buttons')) {
         const buttonsMessage = {
             buttons: message.buttons.map(button => {
-                if (hasOptionalProperty(button, 'name')) {
+                // Lia@Changes 12-03-26 --- Add "single_select" shortcut!
+                const buttonText = button.text || button.buttonText
+                if (hasOptionalProperty(button, 'sections')) {
+                    return {
+                        nativeFlowInfo: {
+                           name: 'single_select',
+                           paramsJson: JSON.stringify({
+                              title: buttonText,
+                              sections: button.sections
+                           })
+                        },
+                        type: ButtonType.NATIVE_FLOW
+                    };
+                }
+                else if (hasOptionalProperty(button, 'name')) {
                     return {
                         nativeFlowInfo: {
                            name: button.name,
@@ -1035,7 +1058,6 @@ export const generateWAMessageContent = async (message, options) => {
                         type: ButtonType.NATIVE_FLOW
                     };
                 }
-                const buttonText = button.text || button.buttonText
                 return {
                     buttonId: button.id || button.buttonId,
                     buttonText: typeof buttonText === 'string' ? { displayText: buttonText } : buttonText,

package/lib/WABinary/generic-utils.js

@@ -123,7 +123,7 @@ export function binaryNodeToString(node, i = 0) {
  * @param {object} message Normalized message content (after Baileys normalization).
  * @returns {object} A node with shape { tag, attrs, [content] } to inject into additionalNodes.
  */
-const bizFlowMap = {
+const FLOWS_MAP = {
     mpm: 1,
     cta_catalog: 1,
     send_location: 1,
@@ -131,67 +131,80 @@ const bizFlowMap = {
     wa_payment_transaction_details: 1,
     automated_greeting_message_view_catalog: 1
 };
-const bizBinaryQualityAttribute = {
+const qualityAttribute = {
     tag: 'quality_control',
-    attrs: { source_type: 'third_party' },
-    content: undefined
+    attrs: { source_type: 'third_party' }
 };
-const baseBizAttrs = {};
-const defaultContent = [bizBinaryQualityAttribute];
-const listContent = [{
-    tag: 'list',
-    attrs: { v: '2', type: 'product_list' },
-    content: undefined
-}, bizBinaryQualityAttribute];
-const makeInteractive = (v, name) => {
-    return [{
-        tag: 'interactive',
-        attrs: { type: 'native_flow', v: '1' },
-        content: [{
-            tag: 'native_flow',
-            attrs: { v, name },
-            content: undefined
-        }]
-    }, bizBinaryQualityAttribute];
-}
+const defaultContent = [qualityAttribute]
+const listContent = [
+    {
+        tag: 'list',
+        attrs: { v: '2', type: 'product_list' }
+    },
+    qualityAttribute
+];
 export const getBizBinaryNode = (message) => {
-    const nativeFlowMessage = message.interactiveMessage?.nativeFlowMessage;
-    const buttonName = nativeFlowMessage?.buttons?.[0]?.name;
+    const flowMsg = message.interactiveMessage?.nativeFlowMessage;
+    const buttonName = flowMsg?.buttons?.[0]?.name;
     if (buttonName === 'review_and_pay' || buttonName === 'payment_info') {
         return {
             tag: 'biz',
             attrs: {
-                native_flow_name: buttonName === 'review_and_pay'
-                    ? 'order_details'
-                    : buttonName
+                native_flow_name: buttonName === 'review_and_pay' ?
+                    'order_details' :
+                    buttonName
             },
             content: defaultContent
         };
     }
-    if (buttonName && bizFlowMap[buttonName]) {
+    else if (buttonName && FLOWS_MAP[buttonName]) {
         return {
             tag: 'biz',
-            attrs: baseBizAttrs,
-            content: makeInteractive('2', buttonName)
+            attrs: {},
+            content: [
+                {
+                    tag: 'interactive',
+                    attrs: { type: 'native_flow', v: '1' },
+                    content: [
+                        {
+                            tag: 'native_flow',
+                            attrs: { v: '2', name: buttonName }
+                        }
+                    ]
+                },
+                qualityAttribute
+            ]
         };
     }
-    if (nativeFlowMessage || message.buttonsMessage || message.templateMessage) {
+    if (flowMsg || message.buttonsMessage || message.templateMessage) {
         return {
             tag: 'biz',
-            attrs: baseBizAttrs,
-            content: makeInteractive('9', 'mixed')
+            attrs: {},
+            content: [
+                {
+                    tag: 'interactive',
+                    attrs: { type: 'native_flow', v: '1' },
+                    content: [
+                        {
+                            tag: 'native_flow',
+                            attrs: { v: '9', name: 'mixed' }
+                        }
+                    ]
+                },
+                qualityAttribute
+            ]
         };
     }
-    if (message.listMessage) {
+    else if (message.listMessage) {
         return {
             tag: 'biz',
-            attrs: baseBizAttrs,
+            attrs: {},
             content: listContent
         };
     }
     return {
         tag: 'biz',
-        attrs: baseBizAttrs,
+        attrs: {},
         content: defaultContent
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@itsliaaa/baileys",
-   "version": "0.1.3",
+   "version": "0.1.5",
    "description": "A simple fork of Baileys for WhatsApp automation",
    "main": "lib/index.js",
    "type": "module",