@neelegirl/baileys 1.5.3 → 1.5.4

package/lib/Socket/messages-recv.js

@@ -1,48 +1,218 @@
-"use strict"
-
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
-
-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 baron = 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 } = baron
-    
+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 } from '../Defaults/index.js';
+import { WAMessageStatus, WAMessageStubType } from '../Types/index.js';
+import { aesDecryptCTR, aesEncryptGCM, cleanMessage, Curve, decodeMediaRetryNode, decodeMessageNode, decryptMessageNode, delay, derivePairingCodeKey, encodeBigEndian, encodeSignedDeviceIdentity, extractAddressingContext, getCallStatusFromNode, getHistoryMsg, getNextPreKeys, getStatusFromReceiptType, hkdf, MISSING_KEYS_ERROR_TEXT, NACK_REASONS, unixTimestampSeconds, xmppPreKey, xmppSignedPreKey } from '../Utils/index.js';
+import { makeMutex } from '../Utils/make-mutex.js';
+import { areJidsSameUser, binaryNodeToString, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildBuffer, getBinaryNodeChildren, getBinaryNodeChildString, isJidGroup, isJidStatusBroadcast, isLidUser, isPnUser, jidDecode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { extractGroupMetadata } from './groups.js';
+import { makeMessagesSocket } from './messages-send.js';
+export const makeMessagesRecvSocket = (config) => {
+    const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid, enableAutoSessionRecreation } = config;
+    const sock = makeMessagesSocket(config);
+    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage, messageRetryManager } = sock;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
-    const retryMutex = make_mutex_1.makeMutex()
-    
-    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 retryMutex = makeMutex();
+    const msgRetryCache = config.msgRetryCounterCache ||
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+            useClones: false
+        });
+    const callOfferCache = config.callOfferCache ||
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.CALL_OFFER, // 5 mins
+            useClones: false
+        });
+    const placeholderResendCache = config.placeholderResendCache ||
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+            useClones: false
+        });
+    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) => {
+        if (!authState.creds.me?.id) {
+            throw new Boom('Not authenticated');
+        }
+        if (placeholderResendCache.get(messageKey?.id)) {
+            logger.debug({ messageKey }, 'already requested resend');
+            return;
+        }
+        else {
+            placeholderResendCache.set(messageKey?.id, true);
+        }
+        await delay(5000);
+        if (!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(() => {
+            if (placeholderResendCache.get(messageKey?.id)) {
+                logger.debug({ messageKey }, 'PDO message without response after 15 seconds. Phone possibly offline');
+                placeholderResendCache.del(messageKey?.id);
+            }
+        }, 15000);
+        return sendPeerDataOperationMessage(pdoMessage);
+    };
+    // Handles mex newsletter notifications
+    const handleMexNewsletterNotification = async (node) => {
+        const mexNode = getBinaryNodeChild(node, 'mex');
+        if (!mexNode?.content) {
+            logger.warn({ node }, 'Invalid mex newsletter notification');
+            return;
+        }
+        let data;
+        try {
+            data = JSON.parse(mexNode.content.toString());
+        }
+        catch (error) {
+            logger.error({ err: error, node }, 'Failed to parse mex newsletter notification');
+            return;
+        }
+        const operation = data?.operation;
+        const updates = data?.updates;
+        if (!updates || !operation) {
+            logger.warn({ data }, 'Invalid mex newsletter notification content');
+            return;
+        }
+        logger.info({ operation, updates }, 'got mex newsletter notification');
+        switch (operation) {
+            case 'NotificationNewsletterUpdate':
+                for (const update of updates) {
+                    if (update.jid && update.settings && Object.keys(update.settings).length > 0) {
+                        ev.emit('newsletter-settings.update', {
+                            id: update.jid,
+                            update: update.settings
+                        });
+                    }
+                }
+                break;
+            case 'NotificationNewsletterAdminPromote':
+                for (const update of updates) {
+                    if (update.jid && update.user) {
+                        ev.emit('newsletter-participants.update', {
+                            id: update.jid,
+                            author: node.attrs.from,
+                            user: update.user,
+                            new_role: 'ADMIN',
+                            action: 'promote'
+                        });
+                    }
+                }
+                break;
+            default:
+                logger.info({ operation, data }, 'Unhandled mex newsletter notification');
+                break;
+        }
+    };
+    // Handles newsletter notifications
+    const handleNewsletterNotification = async (node) => {
+        const from = node.attrs.from;
+        const child = getAllBinaryNodeChildren(node)[0];
+        const author = node.attrs.participant;
+        logger.info({ from, child }, 'got newsletter notification');
+        switch (child.tag) {
+            case 'reaction':
+                const reactionUpdate = {
+                    id: from,
+                    server_id: child.attrs.message_id,
+                    reaction: {
+                        code: getBinaryNodeChildString(child, 'reaction'),
+                        count: 1
+                    }
+                };
+                ev.emit('newsletter.reaction', reactionUpdate);
+                break;
+            case 'view':
+                const viewUpdate = {
+                    id: from,
+                    server_id: child.attrs.message_id,
+                    count: parseInt(child.content?.toString() || '0', 10)
+                };
+                ev.emit('newsletter.view', viewUpdate);
+                break;
+            case 'participant':
+                const participantUpdate = {
+                    id: from,
+                    author,
+                    user: child.attrs.jid,
+                    action: child.attrs.action,
+                    new_role: child.attrs.role
+                };
+                ev.emit('newsletter-participants.update', participantUpdate);
+                break;
+            case 'update':
+                const settingsNode = getBinaryNodeChild(child, 'settings');
+                if (settingsNode) {
+                    const update = {};
+                    const nameNode = getBinaryNodeChild(settingsNode, 'name');
+                    if (nameNode?.content)
+                        update.name = nameNode.content.toString();
+                    const descriptionNode = getBinaryNodeChild(settingsNode, 'description');
+                    if (descriptionNode?.content)
+                        update.description = descriptionNode.content.toString();
+                    ev.emit('newsletter-settings.update', {
+                        id: from,
+                        update
+                    });
+                }
+                break;
+            case 'message':
+                const plaintextNode = getBinaryNodeChild(child, 'plaintext');
+                if (plaintextNode?.content) {
+                    try {
+                        const contentBuf = typeof plaintextNode.content === 'string'
+                            ? Buffer.from(plaintextNode.content, 'binary')
+                            : Buffer.from(plaintextNode.content);
+                        const messageProto = proto.Message.decode(contentBuf).toJSON();
+                        const fullMessage = proto.WebMessageInfo.fromObject({
+                            key: {
+                                remoteJid: from,
+                                id: child.attrs.message_id || child.attrs.server_id,
+                                fromMe: false // TODO: is this really true though
+                            },
+                            message: messageProto,
+                            messageTimestamp: +child.attrs.t
+                        }).toJSON();
+                        await upsertMessage(fullMessage, 'append');
+                        logger.info('Processed plaintext newsletter message');
+                    }
+                    catch (error) {
+                        logger.error({ error }, 'Failed to decode plaintext newsletter message');
+                    }
+                }
+                break;
+            default:
+                logger.warn({ node }, 'Unknown newsletter notification');
+                break;
+        }
+    };
     const sendMessageAck = async ({ tag, attrs, content }, errorCode) => {
         const stanza = {
             tag: 'ack',
@@ -51,201 +221,123 @@ const makeMessagesRecvSocket = (config) => {
                 to: attrs.from,
                 class: tag
             }
-        }
-        
+        };
         if (!!errorCode) {
-            stanza.attrs.error = errorCode.toString()
+            stanza.attrs.error = errorCode.toString();
         }
-        
         if (!!attrs.participant) {
-            stanza.attrs.participant = 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
+            stanza.attrs.recipient = attrs.recipient;
         }
-        
-        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
-            })
+        if (!!attrs.type &&
+            (tag !== 'message' || getBinaryNodeChild({ tag, attrs, content }, 'unavailable') || errorCode !== 0)) {
+            stanza.attrs.type = attrs.type;
         }
