violetics 7.0.1-alpha → 7.0.2-alpha

package/lib/Socket/messages-recv.js

@@ -1,64 +1,222 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeMessagesRecvSocket = void 0;
-const boom_1 = require("@hapi/boom");
-const crypto_1 = require("crypto");
-const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
-const WAProto_1 = require("../../WAProto");
-const Defaults_1 = require("../Defaults");
-const Types_1 = require("../Types");
-const Utils_1 = require("../Utils");
-const make_mutex_1 = require("../Utils/make-mutex");
-const WABinary_1 = require("../WABinary");
-const groups_1 = require("./groups");
-const messages_send_1 = require("./messages-send");
-const makeMessagesRecvSocket = (config) => {
-    const {
-        logger,
-        retryRequestDelayMs,
-        maxMsgRetryCount,
-        getMessage,
-        shouldIgnoreJid
-    } = config;
-    const sock = (0, messages_send_1.makeMessagesSocket)(config);
-    const {
-        ev,
-        authState,
-        ws,
-        processingMutex,
-        signalRepository,
-        query,
-        upsertMessage,
-        resyncAppState,
-        groupMetadata,
-        onUnexpectedError,
-        assertSessions,
-        sendNode,
-        relayMessage,
-        sendReceipt,
-        uploadPreKeys,
-        createParticipantNodes,
-        getUSyncDevices,
-        sendPeerDataOperationMessage
-    } = sock;
+import NodeCache from '@cacheable/node-cache';
+import { Boom } from '@hapi/boom';
+import { randomBytes } from 'crypto';
+import Long from 'long';
+import { proto } from '../../WAProto/index.js';
+import { DEFAULT_CACHE_TTLS, KEY_BUNDLE_TYPE, MIN_PREKEY_COUNT, PLACEHOLDER_MAX_AGE_SECONDS, STATUS_EXPIRY_SECONDS } from '../Defaults/index.js';
+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 { 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';
+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;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
-    const retryMutex = (0, make_mutex_1.makeMutex)();
-    const msgRetryCache = config.msgRetryCounterCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
-        useClones: false
-    });
-    const callOfferCache = config.callOfferCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.CALL_OFFER, // 5 mins
-        useClones: false
-    });
-    const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
-        useClones: false
-    });
+    const retryMutex = makeMutex();
+    const msgRetryCache = config.msgRetryCounterCache ||
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+            useClones: false
+        });
+    const callOfferCache = config.callOfferCache ||
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.CALL_OFFER, // 5 mins
+            useClones: false
+        });
+    const placeholderResendCache = config.placeholderResendCache ||
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+            useClones: false
+        });
+    // Debounce identity-change session refreshes per JID to avoid bursts
+    const identityAssertDebounce = new NodeCache({ stdTTL: 5, useClones: false });
     let sendActiveReceipts = false;
+    const fetchMessageHistory = async (count, oldestMsgKey, oldestMsgTimestamp) => {
+        if (!authState.creds.me?.id) {
+            throw new Boom('Not authenticated');
+        }
+        const pdoMessage = {
+            historySyncOnDemandRequest: {
+                chatJid: oldestMsgKey.remoteJid,
+                oldestMsgFromMe: oldestMsgKey.fromMe,
+                oldestMsgId: oldestMsgKey.id,
+                oldestMsgTimestampMs: oldestMsgTimestamp,
+                onDemandMsgCount: count
+            },
+            peerDataOperationRequestType: proto.Message.PeerDataOperationRequestType.HISTORY_SYNC_ON_DEMAND
+        };
+        return sendPeerDataOperationMessage(pdoMessage);
+    };
+    const requestPlaceholderResend = async (messageKey, msgData) => {
+        if (!authState.creds.me?.id) {
+            throw new Boom('Not authenticated');
+        }
+        if (await placeholderResendCache.get(messageKey?.id)) {
+            logger.debug({ messageKey }, 'already requested resend');
+            return;
+        }
+        else {
+            // Store original message data so PDO response handler can preserve
+            // metadata (LID details, timestamps, etc.) that the phone may omit
+            await placeholderResendCache.set(messageKey?.id, msgData || true);
+        }
+        await delay(2000);
+        if (!(await placeholderResendCache.get(messageKey?.id))) {
+            logger.debug({ messageKey }, 'message received while resend requested');
+            return 'RESOLVED';
+        }
+        const pdoMessage = {
+            placeholderMessageResendRequest: [
+                {
+                    messageKey
+                }
+            ],
+            peerDataOperationRequestType: proto.Message.PeerDataOperationRequestType.PLACEHOLDER_MESSAGE_RESEND
+        };
+        setTimeout(async () => {
+            if (await placeholderResendCache.get(messageKey?.id)) {
+                logger.debug({ messageKey }, 'PDO message without response after 8 seconds. Phone possibly offline');
+                await placeholderResendCache.del(messageKey?.id);
+            }
+        }, 8000);
+        return sendPeerDataOperationMessage(pdoMessage);
+    };
+    // Handles mex newsletter notifications
+    const handleMexNewsletterNotification = async (node) => {
+        const mexNode = getBinaryNodeChild(node, 'mex');
+        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;
+        }
+        const operation = data?.operation;
+        const updates = data?.updates;
+        if (!updates || !operation) {
+            logger.warn({ data }, 'Invalid mex newsletter notification content');
+            return;
+        }
+        logger.info({ operation, updates }, 'got mex newsletter notification');
+        switch (operation) {
+            case 'NotificationNewsletterUpdate':
+                for (const update of updates) {
+                    if (update.jid && update.settings && Object.keys(update.settings).length > 0) {
+                        ev.emit('newsletter-settings.update', {
+                            id: update.jid,
+                            update: update.settings
+                        });
+                    }
+                }
+                break;
+            case 'NotificationNewsletterAdminPromote':
+                for (const update of updates) {
+                    if (update.jid && update.user) {
+                        ev.emit('newsletter-participants.update', {
+                            id: update.jid,
+                            author: node.attrs.from,
+                            user: update.user,
+                            new_role: 'ADMIN',
+                            action: 'promote'
+                        });
+                    }
+                }
+                break;
+            default:
+                logger.info({ operation, data }, 'Unhandled mex newsletter notification');
+                break;
+        }
+    };
+    // Handles newsletter notifications
+    const handleNewsletterNotification = async (node) => {
+        const from = node.attrs.from;
+        const child = getAllBinaryNodeChildren(node)[0];
+        const author = node.attrs.participant;
+        logger.info({ from, child }, 'got newsletter notification');
+        switch (child.tag) {
+            case 'reaction':
+                const reactionUpdate = {
+                    id: from,
+                    server_id: child.attrs.message_id,
+                    reaction: {
+                        code: getBinaryNodeChildString(child, 'reaction'),
+                        count: 1
+                    }
+                };
+                ev.emit('newsletter.reaction', reactionUpdate);
+                break;
+            case 'view':
+                const viewUpdate = {
+                    id: from,
+                    server_id: child.attrs.message_id,
+                    count: parseInt(child.content?.toString() || '0', 10)
+                };
+                ev.emit('newsletter.view', viewUpdate);
+                break;
+            case 'participant':
+                const participantUpdate = {
+                    id: from,
+                    author,
+                    user: child.attrs.jid,
+                    action: child.attrs.action,
+                    new_role: child.attrs.role
+                };
+                ev.emit('newsletter-participants.update', participantUpdate);
+                break;
+            case 'update':
+                const settingsNode = getBinaryNodeChild(child, 'settings');
+                if (settingsNode) {
+                    const update = {};
+                    const nameNode = getBinaryNodeChild(settingsNode, 'name');
+                    if (nameNode?.content)
+                        update.name = nameNode.content.toString();
+                    const descriptionNode = getBinaryNodeChild(settingsNode, 'description');
+                    if (descriptionNode?.content)
+                        update.description = descriptionNode.content.toString();
+                    ev.emit('newsletter-settings.update', {
+                        id: from,
+                        update
+                    });
+                }
+                break;
+            case 'message':
+                const plaintextNode = getBinaryNodeChild(child, 'plaintext');
+                if (plaintextNode?.content) {
+                    try {
+                        const contentBuf = typeof plaintextNode.content === 'string'
+                            ? Buffer.from(plaintextNode.content, 'binary')
+                            : Buffer.from(plaintextNode.content);
+                        const messageProto = proto.Message.decode(contentBuf).toJSON();
+                        const fullMessage = proto.WebMessageInfo.fromObject({
+                            key: {
+                                remoteJid: from,
+                                id: child.attrs.message_id || child.attrs.server_id,
+                                fromMe: false // TODO: is this really true though
+                            },
+                            message: messageProto,
+                            messageTimestamp: +child.attrs.t
+                        }).toJSON();
+                        await upsertMessage(fullMessage, 'append');
+                        logger.info('Processed plaintext newsletter message');
+                    }
+                    catch (error) {
+                        logger.error({ error }, 'Failed to decode plaintext newsletter message');
+                    }
+                }
+                break;
+            default:
+                logger.warn({ node }, 'Unknown newsletter notification');
+                break;
+        }
+    };
     const sendMessageAck = async ({ tag, attrs, content }, errorCode) => {
         const stanza = {
             tag: 'ack',
@@ -67,7 +225,7 @@ const makeMessagesRecvSocket = (config) => {
                 to: attrs.from,
                 class: tag
             }
-        }
+        };
         if (!!errorCode) {
             stanza.attrs.error = errorCode.toString();
         }
