@itsliaaa/baileys 0.1.8 → 0.1.9

package/lib/Defaults/index.js

@@ -4,7 +4,7 @@ import { Browsers } from '../Utils/browser-utils.js';
 import logger from '../Utils/logger.js';
 const version = [2, 3000, 1035194821];
 export const UNAUTHORIZED_CODES = [401, 403, 419];
-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 BIZ_BOT_SUPPORT_PAYLOAD = '{"version":1,"is_ai_message":true,"should_upload_client_logs":false,"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/';
@@ -26,7 +26,6 @@ export const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0';
 export const DICT_VERSION = 3;
 export const KEY_BUNDLE_TYPE = Buffer.from([5]);
 export const NOISE_WA_HEADER = Buffer.from([87, 65, 6, DICT_VERSION]); // last is "DICT_VERSION"
-export const OLD_GROUP_ID_REGEX = /^(\d{1,15})-(\d+)@g\.us$/;
 /** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
 export const URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
 export const WA_CERT_DETAILS = {

package/lib/Socket/messages-send.js

@@ -2,7 +2,7 @@ import NodeCache from '@cacheable/node-cache';
 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 { BIZ_BOT_SUPPORT_PAYLOAD, DEFAULT_CACHE_TTLS, 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';
 import { AssociationType } from '../Types/index.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
@@ -432,7 +432,7 @@ export const makeMessagesSocket = (config) => {
     const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }) => {
         const meId = authState.creds.me.id;
         const meLid = authState.creds.me?.lid;
-        const isRetryResend = Boolean(participant?.jid);
+        const isRetryResend = !!participant?.jid;
         let shouldIncludeDeviceIdentity = isRetryResend;
         const statusJid = 'status@broadcast';
         const { user, server } = jidDecode(jid);
@@ -497,7 +497,7 @@ export const makeMessagesSocket = (config) => {
                     attrs: {
                         to: jid,
                         id: msgId,
-                        type: getMessageType(message),
+                        type: getMessageType(innerMessage),
                         ...(additionalAttributes || {})
                     },
                     content: binaryNodeContent
@@ -731,7 +731,7 @@ export const makeMessagesSocket = (config) => {
                 attrs: {
                     id: msgId,
                     to: destinationJid,
-                    type: getMessageType(message),
+                    type: getMessageType(innerMessage),
                     ...(additionalAttributes || {})
                 },
                 content: binaryNodeContent
@@ -802,17 +802,10 @@ export const makeMessagesSocket = (config) => {
                 stanza.content.push(...additionalNodes);
             }
             // Lia@Changes 30-01-26 --- Add Biz Binary Node to support button messages
-            else if (shouldIncludeBizBinaryNode(innerMessage)) {
+            if (shouldIncludeBizBinaryNode(innerMessage)) {
                 const bizNode = getBizBinaryNode(innerMessage);
                 stanza.content.push(bizNode);
             }
-            if (isGroup && OLD_GROUP_ID_REGEX.test(jid) && !innerMessage.reactionMessage) {
-                stanza.content.push({
-                   tag: 'multicast',
-                   attrs: {},
-                   content: undefined
-                })
-            }
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
             await sendNode(stanza);
             // Add message to retry cache if enabled
@@ -823,24 +816,23 @@ export const makeMessagesSocket = (config) => {
         return msgId;
     };
     const getMessageType = (message) => {
-        const normalizedMessage = normalizeMessageContent(message);
-        if (!normalizedMessage)
+        if (!message)
             return 'text';
-        if (normalizedMessage.reactionMessage || normalizedMessage.encReactionMessage) {
+        if (message.reactionMessage || message.encReactionMessage) {
             return 'reaction';
         }
-        if (normalizedMessage.pollCreationMessage ||
-            normalizedMessage.pollCreationMessageV2 ||
-            normalizedMessage.pollCreationMessageV3 ||
-            normalizedMessage.pollCreationMessageV5 ||
-            normalizedMessage.pollCreationMessageV6 ||
-            normalizedMessage.pollUpdateMessage) {
+        if (message.pollCreationMessage ||
+            message.pollCreationMessageV2 ||
+            message.pollCreationMessageV3 ||
+            message.pollCreationMessageV5 ||
+            message.pollCreationMessageV6 ||
+            message.pollUpdateMessage) {
             return 'poll';
         }
-        if (normalizedMessage.eventMessage) {
+        if (message.eventMessage) {
             return 'event';
         }
-        if (getMediaType(normalizedMessage) !== '') {
+        if (getMediaType(message) !== '') {
             return 'media';
         }
         return 'text';

package/lib/Utils/messages.js

@@ -655,35 +655,34 @@ export const generateForwardMessageContent = (message, forceForward) => {
     return content;
 };
 export const hasNonNullishProperty = (message, key) => {
-    return (typeof message === 'object' &&
-        message !== null &&
+    return message != null &&
+        typeof message === 'object' &&
         key in message &&
-        message[key] !== null &&
-        message[key] !== undefined);
+        message[key] != null;
 };
 export const hasOptionalProperty = (obj, key) => {
-    return typeof obj === 'object' &&
-        obj !== null &&
+    return obj != null &&
+        typeof obj === 'object' &&
         key in obj &&
-        obj[key] !== null;
+        obj[key] != null;
 };
 // Lia@Changes 06-02-26 --- Validate album message media to avoid bug 👀
 export const hasValidAlbumMedia = (message) => {
-    return Boolean(message.imageMessage ||
-        message.videoMessage);
+    return message.imageMessage ||
+        message.videoMessage;
 };
 export const hasValidInteractiveHeader = (message) => {
-    return Boolean(message.imageMessage ||
+    return message.imageMessage ||
         message.videoMessage ||
         message.documentMessage ||
         message.productMessage ||
-        message.locationMessage);
+        message.locationMessage;
 };
 // Lia@Changes 30-01-26 --- Validate carousel cards header to avoid bug 👀
 export const hasValidCarouselHeader = (message) => {
-    return Boolean(message.imageMessage ||
+    return message.imageMessage ||
         message.videoMessage ||
-        message.productMessage);
+        message.productMessage;
 };
 export const generateWAMessageContent = async (message, options) => {
     var _a, _b;
@@ -1875,11 +1874,13 @@ const isWebPBuffer = (buffer) => {
  * such as buttons or other supported interactive types.
  */
 export const shouldIncludeBizBinaryNode = (message) => {
-    const messageType = getContentType(message);
-    return (
-        messageType === 'buttonsMessage' ||
-        messageType === 'interactiveMessage' ||
-        messageType === 'listMessage' ||
-        messageType === 'templateMessage'
-    );
+    const hasValidInteractive =
+        message.interactiveMessage &&
+        !message.interactiveMessage.carouselMessage &&
+        !message.interactiveMessage.collectionMessage &&
+        !message.interactiveMessage.shopStorefrontMessage;
+    return (message.buttonsMessage ||
+        message.interactiveMessage ||
+        message.listMessage ||
+        hasValidInteractive);
 };

