whalibmob 5.1.12 → 5.1.13

package/lib/Client.js

@@ -125,6 +125,7 @@ class WhalibmobClient extends EventEmitter {
     this._pendingAcks      = new Map();   // msgId → resolve fn
     this._groupMembers     = new Map();   // groupJid → Set<memberJid>
     this._lidToPn          = new Map();   // LID user → phone number
+    this._pnToLid          = new Map();   // phone number → LID user
     this._retryPending     = new Map();   // msgId → {node, retryCount}
     this._retryPreKeyIdx   = 0;           // rotating index for assigning unique prekeys to retries
     this._appStateVersions = {};          // collectionName → version (int)
@@ -523,7 +524,7 @@ class WhalibmobClient extends EventEmitter {
     const participant = String(attrs.participant || from);
     // sender_pn is the real phone-based JID when `from` is a LID (linked identity)
     const senderPn = attrs.sender_pn ? String(attrs.sender_pn) : null;
-    if (senderPn) { const lidUser = from.split('@')[0].split(':')[0]; const pnUser = senderPn.split('@')[0].split(':')[0]; if (lidUser && pnUser && lidUser !== pnUser) this._lidToPn.set(lidUser, pnUser); }
+    if (senderPn) { const lidUser = from.split('@')[0].split(':')[0]; const pnUser = senderPn.split('@')[0].split(':')[0]; if (lidUser && pnUser && lidUser !== pnUser) { this._lidToPn.set(lidUser, pnUser); this._pnToLid.set(pnUser, lidUser); } }
     // Debug: log every incoming message node
     process.stderr.write('[DBG] _handleMessage from=' + from + ' participant=' + participant + ' senderPn=' + senderPn + ' id=' + id + '\n');
     // Debug: log message content structure
@@ -702,10 +703,20 @@ class WhalibmobClient extends EventEmitter {
       const encType   = enc.attrs && enc.attrs.type;
       const cipherBuf = Buffer.isBuffer(enc.content) ? enc.content : Buffer.from(enc.content || '');
 
-      // Decrypt SKDM with our Signal session
+      // Decrypt SKDM with our Signal session, then parse the WA Message proto
+      // to extract the actual axolotl SKDM bytes from field 35
       this._signal.decrypt(senderJid, encType, cipherBuf)
-        .then(skdmBytes => {
-          this._signal.processSKDM(groupJid, senderJid, skdmBytes);
+        .then(decrypted => {
+          const decoded = this._decodeMsg(decrypted);
+          if (decoded && decoded.type === 'senderKeyDistribution' &&
+              decoded.groupId && decoded.axolotlBytes &&
+              decoded.axolotlBytes[0] === 0x33) {
+            this._signal.processSKDM(decoded.groupId, senderJid, decoded.axolotlBytes);
+          } else if (decoded && decoded.skdm &&
+                     decoded.skdm.groupId && decoded.skdm.axolotlBytes &&
+                     decoded.skdm.axolotlBytes[0] === 0x33) {
+            this._signal.processSKDM(decoded.skdm.groupId, senderJid, decoded.skdm.axolotlBytes);
+          }
         })
         .catch(() => {});
     }
@@ -1266,6 +1277,18 @@ class WhalibmobClient extends EventEmitter {
     return meta ? meta.participants : [];
   }
 
+  getPNForLID(lid) {
+    const lidUser = String(lid).split('@')[0].split(':')[0];
+    const pnUser  = this._lidToPn.get(lidUser);
+    return pnUser ? pnUser + '@s.whatsapp.net' : null;
+  }
+
+  getLIDForPN(pn) {
+    const pnUser  = String(pn).split('@')[0].split(':')[0];
+    const lidUser = this._pnToLid.get(pnUser);
+    return lidUser ? lidUser + '@lid' : null;
+  }
+
   // ─── Message ID generator ─────────────────────────────────────────────────
 
   _genMsgId() {

package/lib/messages/MessageSender.js

@@ -14,6 +14,7 @@ const {
   encodeLocationMessage, encodeContactMessage,
   encodeDeviceSentMessage, encodeProtocolMessage,
   encodeExtendedText,
+  encodeSenderKeyDistributionMessage,
   PROTOCOL_MSG_REVOKE, PROTOCOL_MSG_EPHEMERAL
 } = require('../proto/MessageProto');
 const { uploadMedia } = require('../MediaService');
@@ -626,10 +627,18 @@ class MessageSender {
         members = this._client._getGroupMembers(groupJid);
       } catch (_) {}
     }
-    const skdmBytes = this._signal.buildSKDM(groupJid, ownJid);
+    const rawSKDM   = this._signal.buildSKDM(groupJid, ownJid);
+    const skdmMsg   = encodeSenderKeyDistributionMessage(groupJid, rawSKDM);
 
     const memberPhones = [...new Set(
-      members.map(jid => { const raw = phoneFromJid(jid); if (raw.length >= 15 && this._client._lidToPn && this._client._lidToPn.has(raw)) return this._client._lidToPn.get(raw); return raw; }).filter(p => p !== ownPhone)
+      members.map(jid => {
+        const isLid = jid.endsWith('@lid') || jid.includes('@lid:') || jid.includes(':@lid');
+        const raw   = phoneFromJid(jid);
+        if (isLid && this._client._lidToPn && this._client._lidToPn.has(raw)) {
+          return this._client._lidToPn.get(raw);
+        }
+        return raw;
+      }).filter(p => p !== ownPhone)
     )];
 
     const [memberDevices, ownDevices] = await Promise.all([
@@ -645,14 +654,13 @@ class MessageSender {
       ? allTargets
       : [ownJid, ...allTargets];
 
-    const skStore   = this._signal.senderKeyStore;
-    skStore.setSKDMMap(groupJid, {});
-    const skdmMap   = skStore.getSKDMMap(groupJid);
-    const skdmRecipients = allTargets;
+    const skStore        = this._signal.senderKeyStore;
+    const existingSkdmMap = skStore.getSKDMMap(groupJid);
+    const skdmRecipients  = allTargets.filter(jid => !existingSkdmMap[jid]);
 
     let skdmEncrypted = [];
     if (skdmRecipients.length > 0) {
-      skdmEncrypted = await this._signal.bulkEncryptForDevices(skdmRecipients, skdmBytes);
+      skdmEncrypted = await this._signal.bulkEncryptForDevices(skdmRecipients, skdmMsg);
       skStore.markSKDMSent(groupJid, skdmRecipients);
     }
 
@@ -809,7 +817,7 @@ class MessageSender {
 
   async _uploadMedia(mediaType, data) {
     if (!this._mediaHosts.length) {
-      throw new Error('No media hosts — wait for media connection before sending media');
+      await this._fetchMediaConn();
     }
     let buf;
     if (Buffer.isBuffer(data))         buf = data;
@@ -817,6 +825,25 @@ class MessageSender {
     else throw new Error('Media must be a Buffer or file path');
     return uploadMedia(mediaType, buf, this._mediaHosts, this._mediaAuth);
   }
+
+  async _fetchMediaConn() {
+    return new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        this._client.removeListener('media_conn', onConn);
+        reject(new Error('Timeout waiting for media connection'));
+      }, 15000);
+      const onConn = ({ hosts, auth }) => {
+        clearTimeout(timeout);
+        if (hosts && hosts.length) {
+          this._mediaHosts = hosts;
+          this._mediaAuth  = auth;
+        }
+        resolve();
+      };
+      this._client.once('media_conn', onConn);
+      try { this._client._requestMediaConnection(); } catch (_) {}
+    });
+  }
 }
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────

package/lib/proto/MessageProto.js

@@ -566,6 +566,14 @@ function decodeMessageContainer(buf) {
   }
 }
 
+function encodeSenderKeyDistributionMessage(groupId, axolotlBytes) {
+  const inner = Buffer.concat([
+    field(1, WIRE_LEN, str(groupId)),
+    field(2, WIRE_LEN, bytes(axolotlBytes))
+  ]);
+  return field(35, WIRE_LEN, inner);
+}
+
 module.exports = {
   encodeText,
   encodeImageMessage,
@@ -583,6 +591,7 @@ module.exports = {
   encodeProtocolMessage,
   encodeExtendedText,
   encodeContextInfo,
+  encodeSenderKeyDistributionMessage,
   encodeVarint,
   field,
   varint,

package/package.json

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