@pontalabs/baileys 1.0.6 → 1.0.7

package/lib/Socket/messages-recv.js

@@ -1,465 +1,388 @@
-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 { ReachoutTimelockEnforcementType, WAMessageStatus, WAMessageStubType } from '../Types/index.js';
-import { ACCOUNT_RESTRICTED_TEXT, aesDecryptCTR, aesEncryptGCM, cleanMessage, Curve, decodeMediaRetryNode, decodeMessageNode, decryptMessageNode, delay, derivePairingCodeKey, encodeBigEndian, encodeSignedDeviceIdentity, extractAddressingContext, extractE2ESessionFromRetryReceipt, getCallStatusFromNode, getHistoryMsg, getNextPreKeys, getStatusFromReceiptType, handleIdentityChange, hkdf, MISSING_KEYS_ERROR_TEXT, NACK_REASONS, NO_MESSAGE_FOUND_ERROR_TEXT, SERVER_ERROR_CODES, toNumber, unixTimestampSeconds, xmppPreKey, xmppSignedPreKey } from '../Utils/index.js';
-import { makeMutex } from '../Utils/make-mutex.js';
-import { makeOfflineNodeProcessor } from '../Utils/offline-node-processor.js';
-import { buildAckStanza } from '../Utils/stanza-ack.js';
-import { buildMergedTcTokenIndexWrite, isTcTokenExpired, readTcTokenIndex, resolveIssuanceJid, resolveTcTokenJid, storeTcTokensFromIqResult, TC_TOKEN_INDEX_KEY } from '../Utils/tc-token-utils.js';
-import { areJidsSameUser, binaryNodeToString, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildBuffer, getBinaryNodeChildren, getBinaryNodeChildString, getBinaryNodeChildUInt, 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';
-const ENFORCEMENT_TYPE_VALUES = new Set(Object.values(ReachoutTimelockEnforcementType));
-function isValidEnforcementType(value) {
-    return typeof value === 'string' && ENFORCEMENT_TYPE_VALUES.has(value);
+"use strict"
+
+var __importDefault = (this && this.__importDefault) || function(mod) {
+    return (mod && mod.__esModule) ? mod : {
+        "default": mod
+    }
 }
-export const makeMessagesRecvSocket = (config) => {
-    const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid, enableAutoSessionRecreation } = config;
-    const sock = makeMessagesSocket(config);
-    const { userDevicesCache, devicesMutex, ev, authState, ws, messageMutex, notificationMutex, receiptMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage, messageRetryManager, registerSocketEndHandler, issuePrivacyTokens, fetchAccountReachoutTimelock, placeholderResendCache } = sock;
-    const getLIDForPN = signalRepository.lidMapping.getLIDForPN.bind(signalRepository.lidMapping);
-    /** this mutex ensures that each retryRequest will wait for the previous one to finish */
-    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
-        });
-    // 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);
-    };
-    const handleMexNotification = async (node) => {
-        const updateNode = getBinaryNodeChild(node, 'update');
-        if (updateNode) {
-            const opName = updateNode.attrs?.op_name;
-            if (!opName) {
-                logger.warn({ node: binaryNodeToString(node) }, 'mex notification missing op_name, fallback to legacy');
-                await handleLegacyMexNewsletterNotification(node);
-                return;
-            }
-            let mexResponse;
-            try {
-                mexResponse = JSON.parse(updateNode.content.toString());
-            }
-            catch (error) {
-                logger.error({ err: error, opName }, 'failed to parse mex notification JSON');
-                return;
-            }
-            if (mexResponse.errors?.length) {
-                logger.warn({ errors: mexResponse.errors, opName }, 'mex notification has GQL errors');
-                return;
-            }
-            const data = mexResponse.data;
-            if (!data) {
-                logger.warn({ opName }, 'mex notification has null data');
-                return;
-            }
-            logger.debug({ opName }, 'processing mex notification');
-            switch (opName) {
-                case 'NotificationUserReachoutTimelockUpdate':
-                    handleReachoutTimelockNotification(data);
-                    break;
-                case 'MessageCappingInfoNotification':
-                    handleMessageCappingNotification(data);
-                    break;
-                // newsletter ops still use the legacy <mex> child structure
-                case 'NotificationNewsletterUpdate':
-                case 'NotificationLinkedProfilesUpdates':
-                case 'NotificationNewsletterAdminPromote':
-                case 'NotificationNewsletterAdminDemote':
-                case 'NotificationNewsletterUserSettingChange':
-                case 'NotificationNewsletterJoin':
-                case 'NotificationNewsletterLeave':
-                case 'NotificationNewsletterStateChange':
-                case 'NotificationNewsletterAdminMetadataUpdate':
-                case 'NotificationNewsletterOwnerUpdate':
-                case 'NotificationNewsletterAdminInviteRevoke':
-                case 'NotificationNewsletterWamoSubStatusChange':
-                case 'NotificationNewsletterBlockUser':
-                case 'NotificationNewsletterPaidPartnership':
-                case 'NotificationNewsletterMilestone':
-                case 'NewsletterResponseStateUpdate':
-                    await handleLegacyMexNewsletterNotification(node);
-                    break;
-                default:
-                    logger.debug({ opName }, 'unhandled mex notification');
-                    break;
-            }
-            return;
-        }
-        await handleLegacyMexNewsletterNotification(node);
-    };
-    const handleReachoutTimelockNotification = (data) => {
-        const payload = data.xwa2_notify_account_reachout_timelock;
-        if (!payload) {
-            logger.warn('reachout timelock notification missing payload');
-            return;
-        }
-        if (!payload.is_active) {
-            logger.info('reachout timelock restriction lifted');
-            ev.emit('connection.update', {
-                reachoutTimeLock: {
-                    isActive: false,
-                    enforcementType: ReachoutTimelockEnforcementType.DEFAULT
-                }
-            });
-            return;
-        }
-        // WA Web defaults to now+60s when the server omits the expiry
-        const timeEnforcementEnds = payload.time_enforcement_ends
-            ? new Date(parseInt(payload.time_enforcement_ends, 10) * 1000)
-            : new Date(Date.now() + 60000);
-        const enforcementType = isValidEnforcementType(payload.enforcement_type)
-            ? payload.enforcement_type
-            : ReachoutTimelockEnforcementType.DEFAULT;
-        logger.info({ enforcementType, timeEnforcementEnds }, 'reachout timelock restriction set');
-        ev.emit('connection.update', {
-            reachoutTimeLock: {
-                isActive: true,
-                timeEnforcementEnds,
-                enforcementType
-            }
-        });
-    };
-    const handleMessageCappingNotification = (data) => {
-        const payload = data.xwa2_notify_new_chat_messages_capping_info_update;
-        if (!payload) {
-            logger.warn('message capping notification missing payload');
-            return;
-        }
-        logger.info({ payload }, 'received message capping update');
-        ev.emit('message-capping.update', payload);
-    };
-    const handleLegacyMexNewsletterNotification = async (node) => {
-        const mexNode = getBinaryNodeChild(node, 'mex');
-        const updateNode = mexNode?.content ? null : getBinaryNodeChild(node, 'update') || getAllBinaryNodeChildren(node)[0];
-        const payloadNode = mexNode?.content ? mexNode : updateNode;
-        if (!payloadNode?.content) {
-            logger.warn({ node: binaryNodeToString(node) }, 'invalid mex newsletter notification');
-            return;
-        }
-        let data;
-        try {
-            const payloadContent = payloadNode.content;
-            if (Array.isArray(payloadContent)) {
-                logger.warn({ payloadNode }, 'invalid mex newsletter notification payload format');
-                return;
-            }
-            const contentBuf = typeof payloadContent === 'string' ? Buffer.from(payloadContent, 'binary') : Buffer.from(payloadContent);
-            data = JSON.parse(contentBuf.toString());
-        }
-        catch (error) {
-            logger.error({ err: error, node: binaryNodeToString(node) }, 'failed to parse mex newsletter notification');
-            return;
-        }
-        const operation = data?.operation ?? payloadNode?.attrs?.op_name;
-        let updates = data?.updates;
-        if (!updates) {
-            const linkedProfiles = data?.data?.xwa2_notify_linked_profiles;
-            if (linkedProfiles) {
-                updates = [linkedProfiles];
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+})
+
+const node_cache_1 = __importDefault(require("@cacheable/node-cache"))
+const boom_1 = require("@hapi/boom")
+const crypto_1 = require("crypto")
+const WAProto_1 = require("../../WAProto")
+const Defaults_1 = require("../Defaults")
+const Types_1 = require("../Types")
+const Utils_1 = require("../Utils")
+const WABinary_1 = require("../WABinary")
+const groups_1 = require("./groups")
+const make_mutex_1 = require("../Utils/make-mutex")
+const messages_send_1 = require("./messages-send")
+
+const makeMessagesRecvSocket = (config) => {
+    const {
+        logger,
+        retryRequestDelayMs,
+        maxMsgRetryCount,
+        getMessage,
+        shouldIgnoreJid,
+        enableAutoSessionRecreation
+    } = config
+    const sock = messages_send_1.makeMessagesSocket(config)
+    const {
+        ev,
+        authState,
+        ws,
+        processingMutex,
+        signalRepository,
+        query,
+        upsertMessage,
+        resyncAppState,
+        onUnexpectedError,
+        assertSessions,
+        sendNode,
+        relayMessage,
+        sendReceipt,
+        uploadPreKeys,
+        groupMetadata,
+        getUSyncDevices,
+        createParticipantNodes,
+        messageRetryManager,
+        sendPeerDataOperationMessage
+    } = sock
+
+    const retryMutex = make_mutex_1.makeMutex()
+    // Mutex terpisah dari processingMutex (dipakai chats.js/messages-send.js) supaya
+    // handleMessage/handleReceipt/handleNotification tidak saling antre di satu antrean
+    // yang sama. Kalau satu pesan lambat diproses (nunggu plugin/group metadata), receipt
+    // & notification lain tetap bisa jalan tanpa nunggu giliran.
+    const messageMutex = make_mutex_1.makeMutex()
+    const receiptMutex = make_mutex_1.makeMutex()
+    const notificationMutex = make_mutex_1.makeMutex()
+
+    const groupDataCache = new Map()
+    global.groupMetadataCache = async (jid) => {
+        if (!groupDataCache.has(jid)) {
+            groupDataCache.set(jid, groupMetadata(jid))
+        }
+        return await groupDataCache.get(jid)
+    }
+
+    const msgRetryCache = config.msgRetryCounterCache || new node_cache_1.default({
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
+        useClones: false
+    })
+
+    const callOfferCache = config.callOfferCache || new node_cache_1.default({
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.CALL_OFFER,
+        useClones: false
+    })
+
+    const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
+        useClones: false
+    })
+
+    let sendActiveReceipts = false
+
+    const sendMessageAck = async ({
+        tag,
+        attrs,
+        content
+    }, errorCode) => {
+        const stanza = {
+            tag: 'ack',
+            attrs: {
+                id: attrs.id,
+                to: attrs.from,
+                class: tag
             }
         }
-        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;
-            case 'NotificationLinkedProfilesUpdates':
-                for (const update of updates) {
-                    const lid = update?.jid;
-                    const addedProfiles = Array.isArray(update?.added_profiles) ? update.added_profiles : [];
-                    const mappings = [];
-                    for (const profile of addedProfiles) {
-                        const pn = typeof profile === 'string' ? profile : (profile?.pn ?? profile?.jid ?? null);
-                        if (lid && pn) {
-                            const mapping = { lid, pn };
-                            ev.emit('lid-mapping.update', mapping);
-                            mappings.push(mapping);
-                        }
-                    }
-                    await signalRepository.lidMapping.storeLIDPNMappings(mappings);
-                }
-                break;
-            default:
-                logger.info({ operation, data }, 'unhandled mex newsletter notification');
-                break;
+
+        if (!!errorCode) {
+            stanza.attrs.error = errorCode.toString()
+        }
+
+        if (!!attrs.participant) {
+            stanza.attrs.participant = attrs.participant
+        }
+
+        if (!!attrs.recipient) {
+            stanza.attrs.recipient = attrs.recipient
+        }
+
+        if (!!attrs.type && (tag !== 'message' || WABinary_1.getBinaryNodeChild({
+                tag,
+                attrs,
+                content
+            }, 'unavailable') || errorCode !== 0)) {
+            stanza.attrs.type = attrs.type
+        }
+
+        if (tag === 'message' && WABinary_1.getBinaryNodeChild({
+                tag,
+                attrs,
+                content
+            }, 'unavailable')) {
+            stanza.attrs.from = authState.creds.me.id
+        }
+
+        logger.debug({
+            recv: {
+                tag,
+                attrs
+            },
+            sent: stanza.attrs
+        }, 'sent ack')
+        await sendNode(stanza)
+    }
+
+    const offerCall = async (toJid, isVideo = false) => {
+        const callId = 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',
+            attrs: {
+                enc: 'opus',
+                rate: '8000'
+            },
+            content: undefined
+        })
+
+        if (isVideo) {
+            offerContent.push({
+                tag: 'video',
+                attrs: {
+                    enc: 'vp8',
+                    dec: 'vp8',
+                    orientation: '0',
+                    'screen_width': '1920',
+                    'screen_height': '1080',
+                    'device_orientation': '0'
+                },
+                content: undefined
+            })
         }
