whalibmob 5.5.31 → 5.5.33

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

@@ -1,7 +1,5 @@
 'use strict';
 
-const { dbg: _whaDbg } = require('./logger');
-
 const crypto = require('crypto');
 const https  = require('https');
 const tls    = require('tls');
@@ -49,7 +47,7 @@ async function httpPostViaSocks(path, body, waVersion, proxyUrl) {
     `User-Agent: ${userAgent}`,
     `Content-Type: application/x-www-form-urlencoded`,
     `Content-Length: ${Buffer.byteLength(body)}`,
-    `Connection: close`,
+    `Connection: keep-alive`,
     '',
     body
   ].join('\r\n');
@@ -693,7 +691,7 @@ async function requestSmsCode(store, method, opts) {
   // Auto-fallback on no_routes
   if (result && result._noRoutes && !autoFallbackDone) {
     autoFallbackDone = true;
-    _whaDbg(`[REG] ${method} returned no_routes — auto-trying ${fallbackMethod}`);
+    process.stderr.write(`[REG] ${method} returned no_routes — auto-trying ${fallbackMethod}\n`);
     result = await _tryMethod(fallbackMethod);
   }
 

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.33",
   "description": "WhatsApp library for interaction with WhatsApp Mobile API no web",
   "author": "Kunboruto20",
   "main": "index.js",