-        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)
-            })
+        if (tag === 'message' && getBinaryNodeChild({ tag, attrs, content }, 'unavailable')) {
+            stanza.attrs.from = authState.creds.me.id;
         }
-        
-        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
-        }
-    }
-    
+        logger.debug({ recv: { tag, 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: [{
+            content: [
+                {
                     tag: 'reject',
                     attrs: {
                         'call-id': callId,
                         'call-creator': callFrom,
-                        count: '0',
+                        count: '0'
                     },
-                    content: undefined,
-                }],
-        })
-        
-        await query(stanza)
-    }
-    
+                    content: undefined
+                }
+            ]
+        };
+        await query(stanza);
+    };
     const sendRetryRequest = async (node, forceIncludeKeys = false) => {
-        const { fullMessage } = Utils_1.decodeMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '')
-        const { key: msgKey } = fullMessage
-        const msgId = msgKey.id
-        
+        const { fullMessage } = 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}`
-            msgRetryCache.set(key, retryCount)
+            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')
-                msgRetryCache.del(key)
-                return
+                logger.debug({ retryCount, msgId }, 'reached retry limit, clearing');
+                msgRetryCache.del(key);
+                return;
             }
-            
-            retryCount += 1
-            await msgRetryCache.set(key, retryCount)
+            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
-        
+        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 = ''
-        
+        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, retryCount, 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.info({ fromJid, retryCount, reason: recreateReason }, 'recreating session for retry')
+                    logger.debug({ fromJid, retryCount, reason: recreateReason }, 'recreating session for retry');
                     // Delete existing session to force recreation
-                    await authState.keys.set({ session: { [sessionId]: null } })
-                    forceIncludeKeys = true
+                    await authState.keys.set({ session: { [sessionId]: null } });
+                    forceIncludeKeys = true;
                 }
             }
             catch (error) {
-                logger.warn({ error, fromJid }, 'failed to check session recreation')
+                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 msgId = await requestPlaceholderResend(msgKey)
-                        logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId} (scheduled)`)
+                        const requestId = await requestPlaceholderResend(msgKey);
+                        logger.debug(`sendRetryRequest: requested placeholder resend (${requestId}) for message ${msgId} (scheduled)`);
                     }
                     catch (error) {
                         logger.warn({ error, msgId }, 'failed to send scheduled phone request');
                     }
-                })
+                });
             }
             else {
                 // Fallback to immediate request
-                const msgId = await requestPlaceholderResend(msgKey)
-                logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId}`)
+                const msgId = await requestPlaceholderResend(msgKey);
+                logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId}`);
             }
         }
-        
-        const deviceIdentity = Utils_1.encodeSignedDeviceIdentity(account, true)
+        const deviceIdentity = encodeSignedDeviceIdentity(account, true);
         await authState.keys.transaction(async () => {
             const receipt = {
                 tag: 'receipt',
@@ -261,447 +353,320 @@ const makeMessagesRecvSocket = (config) => {
                             count: retryCount.toString(),
                             id: node.attrs.id,
                             t: node.attrs.t,
-                            v: '1'
+                            v: '1',
+                            // ADD ERROR FIELD
+                            error: '0'
                         }
                     },
                     {
                         tag: 'registration',
                         attrs: {},
-                        content: Utils_1.encodeBigEndian(authState.creds.registrationId)
+                        content: 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 Utils_1.getNextPreKeys(authState, 1)
-                const [keyId] = Object.keys(preKeys)
-                const key = preKeys[+keyId]
-                const content = receipt.content
-                
+                const { update, preKeys } = await 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(Defaults_1.KEY_BUNDLE_TYPE) },
+                        { tag: 'type', attrs: {}, content: Buffer.from(KEY_BUNDLE_TYPE) },
                         { tag: 'identity', attrs: {}, content: identityKey.public },
-                        Utils_1.xmppPreKey(key, +keyId),
-                        Utils_1.xmppSignedPreKey(signedPreKey),
+                        xmppPreKey(key, +keyId),
+                        xmppSignedPreKey(signedPreKey),
                         { tag: 'device-identity', attrs: {}, content: deviceIdentity }
                     ]
                 });
