@kelvdra/baileys 1.0.3 → 1.0.4

package/lib/Socket/messages-recv.js

@@ -5,15 +5,15 @@ 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, NO_MESSAGE_FOUND_ERROR_TEXT, unixTimestampSeconds, xmppPreKey, xmppSignedPreKey } from '../Utils/index.js';
+import { aesDecryptCTR, aesEncryptGCM, cleanMessage, Curve, decodeMediaRetryNode, decodeMessageNode, decryptMessageNode, delay, derivePairingCodeKey, encodeBigEndian, encodeSignedDeviceIdentity, getCallStatusFromNode, getHistoryMsg, getNextPreKeys, getStatusFromReceiptType, hkdf, MISSING_KEYS_ERROR_TEXT, NACK_REASONS, NO_MESSAGE_FOUND_ERROR_TEXT, unixTimestampSeconds, xmppPreKey, xmppSignedPreKey } from '../Utils/index.js';
 import { makeMutex } from '../Utils/make-mutex.js';
-import { areJidsSameUser, binaryNodeToString, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildBuffer, getBinaryNodeChildren, getBinaryNodeChildString, isJidGroup, isJidNewsletter, isJidStatusBroadcast, isLidUser, isPnUser, jidDecode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { areJidsSameUser, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildBuffer, getBinaryNodeChildren, getBinaryNodeChildString, isJidGroup, isJidStatusBroadcast, isPnUser, isLidUser, 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 { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid } = config;
     const sock = makeMessagesSocket(config);
-    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage, messageRetryManager } = sock;
+    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage } = sock;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
     const retryMutex = makeMutex();
     const msgRetryCache = config.msgRetryCounterCache ||
@@ -31,190 +31,7 @@ export const makeMessagesRecvSocket = (config) => {
             stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
             useClones: false
         });
-    // Debounce identity-change session refreshes per JID to avoid bursts
-    const identityAssertDebounce = new NodeCache({ stdTTL: 5, useClones: false });
     let sendActiveReceipts = false;
