@zetagoaurum-socket/decagramton 3.2.4 → 3.2.7

package/lib/Socket/messages-recv.js

@@ -6,78 +6,146 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMessagesRecvSocket = void 0;
 const boom_1 = require("@hapi/boom");
 const crypto_1 = require("crypto");
-const node_cache_1 = __importDefault(require("node-cache"));
+const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Types_1 = require("../Types");
 const Utils_1 = require("../Utils");
-const Utils_2 = require("../Utils");
 const make_mutex_1 = require("../Utils/make-mutex");
 const WABinary_1 = require("../WABinary");
 const groups_1 = require("./groups");
 const messages_send_1 = require("./messages-send");
 const makeMessagesRecvSocket = (config) => {
-    const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid } = 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, createParticipantNodes } = sock;
+    const { 
+        ev,
+        authState, 
+        ws,
+        processingMutex,
+        signalRepository,
+        query,
+        upsertMessage,
+        resyncAppState,
+        groupMetadata,
+        onUnexpectedError, 
+        assertSessions,
+        sendNode,
+        relayMessage,
+        sendReceipt,
+        uploadPreKeys,
+        createParticipantNodes,
+        getUSyncDevices, 
+        sendPeerDataOperationMessage
+    } = 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({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
         useClones: false
     });
     const callOfferCache = config.callOfferCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.CALL_OFFER,
