whalibmob 5.5.65 → 5.5.66

package/lib/messages/MessageSender.js

@@ -839,10 +839,22 @@ class MessageSender {
 
     // Determine addressing mode for this group (lid = modern groups, pn = legacy)
     const groupAddressingMode = this._client._groupAddressingMode.get(groupJid) || 'lid';
-    // For LID-mode groups, sender identity is own LID JID; otherwise own PN JID
-    const senderIdentity = (groupAddressingMode === 'lid' && this._client._myLid)
-      ? this._client._myLid
-      : ownJid;
+    // A stanza addressed with addressing_mode='lid' must carry participants in
+    // LID space only. Mixing @s.whatsapp.net targets into it is exactly what
+    // DeviceManager warns about, and the server answers it with ack 479.
+    const useLid = groupAddressingMode === 'lid';
+    if (useLid && !this._client._myLid) {
+      throw new Error(
+        'Cannot send to ' + groupJid + ': group is LID-addressed but our own LID ' +
+        'is unknown (the server did not supply lid= on <success>). ' +
+        'Reconnect so the LID is re-issued.'
+      );
+    }
+    const myLidUser = useLid ? phoneFromJid(this._client._myLid) : null;
+    // For LID-mode groups, sender identity is own LID JID; otherwise own PN JID.
+    // Normalised to the bare user so it matches the participant targets below.
+    const selfJid = useLid ? `${myLidUser}@lid` : ownJid;
+    const senderIdentity = selfJid;
 
     const rawSKDM   = await this._signal.buildSKDM(groupJid, senderIdentity);
     const skdmMsg   = encodeSenderKeyDistributionMessage(groupJid, rawSKDM);
@@ -850,16 +862,31 @@ class MessageSender {
     // Resolve member phones for session/device queries.
     // For LID members without a PN mapping, keep the raw LID user part so
     // bulkEnsureSessionsForLid can still acquire sessions for them.
+    // "40778226909:2@s.whatsapp.net" → "<ourLid>:2@lid" — keep the device
+    // suffix, swap identity and domain.
+    const ownJidToLid = (jid) => {
+      const base   = String(jid).replace(/@(?:s\.whatsapp\.net|lid)$/, '');
+      const colon  = base.indexOf(':');
+      return myLidUser + (colon >= 0 ? base.slice(colon) : '') + '@lid';
+    };
+
     const lidMembersWithoutPn = [];
     const memberPhones = [...new Set(
       members.map(jid => {
         const isLid = jid.endsWith('@lid');
         const raw   = phoneFromJid(jid);
         if (isLid) {
-          const pn = this._client._lidToPn && this._client._lidToPn.get(raw);
-          if (pn) return pn;
-          // No PN mapping yet — track for LID-direct session ensure
-          lidMembersWithoutPn.push(jid);
+          // In a LID-addressed group, resolve LID members through the LID path
+          // even when we know their phone number — swapping in the PN would put
+          // an @s.whatsapp.net target into a @lid stanza.
+          if (!useLid) {
+            const pn = this._client._lidToPn && this._client._lidToPn.get(raw);
+            if (pn) return pn;
+          }
+          // Our own LID is a member too — ensureOwnDeviceSessions already
+          // covers those devices, so listing it here would encrypt the SKDM
+          // for ourselves twice and emit duplicate <to> entries.
+          if (raw !== myLidUser) lidMembersWithoutPn.push(jid);
           return null;
         }
         return raw;
@@ -879,11 +906,17 @@ class MessageSender {
       this._devMgr.ensureOwnDeviceSessions(ownPhone, this._signal)
     ]);
 
-    const allTargets = [...memberDevices, ...lidDevices, ...ownDevices];
+    // Own devices come back as @s.whatsapp.net — re-express them in LID space
+    // so every target in a LID stanza shares one address family.
+    const ownTargets = useLid ? ownDevices.map(ownJidToLid) : ownDevices;
+
+    // Dedupe: a device reached through more than one path must still appear
+    // exactly once in <participants>.
+    const allTargets = [...new Set([...memberDevices, ...lidDevices, ...ownTargets])];
 
-    const phashTargets = allTargets.includes(ownJid)
+    const phashTargets = allTargets.includes(selfJid)
       ? allTargets
-      : [ownJid, ...allTargets];
+      : [selfJid, ...allTargets];
 
     const skStore        = this._signal.senderKeyStore;
     const existingSkdmMap = skStore.getSKDMMap(groupJid);

package/package.json

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