lordceaser-baileys 1.0.20 → 1.0.21

package/lib/Socket/messages-recv.js

@@ -4,13 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMessagesRecvSocket = void 0;
-const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
 const boom_1 = require("@hapi/boom");
 const crypto_1 = require("crypto");
-const WAProto_1 = require("../WAProto");
+const node_cache_1 = __importDefault(require("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");
@@ -22,37 +23,34 @@ const makeMessagesRecvSocket = (config) => {
     /** 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
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
         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.CALL_OFFER,
         useClones: false
     });
     const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
         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')) {
@@ -371,7 +369,7 @@ const makeMessagesRecvSocket = (config) => {
                 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 = await (0, Utils_1.hkdf)(companionSharedKey, 32, {
+                const linkCodePairingExpanded = (0, Utils_1.hkdf)(companionSharedKey, 32, {
                     salt: linkCodeSalt,
                     info: 'link_code_pairing_key_bundle_encryption_key'
                 });
@@ -381,7 +379,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 = (await (0, Utils_1.hkdf)(identityPayload, 32, { info: 'adv_secret' })).toString('base64');
+                authState.creds.advSecretKey = (0, Utils_1.hkdf)(identityPayload, 32, { info: 'adv_secret' }).toString('base64');
                 await query({
                     tag: 'iq',
                     attrs: {
@@ -450,7 +448,6 @@ 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;
@@ -463,7 +460,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] };
@@ -489,8 +487,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' || attrs.type === 'sender')
-            && isNodeFromMe);
+        const fromMe = !attrs.recipient || (attrs.type === 'retry' && isNodeFromMe);
         const key = {
             remoteJid,
             id: '',
@@ -515,7 +512,7 @@ const makeMessagesRecvSocket = (config) => {
                         (
                         // 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 ||
+                        status > WAProto_1.proto.WebMessageInfo.Status.DELIVERY_ACK ||
                             !isNodeFromMe)) {
                         if ((0, WABinary_1.isJidGroup)(remoteJid) || (0, WABinary_1.isJidStatusBroadcast)(remoteJid)) {
                             if (attrs.participant) {
@@ -605,15 +602,8 @@ 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') && !encNode) {
+        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);
@@ -631,19 +621,17 @@ const makeMessagesRecvSocket = (config) => {
         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 (((_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) {
+            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')) {
@@ -685,14 +673,13 @@ const makeMessagesRecvSocket = (config) => {
                             await sendReceipt(jid, undefined, [msg.key.id], 'hist_sync');
                         }
                     }
-                    (0, Utils_1.cleanMessage)(msg, authState.creds.me.id);
-                    await sendMessageAck(node);
+                    (0, Utils_2.cleanMessage)(msg, authState.creds.me.id);
                     await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
                 })
             ]);
         }
-        catch (error) {
-            logger.error({ error, node }, 'error in handling message');
+        finally {
+            await sendMessageAck(node);
         }
     };
     const fetchMessageHistory = async (count, oldestMsgKey, oldestMsgTimestamp) => {
@@ -718,7 +705,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({ messageKey }, 'already requested resend');
+            logger.debug('already requested resend', { messageKey });
             return;
         }
         else {
@@ -726,7 +713,7 @@ const makeMessagesRecvSocket = (config) => {
         }
         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');
+            logger.debug('message received while resend requested', { messageKey });
             return 'RESOLVED';
         }
         const pdoMessage = {
@@ -737,7 +724,7 @@ const makeMessagesRecvSocket = (config) => {
         };
         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');
+                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);
@@ -778,19 +765,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) {
@@ -815,63 +802,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)

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

@@ -1,10 +1,10 @@
+/// <reference types="node" />
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto';
 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<any>;
+    getPrivacyTokens: (jids: string[]) => Promise<BinaryNode>;
     assertSessions: (jids: string[], force: boolean) => Promise<boolean>;
     relayMessage: (jid: string, message: proto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }: MessageRelayOptions) => Promise<string>;
     sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: MessageReceiptType) => Promise<void>;
@@ -16,7 +16,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
         [_: string]: string;
     }>;
     sendPeerDataOperationMessage: (pdoMessage: proto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
-    createParticipantNodes: (jids: string[], message: proto.IMessage, extraAttrs?: BinaryNode["attrs"]) => Promise<{
+    createParticipantNodes: (jids: string[], message: proto.IMessage, extraAttrs?: BinaryNode['attrs']) => Promise<{
         nodes: BinaryNode[];
         shouldIncludeDeviceIdentity: boolean;
     }>;
@@ -30,7 +30,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     groupRequestParticipantsList: (jid: string) => Promise<{
         [key: string]: string;
     }[]>;
-    groupRequestParticipantsUpdate: (jid: string, participants: string[], action: "approve" | "reject") => Promise<{
+    groupRequestParticipantsUpdate: (jid: string, participants: string[], action: "reject" | "approve") => Promise<{
         status: string;
         jid: string;
     }[]>;
@@ -39,44 +39,43 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
         jid: string;
         content: BinaryNode;
     }[]>;
-    groupUpdateDescription: (jid: string, description?: string) => Promise<void>;
+    groupUpdateDescription: (jid: string, description?: string | undefined) => Promise<void>;
     groupInviteCode: (jid: string) => Promise<string | undefined>;
     groupRevokeInvite: (jid: string) => Promise<string | undefined>;
     groupAcceptInvite: (code: string) => Promise<string | undefined>;
     groupRevokeInviteV4: (groupJid: string, invitedJid: string) => Promise<boolean>;
-    groupAcceptInviteV4: (key: string | proto.IMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => Promise<any>;
+    groupAcceptInviteV4: (key: string | proto.IMessageKey, inviteMessage: proto.Message.IGroupInviteMessage) => Promise<string>;
     groupGetInviteInfo: (code: string) => Promise<import("../Types").GroupMetadata>;
     groupToggleEphemeral: (jid: string, ephemeralExpiration: number) => Promise<void>;
-    groupSettingUpdate: (jid: string, setting: "announcement" | "not_announcement" | "locked" | "unlocked") => Promise<void>;
-    groupMemberAddMode: (jid: string, mode: "admin_add" | "all_member_add") => Promise<void>;
+    groupSettingUpdate: (jid: string, setting: "announcement" | "locked" | "not_announcement" | "unlocked") => Promise<void>;
+    groupMemberAddMode: (jid: string, mode: "all_member_add" | "admin_add") => Promise<void>;
     groupJoinApprovalMode: (jid: string, mode: "on" | "off") => Promise<void>;
     groupFetchAllParticipating: () => Promise<{
         [_: string]: import("../Types").GroupMetadata;
     }>;
-    getBotListV2: () => Promise<import("../Types").BotListInfo[]>;
     processingMutex: {
-        mutex<T>(code: () => Promise<T> | T): Promise<T>;
+        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>;
-    sendPresenceUpdate: (type: import("../Types").WAPresence, toJid?: string) => Promise<void>;
-    presenceSubscribe: (toJid: string, tcToken?: Buffer) => Promise<void>;
-    profilePictureUrl: (jid: string, type?: "preview" | "image", timeoutMs?: number) => 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<{
+        exists: boolean;
         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>;
     updateProfileName: (name: string) => Promise<void>;
     updateBlockStatus: (jid: string, action: "block" | "unblock") => Promise<void>;
     updateCallPrivacy: (value: import("../Types").WAPrivacyCallValue) => Promise<void>;
-    updateMessagesPrivacy: (value: import("../Types").WAPrivacyMessagesValue) => Promise<void>;
     updateLastSeenPrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
     updateOnlinePrivacy: (value: import("../Types").WAPrivacyOnlineValue) => Promise<void>;
     updateProfilePicturePrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
@@ -84,10 +83,10 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     updateReadReceiptsPrivacy: (value: import("../Types").WAReadReceiptsValue) => Promise<void>;
     updateGroupsAddPrivacy: (value: import("../Types").WAPrivacyGroupAddValue) => Promise<void>;
     updateDefaultDisappearingMode: (duration: number) => Promise<void>;
-    getBusinessProfile: (jid: string) => Promise<import("../Types").WABusinessProfile | void>;
+    getBusinessProfile: (jid: string) => Promise<void | import("../Types").WABusinessProfile>;
     resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>;
     chatModify: (mod: import("../Types").ChatModification, jid: string) => Promise<void>;
-    cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: number | string) => Promise<void>;
+    cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: string | number | undefined) => Promise<void>;
     addLabel: (jid: string, labels: import("../Types/Label").LabelActionBody) => Promise<void>;
     addChatLabel: (jid: string, labelId: string) => Promise<void>;
     removeChatLabel: (jid: string, labelId: string) => Promise<void>;
@@ -95,16 +94,15 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     removeMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;
     star: (jid: string, messages: {
         id: string;
-        fromMe?: boolean;
+        fromMe?: boolean | undefined;
     }[], star: boolean) => Promise<void>;
-    executeUSyncQuery: (usyncQuery: USyncQuery) => Promise<import("../WAUSync").USyncQueryResult | undefined>;
     type: "md";
-    ws: import("./Client").WebSocketClient;
+    ws: any;
     ev: import("../Types").BaileysEventEmitter & {
-        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
+        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): () => void;
         buffer(): void;
-        createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): ((...args: A) => Promise<T>);
-        flush(force?: boolean): boolean;
+        createBufferedFunction<A extends any[], T_1>(work: (...args: A) => Promise<T_1>): (...args: A) => Promise<T_1>;
+        flush(force?: boolean | undefined): boolean;
         isBuffering(): boolean;
     };
     authState: {
@@ -114,17 +112,17 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     signalRepository: import("../Types").SignalRepository;
     user: import("../Types").Contact | undefined;
     generateMessageTag: () => string;
-    query: (node: BinaryNode, timeoutMs?: number) => Promise<any>;
-    waitForMessage: <T>(msgId: string, timeoutMs?: number | undefined) => Promise<any>;
+    query: (node: BinaryNode, timeoutMs?: number | undefined) => Promise<BinaryNode>;
+    waitForMessage: <T_2>(msgId: string, timeoutMs?: number | undefined) => Promise<T_2>;
     waitForSocketOpen: () => Promise<void>;
     sendRawMessage: (data: Uint8Array | Buffer) => Promise<void>;
     sendNode: (frame: BinaryNode) => Promise<void>;
-    logout: (msg?: string) => Promise<void>;
+    logout: (msg?: string | undefined) => Promise<void>;
     end: (error: Error | undefined) => void;
-    onUnexpectedError: (err: Error | Boom, msg: string) => void;
+    onUnexpectedError: (err: Error | Boom<any>, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
     requestPairingCode: (phoneNumber: string) => Promise<string>;
-    waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number) => Promise<void>;
-    sendWAMBuffer: (wamBuffer: Buffer) => Promise<any>;
+    waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>;
+    sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
 };