@hbmodsofc/baileys 2.4.0 → 3.0.0

package/engine-requirements.js

@@ -7,4 +7,4 @@ if (major < 20) {
     `   Please upgrade to Node.js 20+ to proceed.\n`
   );
   process.exit(1);
-}
+}

package/lib/Defaults/baileys-version.json

@@ -1,3 +1,3 @@
 {
-    "version": [2, 3000, 1026924051]
+    "version": [2, 3000, 1027934701]
 }

package/lib/Defaults/index.js

@@ -1,147 +1,122 @@
-var __importDefault = this && this.__importDefault || function (a) {
-    return a && a.__esModule ? a : { "default": a }
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 
-Object.defineProperty(exports, "__esModule", { value: !0 });
+const PHONENUMBER_MCC = require("./phonenumber_mcc.json");
+exports.PHONENUMBER_MCC = PHONENUMBER_MCC;
 
-exports.DEFAULT_CACHE_TTLS =
-    exports.INITIAL_PREKEY_COUNT =
-    exports.MIN_PREKEY_COUNT =
-    exports.MEDIA_KEYS =
-    exports.MEDIA_HKDF_KEY_MAPPING =
-    exports.MEDIA_PATH_MAP =
-    exports.DEFAULT_CONNECTION_CONFIG =
-    exports.PROCESSABLE_HISTORY_TYPES =
-    exports.WA_CERT_DETAILS =
-    exports.URL_REGEX =
-    exports.NOISE_WA_HEADER =
-    exports.KEY_BUNDLE_TYPE =
-    exports.DICT_VERSION =
-    exports.NOISE_MODE =
-    exports.WA_DEFAULT_EPHEMERAL =
-    exports.PHONE_CONNECTION_CB =
-    exports.DEF_TAG_PREFIX =
-    exports.DEF_CALLBACK_PREFIX =
-    exports.DEFAULT_ORIGIN =
-    exports.UNAUTHORIZED_CODES =
-    void 0;
-
-const crypto_1 = require("crypto");
-const WAProto_1 = require("../../WAProto"),
-    libsignal_1 = require("../Signal/libsignal"),
-    Utils_1 = require("../Utils"),
-    logger_1 = __importDefault(require("../Utils/logger")),
-    baileys_version_json_1 = require("./baileys-version.json"),
-    phonenumber_mcc_json_1 = __importDefault(require("./phonenumber-mcc.json"));
-
-exports.UNAUTHORIZED_CODES = [401, 403, 419];
+exports.DEFAULT_CACHE_TTLS = exports.MIN_UPLOAD_INTERVAL = exports.UPLOAD_TIMEOUT = exports.INITIAL_PREKEY_COUNT = exports.MIN_PREKEY_COUNT = exports.MEDIA_KEYS = exports.MEDIA_HKDF_KEY_MAPPING = exports.MEDIA_PATH_MAP = exports.DEFAULT_CONNECTION_CONFIG = exports.PROCESSABLE_HISTORY_TYPES = exports.WA_CERT_DETAILS = exports.URL_REGEX = exports.NOISE_WA_HEADER = exports.KEY_BUNDLE_TYPE = exports.DICT_VERSION = exports.NOISE_MODE = exports.WA_DEFAULT_EPHEMERAL = exports.WA_ADV_HOSTED_DEVICE_SIG_PREFIX = exports.WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = exports.WA_ADV_DEVICE_SIG_PREFIX = exports.WA_ADV_ACCOUNT_SIG_PREFIX = exports.UNAUTHORIZED_CODES = exports.version = void 0;
+const WAProto_1 = require("../../WAProto");
+const libsignal_1 = require("../Signal/libsignal");
+const browser_utils_1 = require("../Utils/browser-utils");
+const logger_1 = __importDefault(require("../Utils/logger"));
 exports.version = [2, 3000, 1027934701];
-exports.PHONENUMBER_MCC = phonenumber_mcc_json_1.default;
-exports.DEFAULT_ORIGIN = "https://web.whatsapp.com";
-exports.MOBILE_ENDPOINT = 'g.whatsapp.net';
-exports.MOBILE_PORT = 443;
-exports.DEF_CALLBACK_PREFIX = "CB:";
-exports.DEF_TAG_PREFIX = "TAG:";
-exports.PHONE_CONNECTION_CB = "CB:Pong";
-exports.WA_DEFAULT_EPHEMERAL = 604800;
-const WA_VERSION = '2.25.23.24';
-const WA_VERSION_HASH = (0, crypto_1.createHash)('md5').update(WA_VERSION).digest('hex');
-exports.MOBILE_TOKEN = Buffer.from('0a1mLfGUIBVrMKF1RdvLI5lkRBvof6vn0fD2QRSM' + WA_VERSION_HASH);
-exports.MOBILE_REGISTRATION_ENDPOINT = 'https://v.whatsapp.net/v2';
-exports.MOBILE_USERAGENT = `WhatsApp/${WA_VERSION} iOS/17.5.1 Device/Apple-iPhone_13`;
-exports.REGISTRATION_PUBLIC_KEY = Buffer.from([
-    5, 142, 140, 15, 116, 195, 235, 197, 215, 166, 134, 92, 108, 60, 132, 56, 86, 176, 97, 33, 204, 232, 234, 119, 77,
-    34, 251, 111, 18, 37, 18, 48, 45,
-]);
-exports.NOISE_MODE = "Noise_XX_25519_AESGCM_SHA256\x00\x00\x00\x00";
-exports.DICT_VERSION = 2;
+exports.UNAUTHORIZED_CODES = [401, 403, 419];
+exports.DEFAULT_ORIGIN = 'https://web.whatsapp.com';
+exports.CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';
+exports.CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/';
+exports.DEF_CALLBACK_PREFIX = 'CB:';
+exports.DEF_TAG_PREFIX = 'TAG:';
+exports.PHONE_CONNECTION_CB = 'CB:Pong';
+exports.WA_ADV_ACCOUNT_SIG_PREFIX = Buffer.from([6, 0]);
+exports.WA_ADV_DEVICE_SIG_PREFIX = Buffer.from([6, 1]);
+exports.WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = Buffer.from([6, 5]);
+exports.WA_ADV_HOSTED_DEVICE_SIG_PREFIX = Buffer.from([6, 6]);
+exports.WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60;
+exports.NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0';
+exports.DICT_VERSION = 3;
 exports.KEY_BUNDLE_TYPE = Buffer.from([5]);
 exports.NOISE_WA_HEADER = Buffer.from([87, 65, 6, exports.DICT_VERSION]);
-exports.PROTOCOL_VERSION = [5, 2];
-exports.MOBILE_NOISE_HEADER = Buffer.concat([Buffer.from('WA'), Buffer.from(exports.PROTOCOL_VERSION)]);
-
 exports.URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
-exports.WA_CERT_DETAILS = { SERIAL: 0 };
-
+exports.WA_CERT_DETAILS = {
+    SERIAL: 0
+};
 exports.PROCESSABLE_HISTORY_TYPES = [
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.INITIAL_BOOTSTRAP,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.PUSH_NAME,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.RECENT,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.FULL,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.ON_DEMAND
+    WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP,
+    WAProto_1.proto.HistorySync.HistorySyncType.PUSH_NAME,
+    WAProto_1.proto.HistorySync.HistorySyncType.RECENT,
+    WAProto_1.proto.HistorySync.HistorySyncType.FULL,
+    WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND,
+    WAProto_1.proto.HistorySync.HistorySyncType.NON_BLOCKING_DATA,
+    WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_STATUS_V3,
 ];
-
 exports.DEFAULT_CONNECTION_CONFIG = {
-    version: baileys_version_json_1.version,
-    browser: Utils_1.Browsers.ubuntu("Chrome"),
-    waWebSocketUrl: "wss://web.whatsapp.com/ws/chat",
-    connectTimeoutMs: 2E4,
-    keepAliveIntervalMs: 3E4,
-    logger: logger_1.default.child({ class: "baileys" }),
-    printQRInTerminal: !1,
-    emitOwnEvents: !0,
-    defaultQueryTimeoutMs: 6E4,
+    version: exports.version,
+    browser: (0, browser_utils_1.Browsers)('Chrome'),
+    waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
+    connectTimeoutMs: 20_000,
+    keepAliveIntervalMs: 30_000,
+    logger: logger_1.default.child({ class: 'baileys' }),
+    emitOwnEvents: true,
+    defaultQueryTimeoutMs: 60_000,
     customUploadHosts: [],
     retryRequestDelayMs: 250,
     maxMsgRetryCount: 5,
-    fireInitQueries: !0,
-    auth: void 0,
-    markOnlineOnConnect: !0,
-    syncFullHistory: !1,
-    patchMessageBeforeSending: a => a,
-    shouldSyncHistoryMessage: () => !0,
-    shouldIgnoreJid: () => !1,
+    fireInitQueries: true,
+    auth: undefined,
+    markOnlineOnConnect: true,
+    syncFullHistory: true,
+    patchMessageBeforeSending: msg => msg,
+    shouldSyncHistoryMessage: () => true,
+    shouldIgnoreJid: () => false,
     linkPreviewImageThumbnailWidth: 192,
-    transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3E3 },
-    generateHighQualityLinkPreview: !1,
+    transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
+    generateHighQualityLinkPreview: false,
+    enableAutoSessionRecreation: true,
+    enableRecentMessageCache: true,
     options: {},
-    appStateMacVerification: { patch: !1, snapshot: !1 },
-    countryCode: "US",
-    getMessage: async () => { },
-    cachedGroupMetadata: async () => { },
+    appStateMacVerification: {
+        patch: false,
+        snapshot: false
+    },
+    countryCode: 'US',
+    getMessage: async () => undefined,
+    cachedGroupMetadata: async () => undefined,
     makeSignalRepository: libsignal_1.makeLibSignalRepository
 };
