@jkt48connect-corp/baileys 7.3.0 → 7.3.2

package/lib/Socket/messages-recv.js

@@ -19,7 +19,7 @@ const messages_send_1 = require("./messages-send");
 const makeMessagesRecvSocket = (config) => {
     const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid } = config;
     const sock = (0, messages_send_1.makeMessagesSocket)(config);
-    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, getUSyncDevices, sendPeerDataOperationMessage, createParticipantNodes } = sock;
+    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, getUSyncDevices, createParticipantNodes } = sock;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
     const retryMutex = (0, make_mutex_1.makeMutex)();
     const msgRetryCache = config.msgRetryCounterCache || new node_cache_1.default({
@@ -30,30 +30,23 @@ const makeMessagesRecvSocket = (config) => {
         stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.CALL_OFFER, // 5 mins
         useClones: false
     });
-    const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
-        useClones: false
-    });
     let sendActiveReceipts = false;
-    const sendMessageAck = async ({ tag, attrs, content }, errorCode) => {
+    const sendMessageAck = async ({ tag, attrs, content }) => {
         const stanza = {
             tag: 'ack',
             attrs: {
                 id: attrs.id,
                 to: attrs.from,
-                class: tag
+                class: tag,
             }
         };
-        if (!!errorCode) {
-            stanza.attrs.error = errorCode.toString();
-        }
         if (!!attrs.participant) {
             stanza.attrs.participant = attrs.participant;
         }
         if (!!attrs.recipient) {
             stanza.attrs.recipient = attrs.recipient;
         }
-        if (!!attrs.type && (tag !== 'message' || (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable') || errorCode !== 0)) {
+        if (!!attrs.type && (tag !== 'message' || (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable'))) {
             stanza.attrs.type = attrs.type;
         }
         if (tag === 'message' && (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable')) {
@@ -134,24 +127,16 @@ const makeMessagesRecvSocket = (config) => {
         await query(stanza);
     };
     const sendRetryRequest = async (node, forceIncludeKeys = false) => {
-        const { fullMessage } = (0, Utils_1.decodeMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '');
-        const { key: msgKey } = fullMessage;
-        const msgId = msgKey.id;
-        const key = `${msgId}:${msgKey === null || msgKey === void 0 ? void 0 : msgKey.participant}`;
-        let retryCount = msgRetryCache.get(key) || 0;
+        const msgId = node.attrs.id;
+        let retryCount = msgRetryCache.get(msgId) || 0;
         if (retryCount >= maxMsgRetryCount) {
             logger.debug({ retryCount, msgId }, 'reached retry limit, clearing');
-            msgRetryCache.del(key);
+            msgRetryCache.del(msgId);
             return;
         }
         retryCount += 1;
-        msgRetryCache.set(key, retryCount);
+        msgRetryCache.set(msgId, 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 = (0, Utils_1.encodeSignedDeviceIdentity)(account, true);
         await authState.keys.transaction(async () => {
             const receipt = {
@@ -230,8 +215,6 @@ const makeMessagesRecvSocket = (config) => {
         }
     };
     const handleGroupNotification = (participant, child, msg) => {
-        var _a, _b, _c, _d;
-        const participantJid = ((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(child, 'participant')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.jid) || participant;
         switch (child === null || child === void 0 ? void 0 : child.tag) {
             case 'create':
                 const metadata = (0, groups_1.extractGroupMetadata)(child);
@@ -257,11 +240,6 @@ const makeMessagesRecvSocket = (config) => {
                     }
                 };
                 break;
-            case 'modify':
-                const oldNumber = (0, WABinary_1.getBinaryNodeChildren)(child, 'participant').map(p => p.attrs.jid);
-                msg.messageStubParameters = oldNumber || [];
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER;
-                break;
             case 'promote':
             case 'demote':
             case 'remove':
@@ -283,11 +261,6 @@ const makeMessagesRecvSocket = (config) => {
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT;
                 msg.messageStubParameters = [child.attrs.subject];
                 break;
-            case 'description':
-                const description = (_d = (_c = (0, WABinary_1.getBinaryNodeChild)(child, 'body')) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.toString();
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_DESCRIPTION;
-                msg.messageStubParameters = description ? [description] : undefined;
-                break;
             case 'announcement':
             case 'not_announcement':
                 msg.messageStubType = Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE;
@@ -316,15 +289,6 @@ const makeMessagesRecvSocket = (config) => {
                     msg.messageStubParameters = [approvalMode.attrs.state];
                 }
                 break;
-            case 'created_membership_requests':
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
-                msg.messageStubParameters = [participantJid, 'created', child.attrs.request_method];
-                break;
-            case 'revoked_membership_requests':
-                const isDenied = (0, WABinary_1.areJidsSameUser)(participantJid, participant);
-                msg.messageStubType = Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD;
-                msg.messageStubParameters = [participantJid, isDenied ? 'revoked' : 'rejected'];
-                break;
         }
     };
     const processNotification = async (node) => {
@@ -357,6 +321,9 @@ const makeMessagesRecvSocket = (config) => {
             case 'encrypt':
                 await handleEncryptNotification(node);
                 break;
+            case 'newsletter':
+                // TO DO
+                break;
             case 'devices':
                 const devices = (0, WABinary_1.getBinaryNodeChildren)(child, 'device');
                 if ((0, WABinary_1.areJidsSameUser)(child.attrs.jid, authState.creds.me.id)) {
@@ -375,7 +342,7 @@ const makeMessagesRecvSocket = (config) => {
                 const setPicture = (0, WABinary_1.getBinaryNodeChild)(node, 'set');
                 const delPicture = (0, WABinary_1.getBinaryNodeChild)(node, 'delete');
                 ev.emit('contacts.update', [{
-                        id: (0, WABinary_1.jidNormalizedUser)((_a = node === null || node === void 0 ? void 0 : node.attrs) === null || _a === void 0 ? void 0 : _a.from) || ((_c = (_b = (setPicture || delPicture)) === null || _b === void 0 ? void 0 : _b.attrs) === null || _c === void 0 ? void 0 : _c.hash) || '',
+                        id: (0, WABinary_1.jidNormalizedUser)((_a = node === null || node === void 0 ? void 0 : node.attrs) === null || _a === void 0 ? void 0 : _a.jid) || ((_c = (_b = (setPicture || delPicture)) === null || _b === void 0 ? void 0 : _b.attrs) === null || _c === void 0 ? void 0 : _c.hash) || '',
                         imgUrl: setPicture ? 'changed' : 'removed'
                     }]);
                 if ((0, WABinary_1.isJidGroup)(from)) {
@@ -420,7 +387,7 @@ const makeMessagesRecvSocket = (config) => {
                 const ref = toRequiredBuffer((0, WABinary_1.getBinaryNodeChildBuffer)(linkCodeCompanionReg, 'link_code_pairing_ref'));
                 const primaryIdentityPublicKey = toRequiredBuffer((0, WABinary_1.getBinaryNodeChildBuffer)(linkCodeCompanionReg, 'primary_identity_pub'));
                 const primaryEphemeralPublicKeyWrapped = toRequiredBuffer((0, WABinary_1.getBinaryNodeChildBuffer)(linkCodeCompanionReg, 'link_code_pairing_wrapped_primary_ephemeral_pub'));
-                const codePairingPublicKey = await decipherLinkPublicKey(primaryEphemeralPublicKeyWrapped);
+                const codePairingPublicKey = decipherLinkPublicKey(primaryEphemeralPublicKeyWrapped);
                 const companionSharedKey = Utils_1.Curve.sharedKey(authState.creds.pairingEphemeralKeyPair.private, codePairingPublicKey);
                 const random = (0, crypto_1.randomBytes)(32);
                 const linkCodeSalt = (0, crypto_1.randomBytes)(32);
@@ -477,10 +444,10 @@ const makeMessagesRecvSocket = (config) => {
             return result;
         }
     };
-    async function decipherLinkPublicKey(data) {
+    function decipherLinkPublicKey(data) {
         const buffer = toRequiredBuffer(data);
         const salt = buffer.slice(0, 32);
-        const secretKey = await (0, Utils_1.derivePairingCodeKey)(authState.creds.pairingCode, salt);
+        const secretKey = (0, Utils_1.derivePairingCodeKey)(authState.creds.pairingCode, salt);
         const iv = buffer.slice(32, 48);
         const payload = buffer.slice(48, 80);
         return (0, Utils_1.aesDecryptCTR)(payload, secretKey, iv);
@@ -515,7 +482,8 @@ const makeMessagesRecvSocket = (config) => {
             await authState.keys.set({ 'sender-key-memory': { [remoteJid]: null } });
         }
         logger.debug({ participant, sendToAll }, 'forced new session for retry recp');
-        for (const [i, msg] of msgs.entries()) {
+        for (let i = 0; i < msgs.length; i++) {
+            const msg = msgs[i];
             if (msg) {
                 updateSendMessageAgainCount(ids[i], participant);
                 const msgRelayOpts = { messageId: ids[i] };
@@ -558,63 +526,59 @@ const makeMessagesRecvSocket = (config) => {
             const items = (0, WABinary_1.getBinaryNodeChildren)(content[0], 'item');
             ids.push(...items.map(i => i.attrs.id));
         }
-        try {
-            await Promise.all([
-                processingMutex.mutex(async () => {
-                    const status = (0, Utils_1.getStatusFromReceiptType)(attrs.type);
-                    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.DELIVERY_ACK ||
-                            !isNodeFromMe)) {
-                        if ((0, WABinary_1.isJidGroup)(remoteJid) || (0, WABinary_1.isJidStatusBroadcast)(remoteJid)) {
-                            if (attrs.participant) {
-                                const updateKey = status === WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp';
-                                ev.emit('message-receipt.update', ids.map(id => ({
-                                    key: { ...key, id },
-                                    receipt: {
-                                        userJid: (0, WABinary_1.jidNormalizedUser)(attrs.participant),
-                                        [updateKey]: +attrs.t
-                                    }
-                                })));
-                            }
-                        }
-                        else {
-                            ev.emit('messages.update', ids.map(id => ({
+        await Promise.all([
+            processingMutex.mutex(async () => {
+                const status = (0, Utils_1.getStatusFromReceiptType)(attrs.type);
+                if (typeof status !== 'undefined' &&
+                    (
+                    // basically, we only want to know when a message from us has been delivered to/read by the other person
+                    // or another device of ours has read some messages
+                    status > WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ||
+                        !isNodeFromMe)) {
+                    if ((0, WABinary_1.isJidGroup)(remoteJid)) {
+                        if (attrs.participant) {
+                            const updateKey = status === WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp';
+                            ev.emit('message-receipt.update', ids.map(id => ({
                                 key: { ...key, id },
-                                update: { status }
+                                receipt: {
+                                    userJid: (0, WABinary_1.jidNormalizedUser)(attrs.participant),
+                                    [updateKey]: +attrs.t
+                                }
                             })));
                         }
                     }
-                    if (attrs.type === 'retry') {
-                        // correctly set who is asking for the retry
-                        key.participant = key.participant || attrs.from;
-                        const retryNode = (0, WABinary_1.getBinaryNodeChild)(node, 'retry');
-                        if (willSendMessageAgain(ids[0], key.participant)) {
-                            if (key.fromMe) {
-                                try {
-                                    logger.debug({ attrs, key }, 'recv retry request');
-                                    await sendMessagesAgain(key, ids, retryNode);
-                                }
-                                catch (error) {
-                                    logger.error({ key, ids, trace: error.stack }, 'error in sending message again');
-                                }
+                    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 = (0, WABinary_1.getBinaryNodeChild)(node, 'retry');
+                    if (willSendMessageAgain(ids[0], key.participant)) {
+                        if (key.fromMe) {
+                            try {
+                                logger.debug({ attrs, key }, 'recv retry request');
+                                await sendMessagesAgain(key, ids, retryNode);
                             }
-                            else {
-                                logger.info({ attrs, key }, 'recv retry for not fromMe message');
+                            catch (error) {
+                                logger.error({ key, ids, trace: error.stack }, 'error in sending message again');
                             }
                         }
                         else {
-                            logger.info({ attrs, key }, 'will not send message again, as sent too many times');
+                            logger.info({ attrs, key }, 'recv retry for not fromMe message');
                         }
                     }
-                })
-            ]);
-        }
-        finally {
-            await sendMessageAck(node);
-        }
+                    else {
+                        logger.info({ attrs, key }, 'will not send message again, as sent too many times');
+                    }
+                }
+            }),
+            sendMessageAck(node)
+        ]);
     };
     const handleNotification = async (node) => {
         const remoteJid = node.attrs.from;
@@ -623,169 +587,89 @@ const makeMessagesRecvSocket = (config) => {
             await sendMessageAck(node);
             return;
         }
-        try {
-            await Promise.all([
-                processingMutex.mutex(async () => {
-                    var _a;
-                    const msg = await processNotification(node);
-                    if (msg) {
-                        const fromMe = (0, WABinary_1.areJidsSameUser)(node.attrs.participant || remoteJid, authState.creds.me.id);
-                        msg.key = {
-                            remoteJid,
-                            fromMe,
-                            participant: node.attrs.participant,
-                            id: node.attrs.id,
-                            ...(msg.key || {})
-                        };
-                        (_a = msg.participant) !== null && _a !== void 0 ? _a : (msg.participant = node.attrs.participant);
-                        msg.messageTimestamp = +node.attrs.t;
-                        const fullMsg = WAProto_1.proto.WebMessageInfo.fromObject(msg);
-                        await upsertMessage(fullMsg, 'append');
-                    }
-                })
-            ]);
-        }
-        finally {
-            await sendMessageAck(node);
-        }
+        await Promise.all([
+            processingMutex.mutex(async () => {
+                var _a;
+                const msg = await processNotification(node);
+                if (msg) {
+                    const fromMe = (0, WABinary_1.areJidsSameUser)(node.attrs.participant || remoteJid, authState.creds.me.id);
+                    msg.key = {
+                        remoteJid,
+                        fromMe,
+                        participant: node.attrs.participant,
+                        id: node.attrs.id,
+                        ...(msg.key || {})
+                    };
+                    (_a = msg.participant) !== null && _a !== void 0 ? _a : (msg.participant = node.attrs.participant);
+                    msg.messageTimestamp = +node.attrs.t;
+                    const fullMsg = WAProto_1.proto.WebMessageInfo.fromObject(msg);
+                    await upsertMessage(fullMsg, 'append');
+                }
+            }),
+            sendMessageAck(node)
+        ]);
     };
     const handleMessage = async (node) => {
-        var _a, _b, _c;
+        var _a, _b;
         if (shouldIgnoreJid(node.attrs.from) && node.attrs.from !== '@s.whatsapp.net') {
             logger.debug({ key: node.attrs.key }, 'ignored message');
             await sendMessageAck(node);
             return;
         }
-        let response;
-        if ((0, WABinary_1.getBinaryNodeChild)(node, 'unavailable') && !(0, WABinary_1.getBinaryNodeChild)(node, 'enc')) {
-            await sendMessageAck(node);
-            const { key } = (0, Utils_1.decodeMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '').fullMessage;
-            response = await requestPlaceholderResend(key);
-            if (response === 'RESOLVED') {
-                return;
-            }
-            logger.debug('received unavailable message, acked and requested resend from phone');
-        }
-        else {
-            if (placeholderResendCache.get(node.attrs.id)) {
-                placeholderResendCache.del(node.attrs.id);
-            }
-        }
         const { fullMessage: msg, category, author, decrypt } = (0, Utils_1.decryptMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
-        if (response && ((_a = msg === null || msg === void 0 ? void 0 : msg.messageStubParameters) === null || _a === void 0 ? void 0 : _a[0]) === Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT) {
-            msg.messageStubParameters = [Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT, response];
-        }
-        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER && node.attrs.sender_pn) {
-            ev.emit('chats.phoneNumberShare', { lid: node.attrs.from, jid: node.attrs.sender_pn });
+        if (((_b = (_a = msg.message) === null || _a === void 0 ? void 0 : _a.protocolMessage) === null || _b === void 0 ? void 0 : _b.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER) {
+            if (node.attrs.sender_pn) {
+                ev.emit('chats.phoneNumberShare', { lid: node.attrs.from, jid: node.attrs.sender_pn });
+            }
         }
-        try {
-            await Promise.all([
-                processingMutex.mutex(async () => {
-                    var _a;
-                    await decrypt();
-                    // message failed to decrypt
-                    if (msg.messageStubType === WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT) {
-                        if (((_a = msg === null || msg === void 0 ? void 0 : msg.messageStubParameters) === null || _a === void 0 ? void 0 : _a[0]) === Utils_1.MISSING_KEYS_ERROR_TEXT) {
-                            return sendMessageAck(node, Utils_1.NACK_REASONS.ParsingError);
-                        }
-                        retryMutex.mutex(async () => {
-                            if (ws.isOpen) {
-                                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);
-                                }
+        await Promise.all([
+            processingMutex.mutex(async () => {
+                await decrypt();
+                // message failed to decrypt
+                if (msg.messageStubType === WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT) {
+                    retryMutex.mutex(async () => {
+                        if (ws.isOpen) {
+                            const encNode = (0, WABinary_1.getBinaryNodeChild)(node, 'enc');
+                            await sendRetryRequest(node, !encNode);
+                            if (retryRequestDelayMs) {
+                                await (0, Utils_1.delay)(retryRequestDelayMs);
                             }
-                            else {
-                                logger.debug({ node }, 'connection closed, ignoring retry req');
-                            }
-                        });
-                    }
-                    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 ((0, WABinary_1.isJidUser)(msg.key.remoteJid)) {
-                                participant = author;
-                            }
-                        }
-                        else if (!sendActiveReceipts) {
-                            type = 'inactive';
+                        else {
+                            logger.debug({ node }, 'connection closed, ignoring retry req');
                         }
-                        await sendReceipt(msg.key.remoteJid, participant, [msg.key.id], type);
-                        // send ack for history message
-                        const isAnyHistoryMsg = (0, Utils_1.getHistoryMsg)(msg.message);
-                        if (isAnyHistoryMsg) {
-                            const jid = (0, WABinary_1.jidNormalizedUser)(msg.key.remoteJid);
-                            await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync');
+                    });
+                }
+                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 ((0, WABinary_1.isJidUser)(msg.key.remoteJid)) {
+                            participant = author;
                         }
                     }
-                    (0, Utils_2.cleanMessage)(msg, authState.creds.me.id);
-                    await sendMessageAck(node);
-                    await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
-                })
-            ]);
-        }
-        catch (error) {
-            logger.error({ error, node }, 'error in handling message');
-        }
-    };
-    const fetchMessageHistory = async (count, oldestMsgKey, oldestMsgTimestamp) => {
-        var _a;
-        if (!((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id)) {
-            throw new boom_1.Boom('Not authenticated');
-        }
-        const pdoMessage = {
-            historySyncOnDemandRequest: {
-                chatJid: oldestMsgKey.remoteJid,
-                oldestMsgFromMe: oldestMsgKey.fromMe,
-                oldestMsgId: oldestMsgKey.id,
-                oldestMsgTimestampMs: oldestMsgTimestamp,
-                onDemandMsgCount: count
-            },
-            peerDataOperationRequestType: WAProto_1.proto.Message.PeerDataOperationRequestType.HISTORY_SYNC_ON_DEMAND
-        };
-        return sendPeerDataOperationMessage(pdoMessage);
-    };
-    const requestPlaceholderResend = async (messageKey) => {
-        var _a;
-        if (!((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id)) {
-            throw new boom_1.Boom('Not authenticated');
-        }
-        if (placeholderResendCache.get(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id)) {
-            logger.debug('already requested resend', { messageKey });
-            return;
-        }
-        else {
-            placeholderResendCache.set(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id, true);
-        }
-        await (0, Utils_1.delay)(5000);
-        if (!placeholderResendCache.get(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id)) {
-            logger.debug('message received while resend requested', { messageKey });
-            return 'RESOLVED';
-        }
-        const pdoMessage = {
-            placeholderMessageResendRequest: [{
-                    messageKey
-                }],
-            peerDataOperationRequestType: WAProto_1.proto.Message.PeerDataOperationRequestType.PLACEHOLDER_MESSAGE_RESEND
-        };
-        setTimeout(() => {
-            if (placeholderResendCache.get(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id)) {
-                logger.debug('PDO message without response after 15 seconds. Phone possibly offline', { messageKey });
-                placeholderResendCache.del(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id);
-            }
-        }, 15000);
-        return sendPeerDataOperationMessage(pdoMessage);
+                    else if (!sendActiveReceipts) {
+                        type = 'inactive';
+                    }
+                    await sendReceipt(msg.key.remoteJid, participant, [msg.key.id], type);
+                    // send ack for history message
+                    const isAnyHistoryMsg = (0, Utils_1.getHistoryMsg)(msg.message);
+                    if (isAnyHistoryMsg) {
+                        const jid = (0, WABinary_1.jidNormalizedUser)(msg.key.remoteJid);
+                        await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync');
+                    }
+                }
+                (0, Utils_2.cleanMessage)(msg, authState.creds.me.id);
+                await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
+            }),
+            sendMessageAck(node)
+        ]);
     };
     const handleCall = async (node) => {
         const { attrs } = node;
@@ -814,7 +698,7 @@ const makeMessagesRecvSocket = (config) => {
             call.isGroup = existingCall.isGroup;
         }
         // delete data once call has ended
-        if (status === 'reject' || status === 'accept' || status === 'timeout' || status === 'terminate') {
+        if (status === 'reject' || status === 'accept' || status === 'timeout') {
             callOfferCache.del(call.id);
         }
         ev.emit('call', [call]);
@@ -822,19 +706,19 @@ const makeMessagesRecvSocket = (config) => {
     };
     const handleBadAck = async ({ attrs }) => {
         const key = { remoteJid: attrs.from, fromMe: true, id: attrs.id };
-        // WARNING: REFRAIN FROM ENABLING THIS FOR NOW. IT WILL CAUSE A LOOP
-        // // current hypothesis is that if pash is sent in the ack
-        // // it means -- the message hasn't reached all devices yet
-        // // we'll retry sending the message here
-        // if(attrs.phash) {
-        // 	logger.info({ attrs }, 'received phash in ack, resending message...')
-        // 	const msg = await getMessage(key)
-        // 	if(msg) {
-        // 		await relayMessage(key.remoteJid!, msg, { messageId: key.id!, useUserDevicesCache: false })
-        // 	} else {
-        // 		logger.warn({ attrs }, 'could not send message again, as it was not found')
-        // 	}
-        // }
+        // current hypothesis is that if pash is sent in the ack
+        // it means -- the message hasn't reached all devices yet
+        // we'll retry sending the message here
+        if (attrs.phash) {
+            logger.info({ attrs }, 'received phash in ack, resending message...');
+            const msg = await getMessage(key);
+            if (msg) {
+                await relayMessage(key.remoteJid, msg, { messageId: key.id, useUserDevicesCache: false });
+            }
+            else {
+                logger.warn({ attrs }, 'could not send message again, as it was not found');
+            }
+        }
         // error in acknowledgement,
         // device could not display the message
         if (attrs.error) {
@@ -859,63 +743,22 @@ const makeMessagesRecvSocket = (config) => {
         await execTask();
         ev.flush();
         function execTask() {
-            return exec(node, false)
+            return exec(node)
                 .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 enqueue = (type, node) => {
-            nodes.push({ type, node });
-            if (isProcessing) {
-                return;
-            }
-            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;
-                    }
-                    await nodeProcessor(node);
-                }
-                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;
-        if (isOffline) {
-            offlineNodeProcessor.enqueue(type, node);
-        }
-        else {
-            processNodeWithBuffer(node, identifier, exec);
-        }
-    };
     // recv a message
     ws.on('CB:message', (node) => {
-        processNode('message', node, 'processing message', handleMessage);
+        processNodeWithBuffer(node, 'processing message', handleMessage);
     });
     ws.on('CB:call', async (node) => {
-        processNode('call', node, 'handling call', handleCall);
+        processNodeWithBuffer(node, 'handling call', handleCall);
     });
     ws.on('CB:receipt', node => {
-        processNode('receipt', node, 'handling receipt', handleReceipt);
+        processNodeWithBuffer(node, 'handling receipt', handleReceipt);
     });
     ws.on('CB:notification', async (node) => {
-        processNode('notification', node, 'handling notification', handleNotification);
+        processNodeWithBuffer(node, 'handling notification', handleNotification);
     });
     ws.on('CB:ack,class:message', (node) => {
         handleBadAck(node)
@@ -958,9 +801,7 @@ const makeMessagesRecvSocket = (config) => {
         sendMessageAck,
         sendRetryRequest,
         offerCall,
-        rejectCall,
-        fetchMessageHistory,
-        requestPlaceholderResend,
+        rejectCall
     };
 };
 exports.makeMessagesRecvSocket = makeMessagesRecvSocket;