whalibmob 5.5.72 → 5.5.73

package/lib/BinaryNode.js

@@ -310,9 +310,15 @@ class NodeDecoder {
     // that does not exist, so device queries for it came back empty, no Signal
     // session was ever built, and group sends were rejected with ack 479.
     const server = _serverForAgent(agent);
+    // The device must survive stringification. Everything downstream keys off
+    // the string form: fetchBundles maps bundles by it, so five devices all
+    // rendering as "user@server" collapsed into one entry and left the rest
+    // without a session; and jidToAddress parses the ":device" out of it, so
+    // dropping it addressed every Signal session as device 0 — which is why a
+    // message from a linked device could not be decrypted either.
     return {
       user, agent, device, server,
-      toString() { return `${user}@${server}`; }
+      toString() { return device ? `${user}:${device}@${server}` : `${user}@${server}`; }
     };
   }
 }

package/lib/messages/MessageSender.js

@@ -554,6 +554,21 @@ class MessageSender {
           return this._sendGroupMessage(toJid, msgId, plaintext, mediaType,
             Object.assign({}, options, { _479retry: true }));
         }
+        // No session could be built for a single member — usually a prekey IQ
+        // that timed out, leaving the device list cached with nothing behind
+        // it. Purge the cached devices and sessions so the retry re-fetches
+        // bundles and opens fresh pkmsg sessions instead of failing again.
+        if (err && /NO_OPEN_SESSION/.test(err.message) && !options._noSessionRetry) {
+          _whaDbg('[DBG] NO_OPEN_SESSION group ' + toJid + ' — forcing fresh pkmsg\n');
+          await this._forceSessionRebuild(
+            (this._client._getGroupMembers ? this._client._getGroupMembers(toJid) : [])
+          );
+          if (this._signal && this._signal.senderKeyStore) {
+            this._signal.senderKeyStore.invalidateSKDM(toJid);
+          }
+          return this._sendGroupMessage(toJid, msgId, plaintext, mediaType,
+            Object.assign({}, options, { _noSessionRetry: true }));
+        }
         throw err;
       }
     }
@@ -587,11 +602,41 @@ class MessageSender {
         return this._sendDMMessage(toJid, retryMsgId, plaintext, mediaType,
           Object.assign({}, options, { _479retry: true }));
       }
+      // ── No session at all ────────────────────────────────────────────────────
+      // Nothing could be encrypted for any device, so there is no ciphertext to
+      // send. This is what a timed-out prekey IQ leaves behind: the device list
+      // is cached but no session sits behind it, and every later send fails the
+      // same way because the cache hides the gap. Purge both and retry once, so
+      // the next attempt re-fetches bundles and opens fresh pkmsg sessions.
+      if (err && /NO_OPEN_SESSION/.test(err.message) && !options._noSessionRetry) {
+        _whaDbg('[DBG] NO_OPEN_SESSION dm ' + toJid + ' — forcing fresh pkmsg\n');
+        await this._forceSessionRebuild([toJid]);
+        return this._sendDMMessage(toJid, generateMessageId(), plaintext, mediaType,
+          Object.assign({}, options, { _noSessionRetry: true }));
+      }
       // ─────────────────────────────────────────────────────────────────────────
       throw err;
     }
   }
 
+  // Drop every cached device list and Signal session for these JIDs so the next
+  // send is forced to re-query devices, re-fetch prekey bundles and open new
+  // pkmsg sessions from scratch.
+  async _forceSessionRebuild(jids) {
+    const phones = [...new Set((jids || []).map(phoneFromJid).filter(Boolean))];
+    for (const phone of phones) {
+      await this._clearSignalSessionsForRecipient(phone).catch(() => {});
+    }
+    if (this._devMgr && phones.length) {
+      this._devMgr.clearCache(phones);
+      // LID device lists are cached under a separate key.
+      if (typeof this._devMgr._dcDel === 'function') {
+        this._devMgr._dcDel(phones.map(p => 'lid:' + p));
+      }
+    }
+    _whaDbg('[DBG] FORCE_SESSION_REBUILD purged ' + phones.join(', ') + '\n');
+  }
+
   // ─── Clear all Signal sessions for a phone-number recipient ─────────────────
   //
   // Called on error 479 (stale session).  Deletes:

package/lib/signal/SignalProtocol.js

@@ -320,6 +320,14 @@ function jidToAddress(jid) {
   } else if (jid && jid.user) {
     user     = jid.user;
     deviceId = jid.device || 0;
+    // A @lid JID is encoded as JID_PAIR with the device kept inside the user
+    // part ("112713111982325:49"), so an object can carry its device there
+    // rather than in .device. Without this the address came out as device 0.
+    const colonIdx = String(user).indexOf(':');
+    if (colonIdx >= 0) {
+      if (!deviceId) deviceId = parseInt(String(user).slice(colonIdx + 1), 10) || 0;
+      user = String(user).slice(0, colonIdx);
+    }
   } else {
     user = String(jid);
   }

package/package.json

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