-    };
-    // Handles newsletter notifications
-    const handleNewsletterNotification = async (node) => {
-        const from = node.attrs.from;
-        const children = getAllBinaryNodeChildren(node);
-        const author = node.attrs.participant;
-        for (const child of children) {
-            logger.debug({ 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.debug('Processed plaintext newsletter message');
-                        }
-                        catch (error) {
-                            logger.error({ error }, 'Failed to decode plaintext newsletter message');
-                        }
-                    }
-                    break;
-                }
-                default:
-                    logger.warn({ node, child }, 'Unknown newsletter notification child');
-                    break;
+        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 = crypto_1.randomBytes(32)
+        const devices = (await getUSyncDevices([toJid], true, false)).map(({
+            user,
+            device
+        }) => WABinary_1.jidEncode(user, 's.whatsapp.net', device))
+        await assertSessions(devices, true)
+
+        const {
+            nodes: destinations,
+            shouldIncludeDeviceIdentity
+        } = await createParticipantNodes(devices, {
+            call: {
+                callKey: new Uint8Array(encKey)
             }
+        }, {
+            count: '0'
+        })
+        offerContent.push({
+            tag: 'destination',
+            attrs: {},
+            content: destinations
+        })
+
+        if (shouldIncludeDeviceIdentity) {
+            offerContent.push({
+                tag: 'device-identity',
+                attrs: {},
+                content: Utils_1.encodeSignedDeviceIdentity(authState.creds.account, true)
+            })
+        }
+
+        const stanza = ({
+            tag: 'call',
+            attrs: {
+                id: Utils_1.generateMessageID(),
+                to: toJid,
+            },
+            content: [{
+                tag: 'offer',
+                attrs: {
+                    'call-id': callId,
+                    'call-creator': authState.creds.me.id,
+                },
+                content: offerContent,
+            }],
+        })
+
+        await query(stanza)
+
+        return {
+            id: callId,
+            to: toJid
         }
-    };
-    const sendMessageAck = async (node, errorCode) => {
-        const stanza = buildAckStanza(node, errorCode, authState.creds.me.id);
-        logger.debug({ recv: { tag: node.tag, attrs: node.attrs }, sent: stanza.attrs }, 'sent ack');
-        await sendNode(stanza);
-    };
+    }
+
     const rejectCall = async (callId, callFrom) => {
-        const stanza = {
+        const stanza = ({
             tag: 'call',
             attrs: {
                 from: authState.creds.me.id,
-                to: callFrom
+                to: callFrom,
             },
-            content: [
-                {
-                    tag: 'reject',
-                    attrs: {
-                        'call-id': callId,
-                        'call-creator': callFrom,
-                        count: '0'
-                    },
-                    content: undefined
-                }
-            ]
-        };
-        await query(stanza);
-    };
+            content: [{
+                tag: 'reject',
+                attrs: {
+                    'call-id': callId,
+                    'call-creator': callFrom,
+                    count: '0',
+                },
+                content: undefined,
+            }],
+        })
+
+        await query(stanza)
+    }
+
     const sendRetryRequest = async (node, forceIncludeKeys = false) => {
-        const { fullMessage } = decodeMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '');
-        const { key: msgKey } = fullMessage;
-        const msgId = msgKey.id;
+        const {
+            fullMessage
+        } = Utils_1.decodeMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '')
+        const {
+            key: msgKey
+        } = fullMessage
+        const msgId = msgKey.id
+
         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;
+                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);
+            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 {
+            const key = `${msgId}:${msgKey?.participant}`
+            msgRetryCache.set(key, retryCount)
+        } else {
             // Fallback to old system
-            const key = `${msgId}:${msgKey?.participant}`;
-            let retryCount = (await msgRetryCache.get(key)) || 0;
+            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;
+                logger.debug({
+                    retryCount,
+                    msgId
+                }, 'reached retry limit, clearing')
+                msgRetryCache.del(key)
+                return
             }
-            retryCount += 1;
-            await msgRetryCache.set(key, retryCount);
-        }
-        const key = `${msgId}:${msgKey?.participant}`;
-        const retryCount = (await msgRetryCache.get(key)) || 1;
-        const { account, signedPreKey, signedIdentityKey: identityKey } = authState.creds;
-        const fromJid = node.attrs.from;
+
+            retryCount += 1
+            await msgRetryCache.set(key, retryCount)
+        }
+
+        const key = `${msgId}:${msgKey?.participant}`
+        const retryCount = (await msgRetryCache.get(key)) || 1
+        const {
+            account,
+            signedPreKey,
+            signedIdentityKey: identityKey
+        } = authState.creds
+        const fromJid = node.attrs.from
+
         // Check if we should recreate the session