-                ev.emit('creds.update', update)
+                ev.emit('creds.update', update);
             }
-            await sendNode(receipt)
-            logger.info({ msgAttrs: node.attrs, retryCount }, 'sent retry receipt')
-        }, authState?.creds?.me?.id || 'sendRetryRequest')
-    }
-    
+            await sendNode(receipt);
+            logger.info({ msgAttrs: node.attrs, retryCount }, 'sent retry receipt');
+        }, authState?.creds?.me?.id || 'sendRetryRequest');
+    };
     const handleEncryptNotification = async (node) => {
-        const from = node.attrs.from
-        if (from === WABinary_1.S_WHATSAPP_NET) {
-            const countChild = 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')
-            
+        const from = node.attrs.from;
+        if (from === S_WHATSAPP_NET) {
+            const countChild = getBinaryNodeChild(node, 'count');
+            const count = +countChild.attrs.value;
+            const shouldUploadMorePreKeys = count < MIN_PREKEY_COUNT;
+            logger.debug({ count, shouldUploadMorePreKeys }, 'recv pre-key count');
             if (shouldUploadMorePreKeys) {
-                await uploadPreKeys()
+                await uploadPreKeys();
             }
         }
-        
         else {
-            const identityNode = WABinary_1.getBinaryNodeChild(node, 'identity')
+            const identityNode = getBinaryNodeChild(node, 'identity');
             if (identityNode) {
-                logger.info({ jid: from }, 'identity changed')
+                logger.info({ jid: from }, 'identity changed');
                 // not handling right now
                 // signal will override new identity anyway
             }
-            
             else {
-                logger.info({ node }, 'unknown encrypt notification')
+                logger.info({ node }, 'unknown encrypt notification');
             }
         }
-    }
-    
-    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) {
+    };
+    const handleGroupNotification = (fullNode, child, msg) => {
+        // TODO: Support PN/LID (Here is only LID now)
+        const actingParticipantLid = fullNode.attrs.participant;
+        const actingParticipantPn = fullNode.attrs.participant_pn;
+        const affectedParticipantLid = getBinaryNodeChild(child, 'participant')?.attrs?.jid || actingParticipantLid;
+        const affectedParticipantPn = getBinaryNodeChild(child, 'participant')?.attrs?.phone_number || actingParticipantPn;
+        switch (child?.tag) {
             case 'create':
-                const metadata = groups_1.extractGroupMetadata(child)
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CREATE
-                msg.messageStubParameters = [metadata.subject]
-                msg.key = { participant: metadata.owner }
-                ev.emit('chats.upsert', [{
+                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', [{
+                        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
+                        author: actingParticipantLid,
+                        authorPn: actingParticipantPn
+                    }
+                ]);
+                break;
             case 'ephemeral':
             case 'not_ephemeral':
                 msg.message = {
                     protocolMessage: {
-                        type: WAProto_1.proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING,
+                        type: proto.Message.ProtocolMessage.Type.EPHEMERAL_SETTING,
                         ephemeralExpiration: +(child.attrs.expiration || 0)
                     }
-                }
-                break
+                };
+                break;
             case 'modify':
-                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
+                const oldNumber = getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid);
+                msg.messageStubParameters = oldNumber || [];
+                msg.messageStubType = WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER;
+                break;
             case 'promote':
             case 'demote':
             case 'remove':
             case 'add':
             case 'leave':
-                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)
+                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,
+                        admin: (attrs.type || null)
+                    };
+                });
                 if (participants.length === 1 &&
                     // if recv. "remove" message and sender removed themselves
                     // mark as left
-                    WABinary_1.areJidsSameUser(participants[0], participant) &&
+                    (areJidsSameUser(participants[0].id, actingParticipantLid) ||
+                        areJidsSameUser(participants[0].id, actingParticipantPn)) &&
                     child.tag === 'remove') {
-                    msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE
+                    msg.messageStubType = WAMessageStubType.GROUP_PARTICIPANT_LEAVE;
                 }
-                msg.messageStubParameters = participants
-                break
+                msg.messageStubParameters = participants.map(a => JSON.stringify(a));
+                break;
             case 'subject':
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT
-                msg.messageStubParameters = [participantJid, child.attrs.subject]
-                break
+                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_SUBJECT;
+                msg.messageStubParameters = [child.attrs.subject];
+                break;
             case 'description':
-                const description = WABinary_1.getBinaryNodeChild(child, 'body')?.content?.toString()
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_DESCRIPTION
-                msg.messageStubParameters = description ? [description] : undefined
-                break
+                const description = getBinaryNodeChild(child, 'body')?.content?.toString();
+                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_DESCRIPTION;
+                msg.messageStubParameters = description ? [description] : undefined;
+                break;
             case 'announcement':
             case 'not_announcement':
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE
-                msg.messageStubParameters = [(child.tag === 'announcement') ? 'on' : 'off']
-                break
+                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_ANNOUNCE;
+                msg.messageStubParameters = [child.tag === 'announcement' ? 'on' : 'off'];
+                break;
             case 'locked':
             case 'unlocked':
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_RESTRICT
-                msg.messageStubParameters = [(child.tag === 'locked') ? 'on' : 'off']
-                break
+                msg.messageStubType = WAMessageStubType.GROUP_CHANGE_RESTRICT;
+                msg.messageStubParameters = [child.tag === 'locked' ? 'on' : 'off'];
+                break;
             case 'invite':
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_INVITE_LINK
-                msg.messageStubParameters = [child.attrs.code]
-                break
+                msg.messageStubType = 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 = Types_1.WAMessageStubType.GROUP_MEMBER_ADD_MODE
-                    msg.messageStubParameters = [addMode.toString()]
+                    msg.messageStubType = WAMessageStubType.GROUP_MEMBER_ADD_MODE;
+                    msg.messageStubParameters = [addMode.toString()];
                 }