package/lib/WABinary/generic-utils.js

@@ -1,4 +1,5 @@
 import { Boom } from '@hapi/boom';
+import { randomBytes } from 'crypto';
 import { proto } from '../../WAProto/index.js';
 import {} from './types.js';
 // some extra useful utilities
@@ -131,21 +132,29 @@ const FLOWS_MAP = {
     wa_payment_transaction_details: true,
     automated_greeting_message_view_catalog: true
 };
-const qualityAttribute = {
-    tag: 'quality_control',
-    attrs: { source_type: 'third_party' }
-};
-const defaultContent = [qualityAttribute]
-const listContent = [
+const DECISION_SOURCE_CONTENT = [
+    {
+        tag: 'decision_source',
+        attrs: { value: 'df' }
+    }
+];
+const MIXED_NATIVE_FLOW = [
     {
-        tag: 'list',
-        attrs: { v: '2', type: 'product_list' }
-    },
-    qualityAttribute
+        tag: 'native_flow',
+        attrs: { v: '9', name: 'mixed' }
+    }
 ];
 export const getBizBinaryNode = (message) => {
     const flowMsg = message.interactiveMessage?.nativeFlowMessage;
     const buttonName = flowMsg?.buttons?.[0]?.name;
+    const qualityContent = {
+        tag: 'quality_control',
+        attrs: {
+            decision_id: randomBytes(20).toString('hex'),
+            source_type: 'third_party'
+        },
+        content: DECISION_SOURCE_CONTENT
+    }
     if (buttonName === 'review_and_pay' || buttonName === 'payment_info') {
         return {
             tag: 'biz',
@@ -154,7 +163,7 @@ export const getBizBinaryNode = (message) => {
                     'order_details' :
                     buttonName
             },
-            content: defaultContent
+            content: [qualityContent]
         };
     }
     if (buttonName && FLOWS_MAP[buttonName]) {
@@ -172,7 +181,7 @@ export const getBizBinaryNode = (message) => {
                         }
                     ]
                 },
-                qualityAttribute
+                qualityContent
             ]
         };
     }
@@ -184,14 +193,9 @@ export const getBizBinaryNode = (message) => {
                 {
                     tag: 'interactive',
                     attrs: { type: 'native_flow', v: '1' },
-                    content: [
-                        {
-                            tag: 'native_flow',
-                            attrs: { v: '9', name: 'mixed' }
-                        }
-                    ]
+                    content: MIXED_NATIVE_FLOW
                 },
-                qualityAttribute
+                qualityContent
             ]
         };
     }
@@ -199,12 +203,18 @@ export const getBizBinaryNode = (message) => {
         return {
             tag: 'biz',
             attrs: {},
-            content: listContent
+            content: [
+                {
+                    tag: 'list',
+                    attrs: { v: '2', type: 'product_list' }
+                },
+                qualityContent
+            ]
         };
     }
     return {
         tag: 'biz',
         attrs: {},
-        content: defaultContent
+        content: [qualityContent]
     };
 }

package/package.json

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