@@ -77,145 +235,204 @@ const makeMessagesRecvSocket = (config) => {
         if (!!attrs.recipient) {
             stanza.attrs.recipient = attrs.recipient;
         }
-        if (!!attrs.type && (tag !== 'message' || (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable') || errorCode !== 0)) {
+        if (!!attrs.type &&
+            (tag !== 'message' || getBinaryNodeChild({ tag, attrs, content }, 'unavailable') || errorCode !== 0)) {
             stanza.attrs.type = attrs.type;
         }
-        if (tag === 'message' && (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable')) {
+        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');
+        logger.debug({ recv: { tag, attrs }, sent: stanza.attrs }, 'sent ack');
         await sendNode(stanza);
     };
-    const offerCall = async (toJid, isVideo = false) => {
-        const callId = (0, crypto_1.randomBytes)(16).toString('hex').toUpperCase().substring(0, 64);
-        const offerContent = [];
-        offerContent.push({
-            tag: 'audio',
-            attrs: {
-                enc: 'opus',
-                rate: '16000'
-            }, content: undefined
-        });
-        offerContent.push({
-            tag: 'audio',
+    const rejectCall = async (callId, callFrom) => {
+        const stanza = {
+            tag: 'call',
             attrs: {
-                enc: 'opus',
-                rate: '8000'
-            }, content: undefined
-        });
-        if (isVideo) {
-            offerContent.push({
-                tag: 'video',
-                attrs: {
-                    orientation: '0',
-                    'screen_width': '1920',
-                    'screen_height': '1080',
-                    'device_orientation': '0',
-                    enc: 'vp8',
-                    dec: 'vp8',
+                from: authState.creds.me.id,
+                to: callFrom
+            },
+            content: [
+                {
+                    tag: 'reject',
+                    attrs: {
+                        'call-id': callId,
+                        'call-creator': callFrom,
+                        count: '0'
+                    },
+                    content: undefined
                 }
-            });
-        }
-        offerContent.push({
-            tag: 'net',
-            attrs: {
-                medium: '3'
-            }, content: undefined
-        });
-        offerContent.push({
-            tag: 'capability',
-            attrs: {
-                ver: '1'
-            }, content: new Uint8Array([1, 4, 255, 131, 207, 4])
-        });
-        offerContent.push({
-            tag: 'encopt',
-            attrs: {
-                keygen: '2'
-            }, content: undefined
-        })
-        const encKey = (0, crypto_1.randomBytes)(32);
-        const devices = (await getUSyncDevices([toJid], true, false)).map(({ user, device }) => (0, WABinary_1.jidEncode)(user, 's.whatsapp.net', device));
-        await assertSessions(devices, true);
-        const { nodes: destinations, shouldIncludeDeviceIdentity } = await createParticipantNodes(devices, {
-            call: {
-                callKey: encKey
-            }
-        });
-        offerContent.push({ tag: 'destination', attrs: {}, content: destinations });
-        if (shouldIncludeDeviceIdentity) {
-            offerContent.push({
-                tag: 'device-identity',
-                attrs: {},
-                content: (0, Utils_1.encodeSignedDeviceIdentity)(authState.creds.account, true)
-            });
+            ]
+        };
+        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 stanza = ({
+        const callId = randomBytes(8).toString('hex');
+        const isVideo = !!options.isVideo;
+        const isGroup = isJidGroup(jid);
+        const stanza = {
             tag: 'call',
             attrs: {
-                to: toJid,
+                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': authState.creds.me.id,
-                },
-                content: offerContent,
-            }],
-        });
+            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);
-        return {
-            callId,
-            toJid,
+        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 rejectCall = async (callId, callFrom) => {
-        const stanza = ({
+    const cancelCall = async (callId, callTo) => {
+        const meId = authState.creds.me?.id;
+        if (!meId) {
+            throw new Boom('Not authenticated');
+        }
+        const stanza = {
             tag: 'call',
             attrs: {
-                from: authState.creds.me.id,
-                to: callFrom,
+                from: meId,
+                to: callTo
             },
-            content: [{
-                tag: 'reject',
-                attrs: {
-                    'call-id': callId,
-                    'call-creator': callFrom,
-                    count: '0',
-                },
-                content: undefined,
-            }],
-        });
+            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 } = (0, Utils_1.decodeMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '');
+        const { fullMessage } = decodeMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '');
         const { key: msgKey } = fullMessage;
         const msgId = msgKey.id;
-        const key = `${msgId}:${msgKey === null || msgKey === void 0 ? void 0 : msgKey.participant}`;
-        let retryCount = msgRetryCache.get(key) || 0;
-        if (retryCount >= maxMsgRetryCount) {
-            logger.debug({ retryCount, msgId }, 'reached retry limit, clearing');
-            msgRetryCache.del(key);
-            return;
+        if (messageRetryManager) {
+            // Check if we've exceeded max retries using the new system
+            if (messageRetryManager.hasExceededMaxRetries(msgId)) {
+                logger.debug({ msgId }, 'reached retry limit with new retry manager, clearing');
+                messageRetryManager.markRetryFailed(msgId);
+                return;
+            }
+            // Increment retry count using new system
+            const retryCount = messageRetryManager.incrementRetryCount(msgId);
+            // Use the new retry count for the rest of the logic
+            const key = `${msgId}:${msgKey?.participant}`;
+            await msgRetryCache.set(key, retryCount);
+        }
+        else {
+            // Fallback to old system
+            const key = `${msgId}:${msgKey?.participant}`;
+            let retryCount = (await msgRetryCache.get(key)) || 0;
+            if (retryCount >= maxMsgRetryCount) {
+                logger.debug({ retryCount, msgId }, 'reached retry limit, clearing');
+                await msgRetryCache.del(key);
+                return;
+            }
+            retryCount += 1;
+            await msgRetryCache.set(key, retryCount);
         }
-        retryCount += 1;
-        msgRetryCache.set(key, retryCount);
+        const key = `${msgId}:${msgKey?.participant}`;
+        const retryCount = (await msgRetryCache.get(key)) || 1;
         const { account, signedPreKey, signedIdentityKey: identityKey } = authState.creds;
-        if (retryCount === 1) {
-            //request a resend via phone
-            const msgId = await requestPlaceholderResend(msgKey);
-            logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId}`);
+        const fromJid = node.attrs.from;
+        // Check if we should recreate the session
+        let shouldRecreateSession = false;
+        let recreateReason = '';
+        if (enableAutoSessionRecreation && messageRetryManager && retryCount > 1) {
+            try {
+                // Check if we have a session with this JID
+                const sessionId = signalRepository.jidToSignalProtocolAddress(fromJid);
+                const hasSession = await signalRepository.validateSession(fromJid);
+                const result = messageRetryManager.shouldRecreateSession(fromJid, hasSession.exists);
+                shouldRecreateSession = result.recreate;
+                recreateReason = result.reason;
+                if (shouldRecreateSession) {
+                    logger.debug({ fromJid, retryCount, reason: recreateReason }, 'recreating session for retry');
+                    // Delete existing session to force recreation
+                    await authState.keys.set({ session: { [sessionId]: null } });
+                    forceIncludeKeys = true;
+                }
+            }
+            catch (error) {
+                logger.warn({ error, fromJid }, 'failed to check session recreation');
+            }
+        }
+        if (retryCount <= 2) {
+            // Use new retry manager for phone requests if available
+            if (messageRetryManager) {
+                // Schedule phone request with delay (like whatsmeow)
+                messageRetryManager.schedulePhoneRequest(msgId, async () => {
+                    try {
+                        const requestId = await requestPlaceholderResend(msgKey);
+                        logger.debug(`sendRetryRequest: requested placeholder resend (${requestId}) for message ${msgId} (scheduled)`);
+                    }
+                    catch (error) {
+                        logger.warn({ error, msgId }, 'failed to send scheduled phone request');
+                    }
+                });
+            }
+            else {
+                // Fallback to immediate request
+                const msgId = await requestPlaceholderResend(msgKey);
+                logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId}`);
+            }
         }
-        const deviceIdentity = (0, Utils_1.encodeSignedDeviceIdentity)(account, true);
+        const deviceIdentity = encodeSignedDeviceIdentity(account, true);
         await authState.keys.transaction(async () => {
             const receipt = {
                 tag: 'receipt',
@@ -231,13 +448,15 @@ const makeMessagesRecvSocket = (config) => {
                             count: retryCount.toString(),
                             id: node.attrs.id,
                             t: node.attrs.t,
-                            v: '1'
+                            v: '1',
+                            // ADD ERROR FIELD
+                            error: '0'
                         }
                     },
                     {
                         tag: 'registration',
                         attrs: {},
-                        content: (0, Utils_1.encodeBigEndian)(authState.creds.registrationId)
+                        content: encodeBigEndian(authState.creds.registrationId)
                     }
                 ]
             };
@@ -247,8 +466,8 @@ const makeMessagesRecvSocket = (config) => {
             if (node.attrs.participant) {
                 receipt.attrs.participant = node.attrs.participant;
             }
-            if (retryCount > 1 || forceIncludeKeys) {
-                const { update, preKeys } = await (0, Utils_1.getNextPreKeys)(authState, 1);
+            if (retryCount > 1 || forceIncludeKeys || shouldRecreateSession) {
+                const { update, preKeys } = await getNextPreKeys(authState, 1);
                 const [keyId] = Object.keys(preKeys);
                 const key = preKeys[+keyId];
                 const content = receipt.content;
@@ -256,10 +475,10 @@ const makeMessagesRecvSocket = (config) => {
                     tag: 'keys',
                     attrs: {},
                     content: [
-                        { tag: 'type', attrs: {}, content: Buffer.from(Defaults_1.KEY_BUNDLE_TYPE) },
+                        { tag: 'type', attrs: {}, content: Buffer.from(KEY_BUNDLE_TYPE) },
                         { tag: 'identity', attrs: {}, content: identityKey.public },
-                        (0, Utils_1.xmppPreKey)(key, +keyId),
-                        (0, Utils_1.xmppSignedPreKey)(signedPreKey),
+                        xmppPreKey(key, +keyId),
+                        xmppSignedPreKey(signedPreKey),
                         { tag: 'device-identity', attrs: {}, content: deviceIdentity }
                     ]
                 });
@@ -267,63 +486,73 @@ const makeMessagesRecvSocket = (config) => {
             }
             await sendNode(receipt);
             logger.info({ msgAttrs: node.attrs, retryCount }, 'sent retry receipt');
-        });
+        }, authState?.creds?.me?.id || 'sendRetryRequest');
     };
     const handleEncryptNotification = async (node) => {
         const from = node.attrs.from;
-        if (from === WABinary_1.S_WHATSAPP_NET) {
-            const countChild = (0, WABinary_1.getBinaryNodeChild)(node, 'count');
+        if (from === S_WHATSAPP_NET) {
+            const countChild = getBinaryNodeChild(node, 'count');
             const count = +countChild.attrs.value;
-            const shouldUploadMorePreKeys = count < Defaults_1.MIN_PREKEY_COUNT;
+            const shouldUploadMorePreKeys = count < MIN_PREKEY_COUNT;
             logger.debug({ count, shouldUploadMorePreKeys }, 'recv pre-key count');
             if (shouldUploadMorePreKeys) {
                 await uploadPreKeys();
             }
         }
         else {
-            const identityNode = (0, WABinary_1.getBinaryNodeChild)(node, 'identity');
-            if (identityNode) {
-                logger.info({ jid: from }, 'identity changed');
-                // not handling right now
-                // signal will override new identity anyway
-            }
-            else {
+            const result = await handleIdentityChange(node, {
+                meId: authState.creds.me?.id,
+                meLid: authState.creds.me?.lid,
+                validateSession: signalRepository.validateSession,
+                assertSessions,
+                debounceCache: identityAssertDebounce,
+                logger
+            });
+            if (result.action === 'no_identity_node') {
                 logger.info({ node }, 'unknown encrypt notification');
             }
         }
     };
-    const handleGroupNotification = (participant, child, msg) => {
-        var _a, _b, _c, _d;
-        const participantJid = ((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(child, 'participant')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.jid) || participant;
-        switch (child === null || child === void 0 ? void 0 : child.tag) {
+    const handleGroupNotification = (fullNode, child, msg) => {
+        // TODO: Support PN/LID (Here is only LID now)
+        const actingParticipantLid = fullNode.attrs.participant;
+        const actingParticipantPn = fullNode.attrs.participant_pn;
+        const affectedParticipantLid = getBinaryNodeChild(child, 'participant')?.attrs?.jid || actingParticipantLid;
+        const affectedParticipantPn = getBinaryNodeChild(child, 'participant')?.attrs?.phone_number || actingParticipantPn;
+        switch (child?.tag) {
             case 'create':
-                const metadata = (0, groups_1.extractGroupMetadata)(child);
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CREATE;
+                const metadata = extractGroupMetadata(child);
+                msg.messageStubType = WAMessageStubType.GROUP_CREATE;
                 msg.messageStubParameters = [metadata.subject];
-                msg.key = { participant: metadata.owner };
-                ev.emit('chats.upsert', [{
-                    id: metadata.id,
-                    name: metadata.subject,
-                    conversationTimestamp: metadata.creation,
-                }]);
-                ev.emit('groups.upsert', [{
-                    ...metadata,
-                    author: participant
-                }]);
+                msg.key = { participant: metadata.owner, participantAlt: metadata.ownerPn };
+                ev.emit('chats.upsert', [
+                    {
+                        id: metadata.id,
+                        name: metadata.subject,
+                        conversationTimestamp: metadata.creation
+                    }
+                ]);
+                ev.emit('groups.upsert', [
+                    {
+                        ...metadata,
+                        author: actingParticipantLid,
+                        authorPn: actingParticipantPn
+                    }
+                ]);
                 break;
             case 'ephemeral':
             case 'not_ephemeral':
                 msg.message = {
                     protocolMessage: {
-                        type: WAProto_1.proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING,
+                        type: proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING,
                         ephemeralExpiration: +(child.attrs.expiration || 0)
                     }
                 };
                 break;
             case 'modify':
-                const oldNumber = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant').map(p => p.attrs.jid);
+                const oldNumber = getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid);
                 msg.messageStubParameters = oldNumber || [];
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER;
+                msg.messageStubType = WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER;
                 break;
             case 'promote':
             case 'demote':
@@ -331,181 +560,141 @@ const makeMessagesRecvSocket = (config) => {
             case 'add':
             case 'leave':
                 const stubType = `GROUP_PARTICIPANT_${child.tag.toUpperCase()}`;
-                msg.messageStubType = Types_1.WAMessageStubType[stubType];
-                const participants = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant').map(p => p.attrs.jid);
+                msg.messageStubType = WAMessageStubType[stubType];
+                const participants = getBinaryNodeChildren(child, 'participant').map(({ attrs }) => {
+                    // TODO: Store LID MAPPINGS
+                    return {
+                        id: attrs.jid,
+                        phoneNumber: isLidUser(attrs.jid) && isPnUser(attrs.phone_number) ? attrs.phone_number : undefined,
+                        lid: isPnUser(attrs.jid) && isLidUser(attrs.lid) ? attrs.lid : undefined,
+                        admin: (attrs.type || null)
+                    };
+                });
                 if (participants.length === 1 &&
                     // if recv. "remove" message and sender removed themselves
                     // mark as left
-                    (0, WABinary_1.areJidsSameUser)(participants[0], participant) &&
+                    (areJidsSameUser(participants[0].id, actingParticipantLid) ||
+                        areJidsSameUser(participants[0].id, actingParticipantPn)) &&
                     child.tag === 'remove') {
-                    msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE;
+                    msg.messageStubType = WAMessageStubType.GROUP_PARTICIPANT_LEAVE;
                 }
-                msg.messageStubParameters = participants;
+                msg.messageStubParameters = participants.map(a => JSON.stringify(a));
                 break;
             case 'subject':
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT;
+                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_SUBJECT;
                 msg.messageStubParameters = [child.attrs.subject];
                 break;
             case 'description':
-                const description = (_d = (_c = (0, WABinary_1.getBinaryNodeChild)(child, 'body')) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.toString();
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_DESCRIPTION;
+                const description = getBinaryNodeChild(child, 'body')?.content?.toString();
+                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_DESCRIPTION;
                 msg.messageStubParameters = description ? [description] : undefined;
                 break;
             case 'announcement':
             case 'not_announcement':
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE;
-                msg.messageStubParameters = [(child.tag === 'announcement') ? 'on' : 'off'];
+                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_ANNOUNCE;
+                msg.messageStubParameters = [child.tag === 'announcement' ? 'on' : 'off'];
                 break;
             case 'locked':
             case 'unlocked':
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_RESTRICT;
-                msg.messageStubParameters = [(child.tag === 'locked') ? 'on' : 'off'];
+                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_RESTRICT;
+                msg.messageStubParameters = [child.tag === 'locked' ? 'on' : 'off'];
                 break;
             case 'invite':
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_INVITE_LINK;
+                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_INVITE_LINK;
                 msg.messageStubParameters = [child.attrs.code];
                 break;
             case 'member_add_mode':
                 const addMode = child.content;
                 if (addMode) {
-                    msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBER_ADD_MODE;
+                    msg.messageStubType = WAMessageStubType.GROUP_MEMBER_ADD_MODE;
                     msg.messageStubParameters = [addMode.toString()];
                 }
                 break;
             case 'membership_approval_mode':
-                const approvalMode = (0, WABinary_1.getBinaryNodeChild)(child, 'group_join');
+                const approvalMode = getBinaryNodeChild(child, 'group_join');
                 if (approvalMode) {
-                    msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE;
+                    msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE;
                     msg.messageStubParameters = [approvalMode.attrs.state];
                 }
                 break;
             case 'created_membership_requests':
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
-                msg.messageStubParameters = [participantJid, 'created', child.attrs.request_method];
+                msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
+                msg.messageStubParameters = [
+                    JSON.stringify({ lid: affectedParticipantLid, pn: affectedParticipantPn }),
+                    'created',
+                    child.attrs.request_method
+                ];
                 break;
             case 'revoked_membership_requests':
-                const isDenied = (0, WABinary_1.areJidsSameUser)(participantJid, participant);
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
-                msg.messageStubParameters = [participantJid, isDenied ? 'revoked' : 'rejected'];
-                break;
+                const isDenied = areJidsSameUser(affectedParticipantLid, actingParticipantLid);
+                // TODO: LIDMAPPING SUPPORT
+                msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
+                msg.messageStubParameters = [
+                    JSON.stringify({ lid: affectedParticipantLid, pn: affectedParticipantPn }),
+                    isDenied ? 'revoked' : 'rejected'
+                ];
                 break;
-            default:
-            // console.log("BAILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
-        }
-    };
-    const handleNewsletterNotification = (id, node) => {
-        const messages = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
-        const message = (0, WABinary_1.getBinaryNodeChild)(messages, 'message');
-        const serverId = message.attrs.server_id;
-        const reactionsList = (0, WABinary_1.getBinaryNodeChild)(message, 'reactions');
-        const viewsList = (0, WABinary_1.getBinaryNodeChildren)(message, 'views_count');
-        if (reactionsList) {
-            const reactions = (0, WABinary_1.getBinaryNodeChildren)(reactionsList, 'reaction');
-            if (reactions.length === 0) {
-                ev.emit('newsletter.reaction', { id, 'server_id': serverId, reaction: { removed: true } });
-            }
-            reactions.forEach(item => {
-                var _a, _b;
-                ev.emit('newsletter.reaction', { id, 'server_id': serverId, reaction: { code: (_a = item.attrs) === null || _a === void 0 ? void 0 : _a.code, count: +((_b = item.attrs) === null || _b === void 0 ? void 0 : _b.count) } });
-            });
-        }
-        if (viewsList.length) {
-            viewsList.forEach(item => {
-                ev.emit('newsletter.view', { id, 'server_id': serverId, count: +item.attrs.count });
-            });
-        }
-    };
-    const handleMexNewsletterNotification = (id, node) => {
-        var _a;
-        const operation = node === null || node === void 0 ? void 0 : node.attrs.op_name;
-        const content = JSON.parse((_a = node === null || node === void 0 ? void 0 : node.content) === null || _a === void 0 ? void 0 : _a.toString());
-        let contentPath;
-        if (operation === Types_1.MexOperations.PROMOTE || operation === Types_1.MexOperations.DEMOTE) {
-            let action;
-            if (operation === Types_1.MexOperations.PROMOTE) {
-                action = 'promote';
-                contentPath = content.data[Types_1.XWAPaths.PROMOTE];
-            }
-            if (operation === Types_1.MexOperations.DEMOTE) {
-                action = 'demote';
-                contentPath = content.data[Types_1.XWAPaths.DEMOTE];
-            }
-            ev.emit('newsletter-participants.update', { id, author: contentPath.actor.pn, user: contentPath.user.pn, new_role: contentPath.user_new_role, action });
-        }
-        if (operation === Types_1.MexOperations.UPDATE) {
-            contentPath = content.data[Types_1.XWAPaths.METADATA_UPDATE];
-            ev.emit('newsletter-settings.update', { id, update: contentPath.thread_metadata.settings });
         }
     };
     const processNotification = async (node) => {
-        var _a, _b;
         const result = {};
-        const [child] = (0, WABinary_1.getAllBinaryNodeChildren)(node);
+        const [child] = getAllBinaryNodeChildren(node);
         const nodeType = node.attrs.type;
-        const from = (0, WABinary_1.jidNormalizedUser)(node.attrs.from);
+        const from = jidNormalizedUser(node.attrs.from);
         switch (nodeType) {
-            case 'privacy_token':
-                const tokenList = (0, WABinary_1.getBinaryNodeChildren)(child, 'token');
-                for (const { attrs, content } of tokenList) {
-                    const jid = attrs.jid;
-                    ev.emit('chats.update', [
-                        {
-                            id: jid,
-                            tcToken: content
-                        }
-                    ]);
-                    logger.debug({ jid }, 'got privacy token update');
-                }
-                break;
             case 'newsletter':
-                handleNewsletterNotification(node.attrs.from, child);
+                await handleNewsletterNotification(node);
                 break;
             case 'mex':
-                handleMexNewsletterNotification(node.attrs.from, child);
+                await handleMexNewsletterNotification(node);
                 break;
             case 'w:gp2':
-                handleGroupNotification(node.attrs.participant, child, result);
+                // TODO: HANDLE PARTICIPANT_PN
+                handleGroupNotification(node, child, result);
                 break;
             case 'mediaretry':
-                const event = (0, Utils_1.decodeMediaRetryNode)(node);
+                const event = decodeMediaRetryNode(node);
                 ev.emit('messages.media-update', [event]);
                 break;
             case 'encrypt':
                 await handleEncryptNotification(node);
                 break;
             case 'devices':
-                const devices = (0, WABinary_1.getBinaryNodeChildren)(child, 'device');
-                if ((0, WABinary_1.areJidsSameUser)(child.attrs.jid, authState.creds.me.id)) {
-                    const deviceJids = devices.map(d => d.attrs.jid);
-                    logger.info({ deviceJids }, 'got my own devices');
+                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 = (0, WABinary_1.getBinaryNodeChild)(node, 'collection');
+                const update = getBinaryNodeChild(node, 'collection');
                 if (update) {
                     const name = update.attrs.name;
-                    // Fire in background — do NOT await inside processingMutex
-                    // Sync runs concurrently with real-time message delivery
-                    resyncAppState([name], false).catch(e => logger.warn({ e, name }, 'background server_sync resync failed'));
+                    await resyncAppState([name], false);
                 }
                 break;
             case 'picture':
-                const setPicture = (0, WABinary_1.getBinaryNodeChild)(node, 'set');
-                const delPicture = (0, WABinary_1.getBinaryNodeChild)(node, 'delete');
-                ev.emit('contacts.update', [{
-                    id: from || ((_b = (_a = (setPicture || delPicture)) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.hash) || '',
-                    imgUrl: setPicture ? 'changed' : 'removed'
-                }]);
-                if ((0, WABinary_1.isJidGroup)(from)) {
+                const setPicture = getBinaryNodeChild(node, 'set');
+                const delPicture = getBinaryNodeChild(node, 'delete');
+                // TODO: WAJIDHASH stuff proper support inhouse
+                ev.emit('contacts.update', [
+                    {
+                        id: jidNormalizedUser(node?.attrs?.from) || (setPicture || delPicture)?.attrs?.hash || '',
+                        imgUrl: setPicture ? 'changed' : 'removed'
+                    }
+                ]);
+                if (isJidGroup(from)) {
                     const node = setPicture || delPicture;
-                    result.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_ICON;
+                    result.messageStubType = WAMessageStubType.GROUP_CHANGE_ICON;
                     if (setPicture) {
                         result.messageStubParameters = [setPicture.attrs.id];
                     }
-                    result.participant = node === null || node === void 0 ? void 0 : node.attrs.author;
+                    result.participant = node?.attrs.author;
                     result.key = {
-                        ...result.key || {},
-                        participant: setPicture === null || setPicture === void 0 ? void 0 : setPicture.attrs.author
+                        ...(result.key || {}),
+                        participant: setPicture?.attrs.author
                     };
                 }
                 break;
@@ -519,44 +708,48 @@ const makeMessagesRecvSocket = (config) => {
                             ...authState.creds.accountSettings,
                             defaultDisappearingMode: {
                                 ephemeralExpiration: newDuration,
-                                ephemeralSettingTimestamp: timestamp,
-                            },
+                                ephemeralSettingTimestamp: timestamp
+                            }
                         }
                     });
                 }
                 else if (child.tag === 'blocklist') {
-                    const blocklists = (0, WABinary_1.getBinaryNodeChildren)(child, 'item');
+                    const blocklists = getBinaryNodeChildren(child, 'item');
                     for (const { attrs } of blocklists) {
                         const blocklist = [attrs.jid];
-                        const type = (attrs.action === 'block') ? 'add' : 'remove';
+                        const type = attrs.action === 'block' ? 'add' : 'remove';
                         ev.emit('blocklist.update', { blocklist, type });
                     }
                 }
                 break;
             case 'link_code_companion_reg':
-                const linkCodeCompanionReg = (0, WABinary_1.getBinaryNodeChild)(node, 'link_code_companion_reg');
-                const ref = toRequiredBuffer((0, WABinary_1.getBinaryNodeChildBuffer)(linkCodeCompanionReg, 'link_code_pairing_ref'));
-                const primaryIdentityPublicKey = toRequiredBuffer((0, WABinary_1.getBinaryNodeChildBuffer)(linkCodeCompanionReg, 'primary_identity_pub'));
-                const primaryEphemeralPublicKeyWrapped = toRequiredBuffer((0, WABinary_1.getBinaryNodeChildBuffer)(linkCodeCompanionReg, 'link_code_pairing_wrapped_primary_ephemeral_pub'));
+                const linkCodeCompanionReg = getBinaryNodeChild(node, 'link_code_companion_reg');
+                const ref = toRequiredBuffer(getBinaryNodeChildBuffer(linkCodeCompanionReg, 'link_code_pairing_ref'));
+                const primaryIdentityPublicKey = toRequiredBuffer(getBinaryNodeChildBuffer(linkCodeCompanionReg, 'primary_identity_pub'));
+                const primaryEphemeralPublicKeyWrapped = toRequiredBuffer(getBinaryNodeChildBuffer(linkCodeCompanionReg, 'link_code_pairing_wrapped_primary_ephemeral_pub'));
                 const codePairingPublicKey = await decipherLinkPublicKey(primaryEphemeralPublicKeyWrapped);
-                const companionSharedKey = Utils_1.Curve.sharedKey(authState.creds.pairingEphemeralKeyPair.private, codePairingPublicKey);
-                const random = (0, crypto_1.randomBytes)(32);
-                const linkCodeSalt = (0, crypto_1.randomBytes)(32);
-                const linkCodePairingExpanded = await (0, Utils_1.hkdf)(companionSharedKey, 32, {
+                const companionSharedKey = Curve.sharedKey(authState.creds.pairingEphemeralKeyPair.private, codePairingPublicKey);
+                const random = randomBytes(32);
+                const linkCodeSalt = randomBytes(32);
+                const linkCodePairingExpanded = hkdf(companionSharedKey, 32, {
                     salt: linkCodeSalt,
                     info: 'link_code_pairing_key_bundle_encryption_key'
                 });
-                const encryptPayload = Buffer.concat([Buffer.from(authState.creds.signedIdentityKey.public), primaryIdentityPublicKey, random]);
-                const encryptIv = (0, crypto_1.randomBytes)(12);
-                const encrypted = (0, Utils_1.aesEncryptGCM)(encryptPayload, linkCodePairingExpanded, encryptIv, Buffer.alloc(0));
+                const encryptPayload = Buffer.concat([
+                    Buffer.from(authState.creds.signedIdentityKey.public),
+                    primaryIdentityPublicKey,
+                    random
+                ]);
+                const encryptIv = randomBytes(12);
+                const encrypted = aesEncryptGCM(encryptPayload, linkCodePairingExpanded, encryptIv, Buffer.alloc(0));
                 const encryptedPayload = Buffer.concat([linkCodeSalt, encryptIv, encrypted]);
-                const identitySharedKey = Utils_1.Curve.sharedKey(authState.creds.signedIdentityKey.private, primaryIdentityPublicKey);
+                const identitySharedKey = Curve.sharedKey(authState.creds.signedIdentityKey.private, primaryIdentityPublicKey);
                 const identityPayload = Buffer.concat([companionSharedKey, identitySharedKey, random]);
-                authState.creds.advSecretKey = (await (0, Utils_1.hkdf)(identityPayload, 32, { info: 'adv_secret' })).toString('base64');
+                authState.creds.advSecretKey = Buffer.from(hkdf(identityPayload, 32, { info: 'adv_secret' })).toString('base64');
                 await query({
                     tag: 'iq',
                     attrs: {
-                        to: WABinary_1.S_WHATSAPP_NET,
+                        to: S_WHATSAPP_NET,
                         type: 'set',
                         id: sock.generateMessageTag(),
                         xmlns: 'md'
@@ -566,7 +759,7 @@ const makeMessagesRecvSocket = (config) => {
                             tag: 'link_code_companion_reg',
                             attrs: {
                                 jid: authState.creds.me.id,
-                                stage: 'companion_finish',
+                                stage: 'companion_finish'
                             },
                             content: [
                                 {
@@ -590,53 +783,125 @@ const makeMessagesRecvSocket = (config) => {
                 });
                 authState.creds.registered = true;
                 ev.emit('creds.update', authState.creds);
+                break;
+            case 'privacy_token':
+                await handlePrivacyTokenNotification(node);
+                break;
         }
         if (Object.keys(result).length) {
             return result;
         }
     };
+    const handlePrivacyTokenNotification = async (node) => {
+        const tokensNode = getBinaryNodeChild(node, 'tokens');
+        const from = jidNormalizedUser(node.attrs.from);
+        if (!tokensNode)
+            return;
+        const tokenNodes = getBinaryNodeChildren(tokensNode, 'token');
+        for (const tokenNode of tokenNodes) {
+            const { attrs, content } = tokenNode;
+            const type = attrs.type;
+            const timestamp = attrs.t;
+            if (type === 'trusted_contact' && content instanceof Buffer) {
+                logger.debug({
+                    from,
+                    timestamp,
+                    tcToken: content
+                }, 'received trusted contact token');
+                await authState.keys.set({
+                    tctoken: { [from]: { token: content, timestamp } }
+                });
+            }
+        }
+    };
     async function decipherLinkPublicKey(data) {
         const buffer = toRequiredBuffer(data);
         const salt = buffer.slice(0, 32);
-        const secretKey = await (0, Utils_1.derivePairingCodeKey)(authState.creds.pairingCode, salt);
+        const secretKey = await derivePairingCodeKey(authState.creds.pairingCode, salt);
         const iv = buffer.slice(32, 48);
         const payload = buffer.slice(48, 80);
-        return (0, Utils_1.aesDecryptCTR)(payload, secretKey, iv);
+        return aesDecryptCTR(payload, secretKey, iv);
     }
     function toRequiredBuffer(data) {
         if (data === undefined) {
-            throw new boom_1.Boom('Invalid buffer', { statusCode: 400 });
+            throw new Boom('Invalid buffer', { statusCode: 400 });
         }
         return data instanceof Buffer ? data : Buffer.from(data);
     }
-    const willSendMessageAgain = (id, participant) => {
+    const willSendMessageAgain = async (id, participant) => {
         const key = `${id}:${participant}`;
-        const retryCount = msgRetryCache.get(key) || 0;
+        const retryCount = (await msgRetryCache.get(key)) || 0;
         return retryCount < maxMsgRetryCount;
     };
-    const updateSendMessageAgainCount = (id, participant) => {
+    const updateSendMessageAgainCount = async (id, participant) => {
         const key = `${id}:${participant}`;
-        const newValue = (msgRetryCache.get(key) || 0) + 1;
-        msgRetryCache.set(key, newValue);
+        const newValue = ((await msgRetryCache.get(key)) || 0) + 1;
+        await msgRetryCache.set(key, newValue);
     };
     const sendMessagesAgain = async (key, ids, retryNode) => {
-        var _a;
-        // todo: implement a cache to store the last 256 sent messages (copy whatsmeow)
-        const msgs = await Promise.all(ids.map(id => getMessage({ ...key, id })));
         const remoteJid = key.remoteJid;
         const participant = key.participant || remoteJid;
+        const retryCount = +retryNode.attrs.count || 1;
+        // Try to get messages from cache first, then fallback to getMessage
+        const msgs = [];
+        for (const id of ids) {
+            let msg;
+            // Try to get from retry cache first if enabled
+            if (messageRetryManager) {
+                const cachedMsg = messageRetryManager.getRecentMessage(remoteJid, id);
+                if (cachedMsg) {
+                    msg = cachedMsg.message;
+                    logger.debug({ jid: remoteJid, id }, 'found message in retry cache');
+                    // Mark retry as successful since we found the message
+                    messageRetryManager.markRetrySuccess(id);
+                }
+            }
+            // Fallback to getMessage if not found in cache
+            if (!msg) {
+                msg = await getMessage({ ...key, id });
+                if (msg) {
+                    logger.debug({ jid: remoteJid, id }, 'found message via getMessage');
+                    // Also mark as successful if found via getMessage
+                    if (messageRetryManager) {
+                        messageRetryManager.markRetrySuccess(id);
+                    }
+                }
+            }
+            msgs.push(msg);
+        }
         // if it's the primary jid sending the request
         // just re-send the message to everyone
         // prevents the first message decryption failure
-        const sendToAll = !((_a = (0, WABinary_1.jidDecode)(participant)) === null || _a === void 0 ? void 0 : _a.device);
+        const sendToAll = !jidDecode(participant)?.device;
+        // Check if we should recreate session for this retry
+        let shouldRecreateSession = false;
+        let recreateReason = '';
+        if (enableAutoSessionRecreation && messageRetryManager && retryCount > 1) {
+            try {
+                const sessionId = signalRepository.jidToSignalProtocolAddress(participant);
+                const hasSession = await signalRepository.validateSession(participant);
+                const result = messageRetryManager.shouldRecreateSession(participant, hasSession.exists);
+                shouldRecreateSession = result.recreate;
+                recreateReason = result.reason;
+                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);
-        if ((0, WABinary_1.isJidGroup)(remoteJid)) {
+        if (isJidGroup(remoteJid)) {
             await authState.keys.set({ 'sender-key-memory': { [remoteJid]: null } });
         }
-        logger.debug({ participant, sendToAll }, 'forced new session for retry recp');
+        logger.debug({ participant, sendToAll, shouldRecreateSession, recreateReason }, 'forced new session for retry recp');
         for (const [i, msg] of msgs.entries()) {
-            if (msg) {
-                updateSendMessageAgainCount(ids[i], participant);
+            if (!ids[i])
+                continue;
+            if (msg && (await willSendMessageAgain(ids[i], participant))) {
+                await updateSendMessageAgainCount(ids[i], participant);
                 const msgRelayOpts = { messageId: ids[i] };
                 if (sendToAll) {
                     msgRelayOpts.useUserDevicesCache = false;
@@ -655,11 +920,10 @@ const makeMessagesRecvSocket = (config) => {
         }
     };
     const handleReceipt = async (node) => {
-        var _a, _b;
         const { attrs, content } = node;
         const isLid = attrs.from.includes('lid');
-        const isNodeFromMe = (0, WABinary_1.areJidsSameUser)(attrs.participant || attrs.from, isLid ? (_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.lid : (_b = authState.creds.me) === null || _b === void 0 ? void 0 : _b.id);
-        const remoteJid = !isNodeFromMe || (0, WABinary_1.isJidGroup)(attrs.from) ? attrs.from : attrs.recipient;
+        const isNodeFromMe = areJidsSameUser(attrs.participant || attrs.from, isLid ? authState.creds.me?.lid : authState.creds.me?.id);
+        const remoteJid = !isNodeFromMe || isJidGroup(attrs.from) ? attrs.from : attrs.recipient;
         const fromMe = !attrs.recipient || ((attrs.type === 'retry' || attrs.type === 'sender') && isNodeFromMe);
         const key = {
             remoteJid,
@@ -667,33 +931,31 @@ const makeMessagesRecvSocket = (config) => {
             fromMe,
             participant: attrs.participant
         };
-        if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
+        if (shouldIgnoreJid(remoteJid) && remoteJid !== S_WHATSAPP_NET) {
             logger.debug({ remoteJid }, 'ignoring receipt from jid');
             await sendMessageAck(node);
             return;
         }
         const ids = [attrs.id];
         if (Array.isArray(content)) {
-            const items = (0, WABinary_1.getBinaryNodeChildren)(content[0], 'item');
+            const items = getBinaryNodeChildren(content[0], 'item');
             ids.push(...items.map(i => i.attrs.id));
         }
         try {
             await Promise.all([
-                processingMutex.mutex(async () => {
-                    const status = (0, Utils_1.getStatusFromReceiptType)(attrs.type);
+                receiptMutex.mutex(async () => {
+                    const status = getStatusFromReceiptType(attrs.type);
                     if (typeof status !== 'undefined' &&
-                        (
-                            // basically, we only want to know when a message from us has been delivered to/read by the other person
-                            // or another device of ours has read some messages
-                            status >= WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK ||
-                            !isNodeFromMe)) {
-                        if ((0, WABinary_1.isJidGroup)(remoteJid) || (0, WABinary_1.isJidStatusBroadcast)(remoteJid)) {
+                        // basically, we only want to know when a message from us has been delivered to/read by the other person
+                        // or another device of ours has read some messages
+                        (status >= proto.WebMessageInfo.Status.SERVER_ACK || !isNodeFromMe)) {
+                        if (isJidGroup(remoteJid) || isJidStatusBroadcast(remoteJid)) {
                             if (attrs.participant) {
-                                const updateKey = status === WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp';
+                                const updateKey = status === proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp';
                                 ev.emit('message-receipt.update', ids.map(id => ({
                                     key: { ...key, id },
                                     receipt: {
-                                        userJid: (0, WABinary_1.jidNormalizedUser)(attrs.participant),
+                                        userJid: jidNormalizedUser(attrs.participant),
                                         [updateKey]: +attrs.t
                                     }
                                 })));
@@ -702,22 +964,23 @@ const makeMessagesRecvSocket = (config) => {
                         else {
                             ev.emit('messages.update', ids.map(id => ({
                                 key: { ...key, id },
-                                update: { status }
+                                update: { status, messageTimestamp: toNumber(+(attrs.t ?? 0)) }
                             })));
                         }
                     }
                     if (attrs.type === 'retry') {
                         // correctly set who is asking for the retry
                         key.participant = key.participant || attrs.from;
-                        const retryNode = (0, WABinary_1.getBinaryNodeChild)(node, 'retry');
-                        if (willSendMessageAgain(ids[0], key.participant)) {
+                        const retryNode = getBinaryNodeChild(node, 'retry');
+                        if (ids[0] && key.participant && (await willSendMessageAgain(ids[0], key.participant))) {
                             if (key.fromMe) {
                                 try {
+                                    await updateSendMessageAgainCount(ids[0], key.participant);
                                     logger.debug({ attrs, key }, 'recv retry request');
                                     await sendMessagesAgain(key, ids, retryNode);
                                 }
                                 catch (error) {
-                                    logger.error({ key, ids, trace: error.stack }, 'error in sending message again');
+                                    logger.error({ key, ids, trace: error instanceof Error ? error.stack : 'Unknown error' }, 'error in sending message again');
                                 }
                             }
                             else {
@@ -737,28 +1000,30 @@ const makeMessagesRecvSocket = (config) => {
     };
     const handleNotification = async (node) => {
         const remoteJid = node.attrs.from;
-        if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
+        if (shouldIgnoreJid(remoteJid) && remoteJid !== S_WHATSAPP_NET) {
             logger.debug({ remoteJid, id: node.attrs.id }, 'ignored notification');
             await sendMessageAck(node);
             return;
         }
         try {
             await Promise.all([
-                processingMutex.mutex(async () => {
-                    var _a;
+                notificationMutex.mutex(async () => {
                     const msg = await processNotification(node);
                     if (msg) {
-                        const fromMe = (0, WABinary_1.areJidsSameUser)(node.attrs.participant || remoteJid, authState.creds.me.id);
+                        const fromMe = areJidsSameUser(node.attrs.participant || remoteJid, authState.creds.me.id);
+                        const { senderAlt: participantAlt, addressingMode } = extractAddressingContext(node);
                         msg.key = {
                             remoteJid,
                             fromMe,
                             participant: node.attrs.participant,
+                            participantAlt,
+                            addressingMode,
                             id: node.attrs.id,
                             ...(msg.key || {})
                         };
-                        (_a = msg.participant) !== null && _a !== void 0 ? _a : (msg.participant = node.attrs.participant);
+                        msg.participant ?? (msg.participant = node.attrs.participant);
                         msg.messageTimestamp = +node.attrs.t;
-                        const fullMsg = WAProto_1.proto.WebMessageInfo.fromObject(msg);
+                        const fullMsg = proto.WebMessageInfo.fromObject(msg);
                         await upsertMessage(fullMsg, 'append');
                     }
                 })
@@ -769,222 +1034,254 @@ const makeMessagesRecvSocket = (config) => {
         }
     };
     const handleMessage = async (node) => {
-        var _a, _b, _c;
-        if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
+        if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== S_WHATSAPP_NET) {
             logger.debug({ key: node.attrs.key }, 'ignored message');
-            await sendMessageAck(node);
+            await sendMessageAck(node, NACK_REASONS.UnhandledError);
             return;
         }
-        const encNode = (0, WABinary_1.getBinaryNodeChild)(node, 'enc');
+        const encNode = getBinaryNodeChild(node, 'enc');
         // TODO: temporary fix for crashes and issues resulting of failed msmsg decryption
-        if (encNode && encNode.attrs.type === 'msmsg') {
+        if (encNode?.attrs.type === 'msmsg') {
             logger.debug({ key: node.attrs.key }, 'ignored msmsg');
-            await sendMessageAck(node);
+            await sendMessageAck(node, NACK_REASONS.MissingMessageSecret);
             return;
         }
-        let response;
-        if ((0, WABinary_1.getBinaryNodeChild)(node, 'unavailable') && !encNode) {
-            await sendMessageAck(node);
-            const { key } = (0, Utils_1.decodeMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '').fullMessage;
-            response = await requestPlaceholderResend(key);
-            if (response === 'RESOLVED') {
-                return;
+        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);
+                }
             }
-            logger.debug('received unavailable message, acked and requested resend from phone');
-        }
-        else {
-            if (placeholderResendCache.get(node.attrs.id)) {
-                placeholderResendCache.del(node.attrs.id);
+            else {
+                await signalRepository.lidMapping.storeLIDPNMappings([{ lid: primaryJid, pn: alt }]);
+                await signalRepository.migrateSession(alt, primaryJid);
             }
         }
-        const { fullMessage: msg, category, author, decrypt } = (0, Utils_1.decryptMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
-        if (response && ((_a = msg === null || msg === void 0 ? void 0 : msg.messageStubParameters) === null || _a === void 0 ? void 0 : _a[0]) === Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT) {
-            msg.messageStubParameters = [Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT, response];
-        }
-        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER && node.attrs.sender_pn) {
-            ev.emit('chats.phoneNumberShare', { lid: node.attrs.from, jid: node.attrs.sender_pn });
+        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 Promise.all([
-                processingMutex.mutex(async () => {
-                    var _a, _b, _c, _d, _e, _f;
-                    await decrypt();
-                    // message failed to decrypt
-                    if (msg.messageStubType === WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT) {
-                        if (((_a = msg === null || msg === void 0 ? void 0 : msg.messageStubParameters) === null || _a === void 0 ? void 0 : _a[0]) === Utils_1.MISSING_KEYS_ERROR_TEXT) {
-                            return sendMessageAck(node, Utils_1.NACK_REASONS.ParsingError);
+            await messageMutex.mutex(async () => {
+                await decrypt();
+                // message failed to decrypt
+                if (msg.messageStubType === proto.WebMessageInfo.StubType.CIPHERTEXT && msg.category !== 'peer') {
+                    if (msg?.messageStubParameters?.[0] === MISSING_KEYS_ERROR_TEXT) {
+                        return sendMessageAck(node, NACK_REASONS.ParsingError);
+                    }
+                    if (msg.messageStubParameters?.[0] === NO_MESSAGE_FOUND_ERROR_TEXT) {
+                        // Message arrived without encryption (e.g. CTWA ads messages).
+                        // Check if this is eligible for placeholder resend (matching WA Web filters).
+                        const unavailableNode = getBinaryNodeChild(node, 'unavailable');
+                        const unavailableType = unavailableNode?.attrs?.type;
+                        if (unavailableType === 'bot_unavailable_fanout' ||
+                            unavailableType === 'hosted_unavailable_fanout' ||
+                            unavailableType === 'view_once_unavailable_fanout') {
+                            logger.debug({ msgId: msg.key.id, unavailableType }, 'skipping placeholder resend for excluded unavailable type');
+                            return sendMessageAck(node);
                         }
-                        retryMutex.mutex(async () => {
-                            if (ws.isOpen) {
-                                if ((0, WABinary_1.getBinaryNodeChild)(node, 'unavailable')) {
+                        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');
+                            return sendMessageAck(node);
+                        }
+                        // Request the real content from the phone via placeholder resend PDO.
+                        // Upsert the CIPHERTEXT stub as a placeholder (like WA Web's processPlaceholderMsg),
+                        // and store the requestId in stubParameters[1] so users can correlate
+                        // with the incoming PDO response event.
+                        const cleanKey = {
+                            remoteJid: msg.key.remoteJid,
+                            fromMe: msg.key.fromMe,
+                            id: msg.key.id,
+                            participant: msg.key.participant
+                        };
+                        // Cache the original message metadata so the PDO response handler
+                        // can preserve key fields (LID details etc.) that the phone may omit
+                        const msgData = {
+                            key: msg.key,
+                            messageTimestamp: msg.messageTimestamp,
+                            pushName: msg.pushName,
+                            participant: msg.participant,
+                            verifiedBizName: msg.verifiedBizName
+                        };
+                        requestPlaceholderResend(cleanKey, msgData)
+                            .then(requestId => {
+                            if (requestId && requestId !== 'RESOLVED') {
+                                logger.debug({ msgId: msg.key.id, requestId }, 'requested placeholder resend for unavailable message');
+                                ev.emit('messages.update', [
+                                    {
+                                        key: msg.key,
+                                        update: { messageStubParameters: [NO_MESSAGE_FOUND_ERROR_TEXT, requestId] }
+                                    }
+                                ]);
+                            }
+                        })
+                            .catch(err => {
+                            logger.warn({ err, msgId: msg.key.id }, 'failed to request placeholder resend for unavailable message');
+                        });
+                        await sendMessageAck(node);
+                        // Don't return — fall through to upsertMessage so the stub is emitted
+                    }
+                    else {
+                        // Skip retry for expired status messages (>24h old)
+                        if (isJidStatusBroadcast(msg.key.remoteJid)) {
+                            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');
+                                return sendMessageAck(node);
+                            }
+                        }
+                        const errorMessage = msg?.messageStubParameters?.[0] || '';
+                        const isPreKeyError = errorMessage.includes('PreKey');
+                        logger.debug(`[handleMessage] Attempting retry request for failed decryption`);
+                        // Handle both pre-key and normal retries in single mutex
+                        await retryMutex.mutex(async () => {
+                            try {
+                                if (!ws.isOpen) {
+                                    logger.debug({ node }, 'Connection closed, skipping retry');
                                     return;
                                 }
-                                const encNode = (0, WABinary_1.getBinaryNodeChild)(node, 'enc');
+                                // Handle pre-key errors with upload and delay
+                                if (isPreKeyError) {
+                                    logger.info({ error: errorMessage }, 'PreKey error detected, uploading and retrying');
+                                    try {
+                                        logger.debug('Uploading pre-keys for error recovery');
+                                        await uploadPreKeys(5);
+                                        logger.debug('Waiting for server to process new pre-keys');
+                                        await delay(1000);
+                                    }
+                                    catch (uploadErr) {
+                                        logger.error({ uploadErr }, 'Pre-key upload failed, proceeding with retry anyway');
+                                    }
+                                }
+                                const encNode = getBinaryNodeChild(node, 'enc');
                                 await sendRetryRequest(node, !encNode);
                                 if (retryRequestDelayMs) {
-                                    await (0, Utils_1.delay)(retryRequestDelayMs);
+                                    await delay(retryRequestDelayMs);
                                 }
                             }
-                            else {
-                                logger.debug({ node }, 'connection closed, ignoring retry req');
+                            catch (err) {
+                                logger.error({ err, isPreKeyError }, 'Failed to handle retry, attempting basic retry');
+                                // Still attempt retry even if pre-key upload failed
+                                try {
+                                    const encNode = getBinaryNodeChild(node, 'enc');
+                                    await sendRetryRequest(node, !encNode);
+                                }
+                                catch (retryErr) {
+                                    logger.error({ retryErr }, 'Failed to send retry after error handling');
+                                }
                             }
+                            await sendMessageAck(node, NACK_REASONS.UnhandledError);
                         });
                     }
-                    else {
+                }
+                else {
+                    if (messageRetryManager && msg.key.id) {
+                        messageRetryManager.cancelPendingPhoneRequest(msg.key.id);
+                    }
+                    const isNewsletter = isJidNewsletter(msg.key.remoteJid);
+                    if (!isNewsletter) {
                         // no type in the receipt => message delivered
                         let type = undefined;
-                        if ((_b = msg.key.participant) === null || _b === void 0 ? void 0 : _b.endsWith('@lid')) {
-                            msg.key.participant = node.attrs.participant_pn || authState.creds.me.id;
-                        }
-                        if ((0, WABinary_1.isJidGroup)(msg.key.remoteJid) && ((_f = (_e = (_d = (_c = msg.message) === null || _c === void 0 ? void 0 : _c.extendedTextMessage) === null || _d === void 0 ? void 0 : _d.contextInfo) === null || _e === void 0 ? void 0 : _e.participant) === null || _f === void 0 ? void 0 : _f.endsWith('@lid'))) {
-                            if (msg.message.extendedTextMessage.contextInfo) {
-                                const metadata = await groupMetadata(msg.key.remoteJid);
-                                const sender = msg.message.extendedTextMessage.contextInfo.participant;
-                                const found = metadata.participants.find(p => p.id === sender);
-                                msg.message.extendedTextMessage.contextInfo.participant = (found === null || found === void 0 ? void 0 : found.jid) || sender;
-                            }
-                        }
-                        if (!(0, WABinary_1.isJidGroup)(msg.key.remoteJid) && (0, WABinary_1.isLidUser)(msg.key.remoteJid)) {
-                            msg.key.remoteJid = node.attrs.sender_pn || node.attrs.peer_recipient_pn;
-                        }
                         let participant = msg.key.participant;
-                        if (category === 'peer') { // special peer message
+                        if (category === 'peer') {
+                            // special peer message
                             type = 'peer_msg';
                         }
-                        else if (msg.key.fromMe) { // message was sent by us from a different device
+                        else if (msg.key.fromMe) {
+                            // message was sent by us from a different device
                             type = 'sender';
                             // need to specially handle this case
-                            if ((0, WABinary_1.isJidUser)(msg.key.remoteJid)) {
-                                participant = author;
+                            if (isLidUser(msg.key.remoteJid) || isLidUser(msg.key.remoteJidAlt)) {
+                                participant = author; // TODO: investigate sending receipts to LIDs and not PNs
                             }
                         }
                         else if (!sendActiveReceipts) {
                             type = 'inactive';
                         }
-                        // Run receipt + message upsert in parallel — bot processes message immediately
-                        // without waiting for WA server to ack the receipt first
-                        const isAnyHistoryMsg = (0, Utils_1.getHistoryMsg)(msg.message);
-                        await Promise.all([
-                            sendReceipt(msg.key.remoteJid, participant, [msg.key.id], type),
-                            isAnyHistoryMsg
-                                ? sendReceipt((0, WABinary_1.jidNormalizedUser)(msg.key.remoteJid), undefined, [msg.key.id], 'hist_sync')
-                                : Promise.resolve()
-                        ]);
+                        await sendReceipt(msg.key.remoteJid, participant, [msg.key.id], type);
+                        // send ack for history message
+                        const isAnyHistoryMsg = getHistoryMsg(msg.message);
+                        if (isAnyHistoryMsg) {
+                            const jid = jidNormalizedUser(msg.key.remoteJid);
+                            await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync'); // TODO: investigate
+                        }
                     }
-                    (0, Utils_1.cleanMessage)(msg, authState.creds.me.id);
-                    await sendMessageAck(node);
-                    await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
-                })
-            ]);
+                    else {
+                        await sendMessageAck(node);
+                        logger.debug({ key: msg.key }, 'processed newsletter message without receipts');
+                    }
+                }
+                cleanMessage(msg, authState.creds.me.id, authState.creds.me.lid);
+                await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
+            });
         }
         catch (error) {
-            logger.error({ error, node }, 'error in handling message');
+            logger.error({ error, node: binaryNodeToString(node) }, 'error in handling message');
         }
     };
-    const fetchMessageHistory = async (count, oldestMsgKey, oldestMsgTimestamp) => {
-        var _a;
-        if (!((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id)) {
-            throw new boom_1.Boom('Not authenticated');
-        }
-        const pdoMessage = {
-            historySyncOnDemandRequest: {
-                chatJid: oldestMsgKey.remoteJid,
-                oldestMsgFromMe: oldestMsgKey.fromMe,
-                oldestMsgId: oldestMsgKey.id,
-                oldestMsgTimestampMs: oldestMsgTimestamp,
-                onDemandMsgCount: count
-            },
-            peerDataOperationRequestType: WAProto_1.proto.Message.PeerDataOperationRequestType.HISTORY_SYNC_ON_DEMAND
-        };
-        return sendPeerDataOperationMessage(pdoMessage);
-    };
-    const requestPlaceholderResend = async (messageKey) => {
-        var _a;
-        if (!((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id)) {
-            throw new boom_1.Boom('Not authenticated');
-        }
-        if (placeholderResendCache.get(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id)) {
-            logger.debug({ messageKey }, 'already requested resend');
-            return;
-        }
-        else {
-            placeholderResendCache.set(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id, true);
-        }
-        await (0, Utils_1.delay)(800); // reduced from 5000ms — wait briefly for message to arrive before requesting resend
-        if (!placeholderResendCache.get(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id)) {
-            logger.debug({ messageKey }, 'message received while resend requested');
-            return 'RESOLVED';
-        }
-        const pdoMessage = {
-            placeholderMessageResendRequest: [{
-                messageKey
-            }],
-            peerDataOperationRequestType: WAProto_1.proto.Message.PeerDataOperationRequestType.PLACEHOLDER_MESSAGE_RESEND
-        };
-        setTimeout(() => {
-            if (placeholderResendCache.get(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id)) {
-                logger.debug({ messageKey }, 'PDO message without response after 15 seconds. Phone possibly offline');
-                placeholderResendCache.del(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id);
-            }
-        }, 15000);
-        return sendPeerDataOperationMessage(pdoMessage);
-    };
     const handleCall = async (node) => {
         const { attrs } = node;
-        const [infoChild] = (0, WABinary_1.getAllBinaryNodeChildren)(node);
+        const [infoChild] = getAllBinaryNodeChildren(node);
+        const status = getCallStatusFromNode(infoChild);
+        if (!infoChild) {
+            throw new Boom('Missing call info in call node');
+        }
         const callId = infoChild.attrs['call-id'];
         const from = infoChild.attrs.from || infoChild.attrs['call-creator'];
-        const status = (0, Utils_1.getCallStatusFromNode)(infoChild);
         const call = {
             chatId: attrs.from,
             from,
+            callerPn: infoChild.attrs['caller_pn'],
             id: callId,
             date: new Date(+attrs.t * 1000),
             offline: !!attrs.offline,
-            status,
+            status
         };
         if (status === 'offer') {
-            call.isVideo = !!(0, WABinary_1.getBinaryNodeChild)(infoChild, 'video');
+            call.isVideo = !!getBinaryNodeChild(infoChild, 'video');
             call.isGroup = infoChild.attrs.type === 'group' || !!infoChild.attrs['group-jid'];
             call.groupJid = infoChild.attrs['group-jid'];
-            callOfferCache.set(call.id, call);
+            await callOfferCache.set(call.id, call);
         }
-        const existingCall = callOfferCache.get(call.id);
+        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') {
-            callOfferCache.del(call.id);
+            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, 'server_id': attrs === null || attrs === void 0 ? void 0 : attrs.server_id };
-        // current hypothesis is that if pash is sent in the ack
-        // it means -- the message hasn't reached all devices yet
-        // we'll retry sending the message here
-        if (attrs.phash) {
-            logger.info({ attrs }, 'received phash in ack, resending message...');
-            const cacheKey = `${key.remoteJid}:${key.id}`;
-            if ((msgRetryCache.get(cacheKey) || 0) >= maxMsgRetryCount) {
-                logger.warn({ attrs }, 'reached max retry count, not sending message again');
-                msgRetryCache.del(cacheKey);
-                return;
-            }
-            const retryCount = msgRetryCache.get(cacheKey) || 0;
-            const msg = await getMessage(key);
-            if (msg) {
-                await relayMessage(key.remoteJid, msg, { messageId: key.id, useUserDevicesCache: false });
-                msgRetryCache.set(cacheKey, retryCount + 1);
-            }
-            else {
-                logger.warn({ attrs }, 'could not send message again, as it was not found');
-            }
-        }
+        const key = { remoteJid: attrs.from, fromMe: true, id: attrs.id };
+        // WARNING: REFRAIN FROM ENABLING THIS FOR NOW. IT WILL CAUSE A LOOP
+        // // current hypothesis is that if pash is sent in the ack
+        // // it means -- the message hasn't reached all devices yet
+        // // we'll retry sending the message here
+        // if(attrs.phash) {
+        // 	logger.info({ attrs }, 'received phash in ack, resending message...')
+        // 	const msg = await getMessage(key)
+        // 	if(msg) {
+        // 		await relayMessage(key.remoteJid!, msg, { messageId: key.id!, useUserDevicesCache: false })
+        // 	} else {
+        // 		logger.warn({ attrs }, 'could not send message again, as it was not found')
+        // 	}
+        // }
         // error in acknowledgement,
         // device could not display the message
         if (attrs.error) {
@@ -993,24 +1290,39 @@ const makeMessagesRecvSocket = (config) => {
                 {
                     key,
                     update: {
-                        status: Types_1.WAMessageStatus.ERROR,
-                        messageStubParameters: [
-                            attrs.error
-                        ]
+                        status: WAMessageStatus.ERROR,
+                        messageStubParameters: [attrs.error]
                     }
                 }
             ]);
+            // resend the message with device_fanout=false, use at your own risk
+            // if (attrs.error === '475') {
+            // 	const msg = await getMessage(key)
+            // 	if (msg) {
+            // 		await relayMessage(key.remoteJid!, msg, {
+            // 			messageId: key.id!,
+            // 			useUserDevicesCache: false,
+            // 			additionalAttributes: {
+            // 				device_fanout: 'false'
+            // 			}
+            // 		})
+            // 	}
+            // }
         }
     };
     /// processes a node with the given function
     /// and adds the task to the existing buffer if we're buffering events
-    /// Uses createBufferedFunction to be nested-buffer-safe: won't underflow
-    /// the buffersInProgress counter that the offline phase is holding open
     const processNodeWithBuffer = async (node, identifier, exec) => {
-        const runBuffered = ev.createBufferedFunction(() =>
-            exec(node, false).catch(err => onUnexpectedError(err, identifier))
-        );
-        await runBuffered();
+        ev.buffer();
+        await execTask();
+        ev.flush();
+        function execTask() {
+            return exec(node, false).catch(err => onUnexpectedError(err, identifier));
+        }
+    };
+    /** Yields control to the event loop to prevent blocking */
+    const yieldToEventLoop = () => {
+        return new Promise(resolve => setImmediate(resolve));
     };
     const makeOfflineNodeProcessor = () => {
         const nodeProcessorMap = new Map([
@@ -1021,6 +1333,8 @@ const makeMessagesRecvSocket = (config) => {
         ]);
         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) {
@@ -1028,11 +1342,8 @@ const makeMessagesRecvSocket = (config) => {
             }
             isProcessing = true;
             const promise = async () => {
-                // NOTE: intentionally NOT checking ws.isOpen here.
-                // Nodes are already in memory — we must process them all to completion.
-                // Individual handlers (handleMessage, handleReceipt, etc.) already
-                // guard against sending ACKs on a closed connection.
-                while (nodes.length) {
+                let processedInBatch = 0;
+                while (nodes.length && ws.isOpen) {
                     const { type, node } = nodes.shift();
                     const nodeProcessor = nodeProcessorMap.get(type);
                     if (!nodeProcessor) {
@@ -1040,6 +1351,13 @@ const makeMessagesRecvSocket = (config) => {
                         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;
             };
@@ -1048,33 +1366,35 @@ const makeMessagesRecvSocket = (config) => {
         return { enqueue };
     };
     const offlineNodeProcessor = makeOfflineNodeProcessor();
-    const processNode = (type, node, identifier, exec) => {
+    const processNode = async (type, node, identifier, exec) => {
         const isOffline = !!node.attrs.offline;
         if (isOffline) {
             offlineNodeProcessor.enqueue(type, node);
         }
         else {
-            processNodeWithBuffer(node, identifier, exec);
+            await processNodeWithBuffer(node, identifier, exec);
         }
     };
     // recv a message
-    ws.on('CB:message', (node) => {
-        processNode('message', node, 'processing message', handleMessage);
+    ws.on('CB:message', async (node) => {
+        await processNode('message', node, 'processing message', handleMessage);
     });
     ws.on('CB:call', async (node) => {
-        processNode('call', node, 'handling call', handleCall);
+        await processNode('call', node, 'handling call', handleCall);
     });
-    ws.on('CB:receipt', node => {
-        processNode('receipt', node, 'handling receipt', handleReceipt);
+    ws.on('CB:receipt', async (node) => {
+        await processNode('receipt', node, 'handling receipt', handleReceipt);
     });
     ws.on('CB:notification', async (node) => {
-        processNode('notification', node, 'handling notification', handleNotification);
+        await processNode('notification', node, 'handling notification', handleNotification);
     });
     ws.on('CB:ack,class:message', (node) => {
-        handleBadAck(node)
-            .catch(error => onUnexpectedError(error, 'handling bad ack'));
+        handleBadAck(node).catch(error => onUnexpectedError(error, 'handling bad ack'));
     });
-    ev.on('call', ([call]) => {
+    ev.on('call', async ([call]) => {
+        if (!call) {
+            return;
+        }
         // missed call + group call notification message generation
         if (call.status === 'timeout' || (call.status === 'offer' && call.isGroup)) {
             const msg = {
@@ -1083,21 +1403,23 @@ const makeMessagesRecvSocket = (config) => {
                     id: call.id,
                     fromMe: false
                 },
-                messageTimestamp: (0, Utils_1.unixTimestampSeconds)(call.date),
+                messageTimestamp: unixTimestampSeconds(call.date)
             };
             if (call.status === 'timeout') {
                 if (call.isGroup) {
-                    msg.messageStubType = call.isVideo ? Types_1.WAMessageStubType.CALL_MISSED_GROUP_VIDEO : Types_1.WAMessageStubType.CALL_MISSED_GROUP_VOICE;
+                    msg.messageStubType = call.isVideo
+                        ? WAMessageStubType.CALL_MISSED_GROUP_VIDEO
+                        : WAMessageStubType.CALL_MISSED_GROUP_VOICE;
                 }
                 else {
-                    msg.messageStubType = call.isVideo ? Types_1.WAMessageStubType.CALL_MISSED_VIDEO : Types_1.WAMessageStubType.CALL_MISSED_VOICE;
+                    msg.messageStubType = call.isVideo ? WAMessageStubType.CALL_MISSED_VIDEO : WAMessageStubType.CALL_MISSED_VOICE;
                 }
             }
             else {
                 msg.message = { call: { callKey: Buffer.from(call.id) } };
             }
-            const protoMsg = WAProto_1.proto.WebMessageInfo.fromObject(msg);
-            upsertMessage(protoMsg, call.offline ? 'append' : 'notify');
+            const protoMsg = proto.WebMessageInfo.fromObject(msg);
+            await upsertMessage(protoMsg, call.offline ? 'append' : 'notify');
         }
     });
     ev.on('connection.update', ({ isOnline }) => {
@@ -1111,9 +1433,10 @@ const makeMessagesRecvSocket = (config) => {
         sendMessageAck,
         sendRetryRequest,
         rejectCall,
-        offerCall,
+        initiateCall,
+        cancelCall,
         fetchMessageHistory,
         requestPlaceholderResend,
+        messageRetryManager
     };
-};
-exports.makeMessagesRecvSocket = makeMessagesRecvSocket;
+};