whalibmob 5.5.33 → 5.5.35

package/lib/Client.js

@@ -117,8 +117,11 @@ class WhalibmobClient extends EventEmitter {
     this._signal        = null;
     this._devMgr        = null;
     this._sessionDir    = opts.sessionDir || process.env.HOME + '/.waSession';
-    this._pingTimer     = null;
-    this._keepTimer     = null;
+    this._pingTimer               = null;
+    this._keepTimer               = null;
+    this._watchdogTimer           = null;
+    this._watchdogLastPingSentAt  = 0;    // timestamp when last keepalive ping was sent
+    this._watchdogPongReceived    = true; // true = server responded after last ping (or no ping sent yet)
     this._connected     = false;
     this._reconnecting  = false;
     this._reconnectTry  = 0;
@@ -259,6 +262,8 @@ class WhalibmobClient extends EventEmitter {
 
   _onOpen(successNode) {
     this._connected = true;
+    this._watchdogLastPingSentAt = 0;
+    this._watchdogPongReceived   = true;
     this._startTimers();
 
     // ── Feature 1: Parse <success> node ──────────────────────────────────────
@@ -495,6 +500,9 @@ class WhalibmobClient extends EventEmitter {
 
     this._keepTimer = setInterval(() => {
       if (this._socket && this._connected) {
+        // Record the time we sent this ping so the watchdog can check for missing pongs.
+        this._watchdogLastPingSentAt = Date.now();
+        this._watchdogPongReceived   = false;
         this._socket.sendNode(new BinaryNode('iq', {
           id:    this._genMsgId(),
           to:    's.whatsapp.net',
@@ -504,18 +512,21 @@ class WhalibmobClient extends EventEmitter {
       }
     }, KEEPALIVE_INTERVAL);
 
-    // Watchdog: if no data arrived from WhatsApp in 2× keepalive window,
-    // the connection is dead but TCP hasn't emitted 'close' (common with NAT drops).
-    // Force-destroy the socket so _onTcpClose fires and reconnection kicks in.
+    // Watchdog: detects a truly dead TCP connection where the OS never emits 'close'
+    // (common with NAT/firewall drops).  Logic: if we sent a keepalive ping and the
+    // server did NOT reply within 2× keepalive window, the connection is dead.
+    // NOTE: idleness alone (bot sleeping between sends) is NOT treated as dead —
+    //       only an unanswered ping triggers the close, so any delay is safe.
     const WATCHDOG_INTERVAL = KEEPALIVE_INTERVAL * 2 + 5000;
     this._watchdogTimer = setInterval(() => {
       if (!this._socket || !this._connected) return;
-      const noiseSocket = this._socket;
-      const lastRx = noiseSocket._lastRxAt || 0;
-      const silentMs = Date.now() - lastRx;
-      if (silentMs > WATCHDOG_INTERVAL) {
-        _whaDbg('[DBG] WATCHDOG: no data for ' + Math.round(silentMs / 1000) + 's — force-closing dead connection');
-        try { noiseSocket.close(); } catch (_) {}
+      if (!this._watchdogPongReceived &&
+          this._watchdogLastPingSentAt > 0 &&
+          Date.now() - this._watchdogLastPingSentAt > WATCHDOG_INTERVAL) {
+        _whaDbg('[DBG] WATCHDOG: keepalive ping sent ' +
+          Math.round((Date.now() - this._watchdogLastPingSentAt) / 1000) +
+          's ago with no server response — force-closing dead connection');
+        try { this._socket.close(); } catch (_) {}
       }
     }, KEEPALIVE_INTERVAL);
   }
@@ -530,6 +541,8 @@ class WhalibmobClient extends EventEmitter {
 
   _onNode(node) {
     if (!node || !node.description) return;
+    // Any node from the server means the connection is alive — reset watchdog state.
+    this._watchdogPongReceived = true;
     const tag = node.description;
     // Debug: log every node received
     _whaDbg('[DBG] _onNode tag=' + tag + ' attrs=' + JSON.stringify(node.attrs || {}));

package/lib/DeviceManager.js

@@ -445,13 +445,16 @@ class DeviceManager {
     const iqNode = new BinaryNode('iq',
       { id: iqId, to: 's.whatsapp.net', type: 'get', xmlns: 'usync' },
       [new BinaryNode('usync',
-        { sid, mode: 'query', last: 'true', index: '0', context: 'interactive' },
+        { sid, mode: 'query', last: 'true', index: '0', context: 'message' },
         [
           new BinaryNode('query', {},
-            [new BinaryNode('devices', { version: '2' }, null)]   // FIX Bug 2: null, not deviceChildren
+            [
+              new BinaryNode('devices', { version: '2' }, null),
+              new BinaryNode('lid', {}, null)
+            ]
           ),
           new BinaryNode('list', {}, listChildren),
-          new BinaryNode('side_list', {}, null)                    // FIX Bug 3: required node
+          new BinaryNode('side_list', {}, null)
         ]
       )]
     );
@@ -771,10 +774,13 @@ class DeviceManager {
     const iqNode = new BinaryNode('iq',
       { id: iqId, to: 's.whatsapp.net', type: 'get', xmlns: 'usync' },
       [new BinaryNode('usync',
-        { sid, mode: 'query', last: 'true', index: '0', context: 'interactive' },
+        { sid, mode: 'query', last: 'true', index: '0', context: 'message' },
         [
           new BinaryNode('query', {},
-            [new BinaryNode('devices', { version: '2' }, null)]
+            [
+              new BinaryNode('devices', { version: '2' }, null),
+              new BinaryNode('lid', {}, null)
+            ]
           ),
           new BinaryNode('list', {},
             [new BinaryNode('user', { jid }, null)]

package/package.json

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