@itsliaaa/baileys 0.1.16-beta.2 → 0.1.17

package/README.md

@@ -585,8 +585,10 @@ sock.sendMessage(jid, {
    footer: '@itsliaaa/baileys',
    optionText: '👉🏻 Select Options', // --- Optional, wrap all native flow into a single list
    optionTitle: '📄 Select Options', // --- Optional
-   couponText: '🏷️ Newest Coupon!', // --- Optional, add coupon into message
-   couponCode: '@itsliaaa/baileys', // --- Optional
+   offerText: '🏷️ Newest Coupon!', // --- Optional, add an offer into message
+   offerCode: '@itsliaaa/baileys', // --- Optional
+   offerUrl: 'https://www.npmjs.com/package/@itsliaaa/baileys', // --- Optional
+   offerExpiration: Date.now() + 3_600_000, // --- Optional
    nativeFlow: [{
       text: '👋🏻 Greeting',
       id: '#Greeting'
@@ -598,7 +600,7 @@ sock.sendMessage(jid, {
       copy: '@itsliaaa/baileys'
    }, {
       text: '🌐 Source',
-      url: 'https://www.npmjs.com/package/baileys'
+      url: 'https://www.npmjs.com/package/@itsliaaa/baileys'
    }, {
       text: '📋 Select',
       sections: [{
@@ -637,7 +639,7 @@ sock.sendMessage(jid, {
       footer: '🏷️️ Pinterest',
       nativeFlow: [{
          text: '🌐 Source',
-         url: 'https://www.npmjs.com/package/baileys'
+         url: 'https://www.npmjs.com/package/@itsliaaa/baileys'
       }]
    }, {
       image: {
@@ -645,11 +647,13 @@ sock.sendMessage(jid, {
       },
       caption: '🖼️ Image 2',
       footer: '🏷️ Pinterest',
-      couponText: '🏷️ New Coupon!',
-      couponCode: '@itsliaaa/baileys',
+      offerText: '🏷️ New Coupon!',
+      offerCode: '@itsliaaa/baileys',
+      offerUrl: 'https://www.npmjs.com/package/@itsliaaa/baileys',
+      offerExpiration: Date.now() + 3_600_000,
       nativeFlow: [{
          text: '🌐 Source',
-         url: 'https://www.npmjs.com/package/baileys'
+         url: 'https://www.npmjs.com/package/@itsliaaa/baileys'
       }]
    }, {
       image: {
@@ -659,14 +663,16 @@ sock.sendMessage(jid, {
       footer: '🏷️ Pinterest',
       optionText: '👉🏻 Select Options',
       optionTitle: '📄 Select Options',
-      couponText: '🏷️ New Coupon!',
-      couponCode: '@itsliaaa/baileys',
+      offerText: '🏷️ New Coupon!',
+      offerCode: '@itsliaaa/baileys',
+      offerUrl: 'https://www.npmjs.com/package/@itsliaaa/baileys',
+      offerExpiration: Date.now() + 3_600_000,
       nativeFlow: [{
          text: '🛒 Product',
          id: '#Product'
       }, {
          text: '🌐 Source',
-         url: 'https://www.npmjs.com/package/baileys'
+         url: 'https://www.npmjs.com/package/@itsliaaa/baileys'
       }]
    }]
 }, {
@@ -689,7 +695,7 @@ sock.sendMessage(jid, {
       id: '#Order'
    }, {
       text: '🌐 Source',
-      url: 'https://www.npmjs.com/package/baileys'
+      url: 'https://www.npmjs.com/package/@itsliaaa/baileys'
    }, {
       text: '📞 Call',
       call: '628123456789'
@@ -806,7 +812,7 @@ sock.sendMessage(jid, {
       body: '❓ I dont know',
       thumbnail: fs.readFileSync('./path/to/image.jpg'), // --- Must in buffer format
       largeThumbnail: false, // --- Or true for bigger thumbnail
-      url: 'https://www.npmjs.com/package/baileys' // --- Optional, used for WhatsApp internal thumbnail caching and direct URL
+      url: 'https://www.npmjs.com/package/@itsliaaa/baileys' // --- Optional, used for WhatsApp internal thumbnail caching and direct URL
    }
 }, {
    quoted: message
@@ -854,7 +860,7 @@ sock.sendMessage(jid, {
 
 ```javascript
 sock.sendMessage(jid, {
-   text: 'Just a label!',
+   text: '🏷️ Just a label!',
    secureMetaServiceLabel: true
 })
 ```

package/WAProto/index.js

@@ -58091,6 +58091,7 @@ export const proto = $root.proto = (() => {
                 HistorySyncOnDemandRequest.prototype.onDemandMsgCount = null;
                 HistorySyncOnDemandRequest.prototype.oldestMsgTimestampMs = null;
                 HistorySyncOnDemandRequest.prototype.accountLid = null;
+                HistorySyncOnDemandRequest.prototype.supportInlineResponse = null;
 
                 let $oneOfFields;
 
@@ -58124,6 +58125,11 @@ export const proto = $root.proto = (() => {
                     set: $util.oneOfSetter($oneOfFields)
                 });
 
+                Object.defineProperty(HistorySyncOnDemandRequest.prototype, "_supportInlineResponse", {
+                    get: $util.oneOfGetter($oneOfFields = ["supportInlineResponse"]),
+                    set: $util.oneOfSetter($oneOfFields)
+                });
+
                 HistorySyncOnDemandRequest.create = function create(properties) {
                     return new HistorySyncOnDemandRequest(properties);
                 };
@@ -58143,6 +58149,8 @@ export const proto = $root.proto = (() => {
                         w.uint32(40).int64(m.oldestMsgTimestampMs);
                     if (m.accountLid != null && Object.hasOwnProperty.call(m, "accountLid"))
                         w.uint32(50).string(m.accountLid);
+                    if (m.supportInlineResponse != null && Object.hasOwnProperty.call(m, "supportInlineResponse"))
+                        w.uint32(56).bool(m.supportInlineResponse);
                     return w;
                 };
 
@@ -58179,6 +58187,10 @@ export const proto = $root.proto = (() => {
                                 m.accountLid = r.string();
                                 break;
                             }
+                        case 7: {
+                                m.supportInlineResponse = r.bool();
+                                break;
+                            }
                         default:
                             r.skipType(t & 7);
                             break;
@@ -58216,6 +58228,9 @@ export const proto = $root.proto = (() => {
                     if (d.accountLid != null) {
                         m.accountLid = String(d.accountLid);
                     }
+                    if (d.supportInlineResponse != null) {
+                        m.supportInlineResponse = Boolean(d.supportInlineResponse);
+                    }
                     return m;
                 };
 
@@ -58256,6 +58271,11 @@ export const proto = $root.proto = (() => {
                         if (o.oneofs)
                             d._accountLid = "accountLid";
                     }
+                    if (m.supportInlineResponse != null && m.hasOwnProperty("supportInlineResponse")) {
+                        d.supportInlineResponse = m.supportInlineResponse;
+                        if (o.oneofs)
+                            d._supportInlineResponse = "supportInlineResponse";
+                    }
                     return d;
                 };
 

package/lib/Socket/messages-send.js

@@ -507,7 +507,20 @@ export const makeMessagesSocket = (config) => {
                 return;
             }
             // Lia@Changes 02-02-26 --- Add keepInChat, editedMessage, mediaNotifyMessage and pollUpdateMessage
-            if (innerMessage?.pinInChatMessage || innerMessage?.pollUpdateMessage || innerMessage?.keepInChatMessage || innerMessage?.protocolMessage?.editedMessage || innerMessage?.protocolMessage?.mediaNotifyMessage || innerMessage?.reactionMessage) {
+            const isNeedMetaAttrs = innerMessage?.pinInChatMessage || innerMessage?.keepInChatMessage || innerMessage?.reactionMessage
+            if (isNeedMetaAttrs) {
+                const metaAttrs = {};
+                if (innerMessage?.pollUpdateMessage) {
+                    metaAttrs.polltype = 'vote';
+                }
+                metaAttrs.content_type = 'add_on';
+                binaryNodeContent.push({
+                    tag: 'meta',
+                    attrs: metaAttrs,
+                    content: undefined
+                });
+            }
+            if (isNeedMetaAttrs || innerMessage?.protocolMessage?.editedMessage || innerMessage?.protocolMessage?.mediaNotifyMessage) {
                 extraAttrs['decrypt-fail'] = 'hide'; // todo: expand for reactions and other types
             }
             // Lia@Changes 02-02-26 --- Add native_flow_name to extraAttrs when sending interactiveResponseMessage
@@ -1121,8 +1134,6 @@ export const makeMessagesSocket = (config) => {
                 const isKeepMsg = 'keep' in content && !!content.keep;
                 const isPollMsg = 'poll' in content && !!content.poll;
                 const isQuizMsg = 'poll' in content && !!content.poll.pollType;
-                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 || {};
@@ -1151,7 +1162,7 @@ export const makeMessagesSocket = (config) => {
                         tag: 'meta',
                         attrs: {
                             // Lia@Note 08-02-26 --- Still a hypothesis regarding PollResult ༎ຶ⁠‿⁠༎ຶ
-                            polltype: isQuizMsg ? 'quiz_creation' : isPollResultMsg || isPollUpdateMsg ? 'vote' : 'creation',
+                            polltype: isQuizMsg ? 'quiz_creation' : 'creation',
                             contenttype: isPollMsg && isNewsletter ? 'text' : undefined
                         },
                         content: undefined

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/generics.js

@@ -1,5 +1,5 @@
 import { Boom } from '@hapi/boom';
-import { createHash, randomBytes } from 'crypto';
+import { createHash, randomBytes, randomFillSync } from 'crypto';
 import { proto } from '../../WAProto/index.js';
 const baileysVersion = [2, 3000, 1035194821];
 import { DisconnectReason } from '../Types/index.js';
@@ -132,19 +132,19 @@ export async function promiseTimeout(ms, promise) {
 // inspired from whatsmeow code
 // https://github.com/tulir/whatsmeow/blob/64bc969fbe78d31ae0dd443b8d4c80a5d026d07a/send.go#L42
 export const generateMessageIDV2 = (userId) => {
-   const data = Buffer.allocUnsafe(8 + 20 + 16);
-   data.writeBigUInt64BE(BigInt(unixTimestampSeconds()));
+   const data = Buffer.allocUnsafe(44);
+   data.writeBigUInt64BE(BigInt(Date.now() / 1000 | 0), 0);
    if (userId) {
-      const id = jidDecode(userId);
-      if (id?.user) {
-         const len = data.write(id.user, 8);
+      const userStr = userId.split('@')[0].split(':')[0]; 
+      if (userStr) {
+         const len = data.write(userStr, 8);
          data.write('@c.us', 8 + len);
       }
    }
-   randomBytes(16).copy(data, 28);
+   randomFillSync(data, 28, 16);
    const hash = createHash('sha256').update(data).digest();
-   const hex = hash.toString('hex').toUpperCase();
-   const baseId = '3EB0' + hex.substring(0, 18);
+   const hex = hash.toString('hex', 0, 9).toUpperCase();
+   const baseId = '3EB0' + hex;
    const pos = 4 + (hash[0] & 15);
    return baseId.slice(0, pos) + 'STARFALL' + baseId.slice(pos);
 };

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/message-retry-manager.js

@@ -1,6 +1,6 @@
 import { LRUCache } from 'lru-cache';
 /** Number of sent messages to cache in memory for handling retry receipts */
-const RECENT_MESSAGES_SIZE = 512;
+const RECENT_MESSAGES_SIZE = 1024;
 const MESSAGE_KEY_SEPARATOR = '\u0000';
 /** Timeout for session recreation - 1 hour */
 const RECREATE_SESSION_TIMEOUT = 60 * 60 * 1000; // 1 hour in milliseconds

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

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@itsliaaa/baileys",
-   "version": "0.1.16-beta.2",
+   "version": "0.1.17",
    "description": "A simple fork of Baileys for WhatsApp automation",
    "main": "lib/index.js",
    "type": "module",
@@ -48,7 +48,7 @@
       "p-queue": "^9.1.0",
       "pino": "^9.6.0",
       "protobufjs": "^7.5.4",
-      "whatsapp-rust-bridge": "0.5.3",
+      "whatsapp-rust-bridge": "^0.5.3",
       "ws": "^8.19.0"
    },
    "peerDependencies": {