@nexustechpro/baileys 1.1.7 → 2.0.1

package/WAProto/GenerateStatics.sh

@@ -0,0 +1,3 @@
+yarn pbjs -t static-module --no-beautify -w es6 --no-bundle --no-delimited --no-verify --no-comments -o ./index.js ./WAProto.proto;
+yarn pbjs -t static-module --no-beautify -w es6 --no-bundle --no-delimited --no-verify ./WAProto.proto | yarn pbts --no-comments -o ./index.d.ts -;
+node ./fix-imports.js

package/lib/Defaults/baileys-version.json

@@ -0,0 +1,3 @@
+{
+    "version": [2, 3000, 1027934701]
+}

package/lib/Defaults/index.js

@@ -1,151 +1,173 @@
-import { proto } from '../../WAProto/index.js'
-import { makeLibSignalRepository } from '../Signal/libsignal.js'
-import { Browsers } from '../Utils/browser-utils.js'
-import logger from '../Utils/logger.js'
+import { createHash } from 'crypto';
+import { createRequire } from 'module';
+import { proto } from '../../WAProto/index.js';
+import { makeLibSignalRepository } from '../Signal/libsignal.js';
+import { Browsers } from '../Utils/browser-utils.js';
+import logger from '../Utils/logger.js';
+const require = createRequire(import.meta.url);
+const PHONENUMBER_MCC = require('./phonenumber-mcc.json');
+export { PHONENUMBER_MCC };
+const version = [2, 3000, 1027934701];
 
-const version = [2, 3000, 1033105955]
+export const UNAUTHORIZED_CODES = [401, 403, 419];
 
-export const UNAUTHORIZED_CODES = [401, 403, 419]
+export const DEFAULT_ORIGIN = 'https://web.whatsapp.com';
+export const CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';
+export const CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/';
+export const DEF_CALLBACK_PREFIX = 'CB:';
+export const DEF_TAG_PREFIX = 'TAG:';
+export const PHONE_CONNECTION_CB = 'CB:Pong';
 
-export const DEFAULT_ORIGIN = 'https://web.whatsapp.com'
-export const CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/'
-export const CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/'
-export const DEF_CALLBACK_PREFIX = 'CB:'
-export const DEF_TAG_PREFIX = 'TAG:'
-export const PHONE_CONNECTION_CB = 'CB:Pong'
+export const WA_ADV_ACCOUNT_SIG_PREFIX = Buffer.from([6, 0]);
+export const WA_ADV_DEVICE_SIG_PREFIX = Buffer.from([6, 1]);
+export const WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = Buffer.from([6, 5]);
+export const WA_ADV_HOSTED_DEVICE_SIG_PREFIX = Buffer.from([6, 6]);
 
-export const WA_ADV_ACCOUNT_SIG_PREFIX = Buffer.from([6, 0])
-export const WA_ADV_DEVICE_SIG_PREFIX = Buffer.from([6, 1])
-export const WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = Buffer.from([6, 5])
-export const WA_ADV_HOSTED_DEVICE_SIG_PREFIX = Buffer.from([6, 6])
+export const WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60;
 
-export const WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60
+export const STATUS_EXPIRY_SECONDS = 24 * 60 * 60;
 
-export const STATUS_EXPIRY_SECONDS = 24 * 60 * 60
+export const PLACEHOLDER_MAX_AGE_SECONDS = 14 * 24 * 60 * 60;
 
-export const PLACEHOLDER_MAX_AGE_SECONDS = 14 * 24 * 60 * 60
+export const BATCH_SIZE = 500;
 
-export const BATCH_SIZE = 500
+export const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0';
+export const DICT_VERSION = 3;
+export const KEY_BUNDLE_TYPE = Buffer.from([5]);
+export const NOISE_WA_HEADER = Buffer.from([87, 65, 6, DICT_VERSION]);
 