-        let shouldRecreateSession = false;
-        let recreateReason = '';
-        if (enableAutoSessionRecreation && messageRetryManager && retryCount > 1) {
+        let shouldRecreateSession = false
+        let recreateReason = ''
+
+        if (enableAutoSessionRecreation && messageRetryManager) {
             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;
+                const sessionId = signalRepository.jidToSignalProtocolAddress(fromJid)
+                const hasSession = await signalRepository.validateSession(fromJid)
+                const result = messageRetryManager.shouldRecreateSession(fromJid, retryCount, hasSession.exists)
+
+                shouldRecreateSession = result.recreate
+                recreateReason = result.reason
+
                 if (shouldRecreateSession) {
-                    logger.debug({ fromJid, retryCount, reason: recreateReason }, 'recreating session for retry');
+                    logger.info({
+                        fromJid,
+                        retryCount,
+                        reason: recreateReason
+                    }, 'recreating session for retry')
                     // Delete existing session to force recreation
-                    await authState.keys.set({ session: { [sessionId]: null } });
-                    forceIncludeKeys = true;
+                    await authState.keys.set({
+                        session: {
+                            [sessionId]: null
+                        }
+                    })
+                    forceIncludeKeys = true
                 }
-            }
-            catch (error) {
-                logger.warn({ error, fromJid }, 'failed to check session recreation');
+            } 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');
+                        const msgId = await requestPlaceholderResend(msgKey)
+                        logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId} (scheduled)`)
+                    } catch (error) {
+                        logger.warn({
+                            error,
+                            msgId
+                        }, 'failed to send scheduled phone request');
                     }
-                });
-            }
-            else {
+                })
+            } else {
                 // Fallback to immediate request
-                const msgId = await requestPlaceholderResend(msgKey);
-                logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId}`);
+                const msgId = await requestPlaceholderResend(msgKey)
+                logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId}`)
             }
         }
-        const deviceIdentity = encodeSignedDeviceIdentity(account, true);
+
+        const deviceIdentity = Utils_1.encodeSignedDeviceIdentity(account, true)
         await authState.keys.transaction(async () => {
             const receipt = {
                 tag: 'receipt',
@@ -468,1031 +391,1315 @@ export const makeMessagesRecvSocket = (config) => {
                     type: 'retry',
                     to: node.attrs.from
                 },
-                content: [
-                    {
+                content: [{
                         tag: 'retry',
                         attrs: {
                             count: retryCount.toString(),
                             id: node.attrs.id,
                             t: node.attrs.t,
-                            v: '1',
-                            // ADD ERROR FIELD
-                            error: '0'
+                            v: '1'
                         }
                     },
                     {
                         tag: 'registration',
                         attrs: {},
-                        content: encodeBigEndian(authState.creds.registrationId)
+                        content: Utils_1.encodeBigEndian(authState.creds.registrationId)
                     }
                 ]
-            };
+            }
+
             if (node.attrs.recipient) {
-                receipt.attrs.recipient = node.attrs.recipient;
+                receipt.attrs.recipient = node.attrs.recipient
             }
+
             if (node.attrs.participant) {
-                receipt.attrs.participant = node.attrs.participant;
+                receipt.attrs.participant = node.attrs.participant
             }
+
             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;
+                const {
+                    update,
+                    preKeys
+                } = await Utils_1.getNextPreKeys(authState, 1)
+                const [keyId] = Object.keys(preKeys)
+                const key = preKeys[+keyId]
+                const content = receipt.content
+
                 content.push({
                     tag: 'keys',
                     attrs: {},
-                    content: [
-                        { tag: 'type', attrs: {}, content: Buffer.from(KEY_BUNDLE_TYPE) },
-                        { tag: 'identity', attrs: {}, content: identityKey.public },
-                        xmppPreKey(key, +keyId),
-                        xmppSignedPreKey(signedPreKey),
-                        { tag: 'device-identity', attrs: {}, content: deviceIdentity }
+                    content: [{
+                            tag: 'type',
+                            attrs: {},
+                            content: Buffer.from(Defaults_1.KEY_BUNDLE_TYPE)
+                        },
+                        {
+                            tag: 'identity',
+                            attrs: {},
+                            content: identityKey.public
+                        },
+                        Utils_1.xmppPreKey(key, +keyId),
+                        Utils_1.xmppSignedPreKey(signedPreKey),
+                        {
+                            tag: 'device-identity',
+                            attrs: {},
+                            content: deviceIdentity
+                        }
                     ]
                 });
-                ev.emit('creds.update', update);
-            }
-            await sendNode(receipt);
-            logger.info({ msgAttrs: node.attrs, retryCount }, 'sent retry receipt');
-        }, authState?.creds?.me?.id || 'sendRetryRequest');
-    };
-    // Mirrors WAWeb/Handle/PreKeyLow.js: skip a re-issued notification with the same stanza id.
-    const inFlightPreKeyLow = new Set();
-    /**
-     * Fire-and-forget tctoken re-issuance after a peer's device identity changed.
-     * Mirrors WAWebSendTcTokenWhenDeviceIdentityChange — runs in parallel with
-     * the session refresh (not after it).
-     */
-    const reissueTcTokenAfterIdentityChange = (from) => {
-        void (async () => {
-            const normalizedJid = jidNormalizedUser(from);
-            const tcJid = await resolveTcTokenJid(normalizedJid, getLIDForPN);
-            const tcTokenData = await authState.keys.get('tctoken', [tcJid]);
-            const senderTs = tcTokenData?.[tcJid]?.senderTimestamp;
-            if (senderTs === null || senderTs === undefined || isTcTokenExpired(senderTs)) {
-                return;
+                ev.emit('creds.update', update)
             }
-            logger.debug({ jid: normalizedJid, senderTimestamp: senderTs }, 'identity changed, re-issuing tctoken');
-            const getPNForLID = signalRepository.lidMapping.getPNForLID.bind(signalRepository.lidMapping);
-            const issueJid = await resolveIssuanceJid(normalizedJid, sock.serverProps.lidTrustedTokenIssueToLid, getLIDForPN, getPNForLID);
-            const result = await issuePrivacyTokens([issueJid], senderTs);
-            await storeTcTokensFromIqResult({
-                result,
-                fallbackJid: tcJid,
-                keys: authState.keys,
-                getLIDForPN,
-                onNewJidStored: trackTcTokenJid
-            });
-        })().catch(err => {
-            logger.debug({ jid: from, err: err?.message }, 'failed to re-issue tctoken after identity change');
-        });
-    };
+            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 === S_WHATSAPP_NET) {
-            const stanzaId = node.attrs.id;
-            if (stanzaId && inFlightPreKeyLow.has(stanzaId)) {
-                return;
-            }
-            const countChild = getBinaryNodeChild(node, 'count');
-            const count = +countChild.attrs.value;
-            const shouldUploadMorePreKeys = count < MIN_PREKEY_COUNT;
-            logger.debug({ count, shouldUploadMorePreKeys }, 'recv pre-key count');
+        const from = node.attrs.from
+        if (from === WABinary_1.S_WHATSAPP_NET) {
+            const countChild = WABinary_1.getBinaryNodeChild(node, 'count')
+            const count = +countChild.attrs.value
+            const shouldUploadMorePreKeys = count < Defaults_1.MIN_PREKEY_COUNT
+            logger.debug({
+                count,
+                shouldUploadMorePreKeys
+            }, 'recv pre-key count')
+
             if (shouldUploadMorePreKeys) {
-                if (stanzaId)
-                    inFlightPreKeyLow.add(stanzaId);
-                try {
-                    await uploadPreKeys();
-                }
-                finally {
-                    if (stanzaId)
-                        inFlightPreKeyLow.delete(stanzaId);
-                }
+                await uploadPreKeys()
             }
-        }
-        else {
-            const result = await handleIdentityChange(node, {
-                meId: authState.creds.me?.id,
-                meLid: authState.creds.me?.lid,
-                validateSession: signalRepository.validateSession,
-                assertSessions,
-                debounceCache: identityAssertDebounce,
-                logger,
-                onBeforeSessionRefresh: reissueTcTokenAfterIdentityChange
-            });
-            if (result.action === 'no_identity_node') {
-                logger.info({ node }, 'unknown encrypt notification');
+        } else {
+            const identityNode = WABinary_1.getBinaryNodeChild(node, 'identity')
+            if (identityNode) {
+                logger.info({
+                    jid: from
+                }, 'identity changed')
+                // not handling right now
+                // signal will override new identity anyway
+            } else {
+                logger.info({
+                    node
+                }, 'unknown encrypt notification')
             }
         }
-    };
-    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 actingParticipantUsername = fullNode.attrs.participant_username;
-        const affectedParticipantLid = getBinaryNodeChild(child, 'participant')?.attrs?.jid || actingParticipantLid;
-        const affectedParticipantPn = getBinaryNodeChild(child, 'participant')?.attrs?.phone_number || actingParticipantPn;
-        switch (child?.tag) {
+    }
+
+    const handleGroupNotification = (participant, child, msg, mode) => {
+        let participantJid = mode === 'lid' ? WABinary_1.getBinaryNodeChild(child, 'participant')?.attrs?.phone_number : WABinary_1.getBinaryNodeChild(child, 'participant')?.attrs?.jid || participant
+
+        // TODO: Add participant LID
+        switch (child.tag) {
             case 'create':
-                const metadata = extractGroupMetadata(child);
-                msg.messageStubType = WAMessageStubType.GROUP_CREATE;
-                msg.messageStubParameters = [metadata.subject];
-                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,
-                        authorUsername: actingParticipantUsername
-                    }
-                ]);
-                break;
+                const metadata = groups_1.extractGroupMetadata(child)
+                msg.messageStubType = Types_1.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
+                }])
+                break
+            case 'delete':
+                msg.messageStubType = Types_1.WAMessageStubType.COMMUNITY_PARENT_GROUP_DELETED
+                msg.messageStubParameters = [participantJid, 'delete']
+                break
             case 'ephemeral':
             case 'not_ephemeral':
                 msg.message = {
                     protocolMessage: {
-                        type: proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING,
+                        type: WAProto_1.proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING,
                         ephemeralExpiration: +(child.attrs.expiration || 0)
                     }
-                };
-                break;
+                }
+                break
             case 'modify':
-                const oldNumber = getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid);
-                msg.messageStubParameters = oldNumber || [];
-                msg.messageStubType = WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER;
-                break;
+                const oldNumber = mode === 'lid' ? WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.phone_number) : WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid)
+                msg.messageStubParameters = oldNumber || []
+                msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER
+                break
             case 'promote':
             case 'demote':
             case 'remove':
             case 'add':
             case 'leave':
-                const stubType = `GROUP_PARTICIPANT_${child.tag.toUpperCase()}`;
-                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,
-                        username: attrs.participant_username || attrs.username || undefined,
-                        admin: (attrs.type || null)
-                    };
-                });
+                let stubType = `GROUP_PARTICIPANT_${child.tag.toUpperCase()}`
+                if (child.attrs?.reason === 'linked_group_join') {
+                    stubType = GROUP_PARTICIPANT_LINKED_GROUP_JOIN
+                }
+                msg.messageStubType = Types_1.WAMessageStubType[stubType]
+                const participants = mode === 'lid' ? WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.phone_number) : WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid)
                 if (participants.length === 1 &&
                     // if recv. "remove" message and sender removed themselves
                     // mark as left
-                    (areJidsSameUser(participants[0].id, actingParticipantLid) ||
-                        areJidsSameUser(participants[0].id, actingParticipantPn)) &&
+                    WABinary_1.areJidsSameUser(participants[0], participant) &&
                     child.tag === 'remove') {
-                    msg.messageStubType = WAMessageStubType.GROUP_PARTICIPANT_LEAVE;
+                    msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE
                 }
-                msg.messageStubParameters = participants.map(a => JSON.stringify(a));
-                break;
+                msg.messageStubParameters = participants
+                break
             case 'subject':
-                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_SUBJECT;
-                msg.messageStubParameters = [child.attrs.subject];
-                break;
+                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT
+                msg.messageStubParameters = [participantJid, child.attrs.subject]
+                break
             case 'description':
-                const description = getBinaryNodeChild(child, 'body')?.content?.toString();
-                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_DESCRIPTION;
-                msg.messageStubParameters = description ? [description] : undefined;
-                break;
+                const description = WABinary_1.getBinaryNodeChild(child, 'body')?.content?.toString()
+                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_DESCRIPTION
+                msg.messageStubParameters = description ? [description] : undefined
+                break
             case 'announcement':
             case 'not_announcement':
-                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_ANNOUNCE;
-                msg.messageStubParameters = [child.tag === 'announcement' ? 'on' : 'off'];
-                break;
+                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE
+                msg.messageStubParameters = [(child.tag === 'announcement') ? 'on' : 'off']
+                break
             case 'locked':
             case 'unlocked':
-                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_RESTRICT;
-                msg.messageStubParameters = [child.tag === 'locked' ? 'on' : 'off'];
-                break;
+                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_RESTRICT
+                msg.messageStubParameters = [(child.tag === 'locked') ? 'on' : 'off']
+                break
             case 'invite':
-                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_INVITE_LINK;
-                msg.messageStubParameters = [child.attrs.code];
-                break;
+                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_INVITE_LINK
+                msg.messageStubParameters = [child.attrs.code]
+                break
             case 'member_add_mode':
-                const addMode = child.content;
+                const addMode = child.content
                 if (addMode) {
-                    msg.messageStubType = WAMessageStubType.GROUP_MEMBER_ADD_MODE;
-                    msg.messageStubParameters = [addMode.toString()];
+                    msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBER_ADD_MODE
+                    msg.messageStubParameters = [addMode.toString()]
                 }
-                break;
+                break
             case 'membership_approval_mode':
-                const approvalMode = getBinaryNodeChild(child, 'group_join');
+                const approvalMode = WABinary_1.getBinaryNodeChild(child, 'group_join')
                 if (approvalMode) {
-                    msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE;
-                    msg.messageStubParameters = [approvalMode.attrs.state];
+                    msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE
+                    msg.messageStubParameters = [approvalMode.attrs.state]
                 }
-                break;
+                break
             case 'created_membership_requests':
-                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;
+                participantJid = mode === 'lid' ? WABinary_1.getBinaryNodeChild(child, 'requested_user')?.attrs?.phone_number : WABinary_1.getBinaryNodeChild(child, 'requested_user')?.attrs?.jid || participant
+
+                msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD
+                msg.messageStubParameters = [participantJid, 'created', child.attrs.request_method]
+                break
             case 'revoked_membership_requests':
-                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;
-        }
-    };
-    const handleDevicesNotification = async (node) => {
-        const [child] = getAllBinaryNodeChildren(node);
-        const from = jidNormalizedUser(node.attrs.from);
-        if (!child) {
-            logger.debug({ from }, 'devices notification missing child, skipping');
-            return;
-        }
-        const tag = child.tag;
-        const deviceHash = child.attrs.device_hash;
-        const devices = getBinaryNodeChildren(child, 'device');
-        if (areJidsSameUser(from, authState.creds.me.id) || areJidsSameUser(from, authState.creds.me.lid)) {
-            const deviceJids = devices.map(d => d.attrs.jid);
-            logger.info({ deviceJids }, 'got my own devices');
-        }
-        if (!devices.length) {
-            logger.debug({ from, tag }, 'no devices in notification, skipping');
-            return;
+                participantJid = mode === 'lid' ? WABinary_1.getBinaryNodeChild(child, 'requested_user')?.attrs?.phone_number : WABinary_1.getBinaryNodeChild(child, 'requested_user')?.attrs?.jid || participant
+
+                const isDenied = 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
+            case 'link':
+            case 'unlink':
+                const type = child.attrs?.unlink_type || child.attrs?.link_type
+                const stubMap = {
+                    parent_group: Types_1.WAMessageStubType[`COMMUNITY_${child.tag.toUpperCase()}_PARENT_GROUP`],
+                    sibling_group: Types_1.WAMessageStubType[`COMMUNITY_${child.tag.toUpperCase()}_SIBLING_GROUP`],
+                    sub_group: Types_1.WAMessageStubType[`COMMUNITY_${child.tag.toUpperCase()}_SUB_GROUP`]
+                }
+                const groups = WABinary_1.getBinaryNodeChildren(child, 'group')
+                    .map(g => g.attrs?.jid || g.attrs?.subject || '')
+                    .filter(x => x)
+                msg.messageStubType = stubMap?.[type] || Types_1.WAMessageStubType[`COMMUNITY_${child.tag.toUpperCase()}_PARENT_GROUP`]
+                msg.messageStubParameters = [participantJid, child.tag, groups]
+                break
+            case 'linked_group_promote':
+            case 'linked_group_demote':
+                const stubtype = `COMMUNITY_PARTICIPANT_${child.tag.split('_')[2].toUpperCase()}`
+                const participantS = mode === 'lid' ? WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.phone_number) : WABinary_1.getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid)
+                msg.messageStubType = Types_1.WAMessageStubType[stubtype]
+                msg.messageStubParameters = participantS
+                break
+            case 'created_sub_group_suggestion':
+                msg.messageStubType = Types_1.WAMessageStubType.SUGGESTED_SUBGROUP_ANNOUNCE
+                msg.messageStubParameters = [participantJid, 'add']
+                break
+            case 'revoked_sub_group_suggestions':
+                const res = WABinary_1.getBinaryNodeChildren(child, 'sub_group_suggestions')
+                const reason = res.attrs?.reason
+                if (reason === 'approved') msg.messageStubType = Types_1.WAMessageStubType.GROUP_CREATE
+                else msg.messageStubType = Types_1.WAMessageStubType.GENERIC_NOTIFICATION
+                msg.messageStubParameters = [participantJid, reason]
+                break
+            default:
+                logger.warn(child.tag, 'Unhandled group node')
+                break
         }
-        const decoded = [];
-        for (const d of devices) {
-            const jid = d.attrs.jid;
-            if (!jid)
-                continue;
-            const parts = jidDecode(jid);
-            if (!parts) {
-                logger.debug({ jid }, 'failed to decode device jid, skipping');
-                continue;
+    }
+
+    const handleNewsletterNotification = (id, node) => {
+        const messages = WABinary_1.getBinaryNodeChild(node, 'messages')
+        const message = WABinary_1.getBinaryNodeChild(node, 'message')
+        const serverId = node.attrs.server_id
+
+        const reactionsList = WABinary_1.getBinaryNodeChild(node, 'reactions')
+        const viewsList = WABinary_1.getBinaryNodeChild(node, 'views_count')
+
+        if (reactionsList) {
+            const reactions = WABinary_1.getBinaryNodeChild(reactionsList, 'reaction')
+
+            if (reactions.length === 0) {
+                ev.emit('newsletter.reaction', {
+                    id,
+                    newsletter_server_id: serverId,
+                    reaction: {
+                        removed: true
+                    }
+                })
             }
-            decoded.push({ jid, user: parts.user, server: parts.server, device: parts.device });
+
+            reactions.forEach(item => {
+                ev.emit('newsletter.reaction', {
+                    id,
+                    newsletter_server_id: serverId,
+                    reaction: {
+                        code: item.attrs?.code,
+                        count: +item.attrs.count
+                    }
+                })
+            })
+        }
+
+        if (viewsList.length) {
+            viewsList.forEach(item => {
+                ev.emit('newsletter.view', {
+                    id,
+                    newsletter_server_id: serverId,
+                    count: +item.attrs.count
+                })
+            })
         }
-        if (!decoded.length)
-            return;
-        await devicesMutex.mutex(async () => {
-            const byUser = new Map();
-            for (const d of decoded) {
-                const list = byUser.get(d.user) || [];
-                list.push(d);
-                byUser.set(d.user, list);
-            }
-            for (const [user, entries] of byUser) {
-                if (tag === 'update') {
-                    logger.debug({ user }, `${user}'s device list updated, dropping cached devices`);
-                    await userDevicesCache?.del(user);
-                    continue;
-                }
-                if (tag === 'remove') {
-                    await signalRepository.deleteSession(entries.map(e => e.jid));
-                }
-                const existingCache = (await userDevicesCache?.get(user)) || [];
-                if (!existingCache.length) {
-                    // No baseline yet; skip applying the delta so getUSyncDevices can
-                    // later fetch the full device list. Caching just the notification
-                    // entries would make a partial list look authoritative.
-                    logger.debug({ user, tag }, 'device list not cached, deferring to USync refresh');
-                    continue;
-                }
-                const affected = new Set(entries.map(e => e.device));
-                let updatedDevices;
-                switch (tag) {
-                    case 'add':
-                        logger.info({ deviceHash, count: entries.length }, 'devices added');
-                        updatedDevices = [
-                            ...existingCache.filter(d => !affected.has(d.device)),
-                            ...entries.map(e => ({ user: e.user, server: e.server, device: e.device }))
-                        ];
-                        break;
-                    case 'remove':
-                        logger.info({ deviceHash, count: entries.length }, 'devices removed');
-                        updatedDevices = existingCache.filter(d => !affected.has(d.device));
-                        break;
-                    default:
-                        logger.debug({ tag }, 'Unknown device list change tag');
-                        continue;
-                }
-                if (updatedDevices.length === 0) {
-                    await userDevicesCache?.del(user);
-                }
-                else {
-                    await userDevicesCache?.set(user, updatedDevices);
-                }
+    }
+
+    const handleMexNotification = (id, node) => {
+        const operation = node?.attrs?.op_name
+        const content = JSON.parse(node?.content)
+
+        let contentPath
+        let 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
+            })
+        } else if (operation === Types_1.MexUpdatesOperations.GROUP_LIMIT_SHARING) {
+            contentPath = content.data[Types_1.XWAPathsMexUpdates.GROUP_SHARING_CHANGE]
+
+            ev.emit('limit-sharing.update', {
+                id,
+                author: contentPath.updated_by?.pn ? contentPath.updated_by.pn : contentPath.updated_by.id,
+                action: `${contentPath.properties.limit_sharing.limit_sharing_enabled ? 'on' : 'off'}`,
+                trigger: contentPath.properties.limit_sharing.limit_sharing_trigger,
+                update_time: contentPath.update_time
+            })
+        } else if (operation === Types_1.MexUpdatesOperations.OWNER_COMMUNITY) {
+            contentPath = content.data[Types_1.XWAPathsMexUpdates.COMMUNITY_OWNER_CHANGE]
+
+            ev.emit('community-owner.update', {
+                id,
+                author: contentPath.updated_by?.pn ? contentPath.updated_by.pn : contentPath.updated_by.id,
+                user: contentPath.role_updates[0].user?.pn ? contentPath.role_updates[0].user.pn : contentPath.role_updates[0].user.jid,
+                new_role: contentPath.role_updates[0].new_role,
+                update_time: contentPath.update_time
+            })
+        } else {
+
+            if (operation === Types_1.MexOperations.PROMOTE) {
+                action = 'promote'
+                contentPath = content.data[Types_1.XWAPaths.PROMOTE]
+            } else {
+                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
+            })
+        }
+    }
+
     const processNotification = async (node) => {
-        const result = {};
-        const [child] = getAllBinaryNodeChildren(node);
-        const nodeType = node.attrs.type;
-        const from = jidNormalizedUser(node.attrs.from);
+        const result = {}
+        const [child] = WABinary_1.getAllBinaryNodeChildren(node)
+        const nodeType = node.attrs.type
+        const from = WABinary_1.jidNormalizedUser(node.attrs.from)
+
         switch (nodeType) {
+            case 'privacy_token':
+                const tokenList = 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 'w:gp2':
+                const mode = node.attrs.addressing_mode
+                handleGroupNotification(mode === 'lid' ? node.attrs.participant_pn : node.attrs.participant, child, result, mode)
+                break
             case 'newsletter':
-                await handleNewsletterNotification(node);
-                break;
+                handleNewsletterNotification(node.attrs.from, child)
+                break
             case 'mex':
-                await handleMexNotification(node);
-                break;
-            case 'w:gp2':
-                // TODO: HANDLE PARTICIPANT_PN
-                handleGroupNotification(node, child, result);
-                break;
+                handleMexNotification(node.attrs.from, child)
+                break
             case 'mediaretry':
-                const event = decodeMediaRetryNode(node);
-                ev.emit('messages.media-update', [event]);
-                break;
+                const event = Utils_1.decodeMediaRetryNode(node)
+                ev.emit('messages.media-update', [event])
+                break
             case 'encrypt':
-                await handleEncryptNotification(node);
-                break;
+                await handleEncryptNotification(node)
+                break
             case 'devices':
-                try {
-                    await handleDevicesNotification(node);
-                }
-                catch (error) {
-                    logger.error({ error, node }, 'failed to handle devices notification');
+                const devices = WABinary_1.getBinaryNodeChildren(child, 'device')
+                if (WABinary_1.areJidsSameUser(child.attrs.jid, authState.creds.me.id) ||
+                    WABinary_1.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')
                 }
-                break;
+                //TODO: drop a new event, add hashes
+                break
             case 'server_sync':
-                const update = getBinaryNodeChild(node, 'collection');
+                const update = WABinary_1.getBinaryNodeChild(node, 'collection')
                 if (update) {
-                    const name = update.attrs.name;
-                    await resyncAppState([name], false);
+                    const name = update.attrs.name
+                    await resyncAppState([name], false)
                 }
-                break;
+                break
             case 'picture':
-                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 = WAMessageStubType.GROUP_CHANGE_ICON;
+                const setPicture = WABinary_1.getBinaryNodeChild(node, 'set')
+                const delPicture = WABinary_1.getBinaryNodeChild(node, 'delete')
+                ev.emit('contacts.update', [{
+                    id: WABinary_1.jidNormalizedUser(node?.attrs?.from) || (setPicture || delPicture)?.attrs?.hash || '',
+                    imgUrl: setPicture ? 'changed' : 'removed'
+                }])
+                if (WABinary_1.isJidGroup(from)) {
+                    const node = setPicture || delPicture
+                    result.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_ICON
                     if (setPicture) {
-                        result.messageStubParameters = [setPicture.attrs.id];
+                        result.messageStubParameters = [setPicture.attrs.id]
                     }
-                    result.participant = node?.attrs.author;
+                    result.participant = node?.attrs?.author
                     result.key = {
-                        ...(result.key || {}),
-                        participant: setPicture?.attrs.author
-                    };
+                        ...result.key || {},
+                        participant: setPicture?.attrs?.author
+                    }
                 }
-                break;
+                break
             case 'account_sync':
                 if (child.tag === 'disappearing_mode') {
-                    const newDuration = +child.attrs.duration;
-                    const timestamp = +child.attrs.t;
-                    logger.info({ newDuration }, 'updated account disappearing mode');
+                    const newDuration = +child.attrs.duration
+                    const timestamp = +child.attrs.t
+                    logger.info({
+                        newDuration
+                    }, 'updated account disappearing mode')
                     ev.emit('creds.update', {
                         accountSettings: {
                             ...authState.creds.accountSettings,
                             defaultDisappearingMode: {
                                 ephemeralExpiration: newDuration,
-                                ephemeralSettingTimestamp: timestamp
-                            }
+                                ephemeralSettingTimestamp: timestamp,
+                            },
                         }
-                    });
-                }
-                else if (child.tag === 'blocklist') {
-                    const blocklists = getBinaryNodeChildren(child, 'item');
-                    for (const { attrs } of blocklists) {
-                        const blocklist = [attrs.jid];
-                        const type = attrs.action === 'block' ? 'add' : 'remove';
-                        ev.emit('blocklist.update', { blocklist, type });
+                    })
+                } else if (child.tag === 'blocklist') {
+                    const blocklists = WABinary_1.getBinaryNodeChildren(child, 'item')
+                    for (const {
+                            attrs
+                        }
+                        of blocklists) {
+                        const blocklist = [attrs.jid]
+                        const type = (attrs.action === 'block') ? 'add' : 'remove'
+                        ev.emit('blocklist.update', {
+                            blocklist,
+                            type
+                        })
                     }
                 }