-
 exports.MEDIA_PATH_MAP = {
-    image: "/mms/image",
-    video: "/mms/video",
-    document: "/mms/document",
-    audio: "/mms/audio",
-    sticker: "/mms/image",
-    "thumbnail-link": "/mms/image",
-    "product-catalog-image": "/product/image",
-    "md-app-state": "",
-    "md-msg-hist": "/mms/md-app-state"
+    image: '/mms/image',
+    video: '/mms/video',
+    document: '/mms/document',
+    audio: '/mms/audio',
+    sticker: '/mms/image',
+    'thumbnail-link': '/mms/image',
+    'product-catalog-image': '/product/image',
+    'md-app-state': '',
+    'md-msg-hist': '/mms/md-app-state',
+    'biz-cover-photo': '/pps/biz-cover-photo'
 };
-
 exports.MEDIA_HKDF_KEY_MAPPING = {
-    audio: "Audio",
-    document: "Document",
-    gif: "Video",
-    image: "Image",
-    ppic: "",
-    product: "Image",
-    ptt: "Audio",
-    sticker: "Image",
-    video: "Video",
-    "thumbnail-document": "Document Thumbnail",
-    "thumbnail-image": "Image Thumbnail",
-    "thumbnail-video": "Video Thumbnail",
-    "thumbnail-link": "Link Thumbnail",
-    "md-msg-hist": "History",
-    "md-app-state": "App State",
-    "product-catalog-image": "",
-    "payment-bg-image": "Payment Background",
-    ptv: "Video"
+    audio: 'Audio',
+    document: 'Document',
+    gif: 'Video',
+    image: 'Image',
+    ppic: '',
+    product: 'Image',
+    ptt: 'Audio',
+    sticker: 'Image',
+    video: 'Video',
+    'thumbnail-document': 'Document Thumbnail',
+    'thumbnail-image': 'Image Thumbnail',
+    'thumbnail-video': 'Video Thumbnail',
+    'thumbnail-link': 'Link Thumbnail',
+    'md-msg-hist': 'History',
+    'md-app-state': 'App State',
+    'product-catalog-image': '',
+    'payment-bg-image': 'Payment Background',
+    ptv: 'Video',
+    'biz-cover-photo': 'Image'
 };