-export const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0'
-export const DICT_VERSION = 3
-export const KEY_BUNDLE_TYPE = Buffer.from([5])
-export const NOISE_WA_HEADER = Buffer.from([87, 65, 6, DICT_VERSION])
-
-export const URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g
+export const URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
 
 export const WA_CERT_DETAILS = {
-  SERIAL: 0,
-  ISSUER: 'WhatsAppLongTerm1',
-  PUBLIC_KEY: Buffer.from('142375574d0a587166aae71ebe516437c4a28b73e3695c6ce1f7f9545da8ee6b', 'hex')
-}
+    SERIAL: 0,
+    ISSUER: 'WhatsAppLongTerm1',
+    PUBLIC_KEY: Buffer.from('142375574d0a587166aae71ebe516437c4a28b73e3695c6ce1f7f9545da8ee6b', 'hex')
+};
 
 export const PROCESSABLE_HISTORY_TYPES = [
-  proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP,
-  proto.HistorySync.HistorySyncType.PUSH_NAME,
-  proto.HistorySync.HistorySyncType.RECENT,
-  proto.HistorySync.HistorySyncType.FULL,
-  proto.HistorySync.HistorySyncType.ON_DEMAND,
-  proto.HistorySync.HistorySyncType.NON_BLOCKING_DATA,
-  proto.HistorySync.HistorySyncType.INITIAL_STATUS_V3
-]
+    proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP,
+    proto.HistorySync.HistorySyncType.PUSH_NAME,
+    proto.HistorySync.HistorySyncType.RECENT,
+    proto.HistorySync.HistorySyncType.FULL,
+    proto.HistorySync.HistorySyncType.ON_DEMAND,
+    proto.HistorySync.HistorySyncType.NON_BLOCKING_DATA,
+    proto.HistorySync.HistorySyncType.INITIAL_STATUS_V3
+];
+export const MOBILE_ENDPOINT = 'g.whatsapp.net';
+export const MOBILE_PORT = 443;
+
+const WA_VERSION = '2.25.23.24';
+const WA_VERSION_HASH = createHash('md5').update(WA_VERSION).digest('hex');
+
+export const MOBILE_TOKEN = Buffer.from('0a1mLfGUIBVrMKF1RdvLI5lkRBvof6vn0fD2QRSM' + WA_VERSION_HASH);
+export const MOBILE_REGISTRATION_ENDPOINT = 'https://v.whatsapp.net/v2';
+export const MOBILE_USERAGENT = `WhatsApp/${WA_VERSION} iOS/17.5.1 Device/Apple-iPhone_13`;
+
+export const REGISTRATION_PUBLIC_KEY = Buffer.from([
+    5, 142, 140, 15, 116, 195, 235, 197, 215, 166, 134, 92, 108, 60, 132, 56, 86, 176, 97, 33, 204, 232, 234, 119, 77,
+    34, 251, 111, 18, 37, 18, 48, 45,
+]);
+
+export const PROTOCOL_VERSION = [5, 2];
+export const MOBILE_NOISE_HEADER = Buffer.concat([Buffer.from('WA'), Buffer.from(PROTOCOL_VERSION)]);
+
 
 export const DEFAULT_CONNECTION_CONFIG = {
-  version: version,
-  browser: Browsers.macOS('Safari'),
-  waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
-  connectTimeoutMs: 600000,
-  keepAliveIntervalMs: 30000,
-  logger: logger.child({ class: 'baileys' }),
-  emitOwnEvents: true,
-  defaultQueryTimeoutMs: 60000,
-  customUploadHosts: [],
-  retryRequestDelayMs: 250,
-  maxMsgRetryCount: 5,
-  fireInitQueries: true,
-  auth: undefined,
-  markOnlineOnConnect: true,
-  syncFullHistory: true,
-  patchMessageBeforeSending: msg => msg,
-  shouldSyncHistoryMessage: ({ syncType }) => {
-    return syncType !== proto.HistorySync.HistorySyncType.FULL
-  },
-  shouldIgnoreJid: () => false,
-  linkPreviewImageThumbnailWidth: 192,
-  transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
-  generateHighQualityLinkPreview: false,
-  enableAutoSessionRecreation: true,
-  enableRecentMessageCache: true,
-  options: {},
-  appStateMacVerification: {
-    patch: false,
-    snapshot: false
-  },
-  countryCode: 'US',
-  getMessage: async () => undefined,
-  cachedGroupMetadata: async () => undefined,
-  makeSignalRepository: makeLibSignalRepository
-}
+    version,
+    browser: Browsers.macOS('Safari'),
+    waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
+    connectTimeoutMs: 600000,
+    keepAliveIntervalMs: 30000,
+    logger: logger.child({ class: 'baileys' }),
+    emitOwnEvents: true,
+    defaultQueryTimeoutMs: 60000,
+    customUploadHosts: [],
+    retryRequestDelayMs: 250,
+    maxMsgRetryCount: 5,
+    fireInitQueries: true,
+    auth: undefined,
+    markOnlineOnConnect: true,
+    syncFullHistory: true,
+    patchMessageBeforeSending: msg => msg,
+    shouldSyncHistoryMessage: ({ syncType }) => {
+        return syncType !== proto.HistorySync.HistorySyncType.FULL;
+    },
+    shouldIgnoreJid: () => false,
+    linkPreviewImageThumbnailWidth: 192,
+    transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
+    generateHighQualityLinkPreview: false,
+    enableAutoSessionRecreation: true,
+    enableRecentMessageCache: true,
+    options: {},
+    appStateMacVerification: {
+        patch: false,
+        snapshot: false
+    },
+    countryCode: 'US',
+    getMessage: async () => undefined,
+    cachedGroupMetadata: async () => undefined,
+    makeSignalRepository: makeLibSignalRepository
+};
 
 export const MEDIA_PATH_MAP = {
-  image: '/mms/image',
-  video: '/mms/video',
-  document: '/mms/document',
-  audio: '/mms/audio',
-  sticker: '/mms/image',
-  'sticker-pack': '/mms/sticker-pack',
-  'thumbnail-link': '/mms/image',
-  'thumbnail-sticker-pack': '/mms/thumbnail-sticker-pack',
-  'product-catalog-image': '/product/image',
-  'md-app-state': '',
-  'md-msg-hist': '/mms/md-app-state',
-  'biz-cover-photo': '/pps/biz-cover-photo'
-}
+    image: '/mms/image',
+    video: '/mms/video',
+    document: '/mms/document',
+    audio: '/mms/audio',
+    sticker: '/mms/image',
+    'sticker-pack': '/mms/sticker-pack',
+    'thumbnail-link': '/mms/image',
+    'thumbnail-sticker-pack': '/mms/thumbnail-sticker-pack',
+    'product-catalog-image': '/product/image',
+    'md-app-state': '',
+    'md-msg-hist': '/mms/md-app-state',
+    'biz-cover-photo': '/pps/biz-cover-photo'
+};
 
 export const MEDIA_HKDF_KEY_MAPPING = {
-  audio: 'Audio',
-  document: 'Document',
-  gif: 'Video',
-  image: 'Image',
-  ppic: '',
-  product: 'Image',
-  ptt: 'Audio',
-  'sticker-pack-publisher': 'Sticker Pack Publisher',
-  sticker: 'Image',
-  'sticker-pack': 'Sticker Pack',
-  'thumbnail-sticker-pack': 'Sticker Pack Thumbnail',
-  video: 'Video',
-  'thumbnail-document': 'Document Thumbnail',
-  'thumbnail-image': 'Image Thumbnail',
-  'thumbnail-video': 'Video Thumbnail',
-  'thumbnail-link': 'Link Thumbnail',
-  'md-msg-hist': 'History',
-  'md-app-state': 'App State',
-  'product-catalog-image': '',
-  'payment-bg-image': 'Payment Background',
-  ptv: 'Video',
-  'biz-cover-photo': 'Image'
-}
-
-export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP)
-
-export const MIN_PREKEY_COUNT = 5
-
-export const INITIAL_PREKEY_COUNT = 95
-
-export const UPLOAD_TIMEOUT = 30000
-export const MIN_UPLOAD_INTERVAL = 5000
+    audio: 'Audio',
+    document: 'Document',
+    gif: 'Video',
+    image: 'Image',
+    ppic: '',
+    product: 'Image',
+    ptt: 'Audio',
+    'sticker-pack-publisher': 'Sticker Pack Publisher',
+    sticker: 'Image',
+    'sticker-pack': 'Sticker Pack',
+    'thumbnail-sticker-pack': 'Sticker Pack Thumbnail',
+    video: 'Video',
+    'thumbnail-document': 'Document Thumbnail',
+    'thumbnail-image': 'Image Thumbnail',
+    'thumbnail-video': 'Video Thumbnail',
+    'thumbnail-link': 'Link Thumbnail',
+    'md-msg-hist': 'History',
+    'md-app-state': 'App State',
+    'product-catalog-image': '',
+    'payment-bg-image': 'Payment Background',
+    ptv: 'Video',
+    'biz-cover-photo': 'Image'
+};
+
+export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP);
+
+export const MIN_PREKEY_COUNT = 5;
+
+export const INITIAL_PREKEY_COUNT = 95;
+
+export const UPLOAD_TIMEOUT = 30000;
+export const MIN_UPLOAD_INTERVAL = 5000;
 
 export const DEFAULT_CACHE_TTLS = {
-  SIGNAL_STORE: 5 * 60,
-  MSG_RETRY: 60 * 60,
-  CALL_OFFER: 5 * 60,
-  USER_DEVICES: 5 * 60
-}
+    SIGNAL_STORE: 5 * 60,
+    MSG_RETRY: 60 * 60,
+    CALL_OFFER: 5 * 60,
+    USER_DEVICES: 5 * 60
+};
 
 export const TimeMs = {
-  Minute: 60 * 1000,
-  Hour: 60 * 60 * 1000,
-  Day: 24 * 60 * 60 * 1000,
-  Week: 7 * 24 * 60 * 60 * 1000
-}
+    Minute: 60 * 1000,
+    Hour: 60 * 60 * 1000,
+    Day: 24 * 60 * 60 * 1000,
+    Week: 7 * 24 * 60 * 60 * 1000
+};

