naya-flore 4.7.2 → 4.7.3

package/lib/Socket/messages-recv.js

@@ -19,41 +19,38 @@ 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, 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, // 1 hour
-        useClones: false
-    });
-    const callOfferCache = config.callOfferCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.CALL_OFFER, // 5 mins
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
         useClones: false
     });
     const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
         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,
+        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')) {
@@ -135,23 +132,16 @@ const makeMessagesRecvSocket = (config) => {
     };
     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 +220,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 +245,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 +266,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 +294,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 +326,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 +347,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 +392,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 +449,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 +487,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 +531,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,31 +592,27 @@ 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;
@@ -656,8 +621,15 @@ const makeMessagesRecvSocket = (config) => {
             await sendMessageAck(node);
             return;
         }
+        const encNode = (0, WABinary_1.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);
+            return;
+        }
         let response;
-        if ((0, WABinary_1.getBinaryNodeChild)(node, 'unavailable') && !(0, WABinary_1.getBinaryNodeChild)(node, 'enc')) {
+        if ((0, WABinary_1.getBinaryNodeChild)(node, 'unavailable') && !encNode) {
             await sendMessageAck(node);
             const { key } = (0, Utils_1.decodeMessageNode)(node, authState.creds.me.id, authState.creds.me.lid || '').fullMessage;
             response = await requestPlaceholderResend(key);
@@ -681,7 +653,7 @@ const makeMessagesRecvSocket = (config) => {
         try {
             await Promise.all([
                 processingMutex.mutex(async () => {
-                    var _a;
+                    var _a, _b, _c, _d, _e, _f;
                     await decrypt();
                     // message failed to decrypt
                     if (msg.messageStubType === WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT) {
@@ -729,7 +701,15 @@ const makeMessagesRecvSocket = (config) => {
                             await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync');
                         }
                     }
-                    (0, Utils_2.cleanMessage)(msg, authState.creds.me.id);
+                    if (((_b = node === null || node === void 0 ? void 0 : node.attrs) === null || _b === void 0 ? void 0 : _b.addressing_mode) === 'lid' && ((0, WABinary_1.jidNormalizedUser)((_c = node === null || node === void 0 ? void 0 : node.attrs) === null || _c === void 0 ? void 0 : _c.participant) === (0, WABinary_1.jidNormalizedUser)(authState.creds.me.lid))) {
+                        // @ts-ignore
+                        msg.key.jid = (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id);
+                    }
+                    if (((_d = node === null || node === void 0 ? void 0 : node.attrs) === null || _d === void 0 ? void 0 : _d.addressing_mode) === 'lid' && ((_e = node === null || node === void 0 ? void 0 : node.attrs) === null || _e === void 0 ? void 0 : _e.participant_pn)) {
+                        // @ts-ignore
+                        msg.key.jid = (0, WABinary_1.jidNormalizedUser)((_f = node === null || node === void 0 ? void 0 : node.attrs) === null || _f === void 0 ? void 0 : _f.participant_pn);
+                    }
+                    (0, Utils_1.cleanMessage)(msg, authState.creds.me.id);
                     await sendMessageAck(node);
                     await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
                 })
@@ -762,7 +742,7 @@ const makeMessagesRecvSocket = (config) => {
             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 });
+            logger.debug({ messageKey }, 'already requested resend');
             return;
         }
         else {
@@ -770,7 +750,7 @@ const makeMessagesRecvSocket = (config) => {
         }
         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 });
+            logger.debug({ messageKey }, 'message received while resend requested');
             return 'RESOLVED';
         }
         const pdoMessage = {
@@ -781,7 +761,7 @@ const makeMessagesRecvSocket = (config) => {
         };
         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 });
+                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);
@@ -814,7 +794,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 +802,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 +839,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 +897,7 @@ const makeMessagesRecvSocket = (config) => {
         sendMessageAck,
         sendRetryRequest,
         offerCall,
-        rejectCall,
-        fetchMessageHistory,
-        requestPlaceholderResend,
+        rejectCall
     };
 };
 exports.makeMessagesRecvSocket = makeMessagesRecvSocket;

package/lib/Socket/messages-send.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="node" />
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto';
-import { AnyMessageContent, Media, MediaConnInfo, MessageReceiptType, MessageRelayOptions, MiscMessageGenerationOptions, QueryIds, SocketConfig, WAMessageKey } from '../Types';
+import { AnyMessageContent, MediaConnInfo, MessageReceiptType, MessageRelayOptions, MiscMessageGenerationOptions, SocketConfig, WAMessageKey } from '../Types';
 import { BinaryNode, JidWithDevice } from '../WABinary';