-                break;
+                break
             case 'link_code_companion_reg':
-                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 = Curve.sharedKey(authState.creds.pairingEphemeralKeyPair.private, codePairingPublicKey);
-                const random = randomBytes(32);
-                const linkCodeSalt = randomBytes(32);
-                const linkCodePairingExpanded = hkdf(companionSharedKey, 32, {
+                const linkCodeCompanionReg = WABinary_1.getBinaryNodeChild(node, 'link_code_companion_reg')
+                const ref = toRequiredBuffer(WABinary_1.getBinaryNodeChildBuffer(linkCodeCompanionReg, 'link_code_pairing_ref'))
+                const primaryIdentityPublicKey = toRequiredBuffer(WABinary_1.getBinaryNodeChildBuffer(linkCodeCompanionReg, 'primary_identity_pub'))
+                const primaryEphemeralPublicKeyWrapped = toRequiredBuffer(WABinary_1.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 = crypto_1.randomBytes(32)
+                const linkCodeSalt = crypto_1.randomBytes(32)
+
+                const linkCodePairingExpanded = await Utils_1.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 = randomBytes(12);
-                const encrypted = aesEncryptGCM(encryptPayload, linkCodePairingExpanded, encryptIv, Buffer.alloc(0));
-                const encryptedPayload = Buffer.concat([linkCodeSalt, encryptIv, encrypted]);
-                const identitySharedKey = Curve.sharedKey(authState.creds.signedIdentityKey.private, primaryIdentityPublicKey);
-                const identityPayload = Buffer.concat([companionSharedKey, identitySharedKey, random]);
-                authState.creds.advSecretKey = Buffer.from(hkdf(identityPayload, 32, { info: 'adv_secret' })).toString('base64');
+                })
+
+                const encryptPayload = Buffer.concat([Buffer.from(authState.creds.signedIdentityKey.public), primaryIdentityPublicKey, random])
+                const encryptIv = crypto_1.randomBytes(12)
+                const encrypted = Utils_1.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 identityPayload = Buffer.concat([companionSharedKey, identitySharedKey, random])
+
+                authState.creds.advSecretKey = (await Utils_1.hkdf(identityPayload, 32, {
+                    info: 'adv_secret'
+                })).toString('base64')
+
                 await query({
                     tag: 'iq',
                     attrs: {
-                        to: S_WHATSAPP_NET,
+                        to: WABinary_1.S_WHATSAPP_NET,
                         type: 'set',
                         id: sock.generateMessageTag(),
                         xmlns: 'md'
                     },
-                    content: [
-                        {
-                            tag: 'link_code_companion_reg',
-                            attrs: {
-                                jid: authState.creds.me.id,
-                                stage: 'companion_finish'
+                    content: [{
+                        tag: 'link_code_companion_reg',
+                        attrs: {
+                            jid: authState.creds.me.id,
+                            stage: 'companion_finish',
+                        },
+                        content: [{
+                                tag: 'link_code_pairing_wrapped_key_bundle',
+                                attrs: {},
+                                content: encryptedPayload
                             },
-                            content: [
-                                {
-                                    tag: 'link_code_pairing_wrapped_key_bundle',
-                                    attrs: {},
-                                    content: encryptedPayload
-                                },
-                                {
-                                    tag: 'companion_identity_public',
-                                    attrs: {},
-                                    content: authState.creds.signedIdentityKey.public
-                                },
-                                {
-                                    tag: 'link_code_pairing_ref',
-                                    attrs: {},
-                                    content: ref
-                                }
-                            ]
-                        }
-                    ]
-                });
-                authState.creds.registered = true;
-                ev.emit('creds.update', authState.creds);
-                break;
-            case 'privacy_token':
-                await handlePrivacyTokenNotification(node);
-                break;
+                            {
+                                tag: 'companion_identity_public',
+                                attrs: {},
+                                content: authState.creds.signedIdentityKey.public
+                            },
+                            {
+                                tag: 'link_code_pairing_ref',
+                                attrs: {},
+                                content: ref
+                            }
+                        ]
+                    }]
+                })
+
+                authState.creds.registered = true
+                ev.emit('creds.update', authState.creds)
         }
+
         if (Object.keys(result).length) {
-            return result;
-        }
-    };
-    /**
-     * In-memory cache of storage JIDs with stored tctokens, seeded from the persisted index.
-     * Used to coalesce writes during a session; pruning always re-reads the persisted index
-     * to cover writes made by other layers (e.g. history sync).
-     */
-    const tcTokenKnownJids = new Set();
-    const tcTokenIndexLoaded = (async () => {
-        try {
-            const jids = await readTcTokenIndex(authState.keys);
-            for (const jid of jids)
-                tcTokenKnownJids.add(jid);
-            logger.debug({ count: tcTokenKnownJids.size }, 'loaded tctoken index');
-        }
-        catch (err) {
-            logger.warn({ err: err?.message }, 'failed to load tctoken index');
-        }
-    })();
-    let tcTokenIndexTimer;
-    async function flushTcTokenIndex() {
-        if (tcTokenIndexTimer) {
-            clearTimeout(tcTokenIndexTimer);
-            tcTokenIndexTimer = undefined;
+            return result
         }
-        // Merge with whatever is already persisted so we don't clobber writes from other
-        // paths (history sync, concurrent sessions on the same store).
-        const write = await buildMergedTcTokenIndexWrite(authState.keys, tcTokenKnownJids);
-        return authState.keys.set({ tctoken: write });
     }
-    function scheduleTcTokenIndexSave() {
-        if (tcTokenIndexTimer) {
-            clearTimeout(tcTokenIndexTimer);
-        }
-        tcTokenIndexTimer = setTimeout(() => {
-            tcTokenIndexTimer = undefined;
-            flushTcTokenIndex().catch(err => {
-                logger.warn({ err: err?.message }, 'failed to save tctoken index');
-            });
-        }, 5000);
-    }
-    function trackTcTokenJid(jid) {
-        if (jid && jid !== TC_TOKEN_INDEX_KEY && !tcTokenKnownJids.has(jid)) {
-            tcTokenKnownJids.add(jid);
-            scheduleTcTokenIndexSave();
-        }
-    }
-    const handlePrivacyTokenNotification = async (node) => {
-        const tokensNode = getBinaryNodeChild(node, 'tokens');
-        if (!tokensNode)
-            return;
-        const from = jidNormalizedUser(node.attrs.from);
-        // WA Web uses: senderLid ?? toLid(from) for the storage key
-        // The sender_lid attribute provides the LID directly when available
-        const senderLid = node.attrs.sender_lid && isLidUser(jidNormalizedUser(node.attrs.sender_lid))
-            ? jidNormalizedUser(node.attrs.sender_lid)
-            : undefined;
-        const fallbackJid = senderLid ?? (await resolveTcTokenJid(from, getLIDForPN));
-        logger.debug({ from, storageJid: fallbackJid }, 'processing privacy token notification');
-        await storeTcTokensFromIqResult({
-            result: node,
-            fallbackJid,
-            keys: authState.keys,
-            getLIDForPN,
-            onNewJidStored: trackTcTokenJid
-        });
-    };
+
     async function decipherLinkPublicKey(data) {
-        const buffer = toRequiredBuffer(data);
-        const salt = buffer.slice(0, 32);
-        const secretKey = await derivePairingCodeKey(authState.creds.pairingCode, salt);
-        const iv = buffer.slice(32, 48);
-        const payload = buffer.slice(48, 80);
-        return aesDecryptCTR(payload, secretKey, iv);
+        const buffer = toRequiredBuffer(data)
+        const salt = buffer.slice(0, 32)
+        const secretKey = await Utils_1.derivePairingCodeKey(authState.creds.pairingCode, salt)
+        const iv = buffer.slice(32, 48)
+        const payload = buffer.slice(48, 80)
+        return Utils_1.aesDecryptCTR(payload, secretKey, iv)
+    }
+
+    function getTypeMessage(message) {
+        const type = Object.keys(message)
+        const restype = (!['senderKeyDistributionMessage', 'messageContextInfo'].includes(type[0]) && type[0]) || (type.length >= 3 && type[1] !== 'messageContextInfo' && type[1]) || type[type.length - 1] || Object.keys(message)[0]
+        return restype
     }
