whalibmob 5.1.13 → 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

@@ -126,6 +126,8 @@ class WhalibmobClient extends EventEmitter {
     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)
@@ -281,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) {
@@ -690,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;
@@ -1165,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');
@@ -1197,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,
@@ -1211,6 +1243,7 @@ class WhalibmobClient extends EventEmitter {
       ephemeral,
       onlyAdminsSend: announce,
       onlyAdminsEdit: restrict,
+      addressingMode,
       participants
     };
   }

package/lib/messages/MessageSender.js

@@ -627,7 +627,15 @@ class MessageSender {
         members = this._client._getGroupMembers(groupJid);
       } catch (_) {}
     }
-    const rawSKDM   = 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(
@@ -664,7 +672,7 @@ class MessageSender {
       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');
@@ -685,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;

package/package.json

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