@itsliaaa/baileys 0.1.16-beta.2 → 0.1.16

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

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

@@ -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.16",
    "description": "A simple fork of Baileys for WhatsApp automation",
    "main": "lib/index.js",
    "type": "module",