whalibmob 5.6.3 → 5.6.4

package/lib/DeviceManager.js

@@ -901,7 +901,10 @@ class DeviceManager {
       }
     }
 
-    const deviceIds  = (this._dcGet(cacheKey) || []).filter(d => d !== 0);
+    // Same rule as the phone-addressed path: skip the device we are, not the
+    // device that happens to be numbered zero.
+    const selfDevice = this._ownDeviceIndex();
+    const deviceIds  = (this._dcGet(cacheKey) || []).filter(d => d !== selfDevice);
     const deviceJids = deviceIds.map(d => makeDeviceJid(lidUser, d, 'lid'));
     if (deviceJids.length === 0) return [];
 
@@ -1085,10 +1088,30 @@ class DeviceManager {
   //   On the first call we query usync, on all subsequent calls we return
   //   from cache — zero extra network round-trips.
   //
+  // Which device index this client occupies.
+  //
+  // A device registered over SMS is the account's primary and is always 0. A
+  // companion linked by pairing code occupies a numbered slot — and then
+  // device 0 is the owner's phone, which is a recipient like any other.
+  _ownDeviceIndex() {
+    const store = this._client && this._client._store;
+    return (store && store.deviceIndex) || 0;
+  }
+
   async ensureOwnDeviceSessions(ownPhone, signalProto, allowPkmsg = true) {
+    // Everything the account owns except the device doing the sending.
+    //
+    // This used to drop device 0 unconditionally, which is right only while we
+    // are device 0. As a companion it silently excluded the owner's own phone
+    // from every message we sent: the recipient got it, the phone did not, and
+    // it sat there showing "waiting for this message" forever. It also put our
+    // participant list out of step with the server's, which is what the phash
+    // mismatch on the ack was reporting.
+    const selfDevice = this._ownDeviceIndex();
+
     // Use cached own device list if it hasn't expired (5-min TTL matches _deviceCache)
     if (this._ownDeviceJids !== null && Date.now() < this._ownDeviceExpiry) {
-      const others = this._ownDeviceJids.filter(j => stripUser(j).device !== 0);
+      const others = this._ownDeviceJids.filter(j => stripUser(j).device !== selfDevice);
       return this._ensureSessions(others, signalProto, allowPkmsg);
     }
 
@@ -1097,7 +1120,7 @@ class DeviceManager {
     this._ownDeviceJids   = deviceJids;
     this._ownDeviceExpiry = Date.now() + 5 * 60 * 1000;
 
-    const others = deviceJids.filter(j => stripUser(j).device !== 0);
+    const others = deviceJids.filter(j => stripUser(j).device !== selfDevice);
     return this._ensureSessions(others, signalProto, allowPkmsg);
   }
 

package/lib/messages/MessageSender.js

@@ -1259,8 +1259,8 @@ class MessageSender {
         : Promise.resolve([]),
       // Our own linked devices, in the address family the stanza is routed with.
       // ensureOwnDeviceSessions hands back @s.whatsapp.net JIDs, which cannot go
-      // into a stanza carrying addressing_mode='lid'; both helpers already leave
-      // out device 0.
+      // into a stanza carrying addressing_mode='lid'; both helpers leave out the
+      // device we are, which is device 0 only while we are the primary.
       useLid
         ? this._devMgr.ensureOwnLidDeviceSessions(myLidUser, ownPhone, this._signal)
         : this._devMgr.ensureOwnDeviceSessions(ownPhone, this._signal)
@@ -1275,8 +1275,17 @@ class MessageSender {
       const s = String(jid);
       return s.endsWith('@hosted') || s.endsWith('@hosted.lid');
     };
+    // The sending device counts in the enumeration even though it is not a
+    // recipient — and that is *this* device, not device 0. On a companion link
+    // the bare JID names the owner's phone, which arrives through ownTargets
+    // like every other device; adding it here again while leaving our own slot
+    // out would hash a set the server never computes.
+    const ownSelfJid = (useLid
+      ? this._client._ownDeviceLidJid()
+      : this._client._ownDeviceJid()) || selfJid;
+
     const enumeratedDevices = [...new Set(
-      [...memberDevices, ...lidDevices, ...ownTargets, selfJid]
+      [...memberDevices, ...lidDevices, ...ownTargets, ownSelfJid]
     )].filter(jid => !isHostedJid(jid));
 
     // The participant hash the server checks the fan-out against. whatsmeow puts

package/package.json

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