-                break
+                break;
             case 'membership_approval_mode':
-                const approvalMode = WABinary_1.getBinaryNodeChild(child, 'group_join')
+                const approvalMode = getBinaryNodeChild(child, 'group_join');
                 if (approvalMode) {
-                    msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE
-                    msg.messageStubParameters = [approvalMode.attrs.state]
+                    msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE;
+                    msg.messageStubParameters = [approvalMode.attrs.state];
                 }
-                break
+                break;
             case 'created_membership_requests':
-            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
+                msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
+                msg.messageStubParameters = [
+                    JSON.stringify({ lid: affectedParticipantLid, pn: affectedParticipantPn }),
+                    'created',
+                    child.attrs.request_method
+                ];
+                break;
             case 'revoked_membership_requests':
-            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 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
-                    }
-                })
-            }
-
-            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
-                })
-            })
-        }
-    }
-    
-    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 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 processNotification = async (node) => {
-        const result = {}
-        const [child] = WABinary_1.getAllBinaryNodeChildren(node)
-        const nodeType = node.attrs.type
-        const from = WABinary_1.jidNormalizedUser(node.attrs.from)
-        
+        const result = {};
+        const [child] = getAllBinaryNodeChildren(node);
+        const nodeType = node.attrs.type;
+        const from = jidNormalizedUser(node.attrs.from);
         switch (nodeType) {
             case 'privacy_token':
-                const tokenList = WABinary_1.getBinaryNodeChildren(child, 'token')
+                const tokenList = getBinaryNodeChildren(child, 'token');
                 for (const { attrs, content } of tokenList) {
-                    const jid = attrs.jid
+                    const jid = attrs.jid;
                     ev.emit('chats.update', [
                         {
                             id: jid,
                             tcToken: content
                         }
-                    ])
-                    logger.debug({ jid }, 'got privacy token update')
+                    ]);
+                    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
+                break;
             case 'newsletter':
-                handleNewsletterNotification(node.attrs.from, child) 
-                break
+                await handleNewsletterNotification(node);
+                break;
             case 'mex':
-                handleMexNotification(node.attrs.from, child) 
-                break
+                await handleMexNewsletterNotification(node);
+                break;
+            case 'w:gp2':
+                // TODO: HANDLE PARTICIPANT_PN
+                handleGroupNotification(node, child, result);
+                break;
             case 'mediaretry':
-                const event = Utils_1.decodeMediaRetryNode(node)
-                ev.emit('messages.media-update', [event])
-                break
+                const event = decodeMediaRetryNode(node);
+                ev.emit('messages.media-update', [event]);
+                break;
             case 'encrypt':
-                await handleEncryptNotification(node)
-                break
+                await handleEncryptNotification(node);
+                break;
             case 'devices':
-                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')
+                const devices = getBinaryNodeChildren(child, 'device');
+                if (areJidsSameUser(child.attrs.jid, authState.creds.me.id) ||
+                    areJidsSameUser(child.attrs.lid, authState.creds.me.lid)) {
+                    const deviceData = devices.map(d => ({ id: d.attrs.jid, lid: d.attrs.lid }));
+                    logger.info({ deviceData }, 'my own devices changed');
                 }
                 //TODO: drop a new event, add hashes
-                break
+                break;
             case 'server_sync':
-                const update = WABinary_1.getBinaryNodeChild(node, 'collection')
+                const update = 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 = 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 || '',
+                const setPicture = getBinaryNodeChild(node, 'set');
+                const delPicture = getBinaryNodeChild(node, 'delete');
+                ev.emit('contacts.update', [
+                    {
+                        id: 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 (isJidGroup(from)) {
+                    const node = setPicture || delPicture;
+                    result.messageStubType = 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 = WABinary_1.getBinaryNodeChildren(child, 'item')
+                    const blocklists = getBinaryNodeChildren(child, 'item');
                     for (const { attrs } of blocklists) {
-                        const blocklist = [attrs.jid]
-                        const type = (attrs.action === 'block') ? 'add' : 'remove'
-                        ev.emit('blocklist.update', { blocklist, type })
+                        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 = 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, {
+                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 = await 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 = 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')
-                
+                });
+                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 = (await hkdf(identityPayload, 32, { info: 'adv_secret' })).toString('base64');
                 await query({
                     tag: 'iq',
                     attrs: {
-                        to: WABinary_1.S_WHATSAPP_NET,
+                        to: S_WHATSAPP_NET,
                         type: 'set',
-                        id: baron.generateMessageTag(),
+                        id: sock.generateMessageTag(),
                         xmlns: 'md'
                     },
                     content: [
@@ -709,7 +674,7 @@ const makeMessagesRecvSocket = (config) => {
                             tag: 'link_code_companion_reg',
                             attrs: {
                                 jid: authState.creds.me.id,
-                                stage: 'companion_finish',
+                                stage: 'companion_finish'
                             },
                             content: [
                                 {
@@ -730,576 +695,394 @@ const makeMessagesRecvSocket = (config) => {
                             ]
                         }
                     ]
-                })
-                
-                authState.creds.registered = true
-                ev.emit('creds.update', authState.creds)
+                });
+                authState.creds.registered = true;
+                ev.emit('creds.update', authState.creds);
         }
-        
         if (Object.keys(result).length) {
-            return result
+            return result;
         }
-    }
-    
+    };
     async function decipherLinkPublicKey(data) {
-        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)
+        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);
     }
