whalibmob 3.0.0 → 3.3.1

package/lib/DeviceManager.js

@@ -224,6 +224,15 @@ class DeviceManager {
     return readyJids;
   }
 
+  // ─── Clear device cache (used on phash mismatch / 421 retry) ──────────────
+  clearCache(phones) {
+    if (!phones || phones.length === 0) {
+      this._deviceCache.clear();
+    } else {
+      for (const p of phones) this._deviceCache.delete(p);
+    }
+  }
+
   // ─── Build participants node ───────────────────────────────────────────────
   static buildParticipantsNode(encryptedList) {
     const toNodes = encryptedList.map(({ jid, type, ciphertext }) =>

package/lib/Registration.js

@@ -242,7 +242,7 @@ function buildPayload(store, waVersion, useToken, extraPairs) {
     'rc',         String(RELEASE_CHANNEL),
     'lg',         meta.lg,
     'lc',         meta.lc,
-    'authkey',    store.noiseKeyPair.public.toString('base64url'),
+    'authkey',    rawKey(store.noiseKeyPair.public).toString('base64url'),
     'e_regid',    intToBytes(store.registrationId, 4).toString('base64url'),
     'e_keytype',  Buffer.from([SIGNAL_KEY_TYPE]).toString('base64url'),
     'e_ident',    rawKey(store.identityKeyPair.public).toString('base64url'),

package/lib/Store.js

@@ -200,14 +200,15 @@ function fromSixParts(sixParts) {
       private:   spkPair.private,
       signature: sig
     },
-    registrationId: 1,
+    registrationId: (crypto.randomBytes(2).readUInt16BE(0) & 0x3fff) + 1,
     fdid:           uuidv4(),
     deviceId:       crypto.randomBytes(16),
     identityId,
     registered:     true,
     name:           'User',
     version:        IOS_VERSION_FALLBACK,
-    device:         IOS_DEVICE
+    device:         IOS_DEVICE,
+    advIdentity:    null
   };
 }
 

package/lib/messages/MessageSender.js

@@ -281,7 +281,7 @@ class MessageSender {
       isAnimated:        options.isAnimated || false,
       contextInfo:       options.contextInfo
     }));
-    return this._sendMessage(toJid, msgId, stkBuf, 'text', options);
+    return this._sendMessage(toJid, msgId, stkBuf, 'media', options);
   }
 
   // ─── Reaction ─────────────────────────────────────────────────────────────
@@ -302,9 +302,31 @@ class MessageSender {
 
   async _sendMessage(toJid, msgId, plaintext, mediaType, options) {
     if (isGroupJid(toJid)) {
-      return this._sendGroupMessage(toJid, msgId, plaintext, mediaType);
+      try {
+        return await this._sendGroupMessage(toJid, msgId, plaintext, mediaType);
+      } catch (err) {
+        // Error 421 = phash mismatch — server's participant list differs from ours.
+        // Flush device cache for group members and retry once (matches Cobalt behaviour).
+        if (err && /\b421\b/.test(err.message)) {
+          const members = this._client._getGroupMembers
+            ? this._client._getGroupMembers(toJid)
+            : [];
+          this._devMgr.clearCache(members.map(phoneFromJid));
+          return this._sendGroupMessage(toJid, msgId, plaintext, mediaType);
+        }
+        throw err;
+      }
+    }
+    try {
+      return await this._sendDMMessage(toJid, msgId, plaintext, mediaType);
+    } catch (err) {
+      // Same phash-mismatch retry for 1-to-1 messages.
+      if (err && /\b421\b/.test(err.message)) {
+        this._devMgr.clearCache([phoneFromJid(toJid)]);
+        return this._sendDMMessage(toJid, msgId, plaintext, mediaType);
+      }
+      throw err;
     }
-    return this._sendDMMessage(toJid, msgId, plaintext, mediaType);
   }
 
   // ─── 1-to-1 multi-device fanout ───────────────────────────────────────────
@@ -403,6 +425,13 @@ class MessageSender {
 
     const allTargets = [...memberDevices, ...ownDevices];
 
+    // phash MUST include the sender's own primary device.
+    // Cobalt's calculateGroupPhash() explicitly adds senderDevice to the set.
+    // ownDevices contains only linked devices (device != 0); ownJid is device 0.
+    const phashTargets = allTargets.includes(ownJid)
+      ? allTargets
+      : [ownJid, ...allTargets];
+
     // senderKeyMap: only send SKDM to devices that haven't received it yet.
     // Persisted in .sk.json so we don't re-send on every group message.
     const skStore   = this._signal.senderKeyStore;
@@ -418,8 +447,8 @@ class MessageSender {
     // SenderKey encrypt the actual group message (one ciphertext for all)
     const skmsgCiphertext = this._signal.senderKeyEncrypt(groupJid, ownJid, plaintext);
 
-    // phash over all group member devices
-    const phash = allTargets.length > 0 ? computePhash(allTargets) : null;
+    // phash over all group member devices + sender primary device
+    const phash = phashTargets.length > 0 ? computePhash(phashTargets) : null;
 
     // ── Feature 2: device_identity for pkmsg in SKDM ─────────────────────────
     // SKDM messages sent to devices with no prior Signal session are pkmsg.

package/lib/noise.js

@@ -285,7 +285,7 @@ class NoiseSocket extends EventEmitter {
       const payload = encodeClientPayload({
         username:           BigInt(this.store.phoneNumber),
         passive:            false,
-        pushName:           this.store.name || 'User',
+        pushName:           this.store.registered ? (this.store.name || null) : null,
         shortConnect:       true,
         connectType:        1,
         connectReason:      1,

package/lib/proto.js

@@ -43,7 +43,7 @@ function encodeUserAgent({ platform, version, mcc, mnc, osVersion, manufacturer,
   ];
   if (osVersion) parts.push(field(5, LEN, string(osVersion)));
   if (manufacturer) parts.push(field(6, LEN, string(manufacturer)));
-  if (device) parts.push(field(7, LEN, string(device)));
+  if (device) parts.push(field(7, LEN, string(String(device).replace(/_/g, ' '))));
   if (osBuildNumber) parts.push(field(8, LEN, string(osBuildNumber)));
   if (phoneId) parts.push(field(9, LEN, string(phoneId)));
   parts.push(field(10, VARINT, varint(releaseChannel || 0)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whalibmob",
-  "version": "3.0.0",
+  "version": "3.3.1",
   "description": "WhatsApp mobile-only Node.js client library with Signal Protocol encryption",
   "main": "index.js",
   "bin": {