+
     function toRequiredBuffer(data) {
         if (data === undefined) {
-            throw new Boom('Invalid buffer', { statusCode: 400 });
+            throw new boom_1.Boom('Invalid buffer', {
+                statusCode: 400
+            })
         }
-        return data instanceof Buffer ? data : Buffer.from(data);
+        return data instanceof Buffer ? data : Buffer.from(data)
     }
+
     const willSendMessageAgain = async (id, participant) => {
-        const key = `${id}:${participant}`;
-        const retryCount = (await msgRetryCache.get(key)) || 0;
-        return retryCount < maxMsgRetryCount;
-    };
+        const key = `${id}:${participant}`
+        const retryCount = (await msgRetryCache.get(key)) || 0
+        return retryCount < maxMsgRetryCount
+    }
+
     const updateSendMessageAgainCount = async (id, participant) => {
-        const key = `${id}:${participant}`;
-        const newValue = ((await msgRetryCache.get(key)) || 0) + 1;
-        await msgRetryCache.set(key, newValue);
-    };
-    const sendMessagesAgain = async (key, ids, retryNode, receiptNode) => {
-        const remoteJid = key.remoteJid;
-        const participant = key.participant || remoteJid;
-        const retryCount = +retryNode.attrs.count || 1;
-        const msgId = ids[0];
+        const key = `${id}:${participant}`
+        const newValue = ((await msgRetryCache.get(key)) || 0) + 1
+        await msgRetryCache.set(key, newValue)
+    }
+
+    const sendMessagesAgain = async (key, ids, retryNode) => {
+        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 = [];
+        const msgs = []
+
         for (const id of ids) {
-            let msg;
+            let msg
+
             // Try to get from retry cache first if enabled
             if (messageRetryManager) {
-                const cachedMsg = messageRetryManager.getRecentMessage(remoteJid, id);
+                const cachedMsg = messageRetryManager.getRecentMessage(remoteJid, id)
                 if (cachedMsg) {
-                    msg = cachedMsg.message;
-                    logger.debug({ jid: remoteJid, id }, 'found message in retry cache');
+                    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);
+                    messageRetryManager.markRetrySuccess(id)
                 }
             }
+
             // Fallback to getMessage if not found in cache
             if (!msg) {
-                msg = await getMessage({ ...key, id });
+                msg = await getMessage({
+                    ...key,
+                    id
+                })
                 if (msg) {
-                    logger.debug({ jid: remoteJid, id }, 'found message via getMessage');
+                    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);
+            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 = !jidDecode(participant)?.device;
-        const sessionId = signalRepository.jidToSignalProtocolAddress(participant);
-        let injectedFromBundle = false;
-        const bundle = extractE2ESessionFromRetryReceipt(receiptNode);
-        if (bundle) {
+        const sendToAll = !WABinary_1.jidDecode(participant)?.device
+
+        // Check if we should recreate session for this retry
+        let shouldRecreateSession = false
+        let recreateReason = ''
+
+        if (enableAutoSessionRecreation && messageRetryManager) {
             try {
-                await signalRepository.injectE2ESession({ jid: participant, session: bundle });
-                injectedFromBundle = true;
-                logger.debug({ participant, retryCount }, 'injected session from retry receipt key bundle');
-            }
-            catch (error) {
-                logger.warn({ error, participant }, 'failed to inject session from retry receipt');
-            }
-        }
-        if (!injectedFromBundle) {
-            const receivedRegId = getBinaryNodeChildUInt(receiptNode, 'registration', 4);
-            if (typeof receivedRegId === 'number' && Number.isInteger(receivedRegId)) {
-                const info = await signalRepository.getSessionInfo(participant);
-                if (info && info.registrationId !== 0 && info.registrationId !== receivedRegId) {
-                    logger.info({ participant, stored: info.registrationId, received: receivedRegId }, 'reg id mismatch on retry without bundle, deleting session');
-                    await authState.keys.set({ session: { [sessionId]: null } });
-                }
-            }
-        }
-        const BASE_KEY_CHECK_RETRY = 2;
-        if (msgId && messageRetryManager) {
-            const info = await signalRepository.getSessionInfo(participant);
-            if (info) {
-                if (retryCount === BASE_KEY_CHECK_RETRY) {
-                    messageRetryManager.saveBaseKey(sessionId, msgId, info.baseKey);
-                }
-                else if (retryCount > BASE_KEY_CHECK_RETRY) {
-                    if (messageRetryManager.hasSameBaseKey(sessionId, msgId, info.baseKey)) {
-                        logger.warn({ participant, retryCount }, 'base key collision on retry, forcing fresh session');
-                        await authState.keys.set({ session: { [sessionId]: null } });
-                    }
-                    messageRetryManager.deleteBaseKey(sessionId, msgId);
-                }
-            }
-        }
-        let shouldRecreateSession = false;
-        let recreateReason = '';
-        if (enableAutoSessionRecreation && messageRetryManager && retryCount > 1 && !injectedFromBundle) {
-            try {
-                const hasSession = await signalRepository.validateSession(participant);
-                const result = messageRetryManager.shouldRecreateSession(participant, hasSession.exists);
-                shouldRecreateSession = result.recreate;
-                recreateReason = result.reason;
+                const sessionId = signalRepository.jidToSignalProtocolAddress(participant)
+                const hasSession = await signalRepository.validateSession(participant)
+                const result = messageRetryManager.shouldRecreateSession(participant, retryCount, 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 } });
+                    logger.info({
+                        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')
             }
-            catch (error) {
-                logger.warn({ error, participant }, 'failed to check session recreation for outgoing retry');
-            }
-        }
-        if (!injectedFromBundle) {
-            await assertSessions([participant], true);
         }
-        if (isJidGroup(remoteJid)) {
-            await authState.keys.set({ 'sender-key-memory': { [remoteJid]: null } });
+
+        await assertSessions([participant], shouldRecreateSession)
+
+        if (WABinary_1.isJidGroup(remoteJid)) {
+            await authState.keys.set({
+                'sender-key-memory': {
+                    [remoteJid]: null
+                }
+            });
         }
-        logger.debug({ participant, sendToAll, shouldRecreateSession, recreateReason, injectedFromBundle }, 'prepared session for retry resend');
+        logger.debug({
+            participant,
+            sendToAll,
+            shouldRecreateSession,
+            recreateReason
+        }, 'forced new session for retry recp')
+
         for (const [i, msg] of msgs.entries()) {
             if (!ids[i])
-                continue;
+                continue
+
             if (msg && (await willSendMessageAgain(ids[i], participant))) {
-                await updateSendMessageAgainCount(ids[i], participant);
-                const msgRelayOpts = { messageId: ids[i] };
-                if (sendToAll) {
-                    msgRelayOpts.useUserDevicesCache = false;
+                updateSendMessageAgainCount(ids[i], participant)
+                const msgRelayOpts = {
+                    messageId: ids[i]
                 }
-                else {
+
+                if (sendToAll) {
+                    msgRelayOpts.useUserDevicesCache = false
+                } else {
                     msgRelayOpts.participant = {
                         jid: participant,
                         count: +retryNode.attrs.count
-                    };
+                    }
                 }
-                await relayMessage(key.remoteJid, msg, msgRelayOpts);
-            }
-            else {
-                logger.debug({ jid: key.remoteJid, id: ids[i] }, 'recv retry request, but message not available');
+                await relayMessage(key.remoteJid, msg, msgRelayOpts)
+            } else {
+                logger.debug({
+                    jid: key.remoteJid,
+                    id: ids[i]
+                }, 'recv retry request, but message not available')
             }
         }
-    };
+    }
+
     const handleReceipt = async (node) => {
-        const { attrs, content } = node;
-        const isLid = attrs.from.includes('lid');
-        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 {
+            attrs,
+            content
+        } = node
+        const isLid = attrs.from.includes('lid')
+        const isNodeFromMe = WABinary_1.areJidsSameUser(attrs.participant || attrs.from, isLid ? authState.creds.me?.lid : authState.creds.me?.id)
+        const remoteJid = !isNodeFromMe || WABinary_1.isJidGroup(attrs.from) ? attrs.from : attrs.recipient
+        const fromMe = !attrs.recipient || ((attrs.type === 'retry' || attrs.type === 'sender') && isNodeFromMe)
+
         const key = {
             remoteJid,
             id: '',
             fromMe,
             participant: attrs.participant
-        };
-        const ids = [attrs.id];
+        }
+
+        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 = getBinaryNodeChildren(content[0], 'item');
-            ids.push(...items.map(i => i.attrs.id));
+            const items = WABinary_1.getBinaryNodeChildren(content[0], 'item')
+            ids.push(...items.map(i => i.attrs.id))
         }
+
         try {
             await Promise.all([
                 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 >= proto.WebMessageInfo.Status.SERVER_ACK || !isNodeFromMe)) {
-                        if (isJidGroup(remoteJid) || isJidStatusBroadcast(remoteJid)) {
+                    const status = Utils_1.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 (WABinary_1.isJidGroup(remoteJid) || WABinary_1.isJidStatusBroadcast(remoteJid)) {
                             if (attrs.participant) {
-                                const updateKey = status === proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp';
+                                const updateKey = status === WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp'
                                 ev.emit('message-receipt.update', ids.map(id => ({
-                                    key: { ...key, id },
+                                    key: {
+                                        ...key,
+                                        id
+                                    },
                                     receipt: {
-                                        userJid: jidNormalizedUser(attrs.participant),
+                                        userJid: WABinary_1.jidNormalizedUser(attrs.participant),
                                         [updateKey]: +attrs.t
                                     }
-                                })));
+                                })))
                             }
-                        }
-                        else {
+                        } else {
                             ev.emit('messages.update', ids.map(id => ({
-                                key: { ...key, id },
-                                update: { status, messageTimestamp: toNumber(+(attrs.t ?? 0)) }
-                            })));
+                                key: {
+                                    ...key,
+                                    id
+                                },
+                                update: {
+                                    status
+                                }
+                            })))
                         }
                     }
+
                     if (attrs.type === 'retry') {
                         // correctly set who is asking for the retry
-                        key.participant = key.participant || attrs.from;
-                        const retryNode = getBinaryNodeChild(node, 'retry');
+                        key.participant = key.participant || attrs.from
+                        const retryNode = WABinary_1.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, node);
-                                }
-                                catch (error) {
-                                    logger.error({ key, ids, trace: error instanceof Error ? error.stack : 'Unknown error' }, 'error in sending message again');
+                                    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 instanceof Error ? error.stack : 'Unknown error'
+                                    }, 'error in sending message again')
                                 }
+                            } else {
+                                logger.info({
+                                    attrs,
+                                    key
+                                }, 'recv retry for not fromMe message')
                             }
-                            else {
-                                logger.info({ attrs, key }, 'recv retry for not fromMe message');
-                            }
-                        }
-                        else {
-                            logger.info({ attrs, key }, 'will not send message again, as sent too many times');
+                        } else {
+                            logger.info({
+                                attrs,
+                                key
+                            }, 'will not send message again, as sent too many times')
                         }
                     }
                 })
-            ]);
-        }
-        finally {
-            await sendMessageAck(node).catch(ackErr => logger.error({ ackErr }, 'failed to ack receipt'));
+            ])
+        } finally {
+            await sendMessageAck(node)
         }
-    };
+    }
+
     const handleNotification = async (node) => {
-        const remoteJid = node.attrs.from;
+        const remoteJid = node.attrs.from
+
+        if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
+            logger.debug({
+                remoteJid,
+                id: node.attrs.id
+            }, 'ignored notification')
+            await sendMessageAck(node)
+            return
+        }
+
         try {
             await Promise.all([
                 notificationMutex.mutex(async () => {
-                    const msg = await processNotification(node);
+                    const msg = await processNotification(node)
+
                     if (msg) {
-                        const fromMe = areJidsSameUser(node.attrs.participant || remoteJid, authState.creds.me.id);
-                        const { senderAlt: participantAlt, addressingMode } = extractAddressingContext(node);
+                        const fromMe = WABinary_1.areJidsSameUser(node.attrs.participant || remoteJid, authState.creds.me.id)
                         msg.key = {
                             remoteJid,
                             fromMe,
                             participant: node.attrs.participant,
-                            participantAlt,
-                            participantUsername: node.attrs.participant_username,
-                            addressingMode,
                             id: node.attrs.id,
                             ...(msg.key || {})
-                        };
-                        msg.participant ?? (msg.participant = node.attrs.participant);
-                        msg.messageTimestamp = +node.attrs.t;
-                        const fullMsg = proto.WebMessageInfo.fromObject(msg);
-                        await upsertMessage(fullMsg, 'append');
+                        }
+                        msg.participant = msg.participant ? msg.participant : node.attrs.participant
+                        msg.messageTimestamp = +node.attrs.t
+                        const fullMsg = WAProto_1.proto.WebMessageInfo.fromObject(msg)
+                        await upsertMessage(fullMsg, 'append')
                     }
                 })
-            ]);
+            ])
+        } finally {
+            await sendMessageAck(node)
         }
