cuki-bailx 1.2.4 → 1.2.6

package/lib/Utils/generics.js

@@ -1,17 +1,63 @@
-"use strict"; 
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bytesToCrockford = exports.trimUndefined = exports.isWABusinessPlatform = exports.getCodeFromWSError = exports.getCallStatusFromNode = exports.getErrorCodeFromStreamError = exports.getStatusFromReceiptType = exports.generateMdTagPrefix = exports.fetchLatestWaWebVersion = exports.fetchLatestBaileysVersion = exports.printQRIfNecessaryListener = exports.bindWaitForConnectionUpdate = exports.bindWaitForEvent = exports.generateMessageID = exports.generateMessageIDV2 = exports.promiseTimeout = exports.delayCancellable = exports.delay = exports.debouncedTimeout = exports.unixTimestampSeconds = exports.toNumber = exports.encodeBigEndian = exports.generateRegistrationId = exports.encodeWAMessage = exports.unpadRandomMax16 = exports.writeRandomPadMax16 = exports.getKeyAuthor = exports.BufferJSON = exports.Browsers = void 0;
+
+exports.isWABusinessPlatform = exports.getCodeFromWSError = exports.getCallStatusFromNode = exports.getErrorCodeFromStreamError = exports.getStatusFromReceiptType = exports.generateMdTagPrefix = exports.fetchLatestWaWebVersion = exports.fetchLatestBaileysVersion = exports.fetchLatestVyzenBaileysxVersion = exports.printQRIfNecessaryListener = exports.bindWaitForConnectionUpdate = exports.generateMessageID = exports.generateMessageIDV2 = exports.delayCancellable = exports.delay = exports.debouncedTimeout = exports.unixTimestampSeconds = exports.toNumber = exports.encodeBigEndian = exports.generateRegistrationId = exports.encodeNewsletterMessage = exports.encodeWAMessage = exports.unpadRandomMax16 = exports.writeRandomPadMax16 = exports.getKeyAuthor = exports.BufferJSON = exports.getPlatformId = exports.Browsers = void 0;
+exports.promiseTimeout = promiseTimeout;
+exports.bindWaitForEvent = bindWaitForEvent;
+exports.trimUndefined = trimUndefined;
+exports.bytesToCrockford = bytesToCrockford;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
 const os_1 = require("os");
 const WAProto_1 = require("../../WAProto");
-const baileys_version_json_1 = require("../Defaults/baileys-version.json");
+
+const vyzen_baileysx_version_json_1 = require("../Defaults/vyzen-baileysx-version.json");
 const Types_1 = require("../Types");
 const WABinary_1 = require("../WABinary");