package/lib/Defaults/phonenumber-mcc.json

@@ -0,0 +1,223 @@
+{
+    "93": 412,
+    "355": 276,
+    "213": 603,
+    "1-684": 544,
+    "376": 213,
+    "244": 631,
+    "1-264": 365,
+    "1-268": 344,
+    "54": 722,
+    "374": 283,
+    "297": 363,
+    "61": 505,
+    "43": 232,
+    "994": 400,
+    "1-242": 364,
+    "973": 426,
+    "880": 470,
+    "1-246": 342,
+    "375": 257,
+    "32": 206,
+    "501": 702,
+    "229": 616,
+    "1-441": 350,
+    "975": 402,
+    "591": 736,
+    "387": 218,
+    "267": 652,
+    "55": 724,
+    "1-284": 348,
+    "673": 528,
+    "359": 284,
+    "226": 613,
+    "257": 642,
+    "855": 456,
+    "237": 624,
+    "238": 625,
+    "1-345": 346,
+    "236": 623,
+    "235": 622,
+    "56": 730,
+    "86": 454,
+    "57": 732,
+    "269": 654,
+    "682": 548,
+    "506": 712,
+    "385": 219,
+    "53": 368,
+    "357": 280,
+    "420": 230,
+    "243": 630,
+    "45": 238,
+    "253": 638,
+    "1-767": 366,
+    "1-809": 370,
+    "1-849": 370,
+    "1-829": 370,
+    "593": 740,
+    "20": 602,
+    "503": 706,
+    "240": 627,
+    "291": 657,
+    "372": 248,
+    "251": 636,
+    "500": 750,
+    "298": 288,
+    "679": 542,
+    "358": 244,
+    "33": 208,
+    "689": 547,
+    "241": 628,
+    "220": 607,
+    "995": 282,
+    "49": 262,
+    "233": 620,
+    "350": 266,
+    "30": 202,
+    "299": 290,
+    "1-473": 352,
+    "1-671": 535,
+    "502": 704,
+    "224": 537,
+    "592": 738,
+    "509": 372,
+    "504": 708,
+    "852": 454,
+    "36": 216,
+    "354": 274,
+    "91": 404,
+    "62": 510,
+    "98": 432,
+    "964": 418,
+    "353": 234,
+    "972": 425,
+    "39": 222,
+    "225": 612,
+    "1-876": 338,
+    "81": 440,
+    "962": 416,
+    "254": 639,
+    "686": 545,
+    "383": 221,
+    "965": 419,
+    "371": 247,
+    "961": 415,
+    "266": 651,
+    "231": 618,
+    "218": 606,
+    "423": 295,
+    "370": 246,
+    "352": 270,
+    "389": 294,
+    "261": 646,
+    "265": 650,
+    "60": 502,
+    "960": 472,
+    "223": 610,
+    "356": 278,
+    "692": 551,
+    "222": 609,
+    "230": 617,
+    "52": 334,
+    "691": 550,
+    "373": 259,
+    "377": 212,
+    "976": 428,
+    "382": 297,
+    "1-664": 354,
+    "212": 604,
+    "258": 643,
+    "95": 414,
+    "264": 649,
+    "674": 536,
+    "977": 429,
+    "31": 204,
+    "687": 546,
+    "64": 530,
+    "505": 710,
+    "227": 614,
+    "234": 621,
+    "683": 555,
+    "1-670": 534,
+    "47": 242,
+    "968": 226,
+    "92": 410,
+    "680": 552,
+    "970": 423,
+    "507": 714,
+    "675": 537,
+    "595": 744,
+    "51": 716,
+    "63": 515,
+    "48": 260,
+    "351": 268,
+    "1-787, 1-939": 330,
+    "974": 427,
+    "242": 630,
+    "40": 226,
+    "7": 250,
+    "250": 635,
+    "290": 658,
+    "1-869": 356,
+    "1-758": 358,
+    "508": 308,
+    "1-784": 360,
+    "685": 544,
+    "378": 292,
+    "239": 626,
+    "966": 420,
+    "221": 608,
+    "381": 220,
+    "248": 633,
+    "232": 619,
+    "65": 525,
+    "386": 293,
+    "677": 540,
+    "27": 655,
+    "211": 659,
+    "34": 214,
+    "94": 413,
+    "249": 634,
+    "597": 746,
+    "268": 653,
+    "46": 240,
+    "41": 228,
+    "963": 417,
+    "886": 466,
+    "992": 436,
+    "255": 640,
+    "66": 520,
+    "228": 615,
+    "690": 554,
+    "676": 539,
+    "1-868": 374,
+    "216": 605,
+    "90": 286,
+    "993": 438,
+    "1-649": 376,
+    "688": 553,
+    "1-340": 332,
+    "256": 641,
+    "380": 255,
+    "971": 424,
+    "44": 234,
+    "1": 310,
+    "598": 748,
+    "998": 434,
+    "678": 541,
+    "379": 225,
+    "58": 734,
+    "681": 543,
+    "967": 421,
+    "260": 645,
+    "263": 648,
+    "670": 514,
+    "245": 632,
+    "856": 457,
+    "599": 362,
+    "850": 467,
+    "262": 647,
+    "82": 450,
+    "84": 452
+}