-import { USyncQuery } from '../WAUSync';
 export declare const makeMessagesSocket: (config: SocketConfig) => {
     getPrivacyTokens: (jids: string[]) => Promise<BinaryNode>;
     assertSessions: (jids: string[], force: boolean) => Promise<boolean>;
@@ -14,22 +13,16 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     readMessages: (keys: WAMessageKey[]) => Promise<void>;
     refreshMediaConn: (forceGet?: boolean) => Promise<MediaConnInfo>;
     getUSyncDevices: (jids: string[], useCache: boolean, ignoreZeroDevices: boolean) => Promise<JidWithDevice[]>;
-    sendPeerDataOperationMessage: (pdoMessage: proto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
     createParticipantNodes: (jids: string[], message: proto.IMessage, extraAttrs?: BinaryNode['attrs']) => Promise<{
         nodes: BinaryNode[];
         shouldIncludeDeviceIdentity: boolean;
     }>;
-    profilePictureUrl: (jid: string, type?: 'preview' | 'image', timeoutMs?: number) => Promise<string | null | undefined>;
     waUploadToServer: import("../Types").WAMediaUploadFunction;
     fetchPrivacySettings: (force?: boolean) => Promise<{
         [_: string]: string;
     }>;
     updateMediaMessage: (message: proto.IWebMessageInfo) => Promise<proto.IWebMessageInfo>;
-    sendStatusMentions: (content: AnyMessageContent, jids?: string[]) => Promise<proto.WebMessageInfo>;
-    sendAlbumMessage: (jid: string, medias: Media[], options?: MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo>;
     sendMessage: (jid: string, content: AnyMessageContent, options?: MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo | undefined>;
-    newsletterQuery: (jid: string, type: "get" | "set", content: BinaryNode[]) => Promise<BinaryNode>;
-    newsletterWMexQuery: (jid: string | undefined, queryId: QueryIds, content?: object | undefined) => Promise<BinaryNode>;
     subscribeNewsletterUpdates: (jid: string) => Promise<{
         duration: string;
     }>;
@@ -43,7 +36,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     newsletterUnmute: (jid: string) => Promise<void>;
     newsletterMute: (jid: string) => Promise<void>;
     newsletterAction: (jid: string, type: "mute" | "follow" | "unfollow" | "unmute") => Promise<void>;
-    newsletterCreate: (name: string, description: string) => Promise<import("../Types").NewsletterMetadata>;
+    newsletterCreate: (name: string, description: string, reaction_codes: string) => Promise<import("../Types").NewsletterMetadata>;
     newsletterMetadata: (type: "invite" | "jid", key: string, role?: import("../Types").NewsletterViewRole | undefined) => Promise<import("../Types").NewsletterMetadata>;
     newsletterAdminCount: (jid: string) => Promise<number>;
     newsletterChangeOwner: (jid: string, user: string) => Promise<void>;
@@ -52,7 +45,6 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     newsletterReactMessage: (jid: string, serverId: string, code?: string | undefined) => Promise<void>;
     newsletterFetchMessages: (type: "invite" | "jid", key: string, count: number, after?: number | undefined) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
     newsletterFetchUpdates: (jid: string, count: number, after?: number | undefined, since?: number | undefined) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
-    groupQuery: (jid: string, type: "get" | "set", content: BinaryNode[]) => Promise<BinaryNode>;
     groupMetadata: (jid: string) => Promise<import("../Types").GroupMetadata>;
     groupCreate: (subject: string, participants: string[]) => Promise<import("../Types").GroupMetadata>;
     groupLeave: (id: string) => Promise<void>;
@@ -82,22 +74,24 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     groupFetchAllParticipating: () => Promise<{
         [_: string]: import("../Types").GroupMetadata;
     }>;
-    interactiveQuery: (userNodes: BinaryNode[], queryNode: BinaryNode) => Promise<BinaryNode[]>;
     processingMutex: {
         mutex<T>(code: () => T | Promise<T>): Promise<T>;
     };
     upsertMessage: (msg: proto.IWebMessageInfo, type: import("../Types").MessageUpsertType) => Promise<void>;
     appPatch: (patchCreate: import("../Types").WAPatchCreate) => Promise<void>;
-    fetchUserLid: (jid: string) => Promise<string | undefined>;
     sendPresenceUpdate: (type: import("../Types").WAPresence, toJid?: string | undefined) => Promise<void>;
     presenceSubscribe: (toJid: string, tcToken?: Buffer | undefined) => Promise<void>;
+    profilePictureUrl: (jid: string, type?: "image" | "preview", timeoutMs?: number | undefined) => Promise<string | undefined>;
     onWhatsApp: (...jids: string[]) => Promise<{
         jid: string;
         exists: unknown;
+        lid: unknown;
     }[] | undefined>;
     fetchBlocklist: () => Promise<string[]>;
-    fetchStatus: (...jids: string[]) => Promise<import("../WAUSync").USyncQueryResultList[] | undefined>;
-    fetchDisappearingDuration: (...jids: string[]) => Promise<import("../WAUSync").USyncQueryResultList[] | undefined>;
+    fetchStatus: (jid: string) => Promise<{
+        status: string | undefined;
+        setAt: Date;
+    } | undefined>;
     updateProfilePicture: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
     removeProfilePicture: (jid: string) => Promise<void>;
     updateProfileStatus: (status: string) => Promise<void>;
@@ -122,7 +116,6 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
         id: string;
         fromMe?: boolean | undefined;
     }[], star: boolean) => Promise<void>;
-    executeUSyncQuery: (usyncQuery: USyncQuery) => Promise<import("../WAUSync").USyncQueryResult | undefined>;
     type: "md";
     ws: any;
     ev: import("../Types").BaileysEventEmitter & {
@@ -149,7 +142,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     onUnexpectedError: (err: Error | Boom<any>, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    requestPairingCode: (phoneNumber: string, pairCode: string) => Promise<string>;
+    requestPairingCode: (phoneNumber: string) => Promise<string>;
     waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>;
     sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
 };