-    
     function toRequiredBuffer(data) {
         if (data === undefined) {
-            throw new boom_1.Boom('Invalid buffer', { statusCode: 400 })
+            throw new Boom('Invalid buffer', { statusCode: 400 });
         }
-        return data instanceof Buffer ? data : Buffer.from(data)
+        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 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
-        
+        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 = !WABinary_1.jidDecode(participant)?.device
-        
+        const sendToAll = !jidDecode(participant)?.device;
         // Check if we should recreate session for this retry
-        let shouldRecreateSession = false
-        let recreateReason = ''
-        
+        let shouldRecreateSession = false;
+        let recreateReason = '';
         if (enableAutoSessionRecreation && messageRetryManager) {
             try {
-                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
-                
+                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.info({ participant, retryCount, reason: recreateReason }, 'recreating session for outgoing retry')
+                    logger.debug({ participant, retryCount, reason: recreateReason }, 'recreating session for outgoing retry');
                     await authState.keys.set({ session: { [sessionId]: null } });
                 }
             }
             catch (error) {
-                logger.warn({ error, participant }, 'failed to check session recreation for outgoing retry')
+                logger.warn({ error, participant }, 'failed to check session recreation for outgoing retry');
             }
         }
-        
-        await assertSessions([participant], shouldRecreateSession)
-        
-        if (WABinary_1.isJidGroup(remoteJid)) {
+        await assertSessions([participant]);
+        if (isJidGroup(remoteJid)) {
             await authState.keys.set({ 'sender-key-memory': { [remoteJid]: null } });
         }
-        logger.debug({ participant, sendToAll, shouldRecreateSession, recreateReason }, 'forced new session for retry recp')
-        
+        logger.debug({ participant, sendToAll, shouldRecreateSession, recreateReason }, '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))) {
-                updateSendMessageAgainCount(ids[i], participant)
-                const msgRelayOpts = { messageId: ids[i] }
-                
+                updateSendMessageAgainCount(ids[i], participant);
+                const msgRelayOpts = { messageId: ids[i] };
                 if (sendToAll) {
-                    msgRelayOpts.useUserDevicesCache = false
+                    msgRelayOpts.useUserDevicesCache = false;
                 }
                 else {
                     msgRelayOpts.participant = {
                         jid: participant,
                         count: +retryNode.attrs.count
-                    }
+                    };
                 }
-                await relayMessage(key.remoteJid, msg, msgRelayOpts)
+                await relayMessage(key.remoteJid, msg, msgRelayOpts);
             }
             else {
-                logger.debug({ jid: key.remoteJid, id: ids[i] }, 'recv retry request, but message not available')
+                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 = 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 { 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 key = {
             remoteJid,
             id: '',
             fromMe,
             participant: attrs.participant
+        };
+        if (shouldIgnoreJid(remoteJid) && remoteJid !== S_WHATSAPP_NET) {
+            logger.debug({ remoteJid }, 'ignoring receipt from jid');
+            await sendMessageAck(node);
+            return;
         }
-        
-        if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
-            logger.debug({ remoteJid }, 'ignoring receipt from jid')
-            await sendMessageAck(node)
-            return
-        }
-        
-        const ids = [attrs.id]
+        const ids = [attrs.id];
         if (Array.isArray(content)) {
-            const items = WABinary_1.getBinaryNodeChildren(content[0], 'item')
-            ids.push(...items.map(i => i.attrs.id))
+            const items = getBinaryNodeChildren(content[0], 'item');
+            ids.push(...items.map(i => i.attrs.id));
         }
-        
         try {
             await Promise.all([
                 processingMutex.mutex(async () => {
-                    const status = Utils_1.getStatusFromReceiptType(attrs.type)
-                    
-                    if (typeof status !== 'undefined' && (
+                    const status = getStatusFromReceiptType(attrs.type);
+                    if (typeof status !== 'undefined' &&
                         // basically, we only want to know when a message from us has been delivered to/read by the other person
                         // or another device of ours has read some messages
-                        status >= WAProto_1.proto.WebMessageInfo.Status.SERVER_ACK ||
-                            !isNodeFromMe)) {
-                        if (WABinary_1.isJidGroup(remoteJid) || WABinary_1.isJidStatusBroadcast(remoteJid)) {
+                        (status >= proto.WebMessageInfo.Status.SERVER_ACK || !isNodeFromMe)) {
+                        if (isJidGroup(remoteJid) || isJidStatusBroadcast(remoteJid)) {
                             if (attrs.participant) {
-                                const updateKey = status === WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp'
+                                const updateKey = status === proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp';
                                 ev.emit('message-receipt.update', ids.map(id => ({
                                     key: { ...key, id },
                                     receipt: {
-                                        userJid: WABinary_1.jidNormalizedUser(attrs.participant),
+                                        userJid: jidNormalizedUser(attrs.participant),
                                         [updateKey]: +attrs.t
                                     }
-                                })))
+                                })));
                             }
                         }
-                        
                         else {
                             ev.emit('messages.update', ids.map(id => ({
                                 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 = WABinary_1.getBinaryNodeChild(node, 'retry')
-                        
+                        key.participant = key.participant || attrs.from;
+                        const retryNode = getBinaryNodeChild(node, 'retry');
                         if (ids[0] && key.participant && (await willSendMessageAgain(ids[0], key.participant))) {
                             if (key.fromMe) {
                                 try {
-                                    updateSendMessageAgainCount(ids[0], key.participant)
-                                    logger.debug({ attrs, key }, 'recv retry request')
-                                    await sendMessagesAgain(key, ids, retryNode)
+                                    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')
+                                    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')
+                                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')
+                            logger.info({ attrs, key }, 'will not send message again, as sent too many times');
                         }
                     }
                 })
-            ])
+            ]);
         }
         finally {
-            await sendMessageAck(node)
+            await sendMessageAck(node);
         }
-    }
-    
+    };
     const handleNotification = async (node) => {
-        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
+        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([
                 processingMutex.mutex(async () => {
-                    const msg = await processNotification(node)
-                    
+                    const msg = await processNotification(node);
                     if (msg) {
-                        const fromMe = WABinary_1.areJidsSameUser(node.attrs.participant || remoteJid, authState.creds.me.id)
+                        const fromMe = areJidsSameUser(node.attrs.participant || remoteJid, authState.creds.me.id);
+                        const { senderAlt: participantAlt, addressingMode } = extractAddressingContext(node);
                         msg.key = {
                             remoteJid,
                             fromMe,
                             participant: node.attrs.participant,
+                            participantAlt,
+                            addressingMode,
                             id: node.attrs.id,
                             ...(msg.key || {})
-                        }
-                        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')
+                        };
+                        msg.participant ?? (msg.participant = node.attrs.participant);
+                        msg.messageTimestamp = +node.attrs.t;
+                        const fullMsg = proto.WebMessageInfo.fromObject(msg);
+                        await upsertMessage(fullMsg, 'append');
                     }
                 })
-            ])
+            ]);
         }
         finally {
-            await sendMessageAck(node)
+            await sendMessageAck(node);
         }