-
 exports.MEDIA_KEYS = Object.keys(exports.MEDIA_PATH_MAP);
 exports.MIN_PREKEY_COUNT = 5;
-exports.INITIAL_PREKEY_COUNT = 30;
-
+exports.INITIAL_PREKEY_COUNT = 812;
+exports.UPLOAD_TIMEOUT = 30000;
+exports.MIN_UPLOAD_INTERVAL = 5000;
 exports.DEFAULT_CACHE_TTLS = {
-    SIGNAL_STORE: 300,
-    MSG_RETRY: 3600,
-    CALL_OFFER: 300,
-    USER_DEVICES: 300
+    SIGNAL_STORE: 5 * 60,
+    MSG_RETRY: 60 * 60,
+    CALL_OFFER: 5 * 60,
+    USER_DEVICES: 5 * 60
 };

package/lib/Defaults/phonenumber_mcc.json

@@ -0,0 +1,223 @@
+{
+	"93": 412,
+	"355": 276,
+	"213": 603,
+	"1-684": 544,
+	"376": 213,
+	"244": 631,
+	"1-264": 365,
+	"1-268": 344,
+	"54": 722,
+	"374": 283,
+	"297": 363,
+	"61": 505,
+	"43": 232,
+	"994": 400,
+	"1-242": 364,
+	"973": 426,
+	"880": 470,
+	"1-246": 342,
+	"375": 257,
+	"32": 206,
+	"501": 702,
+	"229": 616,
+	"1-441": 350,
+	"975": 402,
+	"591": 736,
+	"387": 218,
+	"267": 652,
+	"55": 724,
+	"1-284": 348,
+	"673": 528,
+	"359": 284,
+	"226": 613,
+	"257": 642,
+	"855": 456,
+	"237": 624,
+	"238": 625,
+	"1-345": 346,
+	"236": 623,
+	"235": 622,
+	"56": 730,
+	"86": 454,
+	"57": 732,
+	"269": 654,
+	"682": 548,
+	"506": 712,
+	"385": 219,
+	"53": 368,
+	"357": 280,
+	"420": 230,
+	"243": 630,
+	"45": 238,
+	"253": 638,
+	"1-767": 366,
+	"1-809": 370,
+	"1-849": 370,
+	"1-829": 370,
+	"593": 740,
+	"20": 602,
+	"503": 706,
+	"240": 627,
+	"291": 657,
+	"372": 248,
+	"251": 636,
+	"500": 750,
+	"298": 288,
+	"679": 542,
+	"358": 244,
+	"33": 208,
+	"689": 547,
+	"241": 628,
+	"220": 607,
+	"995": 282,
+	"49": 262,
+	"233": 620,
+	"350": 266,
+	"30": 202,
+	"299": 290,
+	"1-473": 352,
+	"1-671": 535,
+	"502": 704,
+	"224": 537,
+	"592": 738,
+	"509": 372,
+	"504": 708,
+	"852": 454,
+	"36": 216,
+	"354": 274,
+	"91": 404,
+	"62": 510,
+	"98": 432,
+	"964": 418,
+	"353": 234,
+	"972": 425,
+	"39": 222,
+	"225": 612,
+	"1-876": 338,
+	"81": 440,
+	"962": 416,
+	"254": 639,
+	"686": 545,
+	"383": 221,
+	"965": 419,
+	"371": 247,
+	"961": 415,
+	"266": 651,
+	"231": 618,
+	"218": 606,
+	"423": 295,
+	"370": 246,
+	"352": 270,
+	"389": 294,
+	"261": 646,
+	"265": 650,
+	"60": 502,
+	"960": 472,
+	"223": 610,
+	"356": 278,
+	"692": 551,
+	"222": 609,
+	"230": 617,
+	"52": 334,
+	"691": 550,
+	"373": 259,
+	"377": 212,
+	"976": 428,
+	"382": 297,
+	"1-664": 354,
+	"212": 604,
+	"258": 643,
+	"95": 414,
+	"264": 649,
+	"674": 536,
+	"977": 429,
+	"31": 204,
+	"687": 546,
+	"64": 530,
+	"505": 710,
+	"227": 614,
+	"234": 621,
+	"683": 555,
+	"1-670": 534,
+	"47": 242,
+	"968": 226,
+	"92": 410,
+	"680": 552,
+	"970": 423,
+	"507": 714,
+	"675": 537,
+	"595": 744,
+	"51": 716,
+	"63": 515,
+	"48": 260,
+	"351": 268,
+	"1-787, 1-939": 330,
+	"974": 427,
+	"242": 630,
+	"40": 226,
+	"7": 250,
+	"250": 635,
+	"290": 658,
+	"1-869": 356,
+	"1-758": 358,
+	"508": 308,
+	"1-784": 360,
+	"685": 544,
+	"378": 292,
+	"239": 626,
+	"966": 420,
+	"221": 608,
+	"381": 220,
+	"248": 633,
+	"232": 619,
+	"65": 525,
+	"386": 293,
+	"677": 540,
+	"27": 655,
+	"211": 659,
+	"34": 214,
+	"94": 413,
+	"249": 634,
+	"597": 746,
+	"268": 653,
+	"46": 240,
+	"41": 228,
+	"963": 417,
+	"886": 466,
+	"992": 436,
+	"255": 640,
+	"66": 520,
+	"228": 615,
+	"690": 554,
+	"676": 539,
+	"1-868": 374,
+	"216": 605,
+	"90": 286,
+	"993": 438,
+	"1-649": 376,
+	"688": 553,
+	"1-340": 332,
+	"256": 641,
+	"380": 255,
+	"971": 424,
+	"44": 234,
+	"1": 310,
+	"598": 748,
+	"998": 434,
+	"678": 541,
+	"379": 225,
+	"58": 734,
+	"681": 543,
+	"967": 421,
+	"260": 645,
+	"263": 648,
+	"670": 514,
+	"245": 632,
+	"856": 457,
+	"599": 362,
+	"850": 467,
+	"262": 647,
+	"82": 450,
+	"84": 452
+}