+const COMPANION_PLATFORM_MAP = {
+    'Chrome': '49',
+    'Edge': '50',
+    'Firefox': '51',
+    'Opera': '53',
+    'Safari': '54'
+};
 const PLATFORM_MAP = {
     'aix': 'AIX',
     'darwin': 'Mac OS',
@@ -26,12 +72,12 @@ exports.Browsers = {
     macOS: (browser) => ['Mac OS', browser, '14.4.1'],
     baileys: (browser) => ['Baileys', browser, '6.5.0'],
     windows: (browser) => ['Windows', browser, '10.0.22631'],
+    /** The appropriate browser based on your OS & release */
     appropriate: (browser) => [PLATFORM_MAP[(0, os_1.platform)()] || 'Ubuntu', browser, (0, os_1.release)()]
 };
-
 const getPlatformId = (browser) => {
     const platformType = WAProto_1.proto.DeviceProps.PlatformType[browser.toUpperCase()];
-    return platformType ? platformType.toString() : '1'; //chrome
+    return platformType ? platformType.toString() : '49'; //chrome
 };
 exports.getPlatformId = getPlatformId;
 exports.BufferJSON = {
@@ -74,6 +120,8 @@ const unpadRandomMax16 = (e) => {
 exports.unpadRandomMax16 = unpadRandomMax16;
 const encodeWAMessage = (message) => ((0, exports.writeRandomPadMax16)(WAProto_1.proto.Message.encode(message).finish()));
 exports.encodeWAMessage = encodeWAMessage;
+const encodeNewsletterMessage = (message) => (WAProto_1.proto.Message.encode(message).finish());
+exports.encodeNewsletterMessage = encodeNewsletterMessage;
 const generateRegistrationId = () => {
     return Uint16Array.from((0, crypto_1.randomBytes)(2))[0] & 16383;
 };
@@ -88,7 +136,7 @@ const encodeBigEndian = (e, t = 4) => {
     return a;
 };
 exports.encodeBigEndian = encodeBigEndian;
-const toNumber = (t) => ((typeof t === 'object' && t) ? ('toNumber' in t ? t.toNumber() : t.low) : t);
+const toNumber = (t) => ((typeof t === 'object' && t) ? ('toNumber' in t ? t.toNumber() : t.low) : t || 0);
 exports.toNumber = toNumber;
 /** unix timestamp of a date in seconds */
 const unixTimestampSeconds = (date = new Date()) => Math.floor(date.getTime() / 1000);
@@ -154,7 +202,6 @@ async function promiseTimeout(ms, promise) {
         .finally(cancel);
     return p;
 }
-exports.promiseTimeout = promiseTimeout;
 const generateMessageIDV2 = (userId) => {
     const data = Buffer.alloc(8 + 20 + 16);
     data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000)));
@@ -172,7 +219,7 @@ const generateMessageIDV2 = (userId) => {
 };
 exports.generateMessageIDV2 = generateMessageIDV2;
 // generate a random ID to attach to a message
-const generateMessageID = () => 'SH3NN-' + (0, crypto_1.randomBytes)(6).toString('hex').toUpperCase();
+const generateMessageID = () => '3EB0' + (0, crypto_1.randomBytes)(18).toString('hex').toUpperCase();
 exports.generateMessageID = generateMessageID;
 function bindWaitForEvent(ev, event) {
     return async (check, timeoutMs) => {
@@ -186,8 +233,8 @@ function bindWaitForEvent(ev, event) {
                 }
             };
             ev.on('connection.update', closeListener);
-            listener = (update) => {
-                if (check(update)) {
+            listener = async (update) => {
+                if (await check(update)) {
                     resolve();
                 }
             };
@@ -199,14 +246,12 @@ function bindWaitForEvent(ev, event) {
         }));
     };
 }
