whalibmob 5.1.12 → 5.1.14

package/cli.js

@@ -481,8 +481,9 @@ async function handleLine(line) {
         const jid = normalizeJid(jR);
         if (!jid || !file) { fail('usage: /image <jid> <file> [caption]'); break; }
         out('uploading...');
-        const r = await _client.sendImage(jid, file, { caption: cap.join(' ') || undefined });
-        out('sent  ' + (r && r.id ? r.id : r));
+        _client.sendImage(jid, file, { caption: cap.join(' ') || undefined })
+          .then(r => out('sent  ' + (r && r.id ? r.id : r)))
+          .catch(e => fail('image error: ' + e.message));
         break;
       }
 
@@ -492,8 +493,9 @@ async function handleLine(line) {
         const jid = normalizeJid(jR);
         if (!jid || !file) { fail('usage: /video <jid> <file> [caption]'); break; }
         out('uploading...');
-        const r = await _client.sendVideo(jid, file, { caption: cap.join(' ') || undefined });
-        out('sent  ' + (r && r.id ? r.id : r));
+        _client.sendVideo(jid, file, { caption: cap.join(' ') || undefined })
+          .then(r => out('sent  ' + (r && r.id ? r.id : r)))
+          .catch(e => fail('video error: ' + e.message));
         break;
       }
 
@@ -503,8 +505,9 @@ async function handleLine(line) {
         const jid = normalizeJid(jR);
         if (!jid || !file) { fail('usage: /audio <jid> <file>'); break; }
         out('uploading...');
-        const r = await _client.sendAudio(jid, file, {});
-        out('sent  ' + (r && r.id ? r.id : r));
+        _client.sendAudio(jid, file, {})
+          .then(r => out('sent  ' + (r && r.id ? r.id : r)))
+          .catch(e => fail('audio error: ' + e.message));
         break;
       }
 
@@ -514,8 +517,9 @@ async function handleLine(line) {
         const jid = normalizeJid(jR);
         if (!jid || !file) { fail('usage: /ptt <jid> <file>'); break; }
         out('uploading...');
-        const r = await _client.sendAudio(jid, file, { ptt: true });
-        out('sent  ' + (r && r.id ? r.id : r));
+        _client.sendAudio(jid, file, { ptt: true })
+          .then(r => out('sent  ' + (r && r.id ? r.id : r)))
+          .catch(e => fail('ptt error: ' + e.message));
         break;
       }
 
@@ -525,8 +529,9 @@ async function handleLine(line) {
         const jid = normalizeJid(jR);
         if (!jid || !file) { fail('usage: /doc <jid> <file> [name]'); break; }
         out('uploading...');
-        const r = await _client.sendDocument(jid, file, { fileName: fname || path.basename(file) });
-        out('sent  ' + (r && r.id ? r.id : r));
+        _client.sendDocument(jid, file, { fileName: fname || path.basename(file) })
+          .then(r => out('sent  ' + (r && r.id ? r.id : r)))
+          .catch(e => fail('document error: ' + e.message));
         break;
       }
 
@@ -536,8 +541,9 @@ async function handleLine(line) {
         const jid = normalizeJid(jR);
         if (!jid || !file) { fail('usage: /sticker <jid> <file>'); break; }
         out('uploading...');
-        const r = await _client.sendSticker(jid, file, {});
-        out('sent  ' + (r && r.id ? r.id : r));
+        _client.sendSticker(jid, file, {})
+          .then(r => out('sent  ' + (r && r.id ? r.id : r)))
+          .catch(e => fail('sticker error: ' + e.message));
         break;
       }
 