-    }
-    
+    };
     const handleMessage = async (node) => {
-        if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
-            logger.debug({ key: node.attrs.key }, 'ignored message')
-            await sendMessageAck(node)
-            return
+        if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== S_WHATSAPP_NET) {
+            logger.debug({ key: node.attrs.key }, 'ignored message');
+            await sendMessageAck(node, NACK_REASONS.UnhandledError);
+            return;
         }
-        
-        let response
-        const groupJid = node.attrs.from;
-        const communityJid = linkedParentMap[groupJid];
-        const encNode = WABinary_1.getBinaryNodeChild(node, 'enc')
-        
+        const encNode = getBinaryNodeChild(node, 'enc');
         // TODO: temporary fix for crashes and issues resulting of failed msmsg decryption
         if (encNode && encNode.attrs.type === 'msmsg') {
-            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)
-            const { key } = Utils_1.decodeMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '').fullMessage
-            response = await requestPlaceholderResend(key);
-            if (response === 'RESOLVED') {
-                return
-            }
-            logger.debug('received unavailable message, acked and requested resend from phone');
+            logger.debug({ key: node.attrs.key }, 'ignored msmsg');
+            await sendMessageAck(node, NACK_REASONS.MissingMessageSecret);
+            return;
         }
-        else {
-            if (placeholderResendCache.get(node.attrs.id)) {
-                await placeholderResendCache.del(node.attrs.id)
-            }
-        }
-        
-        const { fullMessage: msg, category, author, decrypt } = Utils_1.decryptMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger)
-        
-        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 }])
-        }
-        
-        const alt = msg.key.participantAlt || msg.key.remoteJidAlt
-        
+        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 = WABinary_1.jidDecode(alt)?.server
-            
+            const altServer = jidDecode(alt)?.server;
+            const primaryJid = msg.key.participant || msg.key.remoteJid;
             if (altServer === 'lid') {
-                if (typeof (await signalRepository.lidMapping.getPNForLID(alt)) === 'string') {
-                    await signalRepository.lidMapping.storeLIDPNMappings([
-                        { lid: alt, pn: msg.key.participant || msg.key.remoteJid }
-                    ])
+                if (!(await signalRepository.lidMapping.getPNForLID(alt))) {
+                    await signalRepository.lidMapping.storeLIDPNMappings([{ lid: alt, pn: primaryJid }]);
+                    await signalRepository.migrateSession(primaryJid, alt);
                 }
             }
             else {
-                if (typeof (await signalRepository.lidMapping.getLIDForPN(alt)) === 'string') {
-                    await signalRepository.lidMapping.storeLIDPNMappings([
-                        { lid: msg.key.participant || msg.key.remoteJid, pn: alt }
-                    ])
-                }
+                await signalRepository.lidMapping.storeLIDPNMappings([{ lid: primaryJid, pn: alt }]);
+                await signalRepository.migrateSession(alt, primaryJid);
             }
         }
-        
         if (msg.key?.remoteJid && msg.key?.id && messageRetryManager) {
-            messageRetryManager.addRecentMessage(msg.key.remoteJid, msg.key.id, msg.message)
+            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')
+            }, 'Added message to recent cache for retry receipts');
         }