+        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 }) => {
+    const sendMessageAck = async ({ tag, attrs, content }, errorCode) => {
         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'))) {
+        if (!!attrs.type && (tag !== 'message' || (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable') || errorCode !== 0)) {
             stanza.attrs.type = attrs.type;
         }
         if (tag === 'message' && (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable')) {
             stanza.attrs.from = authState.creds.me.id;
         }
-        logger.debug({ recv: { tag, attrs }, sent: stanza.attrs }, 'sent ack');
+        logger.debug({ 
+            recv: {
+                tag,
+                attrs 
+            },
+            sent: stanza.attrs }, 'sent ack');
         await sendNode(stanza);
     };
     const offerCall = async (toJid, isVideo = false) => {
         const callId = (0, crypto_1.randomBytes)(16).toString('hex').toUpperCase().substring(0, 64);
         const offerContent = [];
-        offerContent.push({ tag: 'audio', attrs: { enc: 'opus', rate: '16000' }, content: undefined });
-        offerContent.push({ tag: 'audio', attrs: { enc: 'opus', rate: '8000' }, content: undefined });
+        offerContent.push({
+            tag: 'audio',
+            attrs: {
+                enc: 'opus',
+                rate: '16000'
+            }, content: undefined
+        });
+        offerContent.push({
+            tag: 'audio',
+            attrs: {
+                enc: 'opus',
+                rate: '8000' 
+            }, content: undefined 
+        });
         if (isVideo) {
             offerContent.push({
                 tag: 'video',
-                attrs: { enc: 'vp8', dec: 'vp8', orientation: '0', 'screen_width': '1920', 'screen_height': '1080', 'device_orientation': '0' },
-                content: undefined
+                attrs: {
+                    orientation: '0',
+                    'screen_width': '1920',
+                    'screen_height': '1080',
+                    'device_orientation': '0',
+                    enc: 'vp8',
+                    dec: 'vp8',
+                }
             });
         }
-        offerContent.push({ tag: 'net', attrs: { medium: '3' }, content: undefined });
-        offerContent.push({ tag: 'capability', attrs: { ver: '1' }, content: new Uint8Array([1, 4, 255, 131, 207, 4]) });
-        offerContent.push({ tag: 'encopt', attrs: { keygen: '2' }, content: undefined });
+        offerContent.push({
+            tag: 'net',
+            attrs: {
+                medium: '3'
+            },  content: undefined 
+        });
+        offerContent.push({ 
+            tag: 'capability',
+            attrs: {
+                ver: '1'
+            },  content: new Uint8Array([1, 4, 255, 131, 207, 4]) });
+        offerContent.push({
+            tag: 'encopt',
+            attrs: { 
+                keygen: '2'
+            },  content: undefined
+        })
         const encKey = (0, crypto_1.randomBytes)(32);
         const devices = (await getUSyncDevices([toJid], true, false)).map(({ user, device }) => (0, WABinary_1.jidEncode)(user, 's.whatsapp.net', device));
         await assertSessions(devices, true);
         const { nodes: destinations, shouldIncludeDeviceIdentity } = await createParticipantNodes(devices, {
             call: {
-                callKey: new Uint8Array(encKey)
+                callKey: encKey
             }
-        }, { count: '0' });
+        });
         offerContent.push({ tag: 'destination', attrs: {}, content: destinations });
         if (shouldIncludeDeviceIdentity) {
             offerContent.push({
@@ -89,7 +157,6 @@ const makeMessagesRecvSocket = (config) => {
         const stanza = ({
             tag: 'call',
             attrs: {
-                id: (0, Utils_1.generateMessageIDV2)(),
                 to: toJid,
             },
             content: [{
@@ -103,8 +170,9 @@ const makeMessagesRecvSocket = (config) => {
         });
         await query(stanza);
         return {
-            id: callId,
-            to: toJid
+            callId,
+            toJid,
+            isVideo,
         };
     };
     const rejectCall = async (callId, callFrom) => {
@@ -127,16 +195,24 @@ const makeMessagesRecvSocket = (config) => {
         await query(stanza);
     };
     const sendRetryRequest = async (node, forceIncludeKeys = false) => {
-        const msgId = node.attrs.id;
-        let retryCount = msgRetryCache.get(msgId) || 0;
+        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;
         if (retryCount >= maxMsgRetryCount) {
             logger.debug({ retryCount, msgId }, 'reached retry limit, clearing');
-            msgRetryCache.del(msgId);
+            msgRetryCache.del(key);
             return;
         }
         retryCount += 1;
-        msgRetryCache.set(msgId, retryCount);
+        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 = (0, Utils_1.encodeSignedDeviceIdentity)(account, true);
         await authState.keys.transaction(async () => {
             const receipt = {
@@ -215,6 +291,8 @@ 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);
@@ -240,6 +318,11 @@ 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':
@@ -261,6 +344,11 @@ 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;
@@ -289,10 +377,66 @@ 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;
+                break;
+            default:
+            // console.log("BAILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
+        }
+    };
+    const handleNewsletterNotification = (id, node) => {
+        const messages = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
+        const message = (0, WABinary_1.getBinaryNodeChild)(messages, 'message');
+        const serverId = message.attrs.server_id;
+        const reactionsList = (0, WABinary_1.getBinaryNodeChild)(message, 'reactions');
+        const viewsList = (0, WABinary_1.getBinaryNodeChildren)(message, 'views_count');
+        if (reactionsList) {
+            const reactions = (0, WABinary_1.getBinaryNodeChildren)(reactionsList, 'reaction');
+            if (reactions.length === 0) {
+                ev.emit('newsletter.reaction', { id, 'server_id': serverId, reaction: { removed: true } });
+            }
+            reactions.forEach(item => {
+                var _a, _b;
+                ev.emit('newsletter.reaction', { id, 'server_id': serverId, reaction: { code: (_a = item.attrs) === null || _a === void 0 ? void 0 : _a.code, count: +((_b = item.attrs) === null || _b === void 0 ? void 0 : _b.count) } });
+            });
+        }
+        if (viewsList.length) {
+            viewsList.forEach(item => {
+                ev.emit('newsletter.view', { id, 'server_id': serverId, count: +item.attrs.count });
+            });
+        }
+    };
+    const handleMexNewsletterNotification = (id, node) => {
+        var _a;
+        const operation = node === null || node === void 0 ? void 0 : node.attrs.op_name;
+        const content = JSON.parse((_a = node === null || node === void 0 ? void 0 : node.content) === null || _a === void 0 ? void 0 : _a.toString());
+        let contentPath;
+        if (operation === Types_1.MexOperations.PROMOTE || operation === Types_1.MexOperations.DEMOTE) {
+            let action;
+            if (operation === Types_1.MexOperations.PROMOTE) {
+                action = 'promote';
+                contentPath = content.data[Types_1.XWAPaths.PROMOTE];
+            }
+            if (operation === Types_1.MexOperations.DEMOTE) {
+                action = 'demote';
+                contentPath = content.data[Types_1.XWAPaths.DEMOTE];
+            }
+            ev.emit('newsletter-participants.update', { id, author: contentPath.actor.pn, user: contentPath.user.pn, new_role: contentPath.user_new_role, action });
+        }
+        if (operation === Types_1.MexOperations.UPDATE) {
+            contentPath = content.data[Types_1.XWAPaths.METADATA_UPDATE];
+            ev.emit('newsletter-settings.update', { id, update: contentPath.thread_metadata.settings });
         }
     };
     const processNotification = async (node) => {
-        var _a, _b, _c;
+        var _a, _b;
         const result = {};
         const [child] = (0, WABinary_1.getAllBinaryNodeChildren)(node);
         const nodeType = node.attrs.type;
@@ -311,6 +455,12 @@ const makeMessagesRecvSocket = (config) => {
                     logger.debug({ jid }, 'got privacy token update');
                 }
                 break;
+            case 'newsletter':
+                handleNewsletterNotification(node.attrs.from, child);
+                break;
+            case 'mex':
+                handleMexNewsletterNotification(node.attrs.from, child);
+                break;
             case 'w:gp2':
                 handleGroupNotification(node.attrs.participant, child, result);
                 break;
@@ -321,9 +471,6 @@ 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)) {
@@ -342,7 +489,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.jid) || ((_c = (_b = (setPicture || delPicture)) === null || _b === void 0 ? void 0 : _b.attrs) === null || _c === void 0 ? void 0 : _c.hash) || '',
+                        id: from || ((_b = (_a = (setPicture || delPicture)) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.hash) || '',
                         imgUrl: setPicture ? 'changed' : 'removed'
                     }]);
                 if ((0, WABinary_1.isJidGroup)(from)) {
@@ -387,11 +534,11 @@ 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 = decipherLinkPublicKey(primaryEphemeralPublicKeyWrapped);
+                const codePairingPublicKey = await 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);
-                const linkCodePairingExpanded = (0, Utils_1.hkdf)(companionSharedKey, 32, {
+                const linkCodePairingExpanded = await (0, Utils_1.hkdf)(companionSharedKey, 32, {
                     salt: linkCodeSalt,
                     info: 'link_code_pairing_key_bundle_encryption_key'
                 });
@@ -401,7 +548,7 @@ const makeMessagesRecvSocket = (config) => {
                 const encryptedPayload = Buffer.concat([linkCodeSalt, encryptIv, encrypted]);
                 const identitySharedKey = Utils_1.Curve.sharedKey(authState.creds.signedIdentityKey.private, primaryIdentityPublicKey);
                 const identityPayload = Buffer.concat([companionSharedKey, identitySharedKey, random]);
-                authState.creds.advSecretKey = (0, Utils_1.hkdf)(identityPayload, 32, { info: 'adv_secret' }).toString('base64');
+                authState.creds.advSecretKey = (await (0, Utils_1.hkdf)(identityPayload, 32, { info: 'adv_secret' })).toString('base64');
                 await query({
                     tag: 'iq',
                     attrs: {
@@ -444,10 +591,10 @@ const makeMessagesRecvSocket = (config) => {
             return result;
         }
     };
-    function decipherLinkPublicKey(data) {
+    async function decipherLinkPublicKey(data) {
         const buffer = toRequiredBuffer(data);
         const salt = buffer.slice(0, 32);
-        const secretKey = (0, Utils_1.derivePairingCodeKey)(authState.creds.pairingCode, salt);
+        const secretKey = await (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);
@@ -470,6 +617,7 @@ const makeMessagesRecvSocket = (config) => {
     };
     const sendMessagesAgain = async (key, ids, retryNode) => {
         var _a;
+        // 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;
@@ -482,8 +630,7 @@ const makeMessagesRecvSocket = (config) => {
             await authState.keys.set({ 'sender-key-memory': { [remoteJid]: null } });
         }
         logger.debug({ participant, sendToAll }, 'forced new session for retry recp');
-        for (let i = 0; i < msgs.length; i++) {
-            const msg = msgs[i];
+        for (const [i, msg] of msgs.entries()) {
             if (msg) {
                 updateSendMessageAgainCount(ids[i], participant);
                 const msgRelayOpts = { messageId: ids[i] };
@@ -509,7 +656,7 @@ const makeMessagesRecvSocket = (config) => {
         const isLid = attrs.from.includes('lid');
         const isNodeFromMe = (0, WABinary_1.areJidsSameUser)(attrs.participant || attrs.from, isLid ? (_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.lid : (_b = authState.creds.me) === null || _b === void 0 ? void 0 : _b.id);
         const remoteJid = !isNodeFromMe || (0, WABinary_1.isJidGroup)(attrs.from) ? attrs.from : attrs.recipient;
-        const fromMe = !attrs.recipient || (attrs.type === 'retry' && isNodeFromMe);
+        const fromMe = !attrs.recipient || ((attrs.type === 'retry' || attrs.type === 'sender') && isNodeFromMe);
         const key = {
             remoteJid,
             id: '',
@@ -526,59 +673,63 @@ const makeMessagesRecvSocket = (config) => {
             const items = (0, WABinary_1.getBinaryNodeChildren)(content[0], 'item');
             ids.push(...items.map(i => i.attrs.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 => ({
+        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.SERVER_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 => ({
                                 key: { ...key, id },
-                                receipt: {
-                                    userJid: (0, WABinary_1.jidNormalizedUser)(attrs.participant),
-                                    [updateKey]: +attrs.t
-                                }
+                                update: { status }
                             })));
                         }
                     }
-                    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);
+                    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');
+                                }
                             }
-                            catch (error) {
-                                logger.error({ key, ids, trace: error.stack }, 'error in sending message again');
+                            else {
+                                logger.info({ attrs, key }, 'recv retry for not fromMe message');
                             }
                         }
                         else {
-                            logger.info({ attrs, key }, 'recv retry for not fromMe message');
+                            logger.info({ attrs, key }, 'will not send message again, as sent too many times');
                         }
                     }
-                    else {
-                        logger.info({ attrs, key }, 'will not send message again, as sent too many times');
-                    }
-                }
-            }),
-            sendMessageAck(node)
-        ]);
+                })
+            ]);
+        }
+        finally {
+            await sendMessageAck(node);
+        }
     };
     const handleNotification = async (node) => {
         const remoteJid = node.attrs.from;
@@ -587,27 +738,31 @@ const makeMessagesRecvSocket = (config) => {
             await sendMessageAck(node);
             return;
         }
-        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)
-        ]);
+        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);
+        }
     };
     const handleMessage = async (node) => {
         var _a, _b, _c;
@@ -638,25 +793,7 @@ const makeMessagesRecvSocket = (config) => {
                 placeholderResendCache.del(node.attrs.id);
             }
         }
-        let msg;
-        let category;
-        let author;
-        let decrypt;
-
-        try {
-            const decryptionResult = (0, Utils_1.decryptMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, logger);
-            msg = decryptionResult.fullMessage;
-            category = decryptionResult.category;
-            author = decryptionResult.author;
-            decrypt = decryptionResult.decrypt;
-        } catch (error) {
-            if (error.message.includes('Bad MAC')) {
-                logger.error({ key: node.attrs.key, error: error.stack }, 'Bad MAC error, triggering retry');
-                await sendRetryRequest(node, true); // Force include keys to reset session
-                return;
-            }
-            throw error;
-        }
+        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];
         }
@@ -738,6 +875,54 @@ const makeMessagesRecvSocket = (config) => {
             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({ messageKey }, 'already requested resend');
+            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({ messageKey }, 'message received while resend requested');
+            return 'RESOLVED';
+        }
+        const pdoMessage = {
+            placeholderMessageResendRequest: [{
+                    messageKey
+                }],
+            peerDataOperationRequestType: WAProto_1.proto.Message.PeerDataOperationRequestType.PLACEHOLDER_MESSAGE_RESEND
+        };
+        setTimeout(() => {
+            if (placeholderResendCache.get(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id)) {
+                logger.debug({ messageKey }, 'PDO message without response after 15 seconds. Phone possibly offline');
+                placeholderResendCache.del(messageKey === null || messageKey === void 0 ? void 0 : messageKey.id);
+            }
+        }, 15000);
+        return sendPeerDataOperationMessage(pdoMessage);
+    };
     const handleCall = async (node) => {
         const { attrs } = node;
         const [infoChild] = (0, WABinary_1.getAllBinaryNodeChildren)(node);
@@ -765,22 +950,30 @@ const makeMessagesRecvSocket = (config) => {
             call.isGroup = existingCall.isGroup;
         }
         // delete data once call has ended
-        if (status === 'reject' || status === 'accept' || status === 'timeout') {
+        if (status === 'reject' || status === 'accept' || status === 'timeout' || status === 'terminate') {
             callOfferCache.del(call.id);
         }
         ev.emit('call', [call]);
         await sendMessageAck(node);
     };
     const handleBadAck = async ({ attrs }) => {
-        const key = { remoteJid: attrs.from, fromMe: true, id: attrs.id };
+        const key = { remoteJid: attrs.from, fromMe: true, id: attrs.id, 'server_id': attrs === null || attrs === void 0 ? void 0 : attrs.server_id };
         // 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 cacheKey = `${key.remoteJid}:${key.id}`;
+            if ((msgRetryCache.get(cacheKey) || 0) >= maxMsgRetryCount) {
+                logger.warn({ attrs }, 'reached max retry count, not sending message again');
+                msgRetryCache.del(cacheKey);
+                return;
+            }
+            const retryCount = msgRetryCache.get(cacheKey) || 0;
             const msg = await getMessage(key);
             if (msg) {
                 await relayMessage(key.remoteJid, msg, { messageId: key.id, useUserDevicesCache: false });
+                msgRetryCache.set(cacheKey, retryCount + 1);
             }
             else {
                 logger.warn({ attrs }, 'could not send message again, as it was not found');
@@ -810,22 +1003,63 @@ const makeMessagesRecvSocket = (config) => {
         await execTask();
         ev.flush();
         function execTask() {
-            return exec(node)
+            return exec(node, false)
                 .catch(err => onUnexpectedError(err, identifier));
         }
     };
+    const makeOfflineNodeProcessor = () => {
+        const nodeProcessorMap = new Map([
+            ['message', handleMessage],
+            ['call', handleCall],
+            ['receipt', handleReceipt],
+            ['notification', handleNotification]
+        ]);
+        const nodes = [];
+        let isProcessing = false;
+        const 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) => {
-        processNodeWithBuffer(node, 'processing message', handleMessage);
+        processNode('message', node, 'processing message', handleMessage);
     });
     ws.on('CB:call', async (node) => {
-        processNodeWithBuffer(node, 'handling call', handleCall);
+        processNode('call', node, 'handling call', handleCall);
     });
     ws.on('CB:receipt', node => {
-        processNodeWithBuffer(node, 'handling receipt', handleReceipt);
+        processNode('receipt', node, 'handling receipt', handleReceipt);
     });
     ws.on('CB:notification', async (node) => {
-        processNodeWithBuffer(node, 'handling notification', handleNotification);
+        processNode('notification', node, 'handling notification', handleNotification);
     });
     ws.on('CB:ack,class:message', (node) => {
         handleBadAck(node)
@@ -867,8 +1101,10 @@ const makeMessagesRecvSocket = (config) => {
         ...sock,
         sendMessageAck,
         sendRetryRequest,
+        rejectCall,
         offerCall,
-        rejectCall
+        fetchMessageHistory,
+        requestPlaceholderResend,
     };
 };
 exports.makeMessagesRecvSocket = makeMessagesRecvSocket;