whalibmob 5.5.31 → 5.5.32

package/lib/Client.js

@@ -122,6 +122,7 @@ class WhalibmobClient extends EventEmitter {
     this._connected     = false;
     this._reconnecting  = false;
     this._reconnectTry  = 0;
+    this._hasConnectedOnce = false;   // true after first successful open; used to detect reconnects
     this._phoneNumber   = null;
     this._mediaConn     = null;
     this._pendingIqs       = new Map();   // id → resolve fn
@@ -277,6 +278,32 @@ class WhalibmobClient extends EventEmitter {
 
     this._requestMediaConnection();
     this._uploadPreKeys();
+
+    // ── Reconnect: flush stale device cache + background re-usync ─────────────
+    // On first connect _hasConnectedOnce is false — nothing extra to do.
+    // On every reconnect (network drop / NAT reset / server restart) we flush the
+    // in-memory device cache because contacts may have linked or unlinked devices
+    // while we were offline.  Disk files are kept for next restart warm-read;
+    // in-memory entries are cleared so the next send triggers a fresh usync IQ.
+    if (this._hasConnectedOnce && this._devMgr) {
+      const phonesInCache = Object.keys(this._devMgr._cacheSnapshot || {});
+      _whaDbg('[DBG] RECONNECT: flushing device cache (' + phonesInCache.length + ' entries) for fresh usync');
+      this._devMgr._dcFlush();
+
+      // Immediately re-usync own devices in the background (tablets / linked devices
+      // could have been added or unlinked while we were offline).
+      if (this._store && this._store.phoneNumber && this._signal) {
+        const ownPhone = this._store.phoneNumber;
+        setImmediate(() => {
+          if (!this._connected || !this._devMgr) return;
+          this._devMgr.ensureOwnDeviceSessions(ownPhone, this._signal, false)
+            .then(() => _whaDbg('[DBG] RECONNECT own-device usync done'))
+            .catch(e  => _whaDbg('[DBG] RECONNECT own-device usync err: ' + e.message));
+        });
+      }
+    }
+    this._hasConnectedOnce = true;
+
     this.emit('connected');
   }
 
@@ -1009,6 +1036,50 @@ class WhalibmobClient extends EventEmitter {
       this._handlePrivacyTokenNotification(node);
     }
 
+    if (type === 'devices') {
+      // Server push: a contact's linked device list changed (they linked or
+      // unlinked a tablet, desktop, etc.).  Invalidate that phone's cache entry
+      // so the next send triggers a fresh usync IQ and reaches all their devices.
+      const fromJid   = attrs.from || '';
+      const fromPhone = fromJid.split('@')[0].split(':')[0];
+      if (fromPhone && this._devMgr) {
+        this._devMgr._dcDel([fromPhone]);
+        _whaDbg('[DBG] NOTIF_DEVICES invalidated cache for ' + fromPhone);
+        // Also process any inline <devices> list the server included
+        const devicesNode = findChildDeep(node, 'devices');
+        if (devicesNode) this._processDeviceUpdate(devicesNode);
+        // Background re-usync so the cache is warm before the next send
+        if (this._signal) {
+          setImmediate(() => {
+            if (!this._connected || !this._devMgr) return;
+            this._devMgr.bulkEnsureSessions([fromPhone], this._signal, false)
+              .then(() => _whaDbg('[DBG] NOTIF_DEVICES bg-usync done for ' + fromPhone))
+              .catch(e  => _whaDbg('[DBG] NOTIF_DEVICES bg-usync err: ' + e.message));
+          });
+        }
+      }
+    }
+
+    if (type === 'identity') {
+      // Server push: a contact re-registered WhatsApp (new identity key / new phone).
+      // Their old Signal sessions are no longer valid — clear them and the device
+      // cache so the next send builds a fresh pkmsg session from scratch.
+      const fromJid   = attrs.from || '';
+      const fromPhone = fromJid.split('@')[0].split(':')[0];
+      if (fromPhone && this._devMgr) {
+        this._devMgr._dcDel([fromPhone]);
+        _whaDbg('[DBG] NOTIF_IDENTITY flushed device cache for re-registered ' + fromPhone);
+      }
+      if (fromPhone && this._signal && this._signal.store && this._signal.store._sessions) {
+        const sessions = this._signal.store._sessions;
+        let cleared = 0;
+        for (const addr of Object.keys(sessions)) {
+          if (addr.startsWith(fromPhone + '.')) { delete sessions[addr]; cleared++; }
+        }
+        _whaDbg('[DBG] NOTIF_IDENTITY cleared ' + cleared + ' Signal sessions for ' + fromPhone);
+      }
+    }
+
     // Ack the notification
     if (this._socket && this._connected) {
       this._socket.sendNode(new BinaryNode('ack', {
@@ -1021,16 +1092,29 @@ class WhalibmobClient extends EventEmitter {
   }
 
   _processDeviceUpdate(devicesNode) {
-    if (!Array.isArray(devicesNode.content)) return;
+    // Called from _handleNotification(type='account_sync') and type='devices'.
+    // Rebuilds the device cache for the affected phones from the server-provided list.
+    // Previous bug: called Set.add() on cache entries that are number[] arrays → silently failed.
+    if (!Array.isArray(devicesNode.content) || !this._devMgr) return;
+
+    // Group all device IDs per phone from the notification
+    const phoneDevices = new Map();  // phone → number[]
     for (const deviceNode of devicesNode.content) {
       if (!deviceNode || deviceNode.description !== 'device') continue;
       const jid = deviceNode.attrs && deviceNode.attrs.jid;
-      if (jid && this._devMgr) {
-        const phone  = jid.split('@')[0].split(':')[0];
-        const device = parseInt((jid.split(':')[1] || '0').split('@')[0], 10);
-        if (!this._devMgr._deviceCache.has(phone)) this._devMgr._deviceCache.set(phone, new Set());
-        this._devMgr._deviceCache.get(phone).add(device);
-      }
+      if (!jid) continue;
+      const phone  = String(jid).split('@')[0].split(':')[0];
+      const device = parseInt((String(jid).split(':')[1] || '0').split('@')[0], 10);
+      if (!phoneDevices.has(phone)) phoneDevices.set(phone, []);
+      const ids = phoneDevices.get(phone);
+      if (!ids.includes(device)) ids.push(device);
+    }
+
+    // Replace cache entries atomically per phone (server list is authoritative)
+    for (const [phone, ids] of phoneDevices) {
+      this._devMgr._dcDel([phone]);       // evict stale entry
+      for (const id of ids) this._devMgr._dcAdd(phone, id);
+      _whaDbg('[DBG] DEV_UPDATE phone=' + phone + ' ids=[' + ids.join(',') + ']');
     }
   }
 

package/lib/Registration.js

@@ -11,9 +11,11 @@ const { getDeviceConfig } = require('./DeviceConfig');
 // ---------- SOCKS5 / Tor support ----------
 // Set TOR_PROXY=socks5://127.0.0.1:9050 (or any socks5 host) to route all
 // WhatsApp registration traffic through Tor / a residential proxy.
-const SOCKS_LIB = '/home/runner/workspace/.config/npm/node_global/lib/node_modules/socks/build/index.js';
+let SOCKS_LIB;
+try { SOCKS_LIB = require.resolve('socks'); }
+catch (_) { SOCKS_LIB = '/home/runner/workspace/.config/npm/node_global/lib/node_modules/socks/build/index.js'; }
 
-async function httpPostViaSocks(path, body, waVersion, proxyUrl) {
+async function httpPostViaSocks(path, body, waVersion, proxyUrl, locale) {
   const url     = new URL(proxyUrl);
   const pHost   = url.hostname;
   const pPort   = parseInt(url.port) || 1080;
@@ -43,13 +45,17 @@ async function httpPostViaSocks(path, body, waVersion, proxyUrl) {
   const userAgent = _dev.os === 'android'
     ? `WhatsApp/${waVersion} A`
     : `WhatsApp/${waVersion} iOS/${_dev.osVersion} Device/${_dev.model}`;
+  const _acceptLang = locale || 'en-US;q=1';
   const req = [
     `POST /v2${path} HTTP/1.1`,
     `Host: ${dHost}`,
     `User-Agent: ${userAgent}`,
+    `Accept: */*`,
+    `Accept-Language: ${_acceptLang}`,
+    `Accept-Encoding: gzip, deflate, br`,
     `Content-Type: application/x-www-form-urlencoded`,
     `Content-Length: ${Buffer.byteLength(body)}`,
-    `Connection: close`,
+    `Connection: keep-alive`,
     '',
     body
   ].join('\r\n');
@@ -216,6 +222,80 @@ const TWO_DIGIT_CCS = new Set([
   '95','98'
 ]);
 
+
+// ---------- Timezone offset per country code (UTC seconds) ----------
+// Used to populate time_zone_offset in /code requests — real iPhones
+// always send this field with their local offset.
+const CC_TZ_OFFSET = {
+  '1':   -18000, // US Eastern
+  '7':    10800, // Russia Moscow
+  '20':   7200,  // Egypt
+  '27':   7200,  // South Africa
+  '30':   7200,  // Greece
+  '31':   3600,  // Netherlands
+  '32':   3600,  // Belgium
+  '33':   3600,  // France
+  '34':   3600,  // Spain
+  '36':   3600,  // Hungary
+  '39':   3600,  // Italy
+  '40':   7200,  // Romania
+  '41':   3600,  // Switzerland
+  '43':   3600,  // Austria
+  '44':      0,  // UK
+  '45':   3600,  // Denmark
+  '46':   3600,  // Sweden
+  '47':   3600,  // Norway
+  '48':   3600,  // Poland
+  '49':   3600,  // Germany
+  '51':  -18000, // Peru
+  '52':  -21600, // Mexico
+  '54':  -10800, // Argentina
+  '55':  -10800, // Brazil
+  '56':  -14400, // Chile
+  '57':  -18000, // Colombia
+  '58':  -14400, // Venezuela
+  '60':   28800, // Malaysia
+  '61':   36000, // Australia
+  '62':   25200, // Indonesia
+  '63':   28800, // Philippines
+  '64':   43200, // New Zealand
+  '65':   28800, // Singapore
+  '66':   25200, // Thailand
+  '81':   32400, // Japan
+  '82':   32400, // South Korea
+  '84':   25200, // Vietnam
+  '86':   28800, // China
+  '90':   10800, // Turkey
+  '91':   19800, // India (IST = UTC+5:30)
+  '92':   18000, // Pakistan
+  '93':   16200, // Afghanistan (UTC+4:30)
+  '94':   19800, // Sri Lanka
+  '95':   23400, // Myanmar (UTC+6:30)
+  '98':   12600, // Iran (UTC+3:30)
+  '212':   3600, // Morocco
+  '213':   3600, // Algeria
+  '216':   3600, // Tunisia
+  '218':   7200, // Libya
+  '234':   3600, // Nigeria
+  '254':  10800, // Kenya
+  '255':  10800, // Tanzania
+  '256':  10800, // Uganda
+  '351':     0,  // Portugal
+  '353':     0,  // Ireland
+  '358':   7200, // Finland
+  '380':   7200, // Ukraine
+  '420':   3600, // Czech Republic
+  '966':  10800, // Saudi Arabia
+  '971':  14400, // UAE
+  '972':   7200, // Israel
+  '880':  21600, // Bangladesh
+};
+
+function getTzOffset(cc) {
+  const v = CC_TZ_OFFSET[String(cc)];
+  return (v !== undefined) ? v : 0;
+}
+
 function parsePhone(phoneNumber) {
   const str = String(phoneNumber).replace(/\D/g, '');
 
@@ -413,9 +493,9 @@ function encryptPayload(plaintext) {
 
 // ---------- HTTP ----------
 
-function httpPost(path, body, waVersion) {
+function httpPost(path, body, waVersion, locale) {
   const proxy = process.env.TOR_PROXY || process.env.SOCKS_PROXY || '';
-  if (proxy) return httpPostViaSocks(path, body, waVersion, proxy);
+  if (proxy) return httpPostViaSocks(path, body, waVersion, proxy, locale);
 
   return new Promise((resolve, reject) => {
     const _httpDev  = getDeviceConfig();
@@ -423,6 +503,7 @@ function httpPost(path, body, waVersion) {
       ? `WhatsApp/${waVersion} A`
       : `WhatsApp/${waVersion} iOS/${_httpDev.osVersion} Device/${_httpDev.model}`;
     const bodyBuf = Buffer.from(body, 'utf8');
+    const acceptLang = locale || 'en-US;q=1';
     const opts = {
       hostname: 'v.whatsapp.net',
       port: 443,
@@ -430,9 +511,13 @@ function httpPost(path, body, waVersion) {
       method: 'POST',
       timeout: 20000,
       headers: {
-        'User-Agent':      userAgent,
-        'Content-Type':   'application/x-www-form-urlencoded',
-        'Content-Length': bodyBuf.length
+        'User-Agent':       userAgent,
+        'Accept':           '*/*',
+        'Accept-Language':  acceptLang,
+        'Accept-Encoding':  'gzip, deflate, br',
+        'Content-Type':     'application/x-www-form-urlencoded',
+        'Content-Length':   bodyBuf.length,
+        'Connection':       'keep-alive'
       }
     };
     const req = https.request(opts, (res) => {
@@ -458,7 +543,12 @@ async function sendRequest(path, store, waVersion, useToken, extraPairs) {
   const plaintext = buildPayload(store, waVersion, useToken, extraPairs);
   const enc = encryptPayload(plaintext);
   const body = 'ENC=' + enc;
-  return httpPost(path, body, waVersion);
+  const { cc: _srCc } = parsePhone(store.phoneNumber);
+  const _srMeta = getCountryMeta(_srCc);
+  const locale = _srMeta.lg === 'en'
+    ? `en-${_srMeta.lc};q=1`
+    : `${_srMeta.lg}-${_srMeta.lc};q=1, en-${_srMeta.lc};q=0.9`;
+  return httpPost(path, body, waVersion, locale);
 }
 
 // ---------- Public API ----------
@@ -501,7 +591,10 @@ async function checkNumberStatus(phoneNumber) {
     'sim_mcc',           meta.mcc,
     'sim_mnc',           meta.mnc,
     'reason',            '',
-    'cellular_strength', '1'
+    'cellular_strength', '3',
+    'network_radio_type','1',
+    'mistyped',          '0',
+    'time_zone_offset',  String(getTzOffset(cc))
   ];
 
   function hasBlock(r) {
@@ -608,13 +701,18 @@ async function requestSmsCode(store, method, opts) {
     if (!emailAddr) throw new Error('requestSmsCode: email method requires opts.email address');
     const { cc: _regCc } = parsePhone(store.phoneNumber);
     const _regMeta       = getCountryMeta(_regCc);
+    const _emailTz = String(getTzOffset(parsePhone(store.phoneNumber).cc));
     const extra = [
       'method',            'email',
       'email',             emailAddr,
       'sim_mcc',           _regMeta.mcc,
       'sim_mnc',           _regMeta.mnc,
       'reason',            '',
-      'cellular_strength', '1'
+      'cellular_strength', '3',
+      'network_radio_type','1',
+      'hasinrc',           _device.os === 'ios' ? '1' : null,
+      'mistyped',          '0',
+      'time_zone_offset',  _emailTz
     ];
     const result = await sendRequest('/code', store, waVersion, true, extra);
     const status = result.status;
@@ -632,13 +730,18 @@ async function requestSmsCode(store, method, opts) {
   const { cc: _regCc } = parsePhone(store.phoneNumber);
   const _regMeta       = getCountryMeta(_regCc);
 
+  const _regTz = String(getTzOffset(_regCc));
   async function _tryMethod(m) {
     const extra = [
       'method',            m,
       'sim_mcc',           _regMeta.mcc,
       'sim_mnc',           _regMeta.mnc,
       'reason',            '',
-      'cellular_strength', '1'
+      'cellular_strength', '3',
+      'network_radio_type','1',
+      'hasinrc',           _device.os === 'ios' ? '1' : null,
+      'mistyped',          '0',
+      'time_zone_offset',  _regTz
     ];
 
     // Retry loop:

package/lib/noise.js

@@ -310,8 +310,8 @@ class NoiseSocket extends EventEmitter {
         username:           BigInt(this.store.phoneNumber),
         passive:            false,
         pushName:           this.store.registered ? (this.store.name || null) : null,
-        shortConnect:       false,
-        connectType:        1,
+        shortConnect:       (this.store.connectAttemptCount || 0) > 0,
+        connectType:        (this.store.connectAttemptCount || 0) > 0 ? 3 : 1,
         connectReason:      1,
         connectAttemptCount: (this.store.connectAttemptCount || 0),
         device:             0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whalibmob",
-  "version": "5.5.31",
+  "version": "5.5.32",
   "description": "WhatsApp library for interaction with WhatsApp Mobile API no web",
   "author": "Kunboruto20",
   "main": "index.js",