@realvare/based 2.7.70 → 2.7.71

package/lib/Socket/messages-recv.js

@@ -34,6 +34,14 @@ const makeMessagesRecvSocket = (config) => {
         stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
         useClones: false
     });
+    const notificationDedupCache = new node_cache_1.default({
+        stdTTL: 30,
+        useClones: false
+    });
+    const notificationStubDedupCache = new node_cache_1.default({
+        stdTTL: 10,
+        useClones: false
+    });
     const sentMessageCache = new Map();
     const sentMessageCacheMaxSize = 256;
     const getSentMessageCacheKey = (remoteJid, id) => `${remoteJid}:${id}`;
@@ -62,12 +70,7 @@ const makeMessagesRecvSocket = (config) => {
         }
     };
     let sendActiveReceipts = false;
-    const resolveJid = (jid) => {
-        if (typeof jid === 'string' && jid.endsWith('@lid')) {
-            return (0, WABinary_1.lidToJid)(jid);
-        }
-        return jid;
-    };
+    const resolveJid = WABinary_1.resolveJid;
     const sendMessageAck = async ({ tag, attrs, content }, errorCode) => {
         const stanza = {
             tag: 'ack',
@@ -271,45 +274,137 @@ const makeMessagesRecvSocket = (config) => {
             if (identityNode) {
                 logger.info({ jid: from }, 'identity changed');
             }
-            else {
-                logger.info({ node }, 'unknown encrypt notification');
-            }
         }
     };
+
     const toLidIfNecessary = (jid) => {
         if (typeof jid !== 'string')
             return jid;
-        const [user, server] = jid.split('@');
-        if (server === 's.whatsapp.net' && /^[0-9]+$/.test(user) && user.length >= 12) {
-            return `${user}@lid`;
+        if (!jid.includes('@') && /^[0-9]+$/.test(jid)) {
+            return `${jid}@s.whatsapp.net`;
+        }
+        if ((0, WABinary_1.isLid)(jid)) {
+            const cached = config.lidCache?.get(jid);
+            if (cached && typeof cached === 'string') {
+                return cached.includes('@') ? cached : `${cached}@s.whatsapp.net`;
+            }
+            return jid;
         }
         return jid;
     };
+
     // Helper for LID resolution in group context by samakavare
     const resolveLidFromGroupContext = async (lid, groupJid) => {
         if (!(0, WABinary_1.isLid)(lid) || !(0, WABinary_1.isJidGroup)(groupJid)) {
             return lid;
         }
-        const metadata = await groupMetadata(groupJid);
-        const found = metadata.participants.find(p => p.id === lid);
-        let jid = found?.jid;
-        if (!jid) {
-            jid = config.lidCache?.get(lid);
+
+        try {
+            const metadata = await groupMetadata(groupJid);
+            const found = metadata.participants.find(p => p.id === lid);
+            const jid = found?.jid;
+            if (jid) {
+                return jid;
+            }
+        }
+        catch (_err) {
+            // ignore & fallback
         }
-        return jid || (0, WABinary_1.lidToJid)(lid); // Fallback to naive if not found
+        const cached = config.lidCache?.get(lid);
+        if (cached && typeof cached === 'string') {
+            return cached.includes('@') ? cached : `${cached}@s.whatsapp.net`;
+        }
+        return lid;
     };
+
+    const resolveLidOrMaskedJidFromGroupContext = async (jid, groupJid) => {
+        if (typeof jid !== 'string') {
+            return jid;
+        }
+        if ((0, WABinary_1.isLid)(jid)) {
+            return await resolveLidFromGroupContext(jid, groupJid);
+        }
+        const decoded = (0, WABinary_1.jidDecode)(jid);
+        const user = decoded === null || decoded === void 0 ? void 0 : decoded.user;
+        const server = decoded === null || decoded === void 0 ? void 0 : decoded.server;
+        if (server === 's.whatsapp.net' && user && /^[0-9]+$/.test(user)) {
+            const asLid = `${user}@lid`;
+            const resolved = await resolveLidFromGroupContext(asLid, groupJid);
+            return resolved === asLid ? jid : resolved;
+        }
+        return jid;
+    };
+
+    const pnToJid = (pn) => {
+        if (typeof pn !== 'string' || !pn) {
+            return undefined;
+        }
+        return pn.includes('@') ? pn : `${pn}@s.whatsapp.net`;
+    };
+
+    const collectContextInfos = (obj, acc) => {
+        if (!obj || typeof obj !== 'object') {
+            return;
+        }
+        if (obj instanceof Uint8Array || Buffer.isBuffer(obj)) {
+            return;
+        }
+        if (Array.isArray(obj)) {
+            for (const item of obj) {
+                collectContextInfos(item, acc);
+            }
+            return;
+        }
+        for (const [key, value] of Object.entries(obj)) {
+            if (key === 'contextInfo' && value && typeof value === 'object') {
+                acc.push(value);
+            }
+            collectContextInfos(value, acc);
+        }
+    };
+
+    const normalizeContextInfoJids = async (contextInfo, groupJid) => {
+        if (!contextInfo || typeof contextInfo !== 'object') {
+            return;
+        }
+        const normalizeJid = async (jid) => {
+            if (typeof jid !== 'string') {
+                return jid;
+            }
+            if ((0, WABinary_1.isLid)(jid)) {
+                if (groupJid) {
+                    return await resolveLidFromGroupContext(jid, groupJid);
+                }
+                const cached = config.lidCache?.get(jid);
+                if (cached && typeof cached === 'string') {
+                    return cached.includes('@') ? cached : `${cached}@s.whatsapp.net`;
+                }
+                return (0, WABinary_1.lidToJid)(jid);
+            }
+            return jid;
+        };
+        if (typeof contextInfo.participant === 'string') {
+            contextInfo.participant = await normalizeJid(contextInfo.participant);
+        }
+        if (Array.isArray(contextInfo.mentionedJid)) {
+            contextInfo.mentionedJid = await Promise.all(contextInfo.mentionedJid.map(j => normalizeJid(j)));
+        }
+    };
+
     const handleGroupNotification = async (participant, participantPn, child, groupJid, msg) => {
         var _a, _b, _c, _d;
         const childTag = child === null || child === void 0 ? void 0 : child.tag;
         if (participantPn && participant && (0, WABinary_1.isLid)(participant) && config.lidCache?.set) {
             // NOTE: in most if not every w:gp2 stubs participant_pn refer to the actor (admin) not the target
-            config.lidCache.set(participant, participantPn);
+            const pnAsJid = typeof participantPn === 'string' ? (participantPn.includes('@') ? participantPn : `${participantPn}@s.whatsapp.net`) : participantPn;
+            config.lidCache.set(participant, pnAsJid);
         }
         const participantJid = (((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(child, 'participant')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.jid) || participant);
         if (participantPn && participantJid && (0, WABinary_1.isLid)(participantJid) && config.lidCache?.set &&
             (childTag === 'created_membership_requests' || childTag === 'revoked_membership_requests')) {
             // For membership requests, participant_pn refers to the requester (target), not the actor 
-            config.lidCache.set(participantJid, participantPn);
+            const pnAsJid = typeof participantPn === 'string' ? (participantPn.includes('@') ? participantPn : `${participantPn}@s.whatsapp.net`) : participantPn;
+            config.lidCache.set(participantJid, pnAsJid);
         }
         switch (child === null || child === void 0 ? void 0 : child.tag) {
             case 'create':
@@ -347,7 +442,18 @@ const makeMessagesRecvSocket = (config) => {
                 };
                 break;
             case 'modify':
-                const oldNumber = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant').map(p => p.attrs.jid);
+                const modifyNodes = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant');
+                const oldNumber = modifyNodes.map(p => {
+                    const phoneNumber = p.attrs.phone_number;
+                    const pn = p.attrs.participant_pn;
+                    if (phoneNumber) {
+                        return typeof phoneNumber === 'string' ? (phoneNumber.includes('@') ? phoneNumber : `${phoneNumber}@s.whatsapp.net`) : phoneNumber;
+                    }
+                    if (pn) {
+                        return typeof pn === 'string' ? (pn.includes('@') ? pn : `${pn}@s.whatsapp.net`) : pn;
+                    }
+                    return p.attrs.jid;
+                });
                 msg.messageStubParameters = oldNumber || [];
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER;
                 break;
@@ -358,7 +464,48 @@ const makeMessagesRecvSocket = (config) => {
             case 'leave':
                 const stubType = `GROUP_PARTICIPANT_${child.tag.toUpperCase()}`;
                 msg.messageStubType = Types_1.WAMessageStubType[stubType];
-                const participants = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant').map(p => p.attrs.jid);
+                const participantNodes = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant');
+                const participants = await Promise.all(participantNodes.map(async (p) => {
+                    const jid = p.attrs.jid;
+                    const pn = p.attrs.participant_pn;
+                    const phoneNumber = p.attrs.phone_number;
+                    // Cache LID to JID mapping if phone_number or participant_pn is available
+                    const realPhone = phoneNumber || pn;
+                    if (realPhone && jid && (0, WABinary_1.isLid)(jid) && config.lidCache?.set) {
+                        const pnAsJid = typeof realPhone === 'string' ? (realPhone.includes('@') ? realPhone : `${realPhone}@s.whatsapp.net`) : realPhone;
+                        config.lidCache.set(jid, pnAsJid);
+                    }
+                    // For ALL participant events, prefer phone_number or participant_pn over jid why i didn't think of it b4 🤕
+                    if (phoneNumber) {
+                        return typeof phoneNumber === 'string' ? (phoneNumber.includes('@') ? phoneNumber : `${phoneNumber}@s.whatsapp.net`) : phoneNumber;
+                    }
+                    if (pn) {
+                        return typeof pn === 'string' ? (pn.includes('@') ? pn : `${pn}@s.whatsapp.net`) : pn;
+                    }
+                    if ((0, WABinary_1.isLid)(jid) && config.lidCache?.get) {
+                        const cached = config.lidCache.get(jid);
+                        if (cached && typeof cached === 'string') {
+                            return cached.includes('@') ? cached : `${cached}@s.whatsapp.net`;
+                        }
+                    }
+                    if (jid && typeof jid === 'string' && jid.endsWith('@s.whatsapp.net')) {
+                        const user = jid.replace('@s.whatsapp.net', '');
+                        if (/^[0-9]+$/.test(user) && user.length > 12) {
+                            const resolved = await resolveLidOrMaskedJidFromGroupContext(jid, groupJid);
+                            if (resolved !== jid) {
+                                return resolved;
+                            }
+                            // If resolution failed, validate the JID - if invalid, convert back to LID
+                            const validated = (0, WABinary_1.validateAndCleanJid)(jid);
+                            return validated;
+                        }
+                    }
+                    // Final validation for any JID before returning
+                    if (jid && typeof jid === 'string') {
+                        return (0, WABinary_1.validateAndCleanJid)(jid);
+                    }
+                    return jid;
+                }));
                 if (participants.length === 1 &&
                     (0, WABinary_1.areJidsSameUser)(participants[0], participant) &&
                     child.tag === 'remove') {
@@ -368,9 +515,9 @@ const makeMessagesRecvSocket = (config) => {
                     && participants.length === 1
                     && participantPn
                     && typeof participantPn === 'string') {
-                    msg.messageStubParameters = [participantPn];
+                    msg.messageStubParameters = [toLidIfNecessary(participantPn)];
                     if (participant && (0, WABinary_1.isLid)(participant)) {
-                        participant = participantPn;
+                        participant = toLidIfNecessary(participantPn);
                     }
                 }
                 else {
@@ -416,49 +563,63 @@ const makeMessagesRecvSocket = (config) => {
                 break;
             case 'created_membership_requests':
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
-                msg.messageStubParameters = [participantPn || participantJid, 'created', child.attrs.request_method];
+                // Resolve participantJid to phone number if it's a LID
+                let resolvedParticipantJid = participantJid;
+                if (participantPn && typeof participantPn === 'string') {
+                    resolvedParticipantJid = participantPn.includes('@') ? participantPn : `${participantPn}@s.whatsapp.net`;
+                } else if ((0, WABinary_1.isLid)(participantJid) && config.lidCache?.get) {
+                    const cached = config.lidCache.get(participantJid);
+                    if (cached && typeof cached === 'string') {
+                        resolvedParticipantJid = cached.includes('@') ? cached : `${cached}@s.whatsapp.net`;
+                    }
+                }
+                msg.messageStubParameters = [resolvedParticipantJid, 'created', child.attrs.request_method];
                 break;
             case 'revoked_membership_requests':
                 const isDenied = (0, WABinary_1.areJidsSameUser)(participantJid, participant);
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
-                msg.messageStubParameters = [participantPn || participantJid, isDenied ? 'revoked' : 'rejected'];
+                // Resolve participantJid to phone number if it's a LID
+                let resolvedRevokedJid = participantJid;
+                if (participantPn && typeof participantPn === 'string') {
+                    resolvedRevokedJid = participantPn.includes('@') ? participantPn : `${participantPn}@s.whatsapp.net`;
+                } else if ((0, WABinary_1.isLid)(participantJid) && config.lidCache?.get) {
+                    const cached = config.lidCache.get(participantJid);
+                    if (cached && typeof cached === 'string') {
+                        resolvedRevokedJid = cached.includes('@') ? cached : `${cached}@s.whatsapp.net`;
+                    }
+                }
+                msg.messageStubParameters = [resolvedRevokedJid, isDenied ? 'revoked' : 'rejected'];
                 break;
             default:
-            // console.log("BAILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
+                // console.log("BAILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
         }
-        if (msg.messageStubParameters) {
-            msg.messageStubParameters = msg.messageStubParameters.map(toLidIfNecessary);
+        const isAddEvent = msg.messageStubType === Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD || 
+                          msg.messageStubType === Types_1.WAMessageStubType.GROUP_PARTICIPANT_INVITE ||
+                          msg.messageStubType === Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD_REQUEST_JOIN;
+        
+        if (msg.messageStubParameters && !isAddEvent) {
+            msg.messageStubParameters = await Promise.all(msg.messageStubParameters.map(async (param) => (typeof param === 'string' ? await resolveLidOrMaskedJidFromGroupContext(param, groupJid) : param)));
         }
         participant = toLidIfNecessary(participant);
         if (msg.key?.participant) {
             msg.key.participant = toLidIfNecessary(msg.key.participant);
         }
-        const needsResolving = (msg.messageStubParameters && msg.messageStubParameters.some(p => (0, WABinary_1.isLid)(p))) ||
-            (participant && (0, WABinary_1.isLid)(participant)) ||
-            (msg.key?.participant && (0, WABinary_1.isLid)(msg.key.participant));
+        const needsResolving = !isAddEvent && ((msg.messageStubParameters && msg.messageStubParameters.some(p => (typeof p === 'string' && ((0, WABinary_1.isLid)(p) || (p.endsWith('@s.whatsapp.net') && /^[0-9]+$/.test(p.split('@')[0])))))) ||
+            (participant && ((0, WABinary_1.isLid)(participant) || (typeof participant === 'string' && participant.endsWith('@s.whatsapp.net') && /^[0-9]+$/.test(participant.split('@')[0])))) ||
+            (msg.key?.participant && ((0, WABinary_1.isLid)(msg.key.participant) || (typeof msg.key.participant === 'string' && msg.key.participant.endsWith('@s.whatsapp.net') && /^[0-9]+$/.test(msg.key.participant.split('@')[0])))));
         if (needsResolving) {
-            const metadata = await groupMetadata(groupJid);
-            const { lidCache } = config;
-            const resolveLid = (lid) => {
-                const found = metadata.participants.find(p => p.id === lid);
-                let jid = found === null || found === void 0 ? void 0 : found.jid;
-                if (!jid) {
-                    jid = lidCache === null || lidCache === void 0 ? void 0 : lidCache.get(lid);
-                }
-                return jid || (0, WABinary_1.lidToJid)(lid);
-            };
             if (msg.messageStubParameters) {
-                msg.messageStubParameters = await Promise.all(msg.messageStubParameters.map(async (param) => (typeof param === 'string' && (0, WABinary_1.isLid)(param) ? await resolveLidFromGroupContext(param, groupJid) : param)));
+                msg.messageStubParameters = await Promise.all(msg.messageStubParameters.map(async (param) => (typeof param === 'string' ? await resolveLidOrMaskedJidFromGroupContext(param, groupJid) : param)));
             }
-            if ((0, WABinary_1.isLid)(participant)) {
-                msg.participant = await resolveLidFromGroupContext(participant, groupJid);
+            if (typeof participant === 'string' && ((0, WABinary_1.isLid)(participant) || (participant.endsWith('@s.whatsapp.net') && /^[0-9]+$/.test(participant.split('@')[0])))) {
+                msg.participant = await resolveLidOrMaskedJidFromGroupContext(participant, groupJid);
             }
             else if (participant) {
                 //If it's a JID, treat it as a JID. Do not convert back to LID. *smh brah
                 msg.participant = participant;
             }
-            if (msg.key && (0, WABinary_1.isLid)(msg.key.participant)) {
-                msg.key.participant = await resolveLidFromGroupContext(msg.key.participant, groupJid);
+            if (msg.key && typeof msg.key.participant === 'string' && ((0, WABinary_1.isLid)(msg.key.participant) || (msg.key.participant.endsWith('@s.whatsapp.net') && /^[0-9]+$/.test(msg.key.participant.split('@')[0])))) {
+                msg.key.participant = await resolveLidOrMaskedJidFromGroupContext(msg.key.participant, groupJid);
             }
             else if (msg.key && msg.key.participant) {
                 // If it's a JID, treat it as a JID. Do not convert back to LID. *smh brah pt2
@@ -466,6 +627,7 @@ const makeMessagesRecvSocket = (config) => {
             }
         }
     };
+
     const handleNewsletterNotification = (id, node) => {
         const messages = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
         const message = (0, WABinary_1.getBinaryNodeChild)(messages, 'message');
@@ -488,6 +650,7 @@ const makeMessagesRecvSocket = (config) => {
             });
         }
     };
+
     const handleMexNewsletterNotification = (id, node) => {
         var _a;
         const operation = node === null || node === void 0 ? void 0 : node.attrs.op_name;
@@ -512,8 +675,9 @@ const makeMessagesRecvSocket = (config) => {
             ev.emit('newsletter-settings.update', { id, update: contentPath.thread_metadata.settings });
         }
     };
+
     const processNotification = async (node) => {
-        var _a, _b;
+        var _a;
         const result = {};
         const [child] = (0, WABinary_1.getAllBinaryNodeChildren)(node);
         const nodeType = node.attrs.type;
@@ -674,6 +838,7 @@ const makeMessagesRecvSocket = (config) => {
             return result;
         }
     };
+
     async function decipherLinkPublicKey(data) {
         const buffer = toRequiredBuffer(data);
         const salt = buffer.slice(0, 32);
@@ -738,16 +903,20 @@ const makeMessagesRecvSocket = (config) => {
         const { attrs, content } = node;
         let participant = attrs.participant;
         if (participant && (0, WABinary_1.isLid)(participant) && (0, WABinary_1.isJidGroup)(attrs.from)) {
-            const metadata = await groupMetadata(attrs.from);
-            const found = metadata.participants.find(p => p.id === participant);
-            const jid = found === null || found === void 0 ? void 0 : found.jid;
-            if (jid && !(0, WABinary_1.isLid)(jid)) {
-                participant = jid;
+            const cached = config.lidCache.get(participant);
+            if (cached) {
+                participant = typeof cached === 'string' && !cached.includes('@') ? `${cached}@s.whatsapp.net` : cached;
             }
             else {
-                const cached = config.lidCache.get(participant);
-                if (cached) {
-                    participant = cached;
+                try {
+                    const metadata = await groupMetadata(attrs.from);
+                    const found = metadata.participants.find(p => p.id === participant);
+                    const jid = found === null || found === void 0 ? void 0 : found.jid;
+                    if (jid && !(0, WABinary_1.isLid)(jid)) {
+                        participant = jid;
+                    }
+                }
+                catch (_e) {
                 }
             }
         }
@@ -843,12 +1012,27 @@ const makeMessagesRecvSocket = (config) => {
             await sendMessageAck(node);
             return;
         }
+        const notifDedupKey = `${remoteJid}:${node.attrs.id}`;
+        if (notificationDedupCache.get(notifDedupKey)) {
+            await sendMessageAck(node);
+            return;
+        }
+        notificationDedupCache.set(notifDedupKey, true);
         try {
             await Promise.all([
                 processingMutex.mutex(async () => {
                     var _a;
                     const msg = await processNotification(node);
                     if (msg) {
+                        const stubType = msg.messageStubType;
+                        const stubParams = Array.isArray(msg.messageStubParameters) ? msg.messageStubParameters : [];
+                        const stubDedupKey = `${remoteJid}:${stubType}:${stubParams.join(',')}`;
+                        if (stubType && notificationStubDedupCache.get(stubDedupKey)) {
+                            return;
+                        }
+                        if (stubType) {
+                            notificationStubDedupCache.set(stubDedupKey, true);
+                        }
                         const participant = msg.participant || resolveJid(node.attrs.participant);
                         const fromMe = (0, WABinary_1.areJidsSameUser)(participant || remoteJid, authState.creds.me.id);
                         const key = msg.key || {};
@@ -914,36 +1098,20 @@ const makeMessagesRecvSocket = (config) => {
             msg.messageStubParameters = [Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT, response];
         }
         if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER && node.attrs.sender_pn) {
-            ev.emit('chats.phoneNumberShare', { lid: resolveJid(node.attrs.from), jid: resolveJid(node.attrs.sender_pn) });
+            ev.emit('chats.phoneNumberShare', { lid: resolveJid(node.attrs.from), jid: pnToJid(node.attrs.sender_pn) || resolveJid(node.attrs.sender_pn) });
         }
         try {
             await Promise.all([
                 processingMutex.mutex(async () => {
                     var _a, _b, _c, _d, _e, _f;
                     await decrypt();
-                    // if the message is from a group, and contains mentions, resolve the LIDs to JIDs by samakavare 🎐
-                    if ((0, WABinary_1.isJidGroup)(msg.key.remoteJid)) {
-                        const contextInfo = msg.message?.extendedTextMessage?.contextInfo;
-                        if (contextInfo) {
-                            const participant = contextInfo.participant;
-                            const mentionedJid = contextInfo.mentionedJid;
-                            const hasLidInParticipant = participant && participant.endsWith('@lid');
-                            const hasLidInMention = mentionedJid && mentionedJid.some(j => j.endsWith('@lid'));
-                            if (hasLidInParticipant || hasLidInMention) {
-                                const metadata = await groupMetadata(msg.key.remoteJid);
-                                if (hasLidInParticipant) {
-                                    const found = metadata.participants.find(p => p.id === participant);
-                                    contextInfo.participant = (found?.jid) || participant;
-                                }
-                                if (hasLidInMention) {
-                                    contextInfo.mentionedJid = await Promise.all(mentionedJid.map(async (jid) => {
-                                        if (jid.endsWith('@lid')) {
-                                            const found = metadata.participants.find(p => p.id === jid);
-                                            return (found?.jid) || jid;
-                                        }
-                                        return jid;
-                                    }));
-                                }
+                    if (msg.message) {
+                        const contextInfos = [];
+                        collectContextInfos(msg.message, contextInfos);
+                        if (contextInfos.length) {
+                            const groupJid = (0, WABinary_1.isJidGroup)(msg.key.remoteJid) ? msg.key.remoteJid : undefined;
+                            for (const ci of contextInfos) {
+                                await normalizeContextInfoJids(ci, groupJid);
                             }
                         }
                     }
@@ -957,7 +1125,6 @@ const makeMessagesRecvSocket = (config) => {
                                 if ((0, WABinary_1.getBinaryNodeChild)(node, 'unavailable')) {
                                     return;
                                 }
-                                const encNode = (0, WABinary_1.getBinaryNodeChild)(node, 'enc');
                                 await sendRetryRequest(node, !encNode);
                                 if (retryRequestDelayMs) {
                                     await (0, Utils_1.delay)(retryRequestDelayMs);
@@ -971,10 +1138,10 @@ const makeMessagesRecvSocket = (config) => {
                     else {
                         let type = undefined;
                         if ((_b = msg.key.participant) === null || _b === void 0 ? void 0 : _b.endsWith('@lid')) {
-                            msg.key.participant = node.attrs.participant_pn || authState.creds.me.id;
+                            msg.key.participant = pnToJid(node.attrs.participant_pn) || authState.creds.me.id;
                         }
                         if (!(0, WABinary_1.isJidGroup)(msg.key.remoteJid) && (0, WABinary_1.isLidUser)(msg.key.remoteJid)) {
-                            msg.key.remoteJid = node.attrs.sender_pn || node.attrs.peer_recipient_pn;
+                            msg.key.remoteJid = pnToJid(node.attrs.sender_pn) || pnToJid(node.attrs.peer_recipient_pn) || msg.key.remoteJid;
                         }
                         let participant = msg.key.participant;
                         if (category === 'peer') {
@@ -1000,9 +1167,8 @@ const makeMessagesRecvSocket = (config) => {
                         const hasLidParam = msg.messageStubParameters && msg.messageStubParameters.some(p => typeof p === 'string' && (0, WABinary_1.isLid)(p));
                         if (hasLidParam) {
                             if ((0, WABinary_1.isJidGroup)(msg.key.remoteJid)) {
-                                const groupJid = msg.key.remoteJid;
                                 msg.messageStubParameters = await Promise.all(msg.messageStubParameters.map(async (param) => (typeof param === 'string' && (0, WABinary_1.isLid)(param))
-                                    ? await resolveLidFromGroupContext(param, groupJid)
+                                    ? await resolveLidFromGroupContext(param, msg.key.remoteJid)
                                     : param));
                             }
                             else {
@@ -1013,18 +1179,18 @@ const makeMessagesRecvSocket = (config) => {
                         }
                         if (msg.key?.participant && typeof msg.key.participant === 'string' && (0, WABinary_1.isLid)(msg.key.participant)) {
                             if ((0, WABinary_1.isJidGroup)(msg.key.remoteJid)) {
-                                msg.key.participant = node.attrs.participant_pn || await resolveLidFromGroupContext(msg.key.participant, msg.key.remoteJid);
+                                msg.key.participant = pnToJid(node.attrs.participant_pn) || await resolveLidFromGroupContext(msg.key.participant, msg.key.remoteJid);
                             }
                             else {
-                                msg.key.participant = node.attrs.participant_pn || (0, WABinary_1.lidToJid)(msg.key.participant);
+                                msg.key.participant = pnToJid(node.attrs.participant_pn) || (0, WABinary_1.lidToJid)(msg.key.participant);
                             }
                         }
                         if (msg.participant && typeof msg.participant === 'string' && (0, WABinary_1.isLid)(msg.participant)) {
                             if ((0, WABinary_1.isJidGroup)(msg.key.remoteJid)) {
-                                msg.participant = node.attrs.participant_pn || await resolveLidFromGroupContext(msg.participant, msg.key.remoteJid);
+                                msg.participant = pnToJid(node.attrs.participant_pn) || await resolveLidFromGroupContext(msg.participant, msg.key.remoteJid);
                             }
                             else {
-                                msg.participant = node.attrs.participant_pn || (0, WABinary_1.lidToJid)(msg.participant);
+                                msg.participant = pnToJid(node.attrs.participant_pn) || (0, WABinary_1.lidToJid)(msg.participant);
                             }
                         }
                     }
@@ -1183,16 +1349,25 @@ const makeMessagesRecvSocket = (config) => {
             }
             isProcessing = true;
             const promise = async () => {
-                while (nodes.length && ws.isOpen) {
-                    const { type, node } = nodes.shift();
-                    const nodeProcessor = nodeProcessorMap.get(type);
-                    if (!nodeProcessor) {
-                        onUnexpectedError(new Error(`unknown offline node type: ${type}`), 'processing offline node');
-                        continue;
+                try {
+                    while (nodes.length && ws.isOpen) {
+                        const { type, node } = nodes.shift();
+                        const nodeProcessor = nodeProcessorMap.get(type);
+                        if (!nodeProcessor) {
+                            onUnexpectedError(new Error(`unknown offline node type: ${type}`), 'processing offline node');
+                            continue;
+                        }
+                        try {
+                            await nodeProcessor(node);
+                        }
+                        catch (error) {
+                            onUnexpectedError(error, 'processing offline node');
+                        }
                     }
-                    await nodeProcessor(node);
                 }
-                isProcessing = false;
+                finally {
+                    isProcessing = false;
+                }
             };
             promise().catch(error => onUnexpectedError(error, 'processing offline nodes'));
         };