-    const fetchMessageHistory = async (count, oldestMsgKey, oldestMsgTimestamp) => {
-        if (!authState.creds.me?.id) {
-            throw new Boom('Not authenticated');
-        }
-        const pdoMessage = {
-            historySyncOnDemandRequest: {
-                chatJid: oldestMsgKey.remoteJid,
-                oldestMsgFromMe: oldestMsgKey.fromMe,
-                oldestMsgId: oldestMsgKey.id,
-                oldestMsgTimestampMs: oldestMsgTimestamp,
-                onDemandMsgCount: count
-            },
-            peerDataOperationRequestType: proto.Message.PeerDataOperationRequestType.HISTORY_SYNC_ON_DEMAND
-        };
-        return sendPeerDataOperationMessage(pdoMessage);
-    };
-    const requestPlaceholderResend = async (messageKey) => {
-        if (!authState.creds.me?.id) {
-            throw new Boom('Not authenticated');
-        }
-        if (placeholderResendCache.get(messageKey?.id)) {
-            logger.debug({ messageKey }, 'already requested resend');
-            return;
-        }
-        else {
-            await 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(async () => {
-            if (placeholderResendCache.get(messageKey?.id)) {
-                logger.debug({ messageKey }, 'PDO message without response after 15 seconds. Phone possibly offline');
-                await 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',
@@ -268,76 +85,20 @@ export const makeMessagesRecvSocket = (config) => {
         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;
-            }
-            // Increment retry count using new system
-            const retryCount = messageRetryManager.incrementRetryCount(msgId);
-            // Use the new retry count for the rest of the logic
-            const key = `${msgId}:${msgKey?.participant}`;
-            await msgRetryCache.set(key, retryCount);
-        }
-        else {
-            // Fallback to old system
-            const key = `${msgId}:${msgKey?.participant}`;
-            let retryCount = (await msgRetryCache.get(key)) || 0;
-            if (retryCount >= maxMsgRetryCount) {
-                logger.debug({ retryCount, msgId }, 'reached retry limit, clearing');
-                await msgRetryCache.del(key);
-                return;
-            }
-            retryCount += 1;
-            await msgRetryCache.set(key, retryCount);
-        }
         const key = `${msgId}:${msgKey?.participant}`;
-        const retryCount = (await msgRetryCache.get(key)) || 1;
-        const { account, signedPreKey, signedIdentityKey: identityKey } = authState.creds;
-        const fromJid = node.attrs.from;
-        // Check if we should recreate the session
-        let shouldRecreateSession = false;
-        let recreateReason = '';
-        if (enableAutoSessionRecreation && messageRetryManager) {
-            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;
-                if (shouldRecreateSession) {
-                    logger.debug({ fromJid, retryCount, reason: recreateReason }, 'recreating session for retry');
-                    // Delete existing session to force recreation
-                    await authState.keys.set({ session: { [sessionId]: null } });
-                    forceIncludeKeys = true;
-                }
-            }
-            catch (error) {
-                logger.warn({ error, fromJid }, 'failed to check session recreation');
-            }
+        let retryCount = msgRetryCache.get(key) || 0;
+        if (retryCount >= maxMsgRetryCount) {
+            logger.debug({ retryCount, msgId }, 'reached retry limit, clearing');
+            msgRetryCache.del(key);
+            return;
         }
-        if (retryCount <= 2) {
-            // Use new retry manager for phone requests if available
-            if (messageRetryManager) {
-                // Schedule phone request with delay (like whatsmeow)
-                messageRetryManager.schedulePhoneRequest(msgId, async () => {
-                    try {
-                        const requestId = await requestPlaceholderResend(msgKey);
-                        logger.debug(`sendRetryRequest: requested placeholder resend (${requestId}) for message ${msgId} (scheduled)`);
-                    }
-                    catch (error) {
-                        logger.warn({ error, msgId }, 'failed to send scheduled phone request');
-                    }
-                });
-            }
-            else {
-                // Fallback to immediate request
-                const msgId = await requestPlaceholderResend(msgKey);
-                logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId}`);
-            }
+        retryCount += 1;
+        msgRetryCache.set(key, retryCount);
+        const { account, signedPreKey, signedIdentityKey: identityKey } = authState.creds;
+        if (retryCount === 1) {
+            //request a resend via phone
+            const msgId = await requestPlaceholderResend(msgKey);
+            logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId}`);
         }
         const deviceIdentity = encodeSignedDeviceIdentity(account, true);
         await authState.keys.transaction(async () => {
@@ -355,9 +116,7 @@ export const makeMessagesRecvSocket = (config) => {
                             count: retryCount.toString(),
                             id: node.attrs.id,
                             t: node.attrs.t,
-                            v: '1',
-                            // ADD ERROR FIELD
-                            error: '0'
+                            v: '1'
                         }
                     },
                     {
@@ -373,7 +132,7 @@ export const makeMessagesRecvSocket = (config) => {
             if (node.attrs.participant) {
                 receipt.attrs.participant = node.attrs.participant;
             }
-            if (retryCount > 1 || forceIncludeKeys || shouldRecreateSession) {
+            if (retryCount > 1 || forceIncludeKeys) {
                 const { update, preKeys } = await getNextPreKeys(authState, 1);
                 const [keyId] = Object.keys(preKeys);
                 const key = preKeys[+keyId];
@@ -393,7 +152,7 @@ export const makeMessagesRecvSocket = (config) => {
             }
             await sendNode(receipt);
             logger.info({ msgAttrs: node.attrs, retryCount }, 'sent retry receipt');
-        }, authState?.creds?.me?.id || 'sendRetryRequest');
+        });
     };
     const handleEncryptNotification = async (node) => {
         const from = node.attrs.from;
@@ -410,35 +169,22 @@ export const makeMessagesRecvSocket = (config) => {
             const identityNode = getBinaryNodeChild(node, 'identity');
             if (identityNode) {
                 logger.info({ jid: from }, 'identity changed');
-                if (identityAssertDebounce.get(from)) {
-                    logger.debug({ jid: from }, 'skipping identity assert (debounced)');
-                    return;
-                }
-                identityAssertDebounce.set(from, true);
-                try {
-                    await assertSessions([from], true);
-                }
-                catch (error) {
-                    logger.warn({ error, jid: from }, 'failed to assert sessions after identity change');
-                }
+                // not handling right now
+                // signal will override new identity anyway
             }
             else {
                 logger.info({ node }, 'unknown encrypt notification');
             }
         }
     };
-    const handleGroupNotification = (fullNode, child, msg) => {
-        // TODO: Support PN/LID (Here is only LID now)
-        const actingParticipantLid = fullNode.attrs.participant;
-        const actingParticipantPn = fullNode.attrs.participant_pn;
-        const affectedParticipantLid = getBinaryNodeChild(child, 'participant')?.attrs?.jid || actingParticipantLid;
-        const affectedParticipantPn = getBinaryNodeChild(child, 'participant')?.attrs?.phone_number || actingParticipantPn;
+    const handleGroupNotification = (participant, child, msg) => {
+        const participantJid = getBinaryNodeChild(child, 'participant')?.attrs?.jid || participant;
         switch (child?.tag) {
             case 'create':
                 const metadata = extractGroupMetadata(child);
                 msg.messageStubType = WAMessageStubType.GROUP_CREATE;
                 msg.messageStubParameters = [metadata.subject];
-                msg.key = { participant: metadata.owner, participantAlt: metadata.ownerPn };
+                msg.key = { participant: metadata.owner };
                 ev.emit('chats.upsert', [
                     {
                         id: metadata.id,
@@ -449,8 +195,7 @@ export const makeMessagesRecvSocket = (config) => {
                 ev.emit('groups.upsert', [
                     {
                         ...metadata,
-                        author: actingParticipantLid,
-                        authorPn: actingParticipantPn
+                        author: participant
                     }
                 ]);
                 break;
@@ -475,24 +220,15 @@ export const makeMessagesRecvSocket = (config) => {
             case 'leave':
                 const stubType = `GROUP_PARTICIPANT_${child.tag.toUpperCase()}`;
                 msg.messageStubType = WAMessageStubType[stubType];
-                const participants = getBinaryNodeChildren(child, 'participant').map(({ attrs }) => {
-                    // TODO: Store LID MAPPINGS
-                    return {
-                        id: attrs.jid,
-                        phoneNumber: isLidUser(attrs.jid) && isPnUser(attrs.phone_number) ? attrs.phone_number : undefined,
-                        lid: isPnUser(attrs.jid) && isLidUser(attrs.lid) ? attrs.lid : undefined,
-                        admin: (attrs.type || null)
-                    };
-                });
+                const participants = getBinaryNodeChildren(child, 'participant').map(p => p.attrs.jid);
                 if (participants.length === 1 &&
                     // if recv. "remove" message and sender removed themselves
                     // mark as left
-                    (areJidsSameUser(participants[0].id, actingParticipantLid) ||
-                        areJidsSameUser(participants[0].id, actingParticipantPn)) &&
+                    areJidsSameUser(participants[0], participant) &&
                     child.tag === 'remove') {
                     msg.messageStubType = WAMessageStubType.GROUP_PARTICIPANT_LEAVE;
                 }
-                msg.messageStubParameters = participants.map(a => JSON.stringify(a));
+                msg.messageStubParameters = participants;
                 break;
             case 'subject':
                 msg.messageStubType = WAMessageStubType.GROUP_CHANGE_SUBJECT;
@@ -533,20 +269,12 @@ export const makeMessagesRecvSocket = (config) => {
                 break;
             case 'created_membership_requests':
                 msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
-                msg.messageStubParameters = [
-                    JSON.stringify({ lid: affectedParticipantLid, pn: affectedParticipantPn }),
-                    'created',
-                    child.attrs.request_method
-                ];
+                msg.messageStubParameters = [participantJid, 'created', child.attrs.request_method];
                 break;
             case 'revoked_membership_requests':
-                const isDenied = areJidsSameUser(affectedParticipantLid, actingParticipantLid);
-                // TODO: LIDMAPPING SUPPORT
+                const isDenied = areJidsSameUser(participantJid, participant);
                 msg.messageStubType = WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
-                msg.messageStubParameters = [
-                    JSON.stringify({ lid: affectedParticipantLid, pn: affectedParticipantPn }),
-                    isDenied ? 'revoked' : 'rejected'
-                ];
+                msg.messageStubParameters = [participantJid, isDenied ? 'revoked' : 'rejected'];
                 break;
         }
     };
@@ -556,6 +284,19 @@ export const makeMessagesRecvSocket = (config) => {
         const nodeType = node.attrs.type;
         const from = jidNormalizedUser(node.attrs.from);
         switch (nodeType) {
+            case 'privacy_token':
+                const tokenList = getBinaryNodeChildren(child, 'token');
+                for (const { attrs, content } of tokenList) {
+                    const jid = attrs.jid;
+                    ev.emit('chats.update', [
+                        {
+                            id: jid,
+                            tcToken: content
+                        }
+                    ]);
+                    logger.debug({ jid }, 'got privacy token update');
+                }
+                break;
             case 'newsletter':
                 await handleNewsletterNotification(node);
                 break;
@@ -563,8 +304,7 @@ export const makeMessagesRecvSocket = (config) => {
                 await handleMexNewsletterNotification(node);
                 break;
             case 'w:gp2':
-                // TODO: HANDLE PARTICIPANT_PN
-                handleGroupNotification(node, child, result);
+                handleGroupNotification(node.attrs.participant, child, result);
                 break;
             case 'mediaretry':
                 const event = decodeMediaRetryNode(node);
@@ -575,12 +315,10 @@ export const makeMessagesRecvSocket = (config) => {
                 break;
             case 'devices':
                 const devices = getBinaryNodeChildren(child, 'device');
-                if (areJidsSameUser(child.attrs.jid, authState.creds.me.id) ||
-                    areJidsSameUser(child.attrs.lid, authState.creds.me.lid)) {
-                    const deviceData = devices.map(d => ({ id: d.attrs.jid, lid: d.attrs.lid }));
-                    logger.info({ deviceData }, 'my own devices changed');
+                if (areJidsSameUser(child.attrs.jid, authState.creds.me.id)) {
+                    const deviceJids = devices.map(d => d.attrs.jid);
+                    logger.info({ deviceJids }, 'got my own devices');
                 }
-                //TODO: drop a new event, add hashes
                 break;
             case 'server_sync':
                 const update = getBinaryNodeChild(node, 'collection');
@@ -696,37 +434,11 @@ export const makeMessagesRecvSocket = (config) => {
                 });
                 authState.creds.registered = true;
                 ev.emit('creds.update', authState.creds);
-                break;
-            case 'privacy_token':
-                await handlePrivacyTokenNotification(node);
-                break;
         }
         if (Object.keys(result).length) {
             return result;
         }
     };
-    const handlePrivacyTokenNotification = async (node) => {
-        const tokensNode = getBinaryNodeChild(node, 'tokens');
-        const from = jidNormalizedUser(node.attrs.from);
-        if (!tokensNode)
-            return;
-        const tokenNodes = getBinaryNodeChildren(tokensNode, 'token');
-        for (const tokenNode of tokenNodes) {
-            const { attrs, content } = tokenNode;
-            const type = attrs.type;
-            const timestamp = attrs.t;
-            if (type === 'trusted_contact' && content instanceof Buffer) {
-                logger.debug({
-                    from,
-                    timestamp,
-                    tcToken: content
-                }, 'received trusted contact token');
-                await authState.keys.set({
-                    tctoken: { [from]: { token: content, timestamp } }
-                });
-            }
-        }
-    };
     async function decipherLinkPublicKey(data) {
         const buffer = toRequiredBuffer(data);
         const salt = buffer.slice(0, 32);
@@ -741,80 +453,33 @@ export const makeMessagesRecvSocket = (config) => {
         }
         return data instanceof Buffer ? data : Buffer.from(data);
     }
-    const willSendMessageAgain = async (id, participant) => {
+    const willSendMessageAgain = (id, participant) => {
         const key = `${id}:${participant}`;
-        const retryCount = (await msgRetryCache.get(key)) || 0;
+        const retryCount = msgRetryCache.get(key) || 0;
         return retryCount < maxMsgRetryCount;
     };
-    const updateSendMessageAgainCount = async (id, participant) => {
+    const updateSendMessageAgainCount = (id, participant) => {
         const key = `${id}:${participant}`;
-        const newValue = ((await msgRetryCache.get(key)) || 0) + 1;
-        await msgRetryCache.set(key, newValue);
+        const newValue = (msgRetryCache.get(key) || 0) + 1;
+        msgRetryCache.set(key, newValue);
     };
     const sendMessagesAgain = async (key, ids, retryNode) => {
+        // todo: implement a cache to store the last 256 sent messages (copy whatsmeow)
+        const msgs = await Promise.all(ids.map(id => getMessage({ ...key, id })));
         const remoteJid = key.remoteJid;
         const participant = key.participant || remoteJid;
-        const retryCount = +retryNode.attrs.count || 1;
-        // Try to get messages from cache first, then fallback to getMessage
-        const msgs = [];
-        for (const id of ids) {
-            let msg;
-            // Try to get from retry cache first if enabled
-            if (messageRetryManager) {
-                const cachedMsg = messageRetryManager.getRecentMessage(remoteJid, id);
-                if (cachedMsg) {
-                    msg = cachedMsg.message;
-                    logger.debug({ jid: remoteJid, id }, 'found message in retry cache');
-                    // Mark retry as successful since we found the message
-                    messageRetryManager.markRetrySuccess(id);
-                }
-            }
-            // Fallback to getMessage if not found in cache
-            if (!msg) {
-                msg = await getMessage({ ...key, id });
-                if (msg) {
-                    logger.debug({ jid: remoteJid, id }, 'found message via getMessage');
-                    // Also mark as successful if found via getMessage
-                    if (messageRetryManager) {
-                        messageRetryManager.markRetrySuccess(id);
-                    }
-                }
-            }
-            msgs.push(msg);
-        }
         // if it's the primary jid sending the request
         // just re-send the message to everyone
         // prevents the first message decryption failure
         const sendToAll = !jidDecode(participant)?.device;
-        // Check if we should recreate session for this retry
-        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;
-                if (shouldRecreateSession) {
-                    logger.debug({ participant, retryCount, reason: recreateReason }, 'recreating session for outgoing retry');
-                    await authState.keys.set({ session: { [sessionId]: null } });
-                }
-            }
-            catch (error) {
-                logger.warn({ error, participant }, 'failed to check session recreation for outgoing retry');
-            }
-        }
         await assertSessions([participant], true);
         if (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 }, 'forced new session for retry recp');
         for (const [i, msg] of msgs.entries()) {
-            if (!ids[i])
-                continue;
-            if (msg && (await willSendMessageAgain(ids[i], participant))) {
-                await updateSendMessageAgainCount(ids[i], participant);
+            if (msg) {
+                updateSendMessageAgainCount(ids[i], participant);
                 const msgRelayOpts = { messageId: ids[i] };
                 if (sendToAll) {
                     msgRelayOpts.useUserDevicesCache = false;
@@ -844,7 +509,7 @@ export const makeMessagesRecvSocket = (config) => {
             fromMe,
             participant: attrs.participant
         };
-        if (shouldIgnoreJid(remoteJid) && remoteJid !== S_WHATSAPP_NET) {
+        if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
             logger.debug({ remoteJid }, 'ignoring receipt from jid');
             await sendMessageAck(node);
             return;
@@ -885,15 +550,14 @@ export const makeMessagesRecvSocket = (config) => {
                         // correctly set who is asking for the retry
                         key.participant = key.participant || attrs.from;
                         const retryNode = getBinaryNodeChild(node, 'retry');
-                        if (ids[0] && key.participant && (await willSendMessageAgain(ids[0], key.participant))) {
+                        if (willSendMessageAgain(ids[0], key.participant)) {
                             if (key.fromMe) {
                                 try {
-                                    await updateSendMessageAgainCount(ids[0], key.participant);
                                     logger.debug({ attrs, key }, 'recv retry request');
                                     await sendMessagesAgain(key, ids, retryNode);
                                 }
                                 catch (error) {
-                                    logger.error({ key, ids, trace: error instanceof Error ? error.stack : 'Unknown error' }, 'error in sending message again');
+                                    logger.error({ key, ids, trace: error.stack }, 'error in sending message again');
                                 }
                             }
                             else {
@@ -913,7 +577,7 @@ export const makeMessagesRecvSocket = (config) => {
     };
     const handleNotification = async (node) => {
         const remoteJid = node.attrs.from;
-        if (shouldIgnoreJid(remoteJid) && remoteJid !== S_WHATSAPP_NET) {
+        if (shouldIgnoreJid(remoteJid) && remoteJid !== '@s.whatsapp.net') {
             logger.debug({ remoteJid, id: node.attrs.id }, 'ignored notification');
             await sendMessageAck(node);
             return;
@@ -924,13 +588,10 @@ export const makeMessagesRecvSocket = (config) => {
                     const msg = await processNotification(node);
                     if (msg) {
                         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 || {})
                         };
@@ -947,97 +608,67 @@ export const makeMessagesRecvSocket = (config) => {
         }
     };
     const handleMessage = async (node) => {
-        if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== S_WHATSAPP_NET) {
+        if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
             logger.debug({ key: node.attrs.key }, 'ignored message');
-            await sendMessageAck(node, NACK_REASONS.UnhandledError);
+            await sendMessageAck(node);
             return;
         }
         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, NACK_REASONS.MissingMessageSecret);
+            await sendMessageAck(node);
             return;
         }
-        const { fullMessage: msg, category, author, decrypt } = decryptMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
-        const alt = msg.key.participantAlt || msg.key.remoteJidAlt;
-        // store new mappings we didn't have before
-        if (!!alt) {
-            const altServer = jidDecode(alt)?.server;
-            const primaryJid = msg.key.participant || msg.key.remoteJid;
-            if (altServer === 'lid') {
-                if (!(await signalRepository.lidMapping.getPNForLID(alt))) {
-                    await signalRepository.lidMapping.storeLIDPNMappings([{ lid: alt, pn: primaryJid }]);
-                    await signalRepository.migrateSession(primaryJid, alt);
-                }
+        let response;
+        if (getBinaryNodeChild(node, 'unavailable') && !encNode) {
+            await sendMessageAck(node);
+            const { key } = decodeMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '').fullMessage;
+            response = await requestPlaceholderResend(key);
+            if (response === 'RESOLVED') {
+                return;
             }
-            else {
-                await signalRepository.lidMapping.storeLIDPNMappings([{ lid: primaryJid, pn: alt }]);
-                await signalRepository.migrateSession(alt, primaryJid);
+            logger.debug('received unavailable message, acked and requested resend from phone');
+        }
+        else {
+            if (placeholderResendCache.get(node.attrs.id)) {
+                placeholderResendCache.del(node.attrs.id);
             }
         }
-        if (msg.key?.remoteJid && msg.key?.id && messageRetryManager) {
-            messageRetryManager.addRecentMessage(msg.key.remoteJid, msg.key.id, msg.message);
-            logger.debug({
-                jid: msg.key.remoteJid,
-                id: msg.key.id
-            }, 'Added message to recent cache for retry receipts');
+        const { fullMessage: msg, category, author, decrypt } = decryptMessageNode(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
+        if (response && msg?.messageStubParameters?.[0] === NO_MESSAGE_FOUND_ERROR_TEXT) {
+            msg.messageStubParameters = [NO_MESSAGE_FOUND_ERROR_TEXT, response];
+        }
+        if (msg.message?.protocolMessage?.type === proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER &&
+            node.attrs.sender_pn) {
+            ev.emit('chats.phoneNumberShare', { lid: node.attrs.from, jid: node.attrs.sender_pn });
         }
         try {
-            await processingMutex.mutex(async () => {
-                await decrypt();
-                // message failed to decrypt
-                if (msg.messageStubType === proto.WebMessageInfo.StubType.CIPHERTEXT && msg.category !== 'peer') {
-                    if (msg?.messageStubParameters?.[0] === MISSING_KEYS_ERROR_TEXT ||
-                        msg.messageStubParameters?.[0] === NO_MESSAGE_FOUND_ERROR_TEXT) {
-                        return sendMessageAck(node);
-                    }
-                    const errorMessage = msg?.messageStubParameters?.[0] || '';
-                    const isPreKeyError = errorMessage.includes('PreKey');
-                    logger.debug(`[handleMessage] Attempting retry request for failed decryption`);
-                    // Handle both pre-key and normal retries in single mutex
-                    await retryMutex.mutex(async () => {
-                        try {
-                            if (!ws.isOpen) {
-                                logger.debug({ node }, 'Connection closed, skipping retry');
-                                return;
-                            }
-                            // Handle pre-key errors with upload and delay
-                            if (isPreKeyError) {
-                                logger.info({ error: errorMessage }, 'PreKey error detected, uploading and retrying');
-                                try {
-                                    logger.debug('Uploading pre-keys for error recovery');
-                                    await uploadPreKeys(5);
-                                    logger.debug('Waiting for server to process new pre-keys');
-                                    await delay(1000);
-                                }
-                                catch (uploadErr) {
-                                    logger.error({ uploadErr }, 'Pre-key upload failed, proceeding with retry anyway');
-                                }
-                            }
-                            const encNode = getBinaryNodeChild(node, 'enc');
-                            await sendRetryRequest(node, !encNode);
-                            if (retryRequestDelayMs) {
-                                await delay(retryRequestDelayMs);
-                            }
+            await Promise.all([
+                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);
                         }
-                        catch (err) {
-                            logger.error({ err, isPreKeyError }, 'Failed to handle retry, attempting basic retry');
-                            // Still attempt retry even if pre-key upload failed
-                            try {
+                        retryMutex.mutex(async () => {
+                            if (ws.isOpen) {
+                                if (getBinaryNodeChild(node, 'unavailable')) {
+                                    return;
+                                }
                                 const encNode = getBinaryNodeChild(node, 'enc');
                                 await sendRetryRequest(node, !encNode);
+                                if (retryRequestDelayMs) {
+                                    await delay(retryRequestDelayMs);
+                                }
                             }
-                            catch (retryErr) {
-                                logger.error({ retryErr }, 'Failed to send retry after error handling');
+                            else {
+                                logger.debug({ node }, 'connection closed, ignoring retry req');
                             }
-                        }
-                        await sendMessageAck(node, NACK_REASONS.UnhandledError);
-                    });
-                }
-                else {
-                    const isNewsletter = isJidNewsletter(msg.key.remoteJid);
-                    if (!isNewsletter) {
+                        });
+                    }
+                    else {
                         // no type in the receipt => message delivered
                         let type = undefined;
                         let participant = msg.key.participant;
@@ -1049,8 +680,8 @@ export const makeMessagesRecvSocket = (config) => {
                             // 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
+                            if (isPnUser(msg.key.remoteJid)) {
+                                participant = author;
                             }
                         }
                         else if (!sendActiveReceipts) {
@@ -1061,31 +692,91 @@ export const makeMessagesRecvSocket = (config) => {
                         const isAnyHistoryMsg = getHistoryMsg(msg.message);
                         if (isAnyHistoryMsg) {
                             const jid = jidNormalizedUser(msg.key.remoteJid);
-                            await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync'); // TODO: investigate
+                            await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync');
                         }
                     }
-                    else {
-                        await sendMessageAck(node);
-                        logger.debug({ key: msg.key }, 'processed newsletter message without receipts');
-                    }
-                }
-                cleanMessage(msg, authState.creds.me.id, authState.creds.me.lid);
-                await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
-            });
+                    cleanMessage(msg, authState.creds.me.id);
+                    await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
+                })
+            ]);
         }
         catch (error) {
-            logger.error({ error, node: binaryNodeToString(node) }, 'error in handling message');
+            logger.error({ error, node }, 'error in handling message');
+        }
+    };
+    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);
     };
     const handleCall = async (node) => {
+        let status;
         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'];
+        status = getCallStatusFromNode(infoChild);
+        if (isLidUser(from) && infoChild.tag === 'relaylatency') {
+            const verify = 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
+                };
+                callOfferCache.set(callId, callLid);
+            }
+        }
         const call = {
             chatId: attrs.from,
             from,
@@ -1098,9 +789,9 @@ export const makeMessagesRecvSocket = (config) => {
             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);
+            callOfferCache.set(call.id, call);
         }
-        const existingCall = await callOfferCache.get(call.id);
+        const existingCall = callOfferCache.get(call.id);
         // use existing call info to populate this event
         if (existingCall) {
             call.isVideo = existingCall.isVideo;
@@ -1108,7 +799,7 @@ export const makeMessagesRecvSocket = (config) => {
         }
         // delete data once call has ended
         if (status === 'reject' || status === 'accept' || status === 'timeout' || status === 'terminate') {
-            await callOfferCache.del(call.id);
+            callOfferCache.del(call.id);
         }
         ev.emit('call', [call]);
         await sendMessageAck(node);
@@ -1141,19 +832,6 @@ export const makeMessagesRecvSocket = (config) => {
                     }
                 }
             ]);
-            // resend the message with device_fanout=false, use at your own risk
-            // if (attrs.error === '475') {
-            // 	const msg = await getMessage(key)
-            // 	if (msg) {
-            // 		await relayMessage(key.remoteJid!, msg, {
-            // 			messageId: key.id!,
-            // 			useUserDevicesCache: false,
-            // 			additionalAttributes: {
-            // 				device_fanout: 'false'
-            // 			}
-            // 		})
-            // 	}
-            // }
         }
     };
     /// processes a node with the given function
@@ -1198,32 +876,165 @@ export const makeMessagesRecvSocket = (config) => {
         return { enqueue };
     };
     const offlineNodeProcessor = makeOfflineNodeProcessor();
-    const processNode = async (type, node, identifier, exec) => {
+    const processNode = (type, node, identifier, exec) => {
         const isOffline = !!node.attrs.offline;
         if (isOffline) {
             offlineNodeProcessor.enqueue(type, node);
         }
         else {
-            await processNodeWithBuffer(node, identifier, exec);
+            processNodeWithBuffer(node, identifier, exec);
         }
     };
+    // Handles newsletter notifications
+    async function handleNewsletterNotification(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);
+                        const fullMessage = proto.WebMessageInfo.fromObject({
+                            key: {
+                                remoteJid: from,
+                                id: child.attrs.message_id || child.attrs.server_id,
+                                fromMe: false
+                            },
+                            message: messageProto,
+                            messageTimestamp: +child.attrs.t
+                        });
+                        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;
+        }
+    }
+    // Handles mex newsletter notifications
+    async function handleMexNewsletterNotification(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;
+        }
+    }
     // recv a message
-    ws.on('CB:message', async (node) => {
-        await processNode('message', node, 'processing message', handleMessage);
+    ws.on('CB:message', (node) => {
+        processNode('message', node, 'processing message', handleMessage);
     });
     ws.on('CB:call', async (node) => {
-        await processNode('call', node, 'handling call', handleCall);
+        processNode('call', node, 'handling call', handleCall);
     });
-    ws.on('CB:receipt', async (node) => {
-        await processNode('receipt', node, 'handling receipt', handleReceipt);
+    ws.on('CB:receipt', node => {
+        processNode('receipt', node, 'handling receipt', handleReceipt);
     });
     ws.on('CB:notification', async (node) => {
-        await processNode('notification', node, 'handling notification', handleNotification);
+        processNode('notification', node, 'handling notification', handleNotification);
     });
     ws.on('CB:ack,class:message', (node) => {
         handleBadAck(node).catch(error => onUnexpectedError(error, 'handling bad ack'));
     });
-    ev.on('call', async ([call]) => {
+    ev.on('call', ([call]) => {
         if (!call) {
             return;
         }
@@ -1251,7 +1062,7 @@ export const makeMessagesRecvSocket = (config) => {
                 msg.message = { call: { callKey: Buffer.from(call.id) } };
             }
             const protoMsg = proto.WebMessageInfo.fromObject(msg);
-            await upsertMessage(protoMsg, call.offline ? 'append' : 'notify');
+            upsertMessage(protoMsg, call.offline ? 'append' : 'notify');
         }
     });
     ev.on('connection.update', ({ isOnline }) => {
@@ -1266,8 +1077,7 @@ export const makeMessagesRecvSocket = (config) => {
         sendRetryRequest,
         rejectCall,
         fetchMessageHistory,
-        requestPlaceholderResend,
-        messageRetryManager
+        requestPlaceholderResend
     };
 };
-//# sourceMappingURL=messages-recv.js.map
+//# sourceMappingURL=messages-recv.js.map