whalibmob 5.5.37 → 5.5.38

package/lib/DeviceManager.js

@@ -43,7 +43,14 @@ function jidStrToObj(jidStr) {
   if (server === 's.whatsapp.net' && device > 0) {
     return { user, agent: 0, device, server, toString() { return self; } };
   }
-  // JID_PAIR: used for @lid, @g.us, and primary (device-0) @s.whatsapp.net
+  // @lid multi-device (e.g. "112713111982325:2@lid"): JID_PAIR with user="112713111982325:2"
+  // so the server receives the colon-device in the user string, not stripped.
+  // Without this, ":2@lid" is encoded as device-0 "@lid" and the server
+  // returns the wrong bundle (or ignores device 2 entirely).
+  if (server === 'lid' && device > 0) {
+    return { user: raw, server, toString() { return self; } };
+  }
+  // JID_PAIR: used for @lid device-0, @g.us, and primary (device-0) @s.whatsapp.net
   return { user, server, toString() { return self; } };
 }
 
@@ -682,8 +689,25 @@ class DeviceManager {
       for (const [jid, bundle] of bundles) {
         try {
           await signalProto.buildSessionFromBundle(jid, bundle);
-          readyJids.push(jid);
-          _whaDbg('[DBG] LID_SESSION_BUILT jid=' + jid);
+          // ── CRITICAL: remap bundle JID back to @lid format ────────────────────
+          // fetchBundles always returns JIDs in @s.whatsapp.net format (because the
+          // WA server uses its own AD_JID / JID_PAIR encoding in responses).
+          // But the outer <message to="lidUser@lid"> requires ALL participant <to>
+          // nodes to also use @lid format — mixing @s.whatsapp.net participants with
+          // a @lid routing address causes the server to close the connection.
+          //
+          // The Signal session address is keyed only by (user, device) — the @server
+          // suffix is stripped by jidToAddress() — so the session is reachable via
+          // either @lid or @s.whatsapp.net.  We push the @lid form so the participants
+          // node is consistent with the routing.
+          //
+          // Mapping: strip @s.whatsapp.net / @lid suffix from jid, re-append @lid
+          // e.g. "112713111982325@s.whatsapp.net"   → "112713111982325@lid"
+          //      "112713111982325:2@s.whatsapp.net" → "112713111982325:2@lid"
+          const jidBase = jid.replace(/@(?:s\.whatsapp\.net|lid)$/, '');
+          const lidJidForDevice = jidBase + '@lid';
+          readyJids.push(lidJidForDevice);
+          _whaDbg('[DBG] LID_SESSION_BUILT jid=' + jid + ' → participant=' + lidJidForDevice);
         } catch (e) {
           _whaDbg('[DBG] LID_SESSION_ERR jid=' + jid + ' err=' + e.message);
         }

package/lib/messages/MessageSender.js

@@ -534,6 +534,18 @@ class MessageSender {
           this._devMgr.clearCache(members.map(phoneFromJid));
           return this._sendGroupMessage(toJid, msgId, plaintext, mediaType, options);
         }
+        // Error 479 = stale/dead Signal session — clear all sessions for every
+        // group member, flush device cache, rebuild from fresh bundles, retry once.
+        if (err && /\b479\b/.test(err.message) && !options._479retry) {
+          _whaDbg('[DBG] 479_GROUP clearing sessions for group ' + toJid);
+          const members = this._client._getGroupMembers
+            ? this._client._getGroupMembers(toJid) : [];
+          for (const memberJid of members) {
+            await this._clearSignalSessionsForRecipient(phoneFromJid(memberJid)).catch(() => {});
+          }
+          return this._sendGroupMessage(toJid, msgId, plaintext, mediaType,
+            Object.assign({}, options, { _479retry: true }));
+        }
         throw err;
       }
     }
@@ -545,10 +557,81 @@ class MessageSender {
         this._devMgr.clearCache([phoneFromJid(toJid)]);
         return this._sendDMMessage(toJid, msgId, plaintext, mediaType, options);
       }
