violetics 7.0.7-alpha → 7.0.8-alpha

package/lib/Socket/messages-recv.js

@@ -7,18 +7,16 @@ import { DEFAULT_CACHE_TTLS, KEY_BUNDLE_TYPE, MIN_PREKEY_COUNT, PLACEHOLDER_MAX_
 import { WAMessageStatus, WAMessageStubType } from '../Types/index.js';
 import { aesDecryptCTR, aesEncryptGCM, cleanMessage, Curve, decodeMediaRetryNode, decodeMessageNode, decryptMessageNode, delay, derivePairingCodeKey, encodeBigEndian, encodeSignedDeviceIdentity, extractAddressingContext, getCallStatusFromNode, getHistoryMsg, getNextPreKeys, getStatusFromReceiptType, handleIdentityChange, hkdf, MISSING_KEYS_ERROR_TEXT, NACK_REASONS, NO_MESSAGE_FOUND_ERROR_TEXT, toNumber, unixTimestampSeconds, xmppPreKey, xmppSignedPreKey } from '../Utils/index.js';
 import { makeMutex } from '../Utils/make-mutex.js';
-import { makeOfflineNodeProcessor } from '../Utils/offline-node-processor.js';
-import { buildAckStanza } from '../Utils/stanza-ack.js';
 import { areJidsSameUser, binaryNodeToString, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildBuffer, getBinaryNodeChildren, getBinaryNodeChildString, isJidGroup, isJidNewsletter, isJidStatusBroadcast, isLidUser, isPnUser, jidDecode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
 import { extractGroupMetadata } from './groups.js';
 import { makeMessagesSocket } from './messages-send.js';
+import { USyncQuery, USyncUser } from '../WAUSync/index.js';
 export const makeMessagesRecvSocket = (config) => {
     const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid, enableAutoSessionRecreation } = config;
     const sock = makeMessagesSocket(config);
-    const { ev, authState, ws, messageMutex, notificationMutex, receiptMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage, generateMessageTag, messageRetryManager } = sock;
+    const { ev, authState, ws, messageMutex, notificationMutex, receiptMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage, messageRetryManager } = sock;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
     const retryMutex = makeMutex();
-    const devicesMutex = makeMutex();
     const msgRetryCache = config.msgRetryCounterCache ||
         new NodeCache({
             stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
@@ -34,11 +32,6 @@ export const makeMessagesRecvSocket = (config) => {
             stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
             useClones: false
         });
-    const userDevicesCache = config.userDevicesCache ??=
-        new NodeCache({
-            stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
-            useClones: false
-        });
     // Debounce identity-change session refreshes per JID to avoid bursts
     const identityAssertDebounce = new NodeCache({ stdTTL: 5, useClones: false });
     let sendActiveReceipts = false;
@@ -212,7 +205,7 @@ export const makeMessagesRecvSocket = (config) => {
                             message: messageProto,
                             messageTimestamp: +child.attrs.t
                         }).toJSON();
-                        await upsertMessage(fullMessage, 'append');
+                        await upsertMessage(fullMessage, 'notify');
                         logger.info('Processed plaintext newsletter message');
                     }
                     catch (error) {
@@ -225,9 +218,32 @@ export const makeMessagesRecvSocket = (config) => {
                 break;
         }
     };
-    const sendMessageAck = async (node, errorCode) => {
-        const stanza = buildAckStanza(node, errorCode, authState.creds.me.id);
-        logger.debug({ recv: { tag: node.tag, attrs: node.attrs }, sent: stanza.attrs }, 'sent ack');
+    const sendMessageAck = async ({ tag, attrs, content }, errorCode) => {
+        const stanza = {
+            tag: 'ack',
+            attrs: {
+                id: attrs.id,
+                to: attrs.from,
+                class: tag
+            }
+        };
+        if (!!errorCode) {
+            stanza.attrs.error = errorCode.toString();
+        }
+        if (!!attrs.participant) {
+            stanza.attrs.participant = attrs.participant;
+        }
+        if (!!attrs.recipient) {
+            stanza.attrs.recipient = attrs.recipient;
+        }
+        if (!!attrs.type &&
+            (tag !== 'message' || getBinaryNodeChild({ tag, attrs, content }, 'unavailable') || errorCode !== 0)) {
+            stanza.attrs.type = attrs.type;
+        }
+        if (tag === 'message' && getBinaryNodeChild({ tag, attrs, content }, 'unavailable')) {
+            stanza.attrs.from = authState.creds.me.id;
+        }
+        logger.debug({ recv: { tag, attrs }, sent: stanza.attrs }, 'sent ack');
         await sendNode(stanza);
     };
     const rejectCall = async (callId, callFrom) => {
@@ -251,97 +267,6 @@ export const makeMessagesRecvSocket = (config) => {
         };
         await query(stanza);
     };
-    // Lia@Note 01-03-26 --- Source: https://github.com/koptereli/Baileys/commit/575cd41e6f01a9b3e1d7e2708c2292fa93de91f2
-    const initiateCall = async (jid, options = {}) => {
-        const meId = authState.creds.me?.id;
-        if (!meId) {
-            throw new Boom('Not authenticated');
-        }
-        const callId = randomBytes(8).toString('hex');
-        const isVideo = !!options.isVideo;
-        const isGroup = isJidGroup(jid);
-        const stanza = {
-            tag: 'call',
-            attrs: {
-                id: generateMessageTag(),
-                from: meId,
-                to: jid,
-                t: String(unixTimestampSeconds()),
-                ...(authState.creds.me?.name ? { notify: authState.creds.me.name } : {})
-            },
-            content: [
-                {
-                    tag: 'offer',
-                    attrs: {
-                        'call-id': callId,
-                        'call-creator': meId,
-                        count: '0'
-                    },
-                    content: [
-                        {
-                            tag: isVideo ? 'video' : 'audio',
-                            attrs: {}
-                        },
-                        {
-                            tag: 'net',
-                            attrs: {}
-                        },
-                        {
-                            tag: 'encopt',
-                            attrs: { key: randomBytes(2).toString('hex') }
-                        },
-                        {
-                            tag: 'relaylatency',
-                            attrs: {}
-                        },
-                        {
-                            tag: 'te',
-                            attrs: {}
-                        }
-                    ]
-                }
-            ]
-        };
-        await query(stanza);
-        await callOfferCache.set(callId, {
-            chatId: jid,
-            from: meId,
-            id: callId,
-            date: new Date(),
-            offline: false,
-            status: 'offer',
-            isVideo,
-            isGroup,
-            groupJid: isGroup ? jid : undefined
-        });
-        // TODO: implement ICE/DTLS-SRTP call media setup once full signaling requirements are mapped.
-        return { callId, to: jid, isVideo };
-    };
-    const cancelCall = async (callId, callTo) => {
-        const meId = authState.creds.me?.id;
-        if (!meId) {
-            throw new Boom('Not authenticated');
-        }
-        const stanza = {
-            tag: 'call',
-            attrs: {
-                from: meId,
-                to: callTo
-            },
-            content: [
-                {
-                    tag: 'terminate',
-                    attrs: {
-                        'call-id': callId,
-                        'call-creator': meId,
-                        count: '0'
-                    }
-                }
-            ]
-        };
-        await query(stanza);
-        await callOfferCache.del(callId);
-    };
     const sendRetryRequest = async (node, forceIncludeKeys = false) => {
         const { fullMessage } = decodeMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '');
         const { key: msgKey } = fullMessage;
@@ -621,64 +546,6 @@ export const makeMessagesRecvSocket = (config) => {
                 break;
         }
     };
-    const handleDevicesNotification = async (node) => {
-        const [child] = getAllBinaryNodeChildren(node);
-        const from = jidNormalizedUser(node.attrs.from);
-        const devices = getBinaryNodeChildren(child, 'device');
-        if (areJidsSameUser(from, authState.creds.me.id) ||
-            areJidsSameUser(from, authState.creds.me.lid)) {
-            const deviceJids = devices.map(d => d.attrs.jid);
-            logger.info({ deviceJids }, 'got my own devices');
-        }
-        if (!devices || !devices.length || !devices[0]) {
-            logger.debug({ from }, 'no devices in notification, skipping');
-            return;
-        }
-        const deviceJid = devices[0].attrs.jid;
-        const decoded = jidDecode(deviceJid);
-        if (!decoded) return;
-        const { user, device } = decoded;
-        const tag = child.tag;
-        if (!deviceJid) {
-            logger.debug({ tag }, 'no device jid in notification, skipping');
-            return;
-        }
-        await devicesMutex.mutex(async () => {
-            if (tag === 'update') {
-                logger.debug({ user }, `${user}'s device list updated, dropping cached devices`);
-                if (userDevicesCache) {
-                    await userDevicesCache.del(user);
-                }
-                return;
-            }
-            const existingCache = (await (userDevicesCache?.get(user))) || [];
-            if (!existingCache.length) {
-                logger.debug({ user, tag }, 'device list not cached, skipping cache update')
-                return;
-            }
-            const deviceHash = child.attrs.device_hash;
-            let updatedDevices = [];
-            switch (tag) {
-                case 'add':
-                    logger.info({ deviceHash }, 'device added');
-                    updatedDevices = [
-                        ...existingCache.filter(d => d.device !== device),
-                        { user, device }
-                    ];
-                    break;
-                case 'remove':
-                    logger.info({ deviceHash }, 'device removed');
-                    updatedDevices = existingCache.filter(d => d.device !== device);
-                    break;
-                default:
-                    logger.debug({ tag }, 'Unknown device list change tag');
-                    return;
-            }
-            if (updatedDevices.length > 0 && userDevicesCache) {
-                await userDevicesCache.set(user, updatedDevices);
-            }
-        });
-    };
     const processNotification = async (node) => {
         const result = {};
         const [child] = getAllBinaryNodeChildren(node);
@@ -703,12 +570,13 @@ export const makeMessagesRecvSocket = (config) => {
                 await handleEncryptNotification(node);
                 break;
             case 'devices':
-                try {
-                    await handleDevicesNotification(node);
-                }
-                catch (error) {
-			     		logger.error({ error, node }, 'failed to handle devices notification');
+                const devices = getBinaryNodeChildren(child, 'device');
+                if (areJidsSameUser(child.attrs.jid, authState.creds.me.id) ||
+                    areJidsSameUser(child.attrs.lid, authState.creds.me.lid)) {
+                    const deviceData = devices.map(d => ({ id: d.attrs.jid, lid: d.attrs.lid }));
+                    logger.info({ deviceData }, 'my own devices changed');
                 }
+                //TODO: drop a new event, add hashes
                 break;
             case 'server_sync':
                 const update = getBinaryNodeChild(node, 'collection');
@@ -1037,7 +905,7 @@ export const makeMessagesRecvSocket = (config) => {
             ]);
         }
         finally {
-            await sendMessageAck(node).catch(ackErr => logger.error({ ackErr }, 'failed to ack receipt'));
+            await sendMessageAck(node);
         }
     };
     const handleNotification = async (node) => {
@@ -1072,7 +940,245 @@ export const makeMessagesRecvSocket = (config) => {
             ]);
         }
         finally {
-            await sendMessageAck(node).catch(ackErr => logger.error({ ackErr }, 'failed to ack notification'));
+            await sendMessageAck(node);
+        }
+    };
+    const resolveMentionedLIDs = async (msg, lidMapping) => {
+        if (msg.key?.participant?.endsWith('@lid')) {
+            try {
+                const pn = await lidMapping.getPNForLID(msg.key.participant);
+                if (pn) {
+                    logger.debug({ lid: msg.key.participant, pn }, 'resolved key.participant LID → PN');
+                    msg.key.participant = pn;
+                }
+            }
+            catch { }
+        }
+        if (msg.key?.remoteJid?.endsWith('@lid')) {
+            try {
+                const pn = await lidMapping.getPNForLID(msg.key.remoteJid);
+                if (pn) {
+                    logger.debug({ lid: msg.key.remoteJid, pn }, 'resolved key.remoteJid LID → PN');
+                    msg.key.remoteJid = pn;
+                }
+            }
+            catch { }
+        }
+        const msgContent = msg.message;
+        if (!msgContent)
+            return;
+        const getContextInfo = (content) => {
+            if (!content || typeof content !== 'object')
+                return null;
+            if (content.contextInfo)
+                return content.contextInfo;
+            for (const val of Object.values(content)) {
+                const found = getContextInfo(val);
+                if (found)
+                    return found;
+            }
+            return null;
+        };
+        const getTextField = (content) => {
+            if (!content || typeof content !== 'object')
+                return null;
+            for (const key of ['text', 'caption', 'conversation']) {
+                if (typeof content[key] === 'string')
+                    return { obj: content, key };
+            }
+            for (const val of Object.values(content)) {
+                const found = getTextField(val);
+                if (found)
+                    return found;
+            }
+            return null;
+        };
+        // Resolve semua contextInfo termasuk yang ada di dalam quotedMessage
+        const getAllContextInfos = (content, results = []) => {
+            if (!content || typeof content !== 'object') return results;
+            if (content.contextInfo) {
+                results.push(content.contextInfo);
+                // Juga cari di dalam quotedMessage secara rekursif
+                if (content.contextInfo.quotedMessage) {
+                    getAllContextInfos(content.contextInfo.quotedMessage, results);
+                }
+            }
+            for (const val of Object.values(content)) {
+                if (val && typeof val === 'object' && !results.includes(val)) {
+                    getAllContextInfos(val, results);
+                }
+            }
+            return results;
+        };
+        const contextInfo = getContextInfo(msgContent);
+        // Resolve participant LID di semua contextInfo (termasuk quotedMessage)
+        const allContextInfos = getAllContextInfos(msgContent);
+        for (const ctx of allContextInfos) {
+            if (ctx?.participant?.endsWith('@lid')) {
+                try {
+                    const pn = await lidMapping.getPNForLID(ctx.participant);
+                    if (pn) {
+                        logger.debug({ lid: ctx.participant, pn }, 'resolved nested contextInfo.participant LID → PN');
+                        ctx.participant = pn;
+                    }
+                } catch { }
+            }
+            // Resolve mentionedJid di quotedMessage contextInfo juga
+            if (ctx !== contextInfo && ctx?.mentionedJid?.length) {
+                const lids = ctx.mentionedJid.filter(j => j?.endsWith('@lid'));
+                for (const lid of lids) {
+                    try {
+                        const pn = await lidMapping.getPNForLID(lid);
+                        if (pn) ctx.mentionedJid = ctx.mentionedJid.map(j => j === lid ? pn : j);
+                    } catch { }
+                }
+            }
+        }
+        // resolve contextInfo.participant (sender of quoted message) jika masih LID
+        if (contextInfo?.participant?.endsWith('@lid')) {
+            try {
+                const pn = await lidMapping.getPNForLID(contextInfo.participant);
+                if (pn) {
+                    logger.debug({ lid: contextInfo.participant, pn }, 'resolved contextInfo.participant LID → PN');
+                    contextInfo.participant = pn;
+                }
+            }
+            catch { }
+        }
+        if (!contextInfo?.mentionedJid?.length)
+            return;
+        // Fix text yang masih mengandung LID number meskipun mentionedJid sudah resolved ke PN
+        // Kasus: mentionedJid sudah jadi @s.whatsapp.net tapi text masih "@165159209271535" (LID num)
+        const textFieldEarly = getTextField(msgContent);
+        if (textFieldEarly) {
+            let earlyText = textFieldEarly.obj[textFieldEarly.key] || '';
+            // Cek apakah text mengandung @angka panjang (>12 digit = kemungkinan LID number bukan nomor HP)
+            const lidNumPattern = /@(\d{13,20})/g;
+            const lidNumMatches = [...earlyText.matchAll(lidNumPattern)];
+            if (lidNumMatches.length > 0) {
+                // Untuk setiap mentionedJid yang sudah resolved, cek apakah ada LID number di text
+                for (const resolvedJid of contextInfo.mentionedJid) {
+                    if (resolvedJid?.endsWith('@lid')) continue; // belum resolved, skip dulu
+                    const pnNum = resolvedJid.split('@')[0].split(':')[0];
+                    if (!pnNum) continue;
+                    // Cari LID number di text yang paling mungkin match (berdasarkan urutan)
+                    for (const match of lidNumMatches) {
+                        const lidNum = match[1];
+                        if (earlyText.includes(`@${lidNum}`)) {
+                            earlyText = earlyText.split(`@${lidNum}`).join(`@${pnNum}`);
+                            logger.debug({ lidNum, pnNum }, 'replaced LID number in text with PN number');
+                            break;
+                        }
+                    }
+                }
+                textFieldEarly.obj[textFieldEarly.key] = earlyText;
+            }
+        }
+        const hasLid = contextInfo.mentionedJid.some((j) => j?.endsWith('@lid'));
+        if (!hasLid)
+            return;
+        const lidJids = contextInfo.mentionedJid.filter((j) => j?.endsWith('@lid'));
+        const resolveMap = new Map();
+        const stillUnresolved = [];
+        for (const lidJid of lidJids) {
+            try {
+                const pn = await lidMapping.getPNForLID(lidJid);
+                if (pn) {
+                    resolveMap.set(lidJid, pn);
+                }
+                else {
+                    stillUnresolved.push(lidJid);
+                }
+            }
+            catch {
+                stillUnresolved.push(lidJid);
+            }
+        }
+        if (stillUnresolved.length > 0) {
+            try {
+                const usyncQ = new USyncQuery()
+                    .withContactProtocol()
+                    .withContext('background');
+                for (const lidJid of stillUnresolved) {
+                    usyncQ.withUser(new USyncUser().withId(lidJid));
+                }
+                const result = await sock.executeUSyncQuery(usyncQ);
+                if (result?.list) {
+                    const mappings = [];
+                    for (const item of result.list) {
+                        // item.id bisa berupa PN (@s.whatsapp.net) atau LID (@lid)
+                        // stillUnresolved berisi LID. Match berdasarkan numeric prefix
+                        const itemNum = (item.id ?? '').split('@')[0].split(':')[0];
+                        const lidJid = stillUnresolved.find(l => {
+                            if (l === item.id) return true;
+                            const lNum = l.split('@')[0].split(':')[0];
+                            return itemNum && lNum && itemNum === lNum;
+                        });
+                        if (lidJid && item.id && !item.id.endsWith('@lid')) {
+                            resolveMap.set(lidJid, item.id);
+                            mappings.push({ lid: lidJid, pn: item.id });
+                            logger.debug({ lid: lidJid, pn: item.id }, 'USync resolved LID → PN');
+                        }
+                    }
+                    if (mappings.length > 0) {
+                        lidMapping.storeLIDPNMappings(mappings).catch(() => { });
+                    }
+                }
+            }
+            catch (e) {
+                logger.debug({ err: e }, 'USync LID resolve failed, using cache only');
+            }
+        }
+        // ── Text-based PN extraction ─────────────────────────────────────────────
+        // WA kadang sudah resolve nomor HP di text (@6285133801810) tapi mentionedJid
+        // masih berisi LID. Kita ekstrak semua @nomor dari text lalu matching ke LID
+        // yang masih unresolved berdasarkan urutan kemunculan di mentionedJid.
+        const textField = getTextField(msgContent);
+        const stillUnresolvedAfterUSync = lidJids.filter(l => !resolveMap.has(l));
+        if (stillUnresolvedAfterUSync.length > 0 && textField) {
+            const rawText = textField.obj[textField.key] || '';
+            // Ekstrak semua mention @nomor dari text (hanya angka, min 7 digit)
+            const mentionMatches = [...rawText.matchAll(/@(\d{7,15})/g)].map(m => m[1]);
+            if (mentionMatches.length > 0) {
+                // Match LID ke nomor berdasarkan urutan index di mentionedJid
+                const lidOrder = contextInfo.mentionedJid
+                    .map((jid, idx) => ({ jid, idx }))
+                    .filter(({ jid }) => stillUnresolvedAfterUSync.includes(jid));
+                for (let i = 0; i < lidOrder.length && i < mentionMatches.length; i++) {
+                    const lidJid = lidOrder[i].jid;
+                    const phoneNum = mentionMatches[i];
+                    const pnJid = `${phoneNum}@s.whatsapp.net`;
+                    resolveMap.set(lidJid, pnJid);
+                    // Simpan mapping baru ini ke store untuk request berikutnya
+                    lidMapping.storeLIDPNMappings([{ lid: lidJid, pn: pnJid }]).catch(() => {});
+                    logger.debug({ lid: lidJid, pn: pnJid }, 'text-extracted PN for LID → PN');
+                }
+            }
+        }
+        // ── End text-based PN extraction ─────────────────────────────────────────
+
+        contextInfo.mentionedJid = contextInfo.mentionedJid.map((jid) => {
+            if (!jid?.endsWith('@lid'))
+                return jid;
+            const resolved = resolveMap.get(jid);
+            if (resolved) {
+                logger.debug({ lid: jid, pn: resolved }, 'resolved mentionedJid LID → PN');
+                return resolved;
+            }
+            // Tetap kembalikan LID jika benar-benar tidak bisa di-resolve
+            return jid;
+        });
+        if (textField) {
+            let text = textField.obj[textField.key];
+            // Replace LID number di text dengan PN number yang sudah di-resolve
+            for (const [lidJid, pnJid] of resolveMap) {
+                const lidNum = lidJid.split('@')[0].split(':')[0] ?? '';
+                const pnNum = pnJid.replace('@s.whatsapp.net', '').split(':')[0] ?? '';
+                if (lidNum && pnNum && text.includes(lidNum)) {
+                    text = text.split(lidNum).join(pnNum);
+                }
+            }
+            textField.obj[textField.key] = text;
         }
     };
     const handleMessage = async (node) => {
@@ -1088,34 +1194,36 @@ export const makeMessagesRecvSocket = (config) => {
             await sendMessageAck(node, NACK_REASONS.MissingMessageSecret);
             return;
         }
-        let acked = false;
-        try {
-            const { fullMessage: msg, category, author, decrypt } = decryptMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
-            const alt = msg.key.participantAlt || msg.key.remoteJidAlt;
-            // store new mappings we didn't have before
-            if (!!alt) {
-                const altServer = jidDecode(alt)?.server;
-                const primaryJid = msg.key.participant || msg.key.remoteJid;
-                if (altServer === 'lid') {
-                    if (!(await signalRepository.lidMapping.getPNForLID(alt))) {
-                        await signalRepository.lidMapping.storeLIDPNMappings([{ lid: alt, pn: primaryJid }]);
-                        await signalRepository.migrateSession(primaryJid, alt);
-                    }
-                }
-                else {
-                    await signalRepository.lidMapping.storeLIDPNMappings([{ lid: primaryJid, pn: alt }]);
-                    await signalRepository.migrateSession(alt, primaryJid);
+        const { fullMessage: msg, category, author, decrypt } = decryptMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
+        const alt = msg.key.participantAlt || msg.key.remoteJidAlt;
+        // store new mappings we didn't have before
+        if (!!alt) {
+            const altServer = jidDecode(alt)?.server;
+            const primaryJid = msg.key.participant || msg.key.remoteJid;
+            if (altServer === 'lid') {
+                if (!(await signalRepository.lidMapping.getPNForLID(alt))) {
+                    await signalRepository.lidMapping.storeLIDPNMappings([{ lid: alt, pn: primaryJid }]);
+                    await signalRepository.migrateSession(primaryJid, alt);
                 }
             }
+            else {
+                await signalRepository.lidMapping.storeLIDPNMappings([{ lid: primaryJid, pn: alt }]);
+                await signalRepository.migrateSession(alt, primaryJid);
+            }
+        }
+        if (msg.key?.remoteJid && msg.key?.id && messageRetryManager) {
+            messageRetryManager.addRecentMessage(msg.key.remoteJid, msg.key.id, msg.message);
+            logger.debug({
+                jid: msg.key.remoteJid,
+                id: msg.key.id
+            }, 'Added message to recent cache for retry receipts');
+        }
+        try {
             await messageMutex.mutex(async () => {
                 await decrypt();
-                if (msg.key?.remoteJid && msg.key?.id && msg.message && messageRetryManager) {
-                    messageRetryManager.addRecentMessage(msg.key.remoteJid, msg.key.id, msg.message);
-                }
                 // message failed to decrypt
                 if (msg.messageStubType === proto.WebMessageInfo.StubType.CIPHERTEXT && msg.category !== 'peer') {
                     if (msg?.messageStubParameters?.[0] === MISSING_KEYS_ERROR_TEXT) {
-                        acked = true;
                         return sendMessageAck(node, NACK_REASONS.ParsingError);
                     }
                     if (msg.messageStubParameters?.[0] === NO_MESSAGE_FOUND_ERROR_TEXT) {
@@ -1127,13 +1235,11 @@ export const makeMessagesRecvSocket = (config) => {
                             unavailableType === 'hosted_unavailable_fanout' ||
                             unavailableType === 'view_once_unavailable_fanout') {
                             logger.debug({ msgId: msg.key.id, unavailableType }, 'skipping placeholder resend for excluded unavailable type');
-                            acked = true;
                             return sendMessageAck(node);
                         }
                         const messageAge = unixTimestampSeconds() - toNumber(msg.messageTimestamp);
                         if (messageAge > PLACEHOLDER_MAX_AGE_SECONDS) {
                             logger.debug({ msgId: msg.key.id, messageAge }, 'skipping placeholder resend for old message');
-                            acked = true;
                             return sendMessageAck(node);
                         }
                         // Request the real content from the phone via placeholder resend PDO.
@@ -1170,7 +1276,6 @@ export const makeMessagesRecvSocket = (config) => {
                             .catch(err => {
                             logger.warn({ err, msgId: msg.key.id }, 'failed to request placeholder resend for unavailable message');
                         });
-                        acked = true;
                         await sendMessageAck(node);
                         // Don't return — fall through to upsertMessage so the stub is emitted
                     }
@@ -1180,7 +1285,6 @@ export const makeMessagesRecvSocket = (config) => {
                             const messageAge = unixTimestampSeconds() - toNumber(msg.messageTimestamp);
                             if (messageAge > STATUS_EXPIRY_SECONDS) {
                                 logger.debug({ msgId: msg.key.id, messageAge, remoteJid: msg.key.remoteJid }, 'skipping retry for expired status message');
-                                acked = true;
                                 return sendMessageAck(node);
                             }
                         }
@@ -1224,7 +1328,6 @@ export const makeMessagesRecvSocket = (config) => {
                                     logger.error({ retryErr }, 'Failed to send retry after error handling');
                                 }
                             }
-                            acked = true;
                             await sendMessageAck(node, NACK_REASONS.UnhandledError);
                         });
                     }
@@ -1253,7 +1356,6 @@ export const makeMessagesRecvSocket = (config) => {
                         else if (!sendActiveReceipts) {
                             type = 'inactive';
                         }
-                        acked = true;
                         await sendReceipt(msg.key.remoteJid, participant, [msg.key.id], type);
                         // send ack for history message
                         const isAnyHistoryMsg = getHistoryMsg(msg.message);
@@ -1263,66 +1365,147 @@ export const makeMessagesRecvSocket = (config) => {
                         }
                     }
                     else {
-                        acked = true;
                         await sendMessageAck(node);
                         logger.debug({ key: msg.key }, 'processed newsletter message without receipts');
                     }
                 }
                 cleanMessage(msg, authState.creds.me.id, authState.creds.me.lid);
+                await resolveMentionedLIDs(msg, signalRepository.lidMapping);
+                // ── Post-resolve: fix semua LID yang tersisa di message object ────────
+                // Setelah resolveMentionedLIDs:
+                //   1. Fix text yang masih "@LIDnum" → "@PNnum"
+                //   2. Fix contextInfo.participant yang masih @lid (sender quoted)
+                //   3. Fix mentionedJid & text di dalam quotedMessage
+                try {
+                    const _safeSet = (obj, key, val) => {
+                        try { obj[key] = val; } catch (_) {
+                            // proto readonly fallback
+                            const proto = Object.getPrototypeOf(obj);
+                            const fresh = Object.assign(Object.create(proto), obj, { [key]: val });
+                            // replace reference di parent jika bisa — caller handles
+                            return fresh;
+                        }
+                        return obj;
+                    };
+                    const _fixTextLid = (innerMsg, mentionedJids, msgTypeLabel) => {
+                        const pnNumbers = (mentionedJids || [])
+                            .filter(j => j && !j.endsWith('@lid'))
+                            .map(j => j.split('@')[0].split(':')[0])
+                            .filter(Boolean);
+                        if (!pnNumbers.length) return;
+                        for (const textKey of ['text', 'caption', 'conversation']) {
+                            const originalText = innerMsg[textKey];
+                            if (typeof originalText !== 'string') continue;
+                            const lidPattern = /@(\d{13,20})/g;
+                            let newText = originalText;
+                            let match;
+                            let pnIdx = 0;
+                            while ((match = lidPattern.exec(originalText)) !== null) {
+                                if (pnIdx >= pnNumbers.length) break;
+                                const lidNum = match[1];
+                                const pnNum = pnNumbers[pnIdx++];
+                                newText = newText.split(`@${lidNum}`).join(`@${pnNum}`);
+                                logger.debug({ lidNum, pnNum, type: msgTypeLabel, textKey }, 'post-resolve: replaced LID num in text');
+                            }
+                            if (newText !== originalText) _safeSet(innerMsg, textKey, newText);
+                        }
+                    };
+                    const msgObj = msg.message;
+                    if (msgObj) {
+                        for (const msgType of Object.keys(msgObj)) {
+                            const innerMsg = msgObj[msgType];
+                            if (!innerMsg || typeof innerMsg !== 'object') continue;
+                            const ctxInfo = innerMsg.contextInfo;
+                            if (!ctxInfo) continue;
+                            // 1. Fix text LID → PN (pesan utama)
+                            if (ctxInfo.mentionedJid?.length) {
+                                _fixTextLid(innerMsg, ctxInfo.mentionedJid, msgType);
+                            }
+                            // 2. Fix contextInfo.participant (sender quoted) jika masih LID
+                            if (ctxInfo.participant?.endsWith('@lid')) {
+                                try {
+                                    const pn = await signalRepository.lidMapping.getPNForLID(ctxInfo.participant);
+                                    if (pn) {
+                                        _safeSet(ctxInfo, 'participant', pn);
+                                        logger.debug({ lid: ctxInfo.participant, pn }, 'post-resolve: fixed contextInfo.participant LID');
+                                    }
+                                } catch (_) {}
+                            }
+                            // 3. Fix mentionedJid & text di dalam quotedMessage
+                            if (ctxInfo.quotedMessage) {
+                                for (const qType of Object.keys(ctxInfo.quotedMessage)) {
+                                    const qInner = ctxInfo.quotedMessage[qType];
+                                    if (!qInner || typeof qInner !== 'object') continue;
+                                    const qCtx = qInner.contextInfo;
+                                    if (!qCtx?.mentionedJid?.length) continue;
+                                    // Resolve LID di mentionedJid quoted
+                                    const resolvedQ = await Promise.all(
+                                        qCtx.mentionedJid.map(async (jid) => {
+                                            if (!jid?.endsWith('@lid')) return jid;
+                                            try {
+                                                const pn = await signalRepository.lidMapping.getPNForLID(jid);
+                                                return pn || jid;
+                                            } catch (_) { return jid; }
+                                        })
+                                    );
+                                    if (resolvedQ.some((j, i) => j !== qCtx.mentionedJid[i])) {
+                                        _safeSet(qCtx, 'mentionedJid', resolvedQ);
+                                        logger.debug({ resolvedQ }, 'post-resolve: fixed quotedMessage mentionedJid');
+                                    }
+                                    // Fix text LID → PN di quoted
+                                    _fixTextLid(qInner, resolvedQ, `quoted.${qType}`);
+                                }
+                            }
+                        }
+                    }
+                } catch (lidFixErr) {
+                    logger.debug({ err: lidFixErr }, 'post-resolve LID fix failed (non-critical)');
+                }
+                // ── End post-resolve fix ──────────────────────────────────────────────
                 await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
             });
         }
         catch (error) {
             logger.error({ error, node: binaryNodeToString(node) }, 'error in handling message');
-            if (!acked) {
-                await sendMessageAck(node, NACK_REASONS.UnhandledError).catch(ackErr => logger.error({ ackErr }, 'failed to ack message after error'));
-            }
         }
     };
     const handleCall = async (node) => {
-        try {
-            const { attrs } = node;
-            const [infoChild] = getAllBinaryNodeChildren(node);
-            if (!infoChild) {
-                throw new Boom('Missing call info in call node');
-            }
-            const status = getCallStatusFromNode(infoChild);
-            const callId = infoChild.attrs['call-id'];
-            const from = infoChild.attrs.from || infoChild.attrs['call-creator'];
-            const call = {
-                chatId: attrs.from,
-                from,
-                callerPn: infoChild.attrs['caller_pn'],
-                id: callId,
-                date: new Date(+attrs.t * 1000),
-                offline: !!attrs.offline,
-                status
-            };
-            if (status === 'offer') {
-                call.isVideo = !!getBinaryNodeChild(infoChild, 'video');
-                call.isGroup = infoChild.attrs.type === 'group' || !!infoChild.attrs['group-jid'];
-                call.groupJid = infoChild.attrs['group-jid'];
-                await callOfferCache.set(call.id, call);
-            }
-            const existingCall = await callOfferCache.get(call.id);
-            // use existing call info to populate this event
-            if (existingCall) {
-                call.isVideo = existingCall.isVideo;
-                call.isGroup = existingCall.isGroup;
-                call.callerPn = call.callerPn || existingCall.callerPn;
-            }
-            // delete data once call has ended
-            if (status === 'reject' || status === 'accept' || status === 'timeout' || status === 'terminate') {
-                await callOfferCache.del(call.id);
-            }
-            ev.emit('call', [call]);
+        const { attrs } = node;
+        const [infoChild] = getAllBinaryNodeChildren(node);
+        const status = getCallStatusFromNode(infoChild);
+        if (!infoChild) {
+            throw new Boom('Missing call info in call node');
         }
-        catch (error) {
-            logger.error({ error, node: binaryNodeToString(node) }, 'error in handling call');
+        const callId = infoChild.attrs['call-id'];
+        const from = infoChild.attrs.from || infoChild.attrs['call-creator'];
+        const call = {
+            chatId: attrs.from,
+            from,
+            callerPn: infoChild.attrs['caller_pn'],
+            id: callId,
+            date: new Date(+attrs.t * 1000),
+            offline: !!attrs.offline,
+            status
+        };
+        if (status === 'offer') {
+            call.isVideo = !!getBinaryNodeChild(infoChild, 'video');
+            call.isGroup = infoChild.attrs.type === 'group' || !!infoChild.attrs['group-jid'];
+            call.groupJid = infoChild.attrs['group-jid'];
+            await callOfferCache.set(call.id, call);
         }
-        finally {
-            await sendMessageAck(node).catch(ackErr => logger.error({ ackErr }, 'failed to ack call'));
+        const existingCall = await callOfferCache.get(call.id);
+        // use existing call info to populate this event
+        if (existingCall) {
+            call.isVideo = existingCall.isVideo;
+            call.isGroup = existingCall.isGroup;
+            call.callerPn = call.callerPn || existingCall.callerPn;
         }
+        // delete data once call has ended
+        if (status === 'reject' || status === 'accept' || status === 'timeout' || status === 'terminate') {
+            await callOfferCache.del(call.id);
+        }
+        ev.emit('call', [call]);
+        await sendMessageAck(node);
     };
     const handleBadAck = async ({ attrs }) => {
         const key = { remoteJid: attrs.from, fromMe: true, id: attrs.id };
@@ -1377,16 +1560,52 @@ export const makeMessagesRecvSocket = (config) => {
             return exec(node, false).catch(err => onUnexpectedError(err, identifier));
         }
     };
-    const offlineNodeProcessor = makeOfflineNodeProcessor(new Map([
-        ['message', handleMessage],
-        ['call', handleCall],
-        ['receipt', handleReceipt],
-        ['notification', handleNotification]
-    ]), {
-        isWsOpen: () => ws.isOpen,
-        onUnexpectedError,
-        yieldToEventLoop: () => new Promise(resolve => setImmediate(resolve))
-    });
+    /** Yields control to the event loop to prevent blocking */
+    const yieldToEventLoop = () => {
+        return new Promise(resolve => setImmediate(resolve));
+    };
+    const makeOfflineNodeProcessor = () => {
+        const nodeProcessorMap = new Map([
+            ['message', handleMessage],
+            ['call', handleCall],
+            ['receipt', handleReceipt],
+            ['notification', handleNotification]
+        ]);
+        const nodes = [];
+        let isProcessing = false;
+        // Number of nodes to process before yielding to event loop
+        const BATCH_SIZE = 10;
+        const enqueue = (type, node) => {
+            nodes.push({ type, node });
+            if (isProcessing) {
+                return;
+            }
+            isProcessing = true;
+            const promise = async () => {
+                let processedInBatch = 0;
+                while (nodes.length && ws.isOpen) {
+                    const { type, node } = nodes.shift();
+                    const nodeProcessor = nodeProcessorMap.get(type);
+                    if (!nodeProcessor) {
+                        onUnexpectedError(new Error(`unknown offline node type: ${type}`), 'processing offline node');
+                        continue;
+                    }
+                    await nodeProcessor(node);
+                    processedInBatch++;
+                    // Yield to event loop after processing a batch
+                    // This prevents blocking the event loop for too long when there are many offline nodes
+                    if (processedInBatch >= BATCH_SIZE) {
+                        processedInBatch = 0;
+                        await yieldToEventLoop();
+                    }
+                }
+                isProcessing = false;
+            };
+            promise().catch(error => onUnexpectedError(error, 'processing offline nodes'));
+        };
+        return { enqueue };
+    };
+    const offlineNodeProcessor = makeOfflineNodeProcessor();
     const processNode = async (type, node, identifier, exec) => {
         const isOffline = !!node.attrs.offline;
         if (isOffline) {
@@ -1454,10 +1673,9 @@ export const makeMessagesRecvSocket = (config) => {
         sendMessageAck,
         sendRetryRequest,
         rejectCall,
-        initiateCall,
-        cancelCall,
         fetchMessageHistory,
         requestPlaceholderResend,
         messageRetryManager
     };
-};
+};
+//# sourceMappingURL=messages-recv.js.map