-        
         try {
-            await Promise.all([
-                processingMutex.mutex(async () => {
-                    await decrypt()
-                    // message failed to decrypt
-                    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 errorMessage = msg?.messageStubParameters?.[0] || ''
-                        const isPreKeyError = errorMessage.includes('PreKey')
-                        logger.debug(`[handleMessage] Attempting retry request for failed decryption`)
-                        
-                        // Handle both pre-key and normal retries in single mutex
-                        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
-                                }
-                                
-                                // Handle pre-key errors with upload and delay
-                                if (isPreKeyError) {
-                                    logger.info({ error: errorMessage }, 'PreKey error detected, uploading and retrying')
-                                    try {
-                                        logger.debug('Uploading pre-keys for error recovery')
-                                        await uploadPreKeys(5)
-                                        logger.debug('Waiting for server to process new pre-keys')
-                                        await 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)
-                                }
+            await processingMutex.mutex(async () => {
+                await decrypt();
+                // message failed to decrypt
+                if (msg.messageStubType === proto.WebMessageInfo.StubType.CIPHERTEXT) {
+                    if (msg?.messageStubParameters?.[0] === MISSING_KEYS_ERROR_TEXT) {
+                        return sendMessageAck(node, NACK_REASONS.ParsingError);
+                    }
+                    const errorMessage = msg?.messageStubParameters?.[0] || '';
+                    const isPreKeyError = errorMessage.includes('PreKey');
+                    logger.debug(`[handleMessage] Attempting retry request for failed decryption`);
+                    // Handle both pre-key and normal retries in single mutex
+                    retryMutex.mutex(async () => {
+                        try {
+                            if (!ws.isOpen) {
+                                logger.debug({ node }, 'Connection closed, skipping retry');
+                                return;
                             }
-                            catch (err) {
-                                logger.error({ err, isPreKeyError }, 'Failed to handle retry, attempting basic retry')
-                                // Still attempt retry even if pre-key upload failed
+                            // Handle pre-key errors with upload and delay
+                            if (isPreKeyError) {
+                                logger.info({ error: errorMessage }, 'PreKey error detected, uploading and retrying');
                                 try {
-                                    const encNode = WABinary_1.getBinaryNodeChild(node, 'enc')
-                                    await sendRetryRequest(node, !encNode)
+                                    logger.debug('Uploading pre-keys for error recovery');
+                                    await uploadPreKeys(5);
+                                    logger.debug('Waiting for server to process new pre-keys');
+                                    await delay(1000);
                                 }
-                                catch (retryErr) {
-                                    logger.error({ retryErr }, 'Failed to send retry after error handling')
+                                catch (uploadErr) {
+                                    logger.error({ uploadErr }, 'Pre-key upload failed, proceeding with retry anyway');
                                 }
                             }
-                        })
-                    }
-                    
-                    else {
-                        // no type in the receipt => message delivered
-                        let type = undefined
-                        
-                        let participant = msg.key.participant
-                        if (communityJid) {
-    msg.communityJid = communityJid;
-}
-                        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 (WABinary_1.isLidUser(msg.key.remoteJid) || WABinary_1.isLidUser(msg.key.remoteJidAlt)) {
-                                participant = author // TODO: investigate sending receipts to LIDs and not PNs
+                            const encNode = getBinaryNodeChild(node, 'enc');
+                            await sendRetryRequest(node, !encNode);
+                            if (retryRequestDelayMs) {
+                                await delay(retryRequestDelayMs);
                             }
                         }
-                        
-                        else if (!sendActiveReceipts) {
-                            type = 'inactive'
+                        catch (err) {
+                            logger.error({ err, isPreKeyError }, 'Failed to handle retry, attempting basic retry');
+                            // Still attempt retry even if pre-key upload failed
+                            try {
+                                const encNode = getBinaryNodeChild(node, 'enc');
+                                await sendRetryRequest(node, !encNode);
+                            }
+                            catch (retryErr) {
+                                logger.error({ retryErr }, 'Failed to send retry after error handling');
+                            }
                         }
-                        await sendReceipt(msg.key.remoteJid, participant, [msg.key.id], type)
-                        
-                        // send ack for history message
-                        const isAnyHistoryMsg = Utils_1.getHistoryMsg(msg.message)
-                        if (isAnyHistoryMsg) {
-                            const jid = WABinary_1.jidNormalizedUser(msg.key.remoteJid)
-                            await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync')
+                        await sendMessageAck(node, NACK_REASONS.UnhandledError);
+                    });
+                }
+                else {
+                    // 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
                         }
                     }
-                    Utils_1.cleanMessage(msg, authState.creds.me.id)
-                    await sendMessageAck(node)
-                    await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify')
-                })
-            ])
+                    else if (!sendActiveReceipts) {
+                        type = 'inactive';
+                    }
+                    await sendReceipt(msg.key.remoteJid, participant, [msg.key.id], type);
+                    // send ack for history message
+                    const isAnyHistoryMsg = getHistoryMsg(msg.message);
+                    if (isAnyHistoryMsg) {
+                        const jid = jidNormalizedUser(msg.key.remoteJid);
+                        await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync');
+                    }
+                }
+                cleanMessage(msg, authState.creds.me.id, authState.creds.me.lid);
+                await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
+            });
         }
-        
         catch (error) {
-            logger.error({ error, node }, 'error in handling message')
+            logger.error({ error, node: binaryNodeToString(node) }, 'error in handling message');
         }
-    }
-    
-    const fetchMessageHistory = async (count, oldestMsgKey, oldestMsgTimestamp) => {
-        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)
-            }
-        }, 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) 
-        	}
-        }
-        
+        const { attrs } = node;
+        const [infoChild] = getAllBinaryNodeChildren(node);
+        const status = getCallStatusFromNode(infoChild);
+        if (!infoChild) {
+            throw new Boom('Missing call info in call node');
+        }
+        const callId = infoChild.attrs['call-id'];
+        const from = infoChild.attrs.from || infoChild.attrs['call-creator'];
         const call = {
             chatId: attrs.from,
             from,
             id: callId,
             date: new Date(+attrs.t * 1000),
             offline: !!attrs.offline,
-            status,
-        }
-        
+            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)
+            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)
-        
+        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.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)
+            await callOfferCache.del(call.id);
         }
