whalibmob 5.5.34 → 5.5.36

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

@@ -412,34 +412,45 @@ class DeviceManager {
     return jids.length > 0 ? jids : phones.map(p => makeDeviceJid(p, 0));
   }
 
-  // ─── FIXED usync IQ — corrects 4 bugs in the original implementation ────────
+  // ─── usync IQ — builds the device-list query exactly as WhatsApp APK does ────
   //
-  //  Bug 1 — Wrong <list> node format:
-  //    Was:  <user><contact>+phone</contact></user>
-  //    Fix:  <user jid="phone@s.whatsapp.net"/>     (jid ATTRIBUTE, not contact child)
+  //  APK-confirmed format (extracted from WhatsApp DEX string tables):
   //
-  //  Bug 2 — Wrong <query><devices> node:
-  //    Was:  <devices version="2"><device jid="phone@s.whatsapp.net"/></devices>
-  //    Fix:  <devices version="2"/>                  (NO device children in query)
+  //  <iq to="s.whatsapp.net" type="get" xmlns="usync">
+  //    <usync sid="..." mode="query" last="true" index="0" context="message">
+  //      <query>
+  //        <devices version="2" device_orientation="0" fetch_options="5"/>
+  //        <lid/>
+  //      </query>
+  //      <list>
+  //        <user><contact>+phone</contact></user>  ← Buffer, not jid attr string
+  //      </list>
+  //      <side_list/>
+  //    </usync>
+  //  </iq>
   //
-  //  Bug 3 — Missing <side_list/> node:
-  //    Was:  (absent)
-  //    Fix:  <side_list/>                            (required for LID device discovery)
+  //  Critical fixes vs original whalibmob implementation:
   //
-  //  Bug 4 — Wrong response parser:
-  //    Was:  deep walk looking for <device jid="..."> attrs
-  //    Fix:  navigate  usync → list → user[jid=...] → devices → device-list → device[id=N]
-  //          Server returns <device id="0"/>  NOT <device jid="..."/>
-  //          The phone/LID identifier is on the PARENT <user jid="..."> node, not on device.
+  //  Fix A — fetch_options="5" MISSING from <devices> node:
+  //    Without fetch_options="5", the WA server returns ONLY device 0 (primary phone).
+  //    fetch_options="5" instructs the server to return ALL linked devices.
+  //    device_orientation="0" is also required by the server.
+  //
+  //  Fix B — User list format: use <contact>+phone</contact> as Buffer content.
+  //    The BinaryNode encoder encodes string attributes as raw UTF-8 (BINARY_8 tag),
+  //    NOT as JID_PAIR binary format.  The APK sends phone as Buffer content of a
+  //    <contact> child node — this is what the server actually expects in the list.
   //
   async _doUsyncIq(phones) {
     const iqId = this._client._genMsgId();
     const sid  = this._client._genMsgId();
 
-    // FIX Bug 1: jid attribute on <user>, not a <contact> child node
-    // FIX Bug 2: <devices version="2"/> with NO children
+    // Fix B: <user><contact>+phone</contact></user> — matches APK exactly.
+    // Buffer.from ensures binary encoding (not raw UTF-8 string attribute).
     const listChildren = phones.map(p =>
-      new BinaryNode('user', { jid: `${p}@s.whatsapp.net` }, null)
+      new BinaryNode('user', {}, [
+        new BinaryNode('contact', {}, Buffer.from('+' + p, 'utf8'))
+      ])
     );
 
     const iqNode = new BinaryNode('iq',
@@ -449,7 +460,9 @@ class DeviceManager {
         [
           new BinaryNode('query', {},
             [
-              new BinaryNode('devices', { version: '2' }, null),
+              // Fix A: fetch_options="5" + device_orientation="0" — required for
+              // the server to return ALL linked devices, not just device 0.
+              new BinaryNode('devices', { version: '2', device_orientation: '0', fetch_options: '5' }, null),
               new BinaryNode('lid', {}, null)
             ]
           ),
@@ -771,6 +784,13 @@ class DeviceManager {
     const iqId = this._client._genMsgId();
     const sid  = this._client._genMsgId();
 
+    // Build proper JID object for binary encoding (JID_PAIR format, not raw string)
+    const jidStr   = typeof jid === 'string' ? jid : String(jid);
+    const atIdx    = jidStr.indexOf('@');
+    const jidUser  = atIdx >= 0 ? jidStr.slice(0, atIdx) : jidStr;
+    const jidSrv   = atIdx >= 0 ? jidStr.slice(atIdx + 1) : 'lid';
+    const jidObj   = { user: jidUser, server: jidSrv, toString() { return jidStr; } };
+
     const iqNode = new BinaryNode('iq',
       { id: iqId, to: 's.whatsapp.net', type: 'get', xmlns: 'usync' },
       [new BinaryNode('usync',
@@ -778,12 +798,13 @@ class DeviceManager {
         [
           new BinaryNode('query', {},
             [
-              new BinaryNode('devices', { version: '2' }, null),
+              // Fix A applied here too: fetch_options="5" + device_orientation="0"
+              new BinaryNode('devices', { version: '2', device_orientation: '0', fetch_options: '5' }, null),
               new BinaryNode('lid', {}, null)
             ]
           ),
           new BinaryNode('list', {},
-            [new BinaryNode('user', { jid }, null)]
+            [new BinaryNode('user', { jid: jidObj }, null)]
           ),
           new BinaryNode('side_list', {}, null)
         ]

package/package.json

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