@@ -546,8 +552,9 @@ async function handleLine(line) {
         const [, jR, msgId, emoji] = p;
         const jid = normalizeJid(jR);
         if (!jid || !msgId || !emoji) { fail('usage: /react <jid> <msgId> <emoji>'); break; }
-        const r = await _client.sendReaction(jid, msgId, emoji);
-        out('sent  ' + (r && r.id ? r.id : r));
+        _client.sendReaction(jid, msgId, emoji)
+          .then(r => out('sent  ' + (r && r.id ? r.id : r)))
+          .catch(e => fail('react error: ' + e.message));
         break;
       }
 
@@ -556,8 +563,9 @@ async function handleLine(line) {
         const [, jR, msgId, ...rest] = p;
         const jid = normalizeJid(jR);
         if (!jid || !msgId || !rest.length) { fail('usage: /edit <jid> <msgId> <text>'); break; }
-        const r = await _client.editMessage(msgId, jid, rest.join(' '));
-        out('edited  ' + (r && r.id ? r.id : r));
+        _client.editMessage(msgId, jid, rest.join(' '))
+          .then(r => out('edited  ' + (r && r.id ? r.id : r)))
+          .catch(e => fail('edit error: ' + e.message));
         break;
       }
 
@@ -566,8 +574,9 @@ async function handleLine(line) {
         const [, jR, msgId, scope] = p;
         const jid = normalizeJid(jR);
         if (!jid || !msgId) { fail('usage: /delete <jid> <msgId> [all]'); break; }
-        await _client.deleteMessage(msgId, jid, true, scope === 'all');
-        out('deleted  ' + (scope === 'all' ? 'for everyone' : 'for me'));
+        _client.deleteMessage(msgId, jid, true, scope === 'all')
+          .then(() => out('deleted  ' + (scope === 'all' ? 'for everyone' : 'for me')))
+          .catch(e => fail('delete error: ' + e.message));
         break;
       }
 

package/lib/Client.js

@@ -125,6 +125,9 @@ 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._myLid            = null;        // own LID JID received from <success> node
+    this._groupAddressingMode = new Map(); // groupJid → 'lid' | 'pn'
     this._retryPending     = new Map();   // msgId → {node, retryCount}
     this._retryPreKeyIdx   = 0;           // rotating index for assigning unique prekeys to retries
     this._appStateVersions = {};          // collectionName → version (int)
@@ -280,6 +283,7 @@ class WhalibmobClient extends EventEmitter {
       }
     }
     if (attrs.platform) this._platform = attrs.platform;