-        
-        ev.emit('call', [call])
-        
-        await sendMessageAck(node)
-    }
-    
+        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 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
@@ -1316,140 +1099,89 @@ const makeMessagesRecvSocket = (config) => {
         // error in acknowledgement,
         // device could not display the message
         if (attrs.error) {
-            logger.warn({ attrs }, 'received error in ack')
+            logger.warn({ attrs }, 'received error in ack');
             ev.emit('messages.update', [
                 {
                     key,
                     update: {
-                        status: Types_1.WAMessageStatus.ERROR,
-                        messageStubParameters: [
-                            attrs.error
-                        ]
+                        status: 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 makeOfflineNodeProcessor = () => {
         const nodeProcessorMap = new Map([
             ['message', handleMessage],
             ['call', handleCall],
             ['receipt', handleReceipt],
             ['notification', handleNotification]
-        ])
-        
-        const nodes = []
-        let isProcessing = false
-        
+        ]);
+        const nodes = [];
+        let isProcessing = false;
         const enqueue = (type, node) => {
-            nodes.push({ type, node })
-            
+            nodes.push({ type, node });
             if (isProcessing) {
-                return
+                return;
             }
-            
-            isProcessing = true
-            
+            isProcessing = true;
             const promise = async () => {
                 while (nodes.length && ws.isOpen) {
-                    const { type, node } = nodes.shift()
-                    const nodeProcessor = nodeProcessorMap.get(type)
+                    const { type, node } = nodes.shift();
+                    const nodeProcessor = nodeProcessorMap.get(type);
                     if (!nodeProcessor) {
-                        onUnexpectedError(new Error(`unknown offline node type: ${type}`), 'processing offline node')
-                        continue
+                        onUnexpectedError(new Error(`unknown offline node type: ${type}`), 'processing offline node');
+                        continue;
                     }
-                    await nodeProcessor(node)
+                    await nodeProcessor(node);
                 }
-                isProcessing = false
-            }
-            promise().catch(error => onUnexpectedError(error, 'processing offline nodes'))
-        }
-        
-        return { enqueue }
-    }
-    
-    const offlineNodeProcessor = makeOfflineNodeProcessor()
-    
+                isProcessing = false;
+            };
+            promise().catch(error => onUnexpectedError(error, 'processing offline nodes'));
+        };
+        return { enqueue };
+    };
+    const offlineNodeProcessor = makeOfflineNodeProcessor();
     const processNode = (type, node, identifier, exec) => {
-        const isOffline = !!node.attrs.offline
-        
+        const isOffline = !!node.attrs.offline;
         if (isOffline) {
-            offlineNodeProcessor.enqueue(type, node)
+            offlineNodeProcessor.enqueue(type, node);
         }
-        
         else {
-            processNodeWithBuffer(node, identifier, exec)
+            processNodeWithBuffer(node, identifier, exec);
         }
-    }
-    let latestNodeInMemory = null;  
-const nodelogger = (node) => {
-  if (!node) return null;
-   latestNodeInMemory = node
-  return latestNodeInMemory;
-};
-const setNodeLoggerListener = () => {
-  return latestNodeInMemory;
-};
+    };
     // recv a message
     ws.on('CB:message', (node) => {
-        processNode('message', node, 'processing message', handleMessage)
-        nodelogger(node)
-    })
+        processNode('message', node, 'processing message', handleMessage);
+    });
     ws.on('CB:call', async (node) => {
-        processNode('call', node, 'handling call', handleCall)
-    })
+        processNode('call', node, 'handling call', handleCall);
+    });
     ws.on('CB:receipt', node => {
-        processNode('receipt', node, 'handling receipt', handleReceipt)
-        nodelogger(node)
-    })
+        processNode('receipt', node, 'handling receipt', handleReceipt);
+    });
     ws.on('CB:notification', async (node) => {
-        processNode('notification', node, 'handling notification', handleNotification)
-        nodelogger(node)
-    })
+        processNode('notification', node, 'handling notification', handleNotification);
+    });
     ws.on('CB:ack,class:message', (node) => {
-        nodelogger(node)
-        handleBadAck(node)
-            .catch(error => onUnexpectedError(error, 'handling bad ack'))
-    })
-
-const linkedParentMap = {};
-ws.on("CB:iq", (node) => {
-    if (node && node.tag === "iq" && node.attrs.type === "result") {
-        const groups = node.content;
-
-        if (Array.isArray(groups)) {
-            for (const group of groups) {
-                const groupId = group.attrs.id + "@g.us";
-
-                if (group && Array.isArray(group.content)) {
-                    for (const item of group.content) {
-                        if (
-                            item.tag === "linked_parent" &&
-                            item.attrs &&
-                            item.attrs.jid
-                        ) {
-                            linkedParentMap[groupId] = item.attrs.jid;
-                        }
-                    }
-                }
-            }
-        }
-    }
-});
+        handleBadAck(node).catch(error => onUnexpectedError(error, 'handling bad ack'));
+    });
     ev.on('call', ([call]) => {
+        if (!call) {
+            return;
+        }
         // missed call + group call notification message generation
         if (call.status === 'timeout' || (call.status === 'offer' && call.isGroup)) {
             const msg = {
@@ -1458,49 +1190,39 @@ ws.on("CB:iq", (node) => {
                     id: call.id,
                     fromMe: false
                 },
-                messageTimestamp: Utils_1.unixTimestampSeconds(call.date),
-            }
-            
+                messageTimestamp: unixTimestampSeconds(call.date)
+            };
             if (call.status === 'timeout') {
                 if (call.isGroup) {
-                    msg.messageStubType = call.isVideo ? Types_1.WAMessageStubType.CALL_MISSED_GROUP_VIDEO : Types_1.WAMessageStubType.CALL_MISSED_GROUP_VOICE
+                    msg.messageStubType = call.isVideo
+                        ? WAMessageStubType.CALL_MISSED_GROUP_VIDEO
+                        : WAMessageStubType.CALL_MISSED_GROUP_VOICE;
                 }
-                
                 else {
-                    msg.messageStubType = call.isVideo ? Types_1.WAMessageStubType.CALL_MISSED_VIDEO : Types_1.WAMessageStubType.CALL_MISSED_VOICE
+                    msg.messageStubType = call.isVideo ? WAMessageStubType.CALL_MISSED_VIDEO : WAMessageStubType.CALL_MISSED_VOICE;
                 }
             }
-            
             else {
-                msg.message = { call: { callKey: Buffer.from(call.id) } }
+                msg.message = { call: { callKey: Buffer.from(call.id) } };
             }
-            
-            const protoMsg = WAProto_1.proto.WebMessageInfo.fromObject(msg)
-            upsertMessage(protoMsg, call.offline ? 'append' : 'notify')
+            const protoMsg = proto.WebMessageInfo.fromObject(msg);
+            upsertMessage(protoMsg, call.offline ? 'append' : 'notify');
         }
-    })
-    
+    });
     ev.on('connection.update', ({ isOnline }) => {
         if (typeof isOnline !== 'undefined') {
-            sendActiveReceipts = isOnline
-            logger.trace(`sendActiveReceipts set to "${sendActiveReceipts}"`)
+            sendActiveReceipts = isOnline;
+            logger.trace(`sendActiveReceipts set to "${sendActiveReceipts}"`);
         }
-    })
-    
+    });
     return {
-        ...baron,
+        ...sock,
         sendMessageAck,
         sendRetryRequest,
-        offerCall, 
         rejectCall,
-        nodelogger,
-        setNodeLoggerListener,
         fetchMessageHistory,
         requestPlaceholderResend,
         messageRetryManager
-    }
-}
-
-module.exports = {
-  makeMessagesRecvSocket
-}
+    };
+};
+//# sourceMappingURL=messages-recv.js.map