-exports.bindWaitForEvent = bindWaitForEvent;
 const bindWaitForConnectionUpdate = (ev) => bindWaitForEvent(ev, 'connection.update');
 exports.bindWaitForConnectionUpdate = bindWaitForConnectionUpdate;
 const printQRIfNecessaryListener = (ev, logger) => {
     ev.on('connection.update', async ({ qr }) => {
         if (qr) {
-            const QR = await import('qrcode-terminal')
-                .then(m => m.default || m)
+            const QR = await Promise.resolve().then(() => __importStar(require('qrcode-terminal'))).then(m => m.default || m)
                 .catch(() => {
                 logger.error('QR code terminal not added as dependency');
             });
@@ -215,50 +260,81 @@ const printQRIfNecessaryListener = (ev, logger) => {
     });
 };
 exports.printQRIfNecessaryListener = printQRIfNecessaryListener;
-/**
- * utility that fetches latest baileys version from the master branch.
- * Use to ensure your WA connection is always on the latest version
- */
-const fetchLatestBaileysVersion = async (options = {}) => {
-    const URL = 'https://raw.githubusercontent.com/kiuur/bails/master/src/Defaults/baileys-version.json';
+
+const fetchLatestVyzenBaileysxVersion = async (options = {}) => {
     try {
-        const result = await axios_1.default.get(URL, {
+        const { data } = await axios_1.default.get('https://registry.npmjs.org/vyzen-baileysx', {
             ...options,
             responseType: 'json'
         });
+        const versionStr = data.version;  
+        const [major, minor, patch] = versionStr.split('.').map(Number);
         return {
-            version: result.data.version,
+            version: [major, minor, patch],
             isLatest: true
         };
+    } catch (error) {
+        return {
+            version: vyzen_baileysx_version_json_1.version,  
+            isLatest: false,
+            error
+        };
     }
-    catch (error) {
+};
+exports.fetchLatestVyzenBaileysxVersion = fetchLatestVyzenBaileysxVersion;
+
+const fetchLatestBaileysVersion = async (options = {}) => {
+    try {
+        const { data } = await axios_1.default.get('https://registry.npmjs.org/vyzen-baileysx', {
+            ...options,
+            responseType: 'json'
+        });
+        const versionStr = data.version; 
+        const [major, minor, patch] = versionStr.split('.').map(Number);
         return {
-            version: baileys_version_json_1.version,
+            version: [major, minor, patch],
+            isLatest: true
+        };
+    } catch (error) {
+        return {
+            version: vyzen_baileysx_version_json_1.version,  
             isLatest: false,
             error
         };
     }
 };
 exports.fetchLatestBaileysVersion = fetchLatestBaileysVersion;
+
 /**
  * A utility that fetches the latest web version of whatsapp.
  * Use to ensure your WA connection is always on the latest version
  */
 const fetchLatestWaWebVersion = async (options) => {
     try {
-        const result = await axios_1.default.get('https://web.whatsapp.com/check-update?version=1&platform=web', {
+        const { data } = await axios_1.default.get('https://web.whatsapp.com/sw.js', {
             ...options,
             responseType: 'json'
         });
-        const version = result.data.currentVersion.split('.');
+        const regex = /\\?"client_revision\\?":\s*(\d+)/;
+        const match = data.match(regex);
+        if (!(match === null || match === void 0 ? void 0 : match[1])) {
+            return {
+                version: vyzen_baileysx_version_json_1.version,
+                isLatest: false,
+                error: {
+                    message: 'Could not find client revision in the fetched content'
+                }
+            };
+        }
+        const clientRevision = match[1];
         return {
-            version: [+version[0], +version[1], +version[2]],
+            version: [2, 3000, +clientRevision],
             isLatest: true
         };
     }
     catch (error) {
         return {
-            version: baileys_version_json_1.version,
+            version: vyzen_baileysx_version_json_1.version,
             isLatest: false,
             error
         };
@@ -272,6 +348,7 @@ const generateMdTagPrefix = () => {
 };
 exports.generateMdTagPrefix = generateMdTagPrefix;
 const STATUS_MAP = {
+    'sender': WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK,
     'played': WAProto_1.proto.WebMessageInfo.Status.PLAYED,
     'read': WAProto_1.proto.WebMessageInfo.Status.READ,
     'read-self': WAProto_1.proto.WebMessageInfo.Status.READ
@@ -320,7 +397,8 @@ const getCallStatusFromNode = ({ tag, attrs }) => {
                 status = 'timeout';
             }
             else {
-                status = 'reject';
+                // fired when accepted/rejected/timeout/caller hangs up
+                status = 'terminate';
             }
             break;
         case 'reject':
@@ -369,7 +447,6 @@ function trimUndefined(obj) {
     }
     return obj;
 }
-exports.trimUndefined = trimUndefined;
 const CROCKFORD_CHARACTERS = '123456789ABCDEFGHJKLMNPQRSTVWXYZ';
 function bytesToCrockford(buffer) {
     let value = 0;
@@ -388,4 +465,5 @@ function bytesToCrockford(buffer) {
     }
     return crockford.join('');
 }
+exports.trimUndefined = trimUndefined;
 exports.bytesToCrockford = bytesToCrockford;

package/lib/Utils/history.js

@@ -32,13 +32,9 @@ const processHistoryMessage = (item) => {
         case WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP:
         case WAProto_1.proto.HistorySync.HistorySyncType.RECENT:
         case WAProto_1.proto.HistorySync.HistorySyncType.FULL:
+        case WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND:
             for (const chat of item.conversations) {
-                contacts.push({ 
-                    id: chat.id,
-                    name: chat.name || undefined,
-                    lid: chat.lidJid || undefined,
-                    jid: (0, WABinary_1.isJidUser)(chat.id) ? chat.id : undefined
-                });
+                contacts.push({ id: chat.id, name: chat.name || undefined, lid: chat.lidJid || undefined, jid: (0, WABinary_1.isJidUser)(chat.id) ? chat.id : chat.pnJid });
                 const msgs = chat.messages || [];
                 delete chat.messages;
                 delete chat.archived;
@@ -79,6 +75,8 @@ const processHistoryMessage = (item) => {
         chats,
         contacts,
         messages,
+        syncType: item.syncType,
+        progress: item.progress
     };
 };
 exports.processHistoryMessage = processHistoryMessage;

package/lib/Utils/index.js

@@ -31,3 +31,5 @@ __exportStar(require("./use-multi-file-auth-state"), exports);
 __exportStar(require("./link-preview"), exports);
 __exportStar(require("./event-buffer"), exports);
 __exportStar(require("./process-message"), exports);
+__exportStar(require("./message-retry-manager"), exports);
+__exportStar(require("./browser-utils"), exports);

package/lib/Utils/link-preview.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUrlInfo = void 0;
 const messages_1 = require("./messages");
@@ -25,7 +58,7 @@ const getUrlInfo = async (text, opts = {
         // retries
         const retries = 0;
         const maxRetry = 5;
-        const { getLinkPreview } = await import('link-preview-js');
+        const { getLinkPreview } = await Promise.resolve().then(() => __importStar(require('link-preview-js')));
         let previewLink = text;
         if (!text.startsWith('https://') && !text.startsWith('http://')) {
             previewLink = 'https://' + previewLink;

package/lib/Utils/lt-hash.js

@@ -30,15 +30,15 @@ class d {
         var n = this;
         return n.add(n.subtract(e, r), t);
     }
-    _addSingle(e, t) {
+    async _addSingle(e, t) {
         var r = this;
-        const n = new Uint8Array((0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
-        return r.performPointwiseWithOverflow(e, n, ((e, t) => e + t));
+        const n = new Uint8Array(await (0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
+        return r.performPointwiseWithOverflow(await e, n, ((e, t) => e + t));
     }
-    _subtractSingle(e, t) {
+    async _subtractSingle(e, t) {
         var r = this;
-        const n = new Uint8Array((0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
-        return r.performPointwiseWithOverflow(e, n, ((e, t) => e - t));
+        const n = new Uint8Array(await (0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
+        return r.performPointwiseWithOverflow(await e, n, ((e, t) => e - t));
     }
     performPointwiseWithOverflow(e, t, r) {
         const n = new DataView(e), i = new DataView(t), a = new ArrayBuffer(n.byteLength), s = new DataView(a);

package/lib/Utils/message-retry-manager.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageRetryManager = void 0;
+
+const lru_cache_1 = require("lru-cache");
+
+const RECENT_MESSAGES_SIZE = 512;
+
+const RECREATE_SESSION_TIMEOUT = 60 * 60 * 1000;
+
+const PHONE_REQUEST_DELAY = 3000;
+
+class MessageRetryManager {
+    constructor(logger, maxMsgRetryCount) {
+        this.logger = logger;
+        this.maxMsgRetryCount = maxMsgRetryCount;
+        this._recentMessagesMap = new lru_cache_1.LRUCache({
+            max: RECENT_MESSAGES_SIZE
+        });
+        this._sessionRecreateHistory = new lru_cache_1.LRUCache({
+            ttl: RECREATE_SESSION_TIMEOUT * 2,
+            ttlAutopurge: true
+        });
+        this._retryCounters = new lru_cache_1.LRUCache({
+            ttl: 15 * 60 * 1000,
+            ttlAutopurge: true,
+            updateAgeOnGet: true
+        });
+        this._pendingPhoneRequests = {};
+        this.statistics = {
+            totalRetries: 0,
+            successfulRetries: 0,
+            failedRetries: 0,
+            mediaRetries: 0,
+            sessionRecreations: 0,
+            phoneRequests: 0
+        };
+        this.maxMsgRetryCount = maxMsgRetryCount;
+    }
+    addRecentMessage(to, id, message) {
+        const key = { to, id };
+        const keyStr = this._keyToString(key);
+        this._recentMessagesMap.set(keyStr, {
+            message,
+            timestamp: Date.now()
+        });
+        this.logger.debug(`Added message to retry cache: ${to}/${id}`);
+    }
+    getRecentMessage(to, id) {
+        const key = { to, id };
+        const keyStr = this._keyToString(key);
+        return this._recentMessagesMap.get(keyStr);
+    }
+    shouldRecreateSession(jid, retryCount, hasSession) {
+        if (!hasSession) {
+            this._sessionRecreateHistory.set(jid, Date.now());
+            this.statistics.sessionRecreations++;
+            return {
+                reason: "we don't have a Signal session with them",
+                recreate: true
+            };
+        }
+        if (retryCount < 2) {
+            return { reason: '', recreate: false };
+        }
+        const now = Date.now();
+        const prevTime = this._sessionRecreateHistory.get(jid);
+        if (!prevTime || now - prevTime > RECREATE_SESSION_TIMEOUT) {
+            this._sessionRecreateHistory.set(jid, now);
+            this.statistics.sessionRecreations++;
+            return {
+                reason: 'retry count > 1 and over an hour since last recreation',
+                recreate: true
+            };
+        }
+        return { reason: '', recreate: false };
+    }
+    incrementRetryCount(messageId) {
+        this._retryCounters.set(messageId, (this._retryCounters.get(messageId) || 0) + 1);
+        this.statistics.totalRetries++;
+        return this._retryCounters.get(messageId);
+    }
+    getRetryCount(messageId) {
+        return this._retryCounters.get(messageId) || 0;
+    }
+    hasExceededMaxRetries(messageId) {
+        return this.getRetryCount(messageId) >= this.maxMsgRetryCount;
+    }
+    markRetrySuccess(messageId) {
+        this.statistics.successfulRetries++;
+        this._retryCounters.delete(messageId);
+        this._cancelPendingPhoneRequest(messageId);
+    }
+    markRetryFailed(messageId) {
+        this.statistics.failedRetries++;
+        this._retryCounters.delete(messageId);
+    }
+    schedulePhoneRequest(messageId, callback, delay = PHONE_REQUEST_DELAY) {
+        this._cancelPendingPhoneRequest(messageId);
+        this._pendingPhoneRequests[messageId] = setTimeout(() => {
+            delete this._pendingPhoneRequests[messageId];
+            this.statistics.phoneRequests++;
+            callback();
+        }, delay);
+        this.logger.debug(`Scheduled phone request for message ${messageId} with ${delay}ms delay`);
+    }
+    cancelPendingPhoneRequest(messageId) {
+        const timeout = this._pendingPhoneRequests[messageId];
+        if (timeout) {
+            clearTimeout(timeout);
+            delete this._pendingPhoneRequests[messageId];
+            this.logger.debug(`Cancelled pending phone request for message ${messageId}`);
+        }
+    }
+    _keyToString(key) {
+        return `${key.to}:${key.id}`;
+    }
+    _cancelPendingPhoneRequest(messageId) {
+        const timeout = this._pendingPhoneRequests[messageId];
+        if (timeout) {
+            clearTimeout(timeout);
+            delete this._pendingPhoneRequests[messageId];
+            this.logger.debug(`Cancelled pending phone request for message ${messageId}`);
+        }
+    }
+}
+
+exports.MessageRetryManager = MessageRetryManager;