-        finally {
-            await sendMessageAck(node).catch(ackErr => logger.error({ ackErr }, 'failed to ack notification'));
-        }
-    };
+    }
+
     const handleMessage = async (node) => {
-        const encNode = getBinaryNodeChild(node, 'enc');
-        // TODO: temporary fix for crashes and issues resulting of failed msmsg decryption
-        if (encNode?.attrs.type === 'msmsg') {
-            logger.debug({ key: node.attrs.key }, 'ignored msmsg');
-            await sendMessageAck(node, NACK_REASONS.MissingMessageSecret);
-            return;
+        if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
+            logger.debug({
+                key: node.attrs.key
+            }, 'ignored message')
+            await sendMessageAck(node)
+            return
+        }
+
+        let response
+
+        const encNode = WABinary_1.getBinaryNodeChild(node, 'enc')
+        if (encNode && encNode.attrs.type === 'msmsg') {
+            logger.debug({
+                key: node.attrs.key
+            }, 'ignored msmsg')
+            await sendMessageAck(node, Utils_1.NACK_REASONS.MissingMessageSecret)
+            return
+        }
+
+        if (WABinary_1.getBinaryNodeChild(node, 'unavailable') && !encNode) {
+            await sendMessageAck(node)
+            let key
+            try {
+                key = Utils_1.decodeMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '').fullMessage.key
+            } catch (error) {
+                logger.error({ error, node }, 'failed to decode unavailable message node, skipping placeholder resend')
+                return
+            }
+            const unavailableNode = WABinary_1.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: node.attrs.id, unavailableType }, 'skipping placeholder resend for excluded unavailable type')
+                return
+            }
+            const messageAge = Utils_1.unixTimestampSeconds() - Utils_1.toNumber(node.attrs.t)
+            if (messageAge > Defaults_1.PLACEHOLDER_MAX_AGE_SECONDS) {
+                logger.debug({ msgId: node.attrs.id, messageAge }, 'skipping placeholder resend for message too old')
+                return
+            }
+            response = await requestPlaceholderResend(key);
+            if (response === 'RESOLVED') {
+                return
+            }
+            logger.debug('received unavailable message, acked and requested resend from phone');
+        } else {
+            if (placeholderResendCache.get(node.attrs.id)) {
+                await placeholderResendCache.del(node.attrs.id)
+            }
         }