+    if (attrs.lid)      this._myLid    = String(attrs.lid);
 
     const devIdNode = findChild(node, 'device-identity');
     if (devIdNode) {
@@ -523,7 +527,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
@@ -689,12 +693,16 @@ class WhalibmobClient extends EventEmitter {
   _processSKDMDistribution(groupJid, senderJid, participantsNode) {
     // For incoming group messages, the SKDM for us is in the participants node
     if (!Array.isArray(participantsNode.content)) return;
+    const ownPhone  = String(this._store.phoneNumber);
+    const ownLidUser = this._myLid ? this._myLid.split('@')[0].split(':')[0] : null;
     for (const toNode of participantsNode.content) {
       if (!toNode || toNode.description !== 'to') continue;
       const toJid = toNode.attrs && toNode.attrs.jid;
       if (!toJid) continue;
-      const toPhone = toJid.split('@')[0].split(':')[0];
-      if (toPhone !== String(this._store.phoneNumber)) continue;
+      const toUser = String(toJid).split('@')[0].split(':')[0];
+      // Match by phone number (PN-mode groups) OR by own LID user (LID-mode groups)
+      const isForUs = (toUser === ownPhone) || (ownLidUser && toUser === ownLidUser);
+      if (!isForUs) continue;
 
       const enc = findChild(toNode, 'enc');
       if (!enc) continue;
@@ -702,10 +710,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(() => {});
     }
@@ -1154,12 +1172,33 @@ class WhalibmobClient extends EventEmitter {
     const children = Array.isArray(groupNode.content) ? groupNode.content : [];
 
     // participants — normalize jid to string (BinaryNode may yield an object)
+    // Also parse phone_number and lid attributes used for LID↔PN mapping
     const participants = children
       .filter(n => n && n.description === 'participant' && n.attrs && n.attrs.jid)
-      .map(n => ({
-        jid:  String(n.attrs.jid),
-        role: n.attrs.type || 'member'   // 'admin' | 'superadmin' | 'member'
-      }));
+      .map(n => {
+        const pJid  = String(n.attrs.jid);
+        const pRole = n.attrs.type || 'member';
+        const pPhone = n.attrs.phone_number ? String(n.attrs.phone_number) : null;
+        const pLid   = n.attrs.lid          ? String(n.attrs.lid)          : null;
+        // Populate LID↔PN maps from participant attributes
+        // Case A: participant JID is a LID, phone_number is their PN
+        if (pJid.endsWith('@lid') || pJid.includes('@lid:')) {
+          const lidUser = pJid.split('@')[0].split(':')[0];
+          if (pPhone) {
+            const pnUser = pPhone.split('@')[0].split(':')[0];
+            this._lidToPn.set(lidUser, pnUser);
+            this._pnToLid.set(pnUser, lidUser);
+          }
+        }
+        // Case B: participant JID is a PN, lid attribute is their LID
+        if (pLid && (pLid.endsWith('@lid') || pLid.includes('@lid:'))) {
+          const pnUser  = pJid.split('@')[0].split(':')[0];
+          const lidUser = pLid.split('@')[0].split(':')[0];
+          this._lidToPn.set(lidUser, pnUser);
+          this._pnToLid.set(pnUser, lidUser);
+        }
+        return { jid: pJid, role: pRole };
+      });
 
     // description
     const descNode = children.find(n => n && n.description === 'description');
@@ -1186,8 +1225,12 @@ class WhalibmobClient extends EventEmitter {
     const groupId = a.id || '';
     const jid = groupId.includes('@') ? groupId : groupId + '@g.us';
 
-    // update member cache
+    // addressing_mode: 'lid' (modern groups) or 'pn' (legacy groups)
+    const addressingMode = (a.addressing_mode === 'pn') ? 'pn' : 'lid';
+
+    // update member cache and addressing mode
     this._groupMembers.set(jid, new Set(participants.map(p => p.jid)));
+    this._groupAddressingMode.set(jid, addressingMode);
 
     return {
       jid,
@@ -1200,6 +1243,7 @@ class WhalibmobClient extends EventEmitter {
       ephemeral,
       onlyAdminsSend: announce,
       onlyAdminsEdit: restrict,
+      addressingMode,
       participants
     };
   }
@@ -1266,6 +1310,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,26 @@ class MessageSender {
         members = this._client._getGroupMembers(groupJid);
       } catch (_) {}
     }
-    const skdmBytes = this._signal.buildSKDM(groupJid, ownJid);
+
+    // 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;
+
+    const rawSKDM   = this._signal.buildSKDM(groupJid, senderIdentity);
+    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,18 +662,17 @@ 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);
     }
 
-    const skmsgCiphertext = this._signal.senderKeyEncrypt(groupJid, ownJid, plaintext);
+    const skmsgCiphertext = this._signal.senderKeyEncrypt(groupJid, senderIdentity, plaintext);
     const phash = phashTargets.length > 0 ? computePhash(phashTargets) : null;
 
     const skdmHasPkmsg = skdmEncrypted.some(e => e.type === 'pkmsg');
@@ -677,7 +693,7 @@ class MessageSender {
       to: groupJid,
       id: msgId,
       type: mediaType,
-      addressing_mode: 'pn',
+      addressing_mode: groupAddressingMode,
       t:   String(msNow())
     };
     if (phash) stanzaAttrs.phash = phash;
@@ -809,7 +825,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 +833,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.14",
   "description": "WhatsApp library for interaction with WhatsApp Mobile API no web",
   "author": "Kunboruto20",
   "main": "index.js",