@itsliaaa/baileys 0.1.16-beta.1 → 0.1.16

package/lib/Socket/messages-send.js

@@ -429,7 +429,7 @@ export const makeMessagesSocket = (config) => {
         }
         return { nodes, shouldIncludeDeviceIdentity };
     };
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }) => {
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, addBizAttributes, statusJidList }) => {
         const meId = authState.creds.me.id;
         const meLid = authState.creds.me?.lid;
         const isRetryResend = !!participant?.jid;
@@ -802,8 +802,8 @@ export const makeMessagesSocket = (config) => {
                 stanza.content.push(...additionalNodes);
             }
             // Lia@Changes 30-01-26 --- Add Biz Binary Node to support button messages
-            if (shouldIncludeBizBinaryNode(innerMessage)) {
-                const bizNode = getBizBinaryNode(innerMessage);
+            if (shouldIncludeBizBinaryNode(innerMessage) || addBizAttributes) {
+                const bizNode = getBizBinaryNode(innerMessage, addBizAttributes);
                 stanza.content.push(bizNode);
             }
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
@@ -1124,6 +1124,7 @@ export const makeMessagesSocket = (config) => {
                 const isPollResultMsg = 'pollResult' in content && !!content.pollResult;
                 const isPollUpdateMsg = 'pollUpdate' in content && !!content.pollUpdate;
                 const isAiMsg = 'ai' in content && !!content.ai;
+                const isNeedBizAttrs = 'secureMetaServiceLabel' in content && !!content.secureMetaServiceLabel;
                 const additionalAttributes = options.additionalAttributes || {};
                 const additionalNodes = options.additionalNodes || [];
                 // required for delete
@@ -1143,7 +1144,7 @@ export const makeMessagesSocket = (config) => {
                     additionalAttributes.edit = '2';
                 }
                 else if (isPollMsg) {
-                    if (!isJidNewsletter(jid) && isQuizMsg) {
+                    if (!isNewsletter && isQuizMsg) {
                         throw new Boom('Quiz are only allowed for newsletter', { statusCode: 400 });
                     }
                     additionalNodes.push({
@@ -1185,6 +1186,7 @@ export const makeMessagesSocket = (config) => {
                 await relayMessage(jid, fullMsg.message, {
                     messageId: fullMsg.key.id,
                     useCachedGroupMetadata: options.useCachedGroupMetadata,
+                    addBizAttributes: isNeedBizAttrs,
                     statusJidList: options.statusJidList,
                     additionalAttributes,
                     additionalNodes
@@ -1219,6 +1221,7 @@ export const makeMessagesSocket = (config) => {
                         await relayMessage(jid, albumMsg.message, {
                             messageId: albumMsg.key.id,
                             useCachedGroupMetadata: options.useCachedGroupMetadata,
+                            addBizAttributes: isNeedBizAttrs,
                             statusJidList: options.statusJidList,
                             additionalAttributes,
                             additionalNodes

package/lib/Socket/socket.js

@@ -5,8 +5,7 @@ import { promisify } from 'util';
 import { proto } from '../../WAProto/index.js';
 import { DEF_CALLBACK_PREFIX, DEF_TAG_PREFIX, INITIAL_PREKEY_COUNT, MIN_PREKEY_COUNT, MIN_UPLOAD_INTERVAL, NOISE_WA_HEADER, PROCESSABLE_HISTORY_TYPES, TimeMs, UPLOAD_TIMEOUT } from '../Defaults/index.js';
 import { DisconnectReason } from '../Types/index.js';
-import { addTransactionCapability, aesEncryptCTR, bindWaitForConnectionUpdate, bytesToCrockford, configureSuccessfulPairing, Curve, derivePairingCodeKey, generateLoginNode, generateMdTagPrefix, generateRegistrationNode, getCodeFromWSError, getErrorCodeFromStreamError, getNextPreKeysNode, makeEventBuffer, makeNoiseHandler, promiseTimeout, signedKeyPair, xmppSignedPreKey } from '../Utils/index.js';
-import { getPlatformId } from '../Utils/browser-utils.js';
+import { addTransactionCapability, aesEncryptCTR, bindWaitForConnectionUpdate, bytesToCrockford, buildPairingQRData, configureSuccessfulPairing, Curve, derivePairingCodeKey, generateLoginNode, generateMdTagPrefix, generateRegistrationNode, getCompanionPlatformId, getCodeFromWSError, getErrorCodeFromStreamError, getNextPreKeysNode, makeEventBuffer, makeNoiseHandler, promiseTimeout, signedKeyPair, xmppSignedPreKey } from '../Utils/index.js';
 import { assertNodeErrorFree, binaryNodeToString, encodeBinaryNode, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildren, isLidUser, jidDecode, jidEncode, S_WHATSAPP_NET } from '../WABinary/index.js';
 import { BinaryInfo } from '../WAM/BinaryInfo.js';
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
@@ -629,7 +628,7 @@ export const makeSocket = (config) => {
                         {
                             tag: 'companion_platform_id',
                             attrs: {},
-                            content: getPlatformId(browser[1])
+                            content: getCompanionPlatformId(browser)
                         },
                         {
                             tag: 'companion_platform_display',
@@ -712,7 +711,7 @@ export const makeSocket = (config) => {
                 return;
             }
             const ref = refNode.content.toString('utf-8');
-            const qr = [ref, noiseKeyB64, identityKeyB64, advB64].join(',');
+            const qr = buildPairingQRData(ref, noiseKeyB64, identityKeyB64, advB64, browser);
             ev.emit('connection.update', { qr });
             qrTimer = setTimeout(genPairQR, qrMs);
             qrMs = qrTimeout || 20000; // shorter subsequent qrs

package/lib/Utils/companion-reg-client-utils.js

@@ -0,0 +1,32 @@
+export const CompanionWebClientType = {
+    UNKNOWN: 0,
+    CHROME: 1,
+    EDGE: 2,
+    FIREFOX: 3,
+    IE: 4,
+    OPERA: 5,
+    SAFARI: 6,
+    ELECTRON: 7,
+    UWP: 8,
+    OTHER_WEB_CLIENT: 9
+};
+const BROWSER_TO_COMPANION_WEB_CLIENT = {
+    Chrome: CompanionWebClientType.CHROME,
+    Edge: CompanionWebClientType.EDGE,
+    Firefox: CompanionWebClientType.FIREFOX,
+    IE: CompanionWebClientType.IE,
+    Opera: CompanionWebClientType.OPERA,
+    Safari: CompanionWebClientType.SAFARI
+};
+export const getCompanionWebClientType = ([os, browserName]) => {
+    if (browserName === 'Desktop') {
+        return os === 'Windows' ? CompanionWebClientType.UWP : CompanionWebClientType.ELECTRON;
+    }
+    return BROWSER_TO_COMPANION_WEB_CLIENT[browserName] || CompanionWebClientType.OTHER_WEB_CLIENT;
+};
+export const getCompanionPlatformId = (browser) => {
+    return getCompanionWebClientType(browser).toString();
+};
+export const buildPairingQRData = (ref, noiseKeyB64, identityKeyB64, advB64, browser) => {
+    return [ref, noiseKeyB64, identityKeyB64, advB64, getCompanionPlatformId(browser)].join(',');
+};

package/lib/Utils/index.js

@@ -17,5 +17,6 @@ export * from './event-buffer.js';
 export * from './process-message.js';
 export * from './message-retry-manager.js';
 export * from './browser-utils.js';
+export * from './companion-reg-client-utils.js';
 export * from './identity-change-handler.js';
 export * from './stanza-ack.js';

package/lib/Utils/messages-media.js

@@ -700,7 +700,7 @@ export const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, opt
             logger.debug(`uploading to "${hostname}"`);
             const auth = encodeURIComponent(uploadInfo.auth);
             // Lia@Changes 06-02-26 --- Switch media path map for newsletter uploads
-            const mediaPathMap = (newsletter ? NEWSLETTER_MEDIA_PATH_MAP : undefined) || MEDIA_PATH_MAP
+            const mediaPathMap = newsletter ? NEWSLETTER_MEDIA_PATH_MAP : MEDIA_PATH_MAP
             // Lia@Changes 20-03-26 --- Add server thumb for newsletter media
             const serverThumb = newsletter ? '&server_thumb_gen=1' : ''
             const url = `https://${hostname}${mediaPathMap[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}${serverThumb}`;

package/lib/Utils/messages.js

@@ -122,7 +122,7 @@ export const prepareWAMessageMedia = async (message, options) => {
             return obj;
         }
     }
-    const isNewsletter = !!options.jid && isJidNewsletter(options.jid);
+    const isNewsletter = isJidNewsletter(options.jid);
     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 && typeof uploadData.waveform === 'undefined';
@@ -534,14 +534,14 @@ const prepareNativeFlowButtons = (message) => {
     const isButtonsFieldArray = Array.isArray(buttons);
     const correctedField = isButtonsFieldArray ? buttons : buttons.buttons;
     const messageParamsJson = {};
-    // Lia@Changes 31-01-26 --- Add coupon and options inside interactive message
-    if (hasOptionalProperty(message, 'couponCode') && !!message.couponCode) {
+    // Lia@Changes 31-01-26 --- Add offer and options inside interactive message
+    if (hasOptionalProperty(message, 'offerText') && !!message.offerText) {
         Object.assign(messageParamsJson, {
             limited_time_offer: {
-                text: message.couponText || LIBRARY_NAME,
-                url: message.couponUrl || DONATE_URL, // Lia@Note 02-02-26 --- Apologies if this feels cheeky, just a fallback
-                copy_code: message.couponCode,
-                expiration_time: Date.now() * 2
+                text: message.offerText || LIBRARY_NAME,
+                url: message.offerUrl || DONATE_URL, // Lia@Note 02-02-26 --- Apologies if this feels cheeky, just a fallback
+                copy_code: message.offerCode,
+                expiration_time: message.offerExpiration
             }
         });
     }
@@ -560,7 +560,7 @@ const prepareNativeFlowButtons = (message) => {
     }
     return {
         buttons: correctedField.map(button => {
-            const buttonText = button.text || button.buttonText;
+            const buttonText = button.text;
             if (hasOptionalProperty(button, 'id') && !!button.id) {
                 return {
                     name: 'quick_reply',
@@ -1037,7 +1037,7 @@ export const generateWAMessageContent = async (message, options) => {
         const buttonsMessage = {
             buttons: message.buttons.map(button => {
                 // Lia@Changes 12-03-26 --- Add "single_select" shortcut!
-                const buttonText = button.text || button.buttonText
+                const buttonText = button.text;
                 if (hasOptionalProperty(button, 'sections')) {
                     return {
                         nativeFlowInfo: {
@@ -1098,11 +1098,12 @@ export const generateWAMessageContent = async (message, options) => {
     else if (hasNonNullishProperty(message, 'templateButtons')) {
         const hydratedTemplate = {
             hydratedButtons: message.templateButtons.map((button, i) => {
+                const buttonText = button.text;
                 if (hasOptionalProperty(button, 'id')) {
                     return {
                         index: i,
                         quickReplyButton: {
-                            displayText: button.text || button.buttonText || '👉🏻 Click',
+                            displayText: buttonText || '👉🏻 Click',
                             id: button.id
                         }
                     };
@@ -1111,7 +1112,7 @@ export const generateWAMessageContent = async (message, options) => {
                     return {
                         index: i,
                         urlButton: {
-                            displayText: button.text || button.buttonText || '🌐 Visit',
+                            displayText: buttonText || '🌐 Visit',
                             url: button.url
                         }
                     };
@@ -1120,7 +1121,7 @@ export const generateWAMessageContent = async (message, options) => {
                     return {
                         index: i,
                         callButton: {
-                            displayText: button.text || button.buttonText || '📞 Call',
+                            displayText: buttonText || '📞 Call',
                             phoneNumber: button.call
                         }
                     };

package/lib/WABinary/generic-utils.js

@@ -153,7 +153,8 @@ const MIXED_NATIVE_FLOW = {
         }
     ]
 };
-export const getBizBinaryNode = (message) => {
+export const getBizBinaryNode = (message, addBizAttributes) => {
+    const bizAttributes = {};
     const flowMsg = message.interactiveMessage?.nativeFlowMessage;
     const firstButtonName = flowMsg?.buttons?.[0]?.name;
     const qualityContent = {
@@ -164,21 +165,25 @@ export const getBizBinaryNode = (message) => {
         },
         content: DECISION_SOURCE_CONTENT
     };
+    if (addBizAttributes) {
+        bizAttributes.actual_actors = '2';
+        bizAttributes.host_storage = '2';
+        bizAttributes.privacy_mode_ts = `${Date.now() / 1_000 | 0}`;
+    }
     if (firstButtonName === 'review_and_pay' || firstButtonName === 'payment_info') {
+        bizAttributes.native_flow_name = firstButtonName === 'review_and_pay' ?
+            'order_details' :
+            firstButtonName;
         return {
             tag: 'biz',
-            attrs: {
-                native_flow_name: firstButtonName === 'review_and_pay' ?
-                    'order_details' :
-                    firstButtonName
-            },
+            attrs: bizAttributes,
             content: [qualityContent]
         };
     }
     if (firstButtonName && FLOWS_MAP[firstButtonName]) {
         return {
             tag: 'biz',
-            attrs: {},
+            attrs: bizAttributes,
             content: [
                 {
                     tag: 'interactive',
@@ -197,7 +202,7 @@ export const getBizBinaryNode = (message) => {
     if (flowMsg || message.buttonsMessage || message.templateMessage) {
         return {
             tag: 'biz',
-            attrs: {},
+            attrs: bizAttributes,
             content: [
                 MIXED_NATIVE_FLOW,
                 qualityContent
@@ -207,7 +212,7 @@ export const getBizBinaryNode = (message) => {
     if (message.listMessage) {
         return {
             tag: 'biz',
-            attrs: {},
+            attrs: bizAttributes,
             content: [
                 LIST_TYPE_CONTENT,
                 qualityContent
@@ -216,7 +221,7 @@ export const getBizBinaryNode = (message) => {
     }
     return {
         tag: 'biz',
-        attrs: {},
+        attrs: bizAttributes,
         content: [qualityContent]
     };
 }

package/package.json

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