+      // ── Error 479: stale / dead Signal session ────────────────────────────────
+      // The server rejected the ciphertext because it was encrypted with a Signal
+      // session key the server no longer recognises (recipient re-installed WA,
+      // changed device, or their prekey was exhausted / revoked).
+      //
+      // Recovery:
+      //   1. Delete all cached Signal sessions for this recipient (PN + LID).
+      //   2. Flush device-ID cache → forces a fresh usync IQ on next send.
+      //   3. Re-call _sendDMMessage → re-runs usync + fetchBundles + buildSession
+      //      + re-encrypts with a fresh PreKey message (pkmsg).
+      //
+      // _479retry flag prevents infinite loops: if the fresh session also gets
+      // 479 (extremely rare — server bug or banned account) we fail cleanly.
+      if (err && /\b479\b/.test(err.message) && !options._479retry) {
+        await this._clearSignalSessionsForRecipient(phoneFromJid(toJid));
+        // CRITICAL: generate a NEW msgId — the server already ACK'd (with error=479)
+        // the original ID and will close the connection if we re-send the same ID.
+        const retryMsgId = generateMessageId();
+        _whaDbg('[DBG] 479_RETRY new msgId=' + retryMsgId);
+        return this._sendDMMessage(toJid, retryMsgId, plaintext, mediaType,
+          Object.assign({}, options, { _479retry: true }));
+      }
+      // ─────────────────────────────────────────────────────────────────────────
       throw err;
     }
   }
 
+  // ─── Clear all Signal sessions for a phone-number recipient ─────────────────
+  //
+  // Called on error 479 (stale session).  Deletes:
+  //   • All Signal sessions keyed by phone-number device JIDs (e.g. 40756469325:0)
+  //   • The corresponding LID device session if a LID mapping is known
+  //
+  // Then flushes the device-ID cache for that phone so the next send re-runs
+  // usync (gets current device list) and re-fetches fresh prekey bundles.
+  async _clearSignalSessionsForRecipient(phone) {
+    _whaDbg('[DBG] 479_RECOVERY phone=' + phone + ' — clearing sessions + device cache');
+    const signal  = this._signal;
+    const devMgr  = this._devMgr;
+    const client  = this._client;
+
+    // ── 1. Get all known device JIDs for this phone (from cache) ──────────────
+    const devJids = devMgr._jidsFromCache([phone]);
+    for (const jid of devJids) {
+      try {
+        await signal.deleteSession(jid);
+        _whaDbg('[DBG] 479_DEL_SESSION jid=' + jid);
+      } catch (_) {}
+    }
+
+    // ── 2. Clear LID session if we have a LID mapping for this phone ──────────
+    // NOTE: LID JIDs use @lid server, NOT @s.whatsapp.net. Cannot use
+    // _jidsFromCache() (it hard-codes @s.whatsapp.net) — build JIDs manually.
+    const lidUser = client._pnToLid && client._pnToLid.get(phone);
+    if (lidUser) {
+      // Get all device IDs for this LID from cache (or assume device 0 primary)
+      const lidDeviceIds = (devMgr._dcGet && devMgr._dcGet('lid:' + lidUser)) || [0];
+      for (const devId of lidDeviceIds) {
+        const jid = (devId === 0) ? `${lidUser}@lid` : `${lidUser}:${devId}@lid`;
+        try {
+          await signal.deleteSession(jid);
+          _whaDbg('[DBG] 479_DEL_LID_SESSION jid=' + jid);
+        } catch (_) {}
+      }
+      // Always delete the bare primary JID too (in case it was stored without device suffix)
+      try { await signal.deleteSession(`${lidUser}@lid`); } catch (_) {}
+      // Flush LID device-ID cache so next send re-runs usync for LID
+      devMgr.clearCache(['lid:' + lidUser]);
+    }
+
+    // ── 3. Flush phone device cache → usync re-runs on next send ──────────────
+    devMgr.clearCache([phone]);
+    _whaDbg('[DBG] 479_CACHE_FLUSHED phone=' + phone);
+  }
+
   // ─── 1-to-1 multi-device fanout ───────────────────────────────────────────
 
   async _sendDMMessage(toJid, msgId, plaintext, mediaType, options) {

package/package.json

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