whalibmob 5.5.71 → 5.5.72

package/lib/Client.js

@@ -11,6 +11,11 @@ const { checkIfRegistered, checkNumberStatus, requestSmsCode, verifyCode, assert
 const { getDeviceConfig } = require('./DeviceConfig');
 const { createNewStore, saveStore, loadStore, toSixParts, fromSixParts } = require('./Store');
 const { BinaryNode }      = require('./BinaryNode');
+
+// How many times a message may be re-sent in answer to retry receipts before
+// the client stops. Each resend can itself draw retries, so this is what keeps
+// an undecryptable message from turning into a flood.
+const MAX_RETRY_RESENDS = 2;
 const { NodeCache }       = require('@cacheable/node-cache');
 
 // Group metadata cache lifetime — matches DeviceManager's device cache.
@@ -877,6 +882,23 @@ class WhalibmobClient extends EventEmitter {
       return;
     }
 
+    // Consume the entry before doing anything else. Every device that failed to
+    // decrypt sends its own retry receipt for the same message, and a group
+    // resend already re-addresses all of them — without this, each receipt
+    // started its own resend.
+    this._sentMsgCache.delete(msgId);
+
+    // Bound the chain. A resend that still cannot be decrypted draws fresh
+    // retry receipts of its own, so an unbounded handler answers each one with
+    // another send and floods the chat. Give up after a few rounds and leave
+    // the message undelivered rather than keep spamming.
+    const depth = (cached.retryDepth || 0) + 1;
+    if (depth > MAX_RETRY_RESENDS) {
+      _whaDbg('[DBG] RETRY_RECV msgId=' + msgId + ' — giving up after ' +
+        cached.retryDepth + ' resends\n');
+      return;
+    }
+
     const fromStr = attrs.from ? String(attrs.from) : '';
     const isGroup = fromStr.endsWith('@g.us');
 
@@ -912,13 +934,18 @@ class WhalibmobClient extends EventEmitter {
     // SenderKey distribution, which only _sendGroupMessage builds. Drop the
     // "already distributed" record first, or the resend would carry the same
     // bare skmsg the recipient just told us it could not read.
-    const resendId = generateMessageId();
+    // Carry the round count into the resend so its own retry receipts continue
+    // the same chain instead of restarting it at zero.
+    const opts = Object.assign({}, cached.options, { _retryDepth: depth });
+
     if (cached.isGroup) {
+      const resendId = generateMessageId();
       if (this._signal && this._signal.senderKeyStore) {
         this._signal.senderKeyStore.invalidateSKDM(cached.toJid);
       }
+      _whaDbg('[DBG] RETRY_RESEND group round=' + depth + ' newId=' + resendId + '\n');
       this._sender._sendGroupMessage(
-        cached.toJid, resendId, cached.plaintext, cached.mediaType, cached.options
+        cached.toJid, resendId, cached.plaintext, cached.mediaType, opts
       )
         .then(r  => _whaDbg('[DBG] RETRY_RESEND group ok id=' + (r && r.id) + '\n'))
         .catch(e => _whaDbg('[DBG] RETRY_RESEND_ERR: ' + e.message));
@@ -926,7 +953,7 @@ class WhalibmobClient extends EventEmitter {
     }
 
     this._sender._sendDMMessage(
-      cached.toJid, cached.msgId, cached.plaintext, cached.mediaType, cached.options
+      cached.toJid, cached.msgId, cached.plaintext, cached.mediaType, opts
     )
       .then(r  => _whaDbg('[DBG] RETRY_RESEND ok id=' + r.id + '\n'))
       .catch(e => _whaDbg('[DBG] RETRY_RESEND_ERR: ' + e.message));

package/lib/messages/MessageSender.js

@@ -772,7 +772,8 @@ class MessageSender {
     // Cache plaintext so Client can re-send with fresh session on recipient retry
     if (this._client._sentMsgCache) {
       this._client._sentMsgCache.set(msgId, {
-        plaintext, toJid, msgId, mediaType, options, recipientPhone
+        plaintext, toJid, msgId, mediaType, options, recipientPhone,
+        retryDepth: options._retryDepth || 0
       });
       // Keep cache bounded — evict oldest entries beyond 200
       if (this._client._sentMsgCache.size > 200) {
@@ -980,7 +981,8 @@ class MessageSender {
     // then silently never arrived.
     if (this._client._sentMsgCache) {
       this._client._sentMsgCache.set(msgId, {
-        plaintext, toJid: groupJid, msgId, mediaType, options, isGroup: true
+        plaintext, toJid: groupJid, msgId, mediaType, options, isGroup: true,
+        retryDepth: options._retryDepth || 0
       });
       if (this._client._sentMsgCache.size > 200) {
         const firstKey = this._client._sentMsgCache.keys().next().value;

package/package.json

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