package/lib/Signal/libsignal.js

@@ -49,7 +49,7 @@ export function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
       }, item.groupId)
     },
 
-    decryptMessage: async ({ jid, type, ciphertext }) => {
+    decryptMessage: async ({ jid, type, ciphertext, alternateJid }) => {
       const addr = jidToAddr(jid)
       const session = new libsignal.SessionCipher(storage, addr)
       try {
@@ -64,6 +64,24 @@ export function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
         if (msg.includes("Bad MAC") || msg.includes("Key used already")) {
           logger?.warn?.({ jid, error: msg }, "Session corrupted")
         }
+        // Retry with alternate JID if available and error is specifically "No matching sessions found"
+        if (alternateJid && msg.includes("No matching sessions found for message")) {
+          logger?.debug?.({ jid, alternateJid }, "Retrying decryption with alternate address")
+          const altAddr = jidToAddr(alternateJid)
+          const altSession = new libsignal.SessionCipher(storage, altAddr)
+          try {
+            return txn(async () => {
+              switch (type) {
+                case "pkmsg": return await altSession.decryptPreKeyWhisperMessage(ciphertext)
+                case "msg": return await altSession.decryptWhisperMessage(ciphertext)
+              }
+            }, alternateJid)
+          } catch (altErr) {
+            const altMsg = altErr?.message || ""
+            logger?.warn?.({ alternateJid, error: altMsg }, "Decryption with alternate address also failed")
+            throw e
+          }
+        }
         throw e
       }
     },

package/lib/Socket/index.js

@@ -1,19 +1,23 @@
 import { DEFAULT_CONNECTION_CONFIG } from '../Defaults/index.js';
-import { makeCommunitiesSocket } from './communities.js';
+import { makeRegistrationSocket } from './registration.js';
 import NexusHandler from './nexus-handler.js';
+
 // export the last socket layer
 const makeWASocket = (config) => {
     const newConfig = {
         ...DEFAULT_CONNECTION_CONFIG,
         ...config
     };
+
     // If the user hasn't provided their own history sync function,
     // let's create a default one that respects the syncFullHistory flag.
     if (config.shouldSyncHistoryMessage === undefined) {
         newConfig.shouldSyncHistoryMessage = () => !!newConfig.syncFullHistory;
     }
-    return makeCommunitiesSocket(newConfig);
+
+    return makeRegistrationSocket(newConfig);
 };
+
 export { NexusHandler };
-export default makeWASocket;
-//# sourceMappingURL=index.js.map
+export { makeWASocket };
+export default makeWASocket;

package/lib/Socket/messages-recv.js

@@ -46,12 +46,12 @@ export const makeMessagesRecvSocket = (config) => {
 
   const handleMexNewsletterNotification = async (node) => {
     const mexNode = getBinaryNodeChild(node, "mex")
-    if (!mexNode?.content) { logger.warn({ node }, "Invalid mex newsletter notification"); return }
+    if (!mexNode?.content) { /*logger.warn({ node }, "Invalid mex newsletter notification");*/ return }
     let data
-    try { data = JSON.parse(mexNode.content.toString()) } catch (error) { logger.error({ err: error, node }, "Failed to parse mex newsletter notification"); return }
+    try { data = JSON.parse(mexNode.content.toString()) } catch (error) { /*logger.error({ err: error, node }, "Failed to parse mex newsletter notification");*/ return }
     const operation = data?.operation
     const updates = data?.updates
-    if (!updates || !operation) { logger.warn({ data }, "Invalid mex newsletter notification content"); return }
+    if (!updates || !operation) { /*logger.warn({ data }, "Invalid mex newsletter notification content");*/ return }
     logger.info({ operation, updates }, "got mex newsletter notification")
     switch (operation) {
       case "NotificationNewsletterUpdate":
@@ -459,9 +459,9 @@ export const makeMessagesRecvSocket = (config) => {
         if (shouldRecreateSession) { logger.debug({ participant, retryCount, reason: recreateReason }, "recreating session for outgoing retry"); await authState.keys.set({ session: { [sessionId]: null } }) }
       } catch (error) { logger.warn({ error, participant }, "failed to check session recreation for outgoing retry") }
     }
-    await assertSessions([participant], true)
+    await assertSessions([participant], false);
     if (isJidGroup(remoteJid)) await authState.keys.set({ "sender-key-memory": { [remoteJid]: null } })
-    logger.debug({ participant, sendToAll, shouldRecreateSession, recreateReason }, "forced new session for retry recp")
+    logger.debug({ participant, sendToAll, shouldRecreateSession, recreateReason }, "preparing retry recp")
     for (const [i, msg] of msgs.entries()) {
       if (!ids[i]) continue
       if (msg && (await willSendMessageAgain(ids[i], participant))) {
@@ -488,7 +488,7 @@ export const makeMessagesRecvSocket = (config) => {
       ids.push(...items.map((i) => i.attrs.id))
     }
     try {
-      await Promise.all([receiptMutex.mutex(async () => {
+      await Promise.all([processingMutex.mutex(async () => {
         const status = getStatusFromReceiptType(attrs.type)
         if (typeof status !== "undefined" && (status >= proto.WebMessageInfo.Status.SERVER_ACK || !isNodeFromMe)) {
           if (isJidGroup(remoteJid) || isJidStatusBroadcast(remoteJid)) {
@@ -509,7 +509,18 @@ export const makeMessagesRecvSocket = (config) => {
                 await sendMessagesAgain(key, ids, retryNode)
               } catch (error) { logger.error({ key, ids, trace: error instanceof Error ? error.stack : "Unknown error" }, "error in sending message again") }
             } else logger.info({ attrs, key }, "recv retry for not fromMe message")
-          } else logger.info({ attrs, key }, "will not send message again, as sent too many times")
+          } else {
+            logger.info({ attrs, key, participant: key.participant }, "retry limit exhausted - clearing broken session")
+            try {
+              await signalRepository.deleteSession([key.participant])
+              logger.debug({ participant: key.participant }, "deleted stale session for retry-exhausted participant")
+              const retryKey = `${ids[0]}:${key.participant}`
+              await msgRetryCache.del(retryKey)
+              logger.debug({ retryKey }, "cleared retry count cache")
+            } catch (err) {
+              logger.error({ err, participant: key.participant }, "failed to clear session/cache at retry exhaustion")
+            }
+          }
         }
       })])
     } finally {