package/lib/Socket/Client/index.js

@@ -14,6 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./abstract-socket-client"), exports);
-__exportStar(require("./mobile-socket-client"), exports);
-__exportStar(require("./web-socket-client"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./websocket"), exports);

package/lib/Socket/Client/{web-socket-client.js → websocket.js}

@@ -6,11 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketClient = void 0;
 const ws_1 = __importDefault(require("ws"));
 const Defaults_1 = require("../../Defaults");
-const abstract_socket_client_1 = require("./abstract-socket-client");
-class WebSocketClient extends abstract_socket_client_1.AbstractSocketClient {
+const types_1 = require("./types");
+class WebSocketClient extends types_1.AbstractSocketClient {
     constructor() {
         super(...arguments);
         this.socket = null;
+        // queue & dispatch variables for throttling outgoing messages to avoid rate limits
+        this._queue = [];
+        this._isDispatching = false;
+        this._lastDispatch = 0;
+        this._minSendIntervalMs = (Defaults_1.DEFAULT_CONNECTION_CONFIG && Defaults_1.DEFAULT_CONNECTION_CONFIG.minSendIntervalMs) || 50;
     }
     get isOpen() {
         var _a;
@@ -53,10 +58,54 @@ class WebSocketClient extends abstract_socket_client_1.AbstractSocketClient {
         this.socket.close();
         this.socket = null;
     }
+    async restart() {
+        if (this.socket) {
+            await new Promise(resolve => {
+                this.socket.once('close', resolve);
+                this.socket.terminate();
+            });
+            this.socket = null;
+        }
+        await this.connect();
+    }
     send(str, cb) {
-        var _a;
-        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(str, cb);
-        return Boolean(this.socket);
+        // throttle sends to reduce rate-limit likelihood
+        const doSend = () => {
+            var _a;
+            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(str, cb);
+            return Boolean(this.socket);
+        };
+        this._queue.push(doSend);
+        this._dispatch();
+        return true;
+    }
+
+    _dispatch() {
+        if (this._isDispatching) {
+            return;
+        }
+        this._isDispatching = true;
+        const tick = () => {
+            const now = Date.now();
+            if (this._queue.length === 0) {
+                this._isDispatching = false;
+                return;
+            }
+            const delta = now - this._lastDispatch;
+            const wait = Math.max(0, this._minSendIntervalMs - delta);
+            setTimeout(() => {
+                const fn = this._queue.shift();
+                this._lastDispatch = Date.now();
+                try {
+                    fn && fn();
+                }
+                catch (_err) {
+                    // ignore send errors here; they'll surface elsewhere
+                }
+                tick();
+            }, wait);
+        };
+        tick();
     }
 }
 exports.WebSocketClient = WebSocketClient;

package/lib/Socket/business.js

@@ -6,8 +6,13 @@ const WABinary_1 = require("../WABinary");
 const generic_utils_1 = require("../WABinary/generic-utils");
 const messages_recv_1 = require("./messages-recv");
 const makeBusinessSocket = (config) => {
-    const sock = (0, messages_recv_1.makeMessagesRecvSocket)(config);
-    const { authState, query, waUploadToServer } = sock;
+    const sock = (0, messages_recv_1.makeMessagesRecvSocket)({
+    ...config,
+    forceNewConnection: true,
+    syncFullHistory: false,
+    shouldIgnoreJid: () => false
+});
+    const { authState, query, waUploadToServer, refreshMediaConn } = sock;
     const getCatalog = async ({ jid, limit, cursor }) => {
         var _a;
         jid = jid || ((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id);
@@ -249,6 +254,7 @@ const makeBusinessSocket = (config) => {
     return {
         ...sock,
         logger: config.logger,
+        refreshMediaConn,
         getOrderDetails,
         getCatalog,
         getCollections,