-        let acked = false;
+
+        let decodeResult
         try {
-            const { fullMessage: msg, category, author, decrypt } = decryptMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
-            const alt = msg.key.participantAlt || msg.key.remoteJidAlt;
-            // store new mappings we didn't have before
-            if (!!alt) {
-                const altServer = jidDecode(alt)?.server;
-                const primaryJid = msg.key.participant || msg.key.remoteJid;
-                if (altServer === 'lid') {
-                    if (!(await signalRepository.lidMapping.getPNForLID(alt))) {
-                        await signalRepository.lidMapping.storeLIDPNMappings([{ lid: alt, pn: primaryJid }]);
-                        await signalRepository.migrateSession(primaryJid, alt);
-                    }
-                }
-                else {
-                    await signalRepository.lidMapping.storeLIDPNMappings([{ lid: primaryJid, pn: alt }]);
-                    await signalRepository.migrateSession(alt, primaryJid);
-                }
+            // decryptMessageNode bisa throw sebelum sempat masuk try/catch utama di bawah
+            // (contoh: bug upstream baileys "No participant in group message" pada node
+            // yang malformed/gak lengkap). Kalau gak ditangkep di sini, exception ini lolos
+            // sebagai unhandled rejection dari handleMessage - baik pas diproses langsung
+            // (live message) maupun lewat offline queue.
+            decodeResult = Utils_1.decryptMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger)
+        } catch (error) {
+            logger.error({ error, node }, 'failed to decrypt/decode message node, dropping')
+            try {
+                await sendMessageAck(node, Utils_1.NACK_REASONS.ParsingError)
+            } catch (ackError) {
+                logger.error({ ackError }, 'failed to ack undecodable message node')
             }
-            await messageMutex.mutex(async () => {
-                await decrypt();
-                if (msg.key?.remoteJid && msg.key?.id && msg.message && messageRetryManager) {
-                    messageRetryManager.addRecentMessage(msg.key.remoteJid, msg.key.id, msg.message);
-                }
-                // message failed to decrypt
-                if (msg.messageStubType === proto.WebMessageInfo.StubType.CIPHERTEXT && msg.category !== 'peer') {
-                    if (msg?.messageStubParameters?.[0] === MISSING_KEYS_ERROR_TEXT) {
-                        acked = true;
-                        return sendMessageAck(node, NACK_REASONS.ParsingError);
+            return
+        }
+
+        const {
+            fullMessage: msg,
+            category,
+            author,
+            decrypt
+        } = decodeResult
+        if (response && msg?.messageStubParameters?.[0] === Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT) {
+            msg.messageStubParameters = [Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT, response]
+        }
+
+        if (msg.message?.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER && node.attrs.sender_pn) {
+            const lid = WABinary_1.jidNormalizedUser(node.attrs.from), pn = WABinary_1.jidNormalizedUser(node.attrs.sender_pn)
+            ev.emit('lid-mapping.update', {
+                lid,
+                pn
+            })
+            await signalRepository.lidMapping.storeLIDPNMappings([{
+                lid,
+                pn
+            }])
+        }
+
+        try {
+            await Promise.all([
+                messageMutex.mutex(async () => {
+                    await decrypt()
+                    if (msg.key?.remoteJid && msg.key?.id && msg.message && messageRetryManager) {
+                        messageRetryManager.addRecentMessage(msg.key.remoteJid, msg.key.id, msg.message)
+                        logger.debug({
+                            jid: msg.key.remoteJid,
+                            id: msg.key.id
+                        }, 'Added message to recent cache for retry receipts')
                     }
-                    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');
-                            acked = true;
-                            return sendMessageAck(node);
+                    if (msg.messageStubType === WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT) {
+                        if (msg?.messageStubParameters?.[0] === Utils_1.MISSING_KEYS_ERROR_TEXT) {
+                            return sendMessageAck(node, Utils_1.NACK_REASONS.ParsingError)
                         }
-                        const messageAge = unixTimestampSeconds() - toNumber(msg.messageTimestamp);
-                        if (messageAge > PLACEHOLDER_MAX_AGE_SECONDS) {
-                            logger.debug({ msgId: msg.key.id, messageAge }, 'skipping placeholder resend for old message');
-                            acked = true;
-                            return sendMessageAck(node);
+
+                        if (WABinary_1.isJidStatusBroadcast(msg.key.remoteJid)) {
+                            const messageAge = Utils_1.unixTimestampSeconds() - Utils_1.toNumber(msg.messageTimestamp)
+                            if (messageAge > Defaults_1.STATUS_EXPIRY_SECONDS) {
+                                logger.debug({ msgId: msg.key.id, messageAge }, 'skipping retry for expired status 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] }
+
+                        const errorMessage = msg?.messageStubParameters?.[0] || ''
+                        const isPreKeyError = errorMessage.includes('PreKey')
+                        logger.debug(`[handleMessage] Attempting retry request for failed decryption`)
+
+                        // .catch() wajib ada: call ini sengaja tidak di-await (biar retry
+                        // request gak ngeblok proses pesan lain), tapi kalau dibiarkan tanpa
+                        // .catch() dan mutex-nya reject, itu jadi unhandled promise rejection
+                        // yang bisa nge-crash seluruh proses Node (default Node behavior sejak
+                        // v15). Ini yang paling mungkin jadi penyebab bot "tiba-tiba disconnect
+                        // dan gak recover" setelah jalan beberapa jam.
+                        retryMutex.mutex(async () => {
+                            try {
+                                if (!ws.isOpen) {
+                                    logger.debug({
+                                        node
+                                    }, 'Connection closed, skipping retry')
+                                    return
+                                }
+
+                                if (WABinary_1.getBinaryNodeChild(node, 'unavailable')) {
+                                    logger.debug('Message unavailable, skipping retry')
+                                    return
+                                }
+
+                                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 Utils_1.delay(1000)
+                                    } catch (uploadErr) {
+                                        logger.error({
+                                            uploadErr
+                                        }, 'Pre-key upload failed, proceeding with retry anyway')
                                     }
-                                ]);
+                                }
+
+                                const encNode = WABinary_1.getBinaryNodeChild(node, 'enc')
+                                await sendRetryRequest(node, !encNode)
+                                if (retryRequestDelayMs) {
+                                    await Utils_1.delay(retryRequestDelayMs)
+                                }
+                            } catch (err) {
+                                logger.error({
+                                    err,
+                                    isPreKeyError
+                                }, 'Failed to handle retry, attempting basic retry')
+                                try {
+                                    const encNode = WABinary_1.getBinaryNodeChild(node, 'enc')
+                                    await sendRetryRequest(node, !encNode)
+                                } catch (retryErr) {
+                                    logger.error({
+                                        retryErr
+                                    }, 'Failed to send retry after error handling')
+                                }
                             }
+                        }).catch((mutexErr) => {
+                            logger.error({ mutexErr }, 'retryMutex task failed unexpectedly')
                         })
-                            .catch(err => {
-                            logger.warn({ err, msgId: msg.key.id }, 'failed to request placeholder resend for unavailable message');
-                        });
-                        acked = true;
-                        await sendMessageAck(node);
-                        // Don't return — fall through to upsertMessage so the stub is emitted
-                    }
-                    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');
-                                acked = true;
-                                return sendMessageAck(node);
+                    } else {
+                        let type = undefined
+                        // FIX: Jangan fallback ke me.id saat LID tidak bisa di-resolve.
+                        // Fallback ke me.id menyebabkan semua pesan LID private chat
+                        // punya participant = JID bot sendiri, sehingga owner check lolos
+                        // untuk semua user yang menggunakan LID addressing.
+                        if (msg.key.participant && msg.key.participant.endsWith('@lid')) {
+                            if (node.attrs.participant_pn) {
+                                // Gunakan nomor telepon asli jika tersedia
+                                msg.key.participant = WABinary_1.jidNormalizedUser(node.attrs.participant_pn);
+                            } else {
+                                // Coba resolve dari lidMapping, jika gagal pakai remoteJid
+                                // (lebih aman daripada me.id yang menyebabkan false owner match)
+                                try {
+                                    const resolvedPn = await signalRepository.lidMapping.getPNForLID(msg.key.participant);
+                                    msg.key.participant = resolvedPn
+                                        ? WABinary_1.jidNormalizedUser(resolvedPn)
+                                        : WABinary_1.jidNormalizedUser(msg.key.remoteJid);
+                                } catch (_) {
+                                    msg.key.participant = WABinary_1.jidNormalizedUser(msg.key.remoteJid);
+                                }
                             }
                         }
-                        logger.debug('[handleMessage] Attempting retry request for failed decryption');
-                        // WAWeb only retry-receipts here; server emits PreKeyLow if prekeys run low.
-                        await retryMutex.mutex(async () => {
-                            try {
-                                if (!ws.isOpen) {
-                                    logger.debug({ node }, 'Connection closed, skipping retry');
-                                    return;
+                        if (WABinary_1.isJidGroup(msg.key.remoteJid)) {
+                            const mtype = getTypeMessage(msg.message)
+                            const message = msg.message?.[mtype]
+                            const contextInfo = message?.contextInfo
+                            const participant = contextInfo?.participant
+                            const mentionedJid = contextInfo?.mentionedJid
+                            if (typeof participant === "string" && participant.endsWith('@lid')) {
+                                if (msg.message?.[mtype]?.contextInfo) {
+                                    const metadata = await global.groupMetadataCache(msg.key.remoteJid)
+                                    const sender_lid = msg.message[mtype].contextInfo.participant
+                                    const found = metadata.participants.find(p => p.lid === sender_lid)
+                                    if (found) {
+                                        msg.message[mtype].contextInfo.participant = found.id
+                                    } else {
+                                        const lid = WABinary_1.jidNormalizedUser(sender_lid)
+                                        const sender_jid = await signalRepository.lidMapping.getPNForLID(sender_lid)
+                                        if (sender_jid) {
+                                            const pn = WABinary_1.jidNormalizedUser(sender_jid)
+                                            await signalRepository.lidMapping.storeLIDPNMappings([{ lid, pn }])
+                                            msg.message[mtype].contextInfo.participant = pn
+                                        }
+                                    }
                                 }
-                                const encNode = getBinaryNodeChild(node, 'enc');
-                                await sendRetryRequest(node, !encNode);
-                                if (retryRequestDelayMs) {
-                                    await delay(retryRequestDelayMs);
+                            }
+                            if (Array.isArray(mentionedJid) && mentionedJid.length > 0) {
+                                if (msg.message?.[mtype]?.contextInfo) {
+                                    const metadata = await global.groupMetadataCache(msg.key.remoteJid)
+                                    const updatedMentionedJid = []
+                                    let needsUpdate = false
+                                    for (const mentionedLid of mentionedJid) {
+                                        if (typeof mentionedLid === "string" && mentionedLid.endsWith('@lid')) {
+                                            const found = metadata.participants.find(p => p.lid === mentionedLid)
+                                            if (found) {
+                                                updatedMentionedJid.push(found.id)
+                                                if (msg.message[mtype]?.text) {
+                                                    msg.message[mtype].text = msg.message[mtype].text.replace(new RegExp(`@${mentionedLid.split("@")[0]}`, "g"), `@${found.id.split("@")[0]}`);
+                                                } else if (msg.message[mtype]?.caption) {
+                                                    msg.message[mtype].caption = msg.message[mtype].caption.replace(new RegExp(`@${mentionedLid.split("@")[0]}`, "g"), `@${found.id.split("@")[0]}`);
+                                                }
+                                            } else {
+                                                const lid = WABinary_1.jidNormalizedUser(mentionedLid)
+                                                const mentioned_jid = await signalRepository.lidMapping.getPNForLID(mentionedLid)
+                                                if (mentioned_jid) {
+                                                    const pn = WABinary_1.jidNormalizedUser(mentioned_jid)
+                                                    await signalRepository.lidMapping.storeLIDPNMappings([{ lid, pn }])
+                                                    updatedMentionedJid.push(pn)
+                                                    if (msg.message[mtype]?.text) {
+                                                        msg.message[mtype].text = msg.message[mtype].text.replace(new RegExp(`@${mentionedLid.split("@")[0]}`, "g"), `@${pn.split("@")[0]}`);
+                                                    } else if (msg.message[mtype]?.caption) {
+                                                        msg.message[mtype].caption = msg.message[mtype].caption.replace(new RegExp(`@${mentionedLid.split("@")[0]}`, "g"), `@${pn.split("@")[0]}`);
+                                                    }
+                                                } else {
+                                                    updatedMentionedJid.push(mentionedLid)
+                                                }
+                                            }
+                                            needsUpdate = true
+                                        } else {
+                                            updatedMentionedJid.push(mentionedLid)
+                                        }
+                                    }
+                                    if (needsUpdate) {
+                                        msg.message[mtype].contextInfo.mentionedJid = updatedMentionedJid
+                                    }
                                 }
                             }
-                            catch (err) {
-                                logger.error({ err }, 'Failed to send retry');
+                        }
+                        if (!WABinary_1.isJidGroup(msg.key.remoteJid) && WABinary_1.isLidUser(msg.key.remoteJid)) {
+                            // FIX: private chat - resolve remoteJid dari LID ke JID,
+                            // simpen bentuk LID aslinya ke remoteJidAlt biar gak ilang
+                            const originalLidRemote = msg.key.remoteJid;
+                            const resolvedRemote = node.attrs.sender_pn || node.attrs.peer_recipient_pn;
+                            if (resolvedRemote) {
+                                msg.key.remoteJid = WABinary_1.jidNormalizedUser(resolvedRemote);
+                                msg.key.remoteJidAlt = msg.key.remoteJidAlt || originalLidRemote;
+                            } else {
+                                // Fallback: coba resolve dari lidMapping
+                                try {
+                                    const resolvedPn = await signalRepository.lidMapping.getPNForLID(msg.key.remoteJid);
+                                    if (resolvedPn) {
+                                        msg.key.remoteJid = WABinary_1.jidNormalizedUser(resolvedPn);
+                                        msg.key.remoteJidAlt = msg.key.remoteJidAlt || originalLidRemote;
+                                    }
+                                } catch (_) {}
                             }
-                            acked = true;
-                            await sendMessageAck(node, NACK_REASONS.UnhandledError);
-                        });
-                    }
-                }
-                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;
-                        let participant = msg.key.participant;
-                        if (category === 'peer') {
-                            // special peer message
-                            type = 'peer_msg';
                         }
-                        else if (msg.key.fromMe) {
-                            // message was sent by us from a different device
-                            type = 'sender';
-                            // need to specially handle this case
-                            if (isLidUser(msg.key.remoteJid) || isLidUser(msg.key.remoteJidAlt)) {
-                                participant = author; // TODO: investigate sending receipts to LIDs and not PNs
+                        // FIX: private chat - jika author masih LID, resolve ke JID
+                        if (!WABinary_1.isJidGroup(msg.key.remoteJid) && author && WABinary_1.isLidUser(author)) {
+                            const resolvedAuthor = node.attrs.sender_pn
+                                || node.attrs.participant_pn
+                                || node.attrs.peer_recipient_pn;
+                            if (resolvedAuthor) {
+                                author = WABinary_1.jidNormalizedUser(resolvedAuthor);
+                            } else {
+                                try {
+                                    const resolvedPn = await signalRepository.lidMapping.getPNForLID(author);
+                                    if (resolvedPn) author = WABinary_1.jidNormalizedUser(resolvedPn);
+                                } catch (_) {}
                             }
                         }
-                        else if (!sendActiveReceipts) {
-                            type = 'inactive';
+                        let participant = msg.key.participant
+                        if (category === 'peer') {
+                            type = 'peer_msg'
+                        } else if (msg.key.fromMe) {
+                            type = 'sender'
+                            if (WABinary_1.isLidUser(msg.key.remoteJid) || WABinary_1.isLidUser(msg.key.participantAlt)) {
+                                participant = author
+                            }
+                        } else if (!sendActiveReceipts) {
+                            type = 'inactive'
                         }
-                        acked = true;
-                        await sendReceipt(msg.key.remoteJid, participant, [msg.key.id], type);
-                        // send ack for history message
-                        const isAnyHistoryMsg = getHistoryMsg(msg.message);
+                        await sendReceipt(msg.key.remoteJid, participant, [msg.key.id], type)
+
+                        const isAnyHistoryMsg = Utils_1.getHistoryMsg(msg.message)
                         if (isAnyHistoryMsg) {
-                            const jid = jidNormalizedUser(msg.key.remoteJid);
-                            await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync'); // TODO: investigate
+                            const jid = WABinary_1.jidNormalizedUser(msg.key.remoteJid)
+                            await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync')
                         }
                     }
-                    else {
-                        acked = true;
-                        await sendMessageAck(node);
-                        logger.debug({ key: msg.key }, 'processed newsletter message without receipts');
-                    }
-                }
-                cleanMessage(msg, authState.creds.me.id, authState.creds.me.lid);
-                await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
-            });
-        }
-        catch (error) {
-            logger.error({ error, node: binaryNodeToString(node) }, 'error in handling message');
-            if (!acked) {
-                await sendMessageAck(node, NACK_REASONS.UnhandledError).catch(ackErr => logger.error({ ackErr }, 'failed to ack message after error'));
+                    Utils_1.cleanMessage(msg, authState.creds.me.id)
+                    await sendMessageAck(node)
+                    await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify')
+                })
+            ])
+        } catch (error) {
+            logger.error({
+                error,
+                node
+            }, 'error in handling message')
+            // Kalau exception terjadi sebelum sempat ack (misal error di plugin/group
+            // metadata sebelum baris sendMessageAck), stanza ini wajib tetap di-ack.
+            // Tanpa ini, server WA bisa terus retry/redeliver pesan yang sama berulang-ulang.
+            try {
+                await sendMessageAck(node, Utils_1.NACK_REASONS.UnhandledError)
+            } catch (ackError) {
+                logger.error({ ackError }, 'failed to ack message after error')
             }
         }
-    };
-    const handleCall = async (node) => {
-        try {
-            const { attrs } = node;
-            const [infoChild] = getAllBinaryNodeChildren(node);
-            if (!infoChild) {
-                throw new Boom('Missing call info in call node');
+    }
+
+    const fetchMessageHistory = async (count, oldestMsgKey, oldestMsgTimestamp) => {
+        if (!authState.creds.me?.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) => {
+        if (!authState.creds.me?.id) {
+            throw new boom_1.Boom('Not authenticated')
+        }
+
+        if (placeholderResendCache.get(messageKey?.id)) {
+            logger.debug({
+                messageKey
+            }, 'already requested resend')
+            return
+        } else {
+            placeholderResendCache.set(messageKey?.id, true)
+        }
+
+        await Utils_1.delay(5000)
+
+        if (!placeholderResendCache.get(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?.id)) {
+                logger.debug({
+                    messageKey
+                }, 'PDO message without response after 15 seconds. Phone possibly offline')
+                placeholderResendCache.del(messageKey?.id)
             }
-            const status = getCallStatusFromNode(infoChild);
-            const callId = infoChild.attrs['call-id'];
-            const from = infoChild.attrs.from || infoChild.attrs['call-creator'];
-            const call = {
-                chatId: attrs.from,
-                from,
-                callerPn: infoChild.attrs['caller_pn'],
-                id: callId,
-                date: new Date(+attrs.t * 1000),
-                offline: !!attrs.offline,
-                status
-            };
-            if (status === 'relaylatency') {
-                const latencyValue = infoChild.attrs.latency || infoChild.attrs['latency_ms'] || infoChild.attrs['latency-ms'];
-                const latencyMs = latencyValue ? Number(latencyValue) : undefined;
-                if (Number.isFinite(latencyMs)) {
-                    call.latencyMs = latencyMs;
+        }, 15000)
+
+        return sendPeerDataOperationMessage(pdoMessage)
+    }
+
+    const handleCall = async (node) => {
+        let status
+
+        const {
+            attrs
+        } = node
+        const [infoChild] = WABinary_1.getAllBinaryNodeChildren(node)
+        const callId = infoChild.attrs['call-id']
+        const from = infoChild.attrs.from || infoChild.attrs['call-creator']
+        status = Utils_1.getCallStatusFromNode(infoChild)
+
+        if (WABinary_1.isLidUser(from) && infoChild.tag === 'relaylatency') {
+            const verify = await callOfferCache.get(callId)
+
+            if (!verify) {
+                status = 'offer'
+
+                const callLid = {
+                    chatId: attrs.from,
+                    from,
+                    id: callId,
+                    date: new Date(+attrs.t * 1000),
+                    offline: !!attrs.offline,
+                    status
                 }
+                await callOfferCache.set(callId, callLid)
             }
-            if (status === 'offer') {
-                call.isVideo = !!getBinaryNodeChild(infoChild, 'video');
-                call.isGroup = infoChild.attrs.type === 'group' || !!infoChild.attrs['group-jid'];
-                call.groupJid = infoChild.attrs['group-jid'];
-                await callOfferCache.set(call.id, call);
-            }
-            const existingCall = await callOfferCache.get(call.id);
-            // use existing call info to populate this event
-            if (existingCall) {
-                call.isVideo = existingCall.isVideo;
-                call.isGroup = existingCall.isGroup;
-                call.callerPn = call.callerPn || existingCall.callerPn;
-            }
-            // delete data once call has ended
-            if (status === 'reject' || status === 'accept' || status === 'timeout' || status === 'terminate') {
-                await callOfferCache.del(call.id);
-            }
-            ev.emit('call', [call]);
-        }
-        catch (error) {
-            logger.error({ error, node: binaryNodeToString(node) }, 'error in handling call');
         }
-        finally {
-            await sendMessageAck(node).catch(ackErr => logger.error({ ackErr }, 'failed to ack call'));
+
+        const call = {
+            chatId: attrs.from,
+            from,
+            id: callId,
+            date: new Date(+attrs.t * 1000),
+            offline: !!attrs.offline,
+            status,
+        }
+
+        if (status === 'offer') {
+            call.isVideo = !!WABinary_1.getBinaryNodeChild(infoChild, 'video')
+            call.isGroup = infoChild.attrs.type === 'group' || !!infoChild.attrs['group-jid']
+            call.groupJid = infoChild.attrs['group-jid']
+            await callOfferCache.set(call.id, call)
+        }
+
+        const existingCall = await callOfferCache.get(call.id)
+
+        // use existing call info to populate this event
+        if (existingCall) {
+            call.isVideo = existingCall.isVideo
+            call.isGroup = existingCall.isGroup
+        }
+
+        // delete data once call has ended
+        if (status === 'reject' || status === 'accept' || status === 'timeout' || status === 'terminate') {
+            await callOfferCache.del(call.id)
+        }
+
+        ev.emit('call', [call])
+
+        await sendMessageAck(node)
+    }
+
+    const handleBadAck = async ({
+        attrs
+    }) => {
+        const key = {
+            remoteJid: attrs.from,
+            fromMe: true,
+            id: attrs.id,
+            newsletter_server_id: attrs?.server_id
         }
-    };
-    const handleBadAck = async ({ attrs }) => {
-        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
@@ -1509,125 +1716,130 @@ export const makeMessagesRecvSocket = (config) => {
         // error in acknowledgement,
         // device could not display the message
         if (attrs.error) {
-            const isReachoutTimelocked = attrs.error === String(NACK_REASONS.SenderReachoutTimelocked);
-            if (attrs.error === SERVER_ERROR_CODES.MessageAccountRestriction) {
-                // 463 = 1:1 message missing privacy token (tctoken). Usually means the
-                // account is restricted: WhatsApp blocks starting new chats but preserves
-                // existing ones, since established chats already carry a tctoken.
-                // WA Web prevents this client-side (disables the compose bar).
-                // No retry — retrying counts as another "reach out" and worsens the restriction.
-                logger.warn({ msgId: attrs.id, from: attrs.from }, 'error 463: account restricted or missing tctoken for contact');
-                const ackFrom = attrs.from;
-                if (ackFrom && !inFlight463Recoveries.has(ackFrom)) {
-                    inFlight463Recoveries.add(ackFrom);
-                    void (async () => {
-                        try {
-                            const getPNForLID = signalRepository.lidMapping.getPNForLID.bind(signalRepository.lidMapping);
-                            const tcStorageJid = await resolveTcTokenJid(ackFrom, getLIDForPN);
-                            const issueJid = await resolveIssuanceJid(ackFrom, sock.serverProps.lidTrustedTokenIssueToLid, getLIDForPN, getPNForLID);
-                            const result = await issuePrivacyTokens([issueJid], unixTimestampSeconds());
-                            await storeTcTokensFromIqResult({
-                                result,
-                                fallbackJid: tcStorageJid,
-                                keys: authState.keys,
-                                getLIDForPN,
-                                onNewJidStored: trackTcTokenJid
-                            });
-                            logger.debug({ from: ackFrom }, 'completed 463 token recovery issuance');
-                        }
-                        catch (err) {
-                            logger.debug({ from: ackFrom, err: err?.message }, 'failed 463 token recovery issuance');
-                        }
-                        finally {
-                            inFlight463Recoveries.delete(ackFrom);
-                        }
-                    })();
-                }
-            }
-            else if (attrs.error === SERVER_ERROR_CODES.SmaxInvalid) {
-                logger.warn({ msgId: attrs.id, from: attrs.from }, 'smax-invalid (479): stanza rejected by server — likely stale device session or malformed addressing');
-            }
-            else if (isReachoutTimelocked) {
-                // user is temporarily restricted, fetch current restriction details
-                await fetchAccountReachoutTimelock().catch(err => logger.warn({ err }, 'failed to fetch reachout timelock'));
-                logger.warn({ attrs }, 'received error in ack');
-            }
-            else {
-                logger.warn({ attrs }, 'received error in ack');
-            }
-            ev.emit('messages.update', [
-                {
-                    key,
-                    update: {
-                        status: WAMessageStatus.ERROR,
-                        messageStubParameters: isReachoutTimelocked ? [attrs.error, ACCOUNT_RESTRICTED_TEXT] : [attrs.error]
-                    }
+            logger.warn({
+                attrs
+            }, 'received error in ack')
+            ev.emit('messages.update', [{
+                key,
+                update: {
+                    status: Types_1.WAMessageStatus.ERROR,
+                    messageStubParameters: [
+                        attrs.error
+                    ]
                 }
-            ]);
+            }])
         }
-    };
+    }
+
     /// processes a node with the given function
     /// and adds the task to the existing buffer if we're buffering events
     const processNodeWithBuffer = async (node, identifier, exec) => {
-        ev.buffer();
-        await execTask();
-        ev.flush();
+        ev.buffer()
+        await execTask()
+        ev.flush()
+
         function execTask() {
-            return exec(node, false).catch(err => onUnexpectedError(err, identifier));
+            return exec(node, false)
+                .catch(err => onUnexpectedError(err, identifier))
         }
-    };
-    const offlineNodeProcessor = makeOfflineNodeProcessor(new Map([
-        ['message', handleMessage],
-        ['call', handleCall],
-        ['receipt', handleReceipt],
-        ['notification', handleNotification]
-    ]), {
-        isWsOpen: () => ws.isOpen,
-        onUnexpectedError,
-        yieldToEventLoop: () => new Promise(resolve => setImmediate(resolve))
-    });
-    const processNode = async (type, node, identifier, exec) => {
-        // Fast path: ack and drop ignored JIDs before entering the buffer/queue
-        const from = node.attrs.from;
-        let ignoreJid = from;
-        if (type === 'receipt' && from) {
-            const attrs = node.attrs;
-            const isLid = attrs.from.includes('lid');
-            const isNodeFromMe = areJidsSameUser(attrs.participant || attrs.from, isLid ? authState.creds.me?.lid : authState.creds.me?.id);
-            ignoreJid = !isNodeFromMe || isJidGroup(attrs.from) ? attrs.from : attrs.recipient;
+    }
+
+    const makeOfflineNodeProcessor = () => {
+        const nodeProcessorMap = new Map([
+            ['message', handleMessage],
+            ['call', handleCall],
+            ['receipt', handleReceipt],
+            ['notification', handleNotification]
+        ])
+
+        const nodes = []
+        let isProcessing = false
+
+        const enqueue = (type, node) => {
+            nodes.push({
+                type,
+                node
+            })
+
+            if (isProcessing) {
+                return
+            }
+
+            isProcessing = true
+
+            const promise = async () => {
+                // PENTING: sebelumnya kalau nodeProcessor(node) throw (misal bug upstream
+                // baileys "No participant in group message" pas decrypt node offline yang
+                // malformed), exception itu keluar dari while-loop ini SEBELUM sempat
+                // `isProcessing = false`. Akibatnya isProcessing kepentok true SELAMANYA,
+                // dan enqueue() di bawah selalu langsung `return` tanpa pernah mulai
+                // proses lagi -> semua pesan sesudahnya cuma numpuk di array `nodes` dan
+                // gak pernah diproses lagi sampai bot di-restart total. Ini kemungkinan
+                // besar penyebab "reconnect tapi gak pernah nerima pesan lagi".
+                try {
+                    while (nodes.length && ws.isOpen) {
+                        const {
+                            type,
+                            node
+                        } = nodes.shift()
+                        const nodeProcessor = nodeProcessorMap.get(type)
+                        if (!nodeProcessor) {
+                            onUnexpectedError(new Error(`unknown offline node type: ${type}`), 'processing offline node')
+                            continue
+                        }
+                        try {
+                            await nodeProcessor(node)
+                        } catch (error) {
+                            // Satu node gagal (misal pesan corrupt/participant kosong) TIDAK
+                            // boleh ngeblok node-node lain di belakangnya dalam antrian.
+                            onUnexpectedError(error, 'processing offline node')
+                        }
+                    }
+                } finally {
+                    isProcessing = false
+                }
+            }
+            promise().catch(error => onUnexpectedError(error, 'processing offline nodes'))
         }
-        if (ignoreJid && ignoreJid !== S_WHATSAPP_NET && shouldIgnoreJid(ignoreJid)) {
-            await sendMessageAck(node, type === 'message' ? NACK_REASONS.UnhandledError : undefined);
-            return;
+
+        return {
+            enqueue
         }
-        const isOffline = !!node.attrs.offline;
+    }
+
+    const offlineNodeProcessor = makeOfflineNodeProcessor()
+
+    const processNode = async (type, node, identifier, exec) => {
+        const isOffline = !!node.attrs.offline
+
         if (isOffline) {
-            offlineNodeProcessor.enqueue(type, node);
-        }
-        else {
-            await processNodeWithBuffer(node, identifier, exec);
+            offlineNodeProcessor.enqueue(type, node)
+        } else {
+            await processNodeWithBuffer(node, identifier, exec)
         }
-    };
+    }
+
     // recv a message
+    // Semua handler di-await supaya event 'CB:message'/'CB:call'/'CB:receipt'/'CB:notification'
+    // yang datang beruntun tidak diproses bersamaan tanpa urutan (race condition di state
+    // bersama seperti session & cache).
     ws.on('CB:message', async (node) => {
-        await processNode('message', node, 'processing message', handleMessage);
-    });
+        await processNode('message', node, 'processing message', handleMessage)
+    })
     ws.on('CB:call', async (node) => {
-        await processNode('call', node, 'handling call', handleCall);
-    });
+        await processNode('call', node, 'handling call', handleCall)
+    })
     ws.on('CB:receipt', async (node) => {
-        await processNode('receipt', node, 'handling receipt', handleReceipt);
-    });
+        await processNode('receipt', node, 'handling receipt', handleReceipt)
+    })
     ws.on('CB:notification', async (node) => {
-        await 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'));
-    });
-    ev.on('call', async ([call]) => {
-        if (!call) {
-            return;
-        }
+        handleBadAck(node)
+            .catch(error => onUnexpectedError(error, 'handling bad ack'))
+    })
+    ev.on('call', ([call]) => {
         // missed call + group call notification message generation
         if (call.status === 'timeout' || (call.status === 'offer' && call.isGroup)) {
             const msg = {
@@ -1636,137 +1848,49 @@ export const makeMessagesRecvSocket = (config) => {
                     id: call.id,
                     fromMe: false
                 },
-                messageTimestamp: unixTimestampSeconds(call.date)
-            };
+                messageTimestamp: Utils_1.unixTimestampSeconds(call.date),
+            }
+
             if (call.status === 'timeout') {
                 if (call.isGroup) {
-                    msg.messageStubType = call.isVideo
-                        ? WAMessageStubType.CALL_MISSED_GROUP_VIDEO
-                        : WAMessageStubType.CALL_MISSED_GROUP_VOICE;
+                    msg.messageStubType = call.isVideo ? Types_1.WAMessageStubType.CALL_MISSED_GROUP_VIDEO : Types_1.WAMessageStubType.CALL_MISSED_GROUP_VOICE
+                } else {
+                    msg.messageStubType = call.isVideo ? Types_1.WAMessageStubType.CALL_MISSED_VIDEO : Types_1.WAMessageStubType.CALL_MISSED_VOICE
                 }
-                else {
-                    msg.messageStubType = call.isVideo ? WAMessageStubType.CALL_MISSED_VIDEO : WAMessageStubType.CALL_MISSED_VOICE;
+            } else {
+                msg.message = {
+                    call: {
+                        callKey: Buffer.from(call.id)
+                    }
                 }
             }
-            else {
-                msg.message = { call: { callKey: Buffer.from(call.id) } };
-            }
-            const protoMsg = proto.WebMessageInfo.fromObject(msg);
-            await upsertMessage(protoMsg, call.offline ? 'append' : 'notify');
-        }
-    });
-    /** timestamp of last tctoken prune run — throttles to once per 24h */
-    let lastTcTokenPruneTs = 0;
-    /** dedupe in-flight 463 recovery token issuance by target JID */
-    const inFlight463Recoveries = new Set();
-    ev.on('connection.update', ({ isOnline, connection }) => {
+
+            const protoMsg = WAProto_1.proto.WebMessageInfo.fromObject(msg)
+            upsertMessage(protoMsg, call.offline ? 'append' : 'notify')
+        }
+    })
+
+    ev.on('connection.update', ({
+        isOnline
+    }) => {
         if (typeof isOnline !== 'undefined') {
-            sendActiveReceipts = isOnline;
-            logger.trace(`sendActiveReceipts set to "${sendActiveReceipts}"`);
-        }
-        // Flush pending tctoken index save on disconnect to avoid writing after close
-        if (connection === 'close' && tcTokenIndexTimer) {
-            clearTimeout(tcTokenIndexTimer);
-            tcTokenIndexTimer = undefined;
-            // Best-effort flush — may fail if store is already closed
-            try {
-                void Promise.resolve(flushTcTokenIndex()).catch(() => { });
-            }
-            catch {
-                /* ignore sync errors */
-            }
-        }
-        // Prune expired tctokens when coming online, at most once per 24 hours
-        // Matches WA Web's CLEAN_TC_TOKENS task
-        // Note: don't gate on tcTokenKnownJids.size — the index may still be loading
-        if (isOnline) {
-            const now = Date.now();
-            const DAY_MS = 24 * 60 * 60 * 1000;
-            if (now - lastTcTokenPruneTs >= DAY_MS) {
-                lastTcTokenPruneTs = now;
-                void pruneExpiredTcTokens();
-            }
-        }
-    });
-    registerSocketEndHandler(() => {
-        if (!config.msgRetryCounterCache && msgRetryCache.close) {
-            msgRetryCache.close();
-        }
-        if (!config.callOfferCache && callOfferCache.close) {
-            callOfferCache.close();
-        }
-        identityAssertDebounce.close();
-        sendActiveReceipts = false;
-    });
-    async function pruneExpiredTcTokens() {
-        try {
-            await tcTokenIndexLoaded;
-            // Union with the persisted index picks up JIDs added by other layers
-            // (history sync) without needing inter-module wiring.
-            const persisted = await readTcTokenIndex(authState.keys);
-            const allJids = new Set(tcTokenKnownJids);
-            for (const jid of persisted)
-                allJids.add(jid);
-            if (!allJids.size)
-                return;
-            const jids = [...allJids];
-            const allTokens = await authState.keys.get('tctoken', jids);
-            const writes = {};
-            const survivors = new Set();
-            let mutated = 0;
-            for (const jid of jids) {
-                const entry = allTokens[jid];
-                if (!entry) {
-                    // Tracked but nothing in store — drop from index.
-                    mutated++;
-                    continue;
-                }
-                const hasPeerToken = !!entry.token?.length;
-                const peerTokenExpired = hasPeerToken && isTcTokenExpired(entry.timestamp);
-                const hasSenderTs = entry.senderTimestamp !== undefined;
-                const senderTsExpired = hasSenderTs && isTcTokenExpired(entry.senderTimestamp);
-                const keepPeerToken = hasPeerToken && !peerTokenExpired;
-                const keepSenderTs = hasSenderTs && !senderTsExpired;
-                if (!keepPeerToken && !keepSenderTs) {
-                    writes[jid] = null;
-                    mutated++;
-                }
-                else if (peerTokenExpired && keepSenderTs) {
-                    writes[jid] = { token: Buffer.alloc(0), senderTimestamp: entry.senderTimestamp };
-                    survivors.add(jid);
-                    mutated++;
-                }
-                else {
-                    survivors.add(jid);
-                }
-            }
-            if (mutated === 0)
-                return;
-            await authState.keys.set({
-                tctoken: {
-                    ...writes,
-                    [TC_TOKEN_INDEX_KEY]: {
-                        token: Buffer.from(JSON.stringify([...survivors]))
-                    }
-                }
-            });
-            tcTokenKnownJids.clear();
-            for (const jid of survivors)
-                tcTokenKnownJids.add(jid);
-            logger.debug({ mutated, remaining: survivors.size }, 'pruned expired tctokens');
-        }
-        catch (err) {
-            logger.warn({ err: err?.message }, 'failed to prune expired tctokens');
+            sendActiveReceipts = isOnline
+            logger.trace(`sendActiveReceipts set to "${sendActiveReceipts}"`)
         }
-    }
+    })
+
     return {
         ...sock,
         sendMessageAck,
         sendRetryRequest,
+        offerCall,
         rejectCall,
         fetchMessageHistory,
         requestPlaceholderResend,
         messageRetryManager
-    };
-};
-//# sourceMappingURL=messages-recv.js.map
+    }
+}
+
+module.exports = {
+    makeMessagesRecvSocket
+}