@genuxofficial/baileys 1.0.0 → 3.0.0

package/lib/Socket/newsletter.d.ts

@@ -0,0 +1,137 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { SocketConfig, WAMediaUpload, NewsletterMetadata, NewsletterReactionMode, NewsletterViewRole, NewsletterFetchedUpdate } from '../Types';
+import { BinaryNode } from '../WABinary';
+export declare const makeNewsletterSocket: (config: SocketConfig) => {
+    subscribeNewsletterUpdates: (jid: string) => Promise<{
+        duration: string;
+    }>;
+    newsletterReactionMode: (jid: string, mode: NewsletterReactionMode) => Promise<void>;
+    newsletterUpdateDescription: (jid: string, description?: string) => Promise<void>;
+    newsletterUpdateName: (jid: string, name: string) => Promise<void>;
+    newsletterUpdatePicture: (jid: string, content: WAMediaUpload) => Promise<void>;
+    newsletterRemovePicture: (jid: string) => Promise<void>;
+    newsletterUnfollow: (jid: string) => Promise<void>;
+    newsletterFollow: (jid: string) => Promise<void>;
+    newsletterUnmute: (jid: string) => Promise<void>;
+    newsletterMute: (jid: string) => Promise<void>;
+    newsletterCreate: (name: string, description?: string, picture?: WAMediaUpload) => Promise<NewsletterMetadata>;
+    newsletterMetadata: (type: 'invite' | 'jid', key: string, role?: NewsletterViewRole) => Promise<NewsletterMetadata>;
+    newsletterAdminCount: (jid: string) => Promise<number>;
+    /**user is Lid, not Jid */
+    newsletterChangeOwner: (jid: string, user: string) => Promise<void>;
+    /**user is Lid, not Jid */
+    newsletterDemote: (jid: string, user: string) => Promise<void>;
+    newsletterDelete: (jid: string) => Promise<void>;
+    /**if code wasn't passed, the reaction will be removed (if is reacted) */
+    newsletterReactMessage: (jid: string, server_id: string, code?: string) => Promise<void>;
+    newsletterFetchMessages: (type: 'invite' | 'jid', key: string, count: number, after?: number) => Promise<NewsletterFetchedUpdate[]>;
+    newsletterFetchUpdates: (jid: string, count: number, after?: number, since?: number) => Promise<NewsletterFetchedUpdate[]>;
+    groupMetadata: (jid: string) => Promise<import("../Types").GroupMetadata>;
+    groupCreate: (subject: string, participants: string[]) => Promise<import("../Types").GroupMetadata>;
+    groupLeave: (id: string) => Promise<void>;
+    groupUpdateSubject: (jid: string, subject: string) => Promise<void>;
+    groupRequestParticipantsList: (jid: string) => Promise<{
+        [key: string]: string;
+    }[]>;
+    groupRequestParticipantsUpdate: (jid: string, participants: string[], action: "reject" | "approve") => Promise<{
+        status: string;
+        jid: string;
+    }[]>;
+    groupParticipantsUpdate: (jid: string, participants: string[], action: import("../Types").ParticipantAction) => Promise<{
+        status: string;
+        jid: string;
+        content: BinaryNode;
+    }[]>;
+    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 | import("../Types").WAMessageKey, inviteMessage: import("../Types").WAProto.Message.IGroupInviteMessage) => Promise<any>;
+    groupGetInviteInfo: (code: string) => Promise<import("../Types").GroupMetadata>; /**user is Lid, not Jid */
+    groupToggleEphemeral: (jid: string, ephemeralExpiration: number) => 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: () => T | Promise<T>): Promise<T>;
+    };
+    fetchPrivacySettings: (force?: boolean) => Promise<{
+        [_: string]: string;
+    }>;
+    upsertMessage: (msg: import("../Types").WAProto.IWebMessageInfo, type: import("../Types").MessageUpsertType) => Promise<void>;
+    appPatch: (patchCreate: import("../Types").WAPatchCreate) => Promise<void>;
+    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[]>;
+    fetchDisappearingDuration: (...jids: string[]) => Promise<import("../index").USyncQueryResultList[] | undefined>;
+    fetchStatus: (...jids: string[]) => Promise<import("../index").USyncQueryResultList[] | undefined>;
+    updateProfilePicture: (jid: string, content: 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>;
+    updateStatusPrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
+    updateReadReceiptsPrivacy: (value: import("../Types").WAReadReceiptsValue) => Promise<void>;
+    updateGroupsAddPrivacy: (value: import("../Types").WAPrivacyGroupAddValue) => Promise<void>;
+    updateDefaultDisappearingMode: (duration: number) => Promise<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?: string | number | undefined) => Promise<void>;
+    addChatLabel: (jid: string, labelId: string) => Promise<void>;
+    removeChatLabel: (jid: string, labelId: string) => Promise<void>;
+    addMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;
+    removeMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;
+    star: (jid: string, messages: {
+        id: string;
+        fromMe?: boolean | undefined;
+    }[], star: boolean) => Promise<void>;
+    executeUSyncQuery: (usyncQuery: import("../index").USyncQuery) => Promise<import("../index").USyncQueryResult | undefined>;
+    type: "md";
+    ws: import("./Client/websocket").WebSocketClient;
+    ev: import("../Types").BaileysEventEmitter & {
+        process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): () => void;
+        buffer(): void;
+        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: {
+        creds: import("../Types").AuthenticationCreds;
+        keys: import("../Types").SignalKeyStoreWithTransaction;
+    };
+    signalRepository: import("../Types").SignalRepository;
+    user: import("../Types").Contact | undefined;
+    generateMessageTag: () => string;
+    query: (node: BinaryNode, timeoutMs?: number | undefined) => Promise<any>;
+    waitForMessage: <T_2>(msgId: string, timeoutMs?: number | undefined) => Promise<any>;
+    waitForSocketOpen: () => Promise<void>;
+    sendRawMessage: (data: Uint8Array | Buffer) => Promise<void>;
+    sendNode: (frame: BinaryNode) => Promise<void>;
+    logout: (msg?: string | undefined) => Promise<void>;
+    end: (error: Error | undefined) => void;
+    onUnexpectedError: (err: Error | import("@hapi/boom").Boom<any>, msg: string) => void;
+    uploadPreKeys: (count?: number) => Promise<void>;
+    uploadPreKeysToServerIfRequired: () => Promise<void>;
+    requestPairingCode: (phoneNumber: string, pairCode: string) => Promise<string>;
+    waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number | undefined) => Promise<void>;
+    sendWAMBuffer: (wamBuffer: Buffer) => Promise<any>;
+};
+export declare const extractNewsletterMetadata: (node: BinaryNode, isCreate?: boolean) => NewsletterMetadata;

package/lib/Socket/newsletter.js

@@ -0,0 +1,256 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractNewsletterMetadata = exports.makeNewsletterSocket = void 0;
+const Types_1 = require("../Types");
+const Utils_1 = require("../Utils");
+const WABinary_1 = require("../WABinary");
+const groups_1 = require("./groups");
+var QueryIds;
+(function (QueryIds) {
+    QueryIds["JOB_MUTATION"] = "7150902998257522";
+    QueryIds["METADATA"] = "6620195908089573";
+    QueryIds["UNFOLLOW"] = "7238632346214362";
+    QueryIds["FOLLOW"] = "7871414976211147";
+    QueryIds["UNMUTE"] = "7337137176362961";
+    QueryIds["MUTE"] = "25151904754424642";
+    QueryIds["CREATE"] = "6996806640408138";
+    QueryIds["ADMIN_COUNT"] = "7130823597031706";
+    QueryIds["CHANGE_OWNER"] = "7341777602580933";
+    QueryIds["DELETE"] = "8316537688363079";
+    QueryIds["DEMOTE"] = "6551828931592903";
+})(QueryIds || (QueryIds = {}));
+const makeNewsletterSocket = (config) => {
+    const { getMessage } = config;
+    const sock = (0, groups_1.makeGroupsSocket)(config);
+    const { authState, signalRepository, query, generateMessageTag } = sock;
+    const encoder = new TextEncoder();
+    const newsletterQuery = async (jid, type, content) => (query({
+        tag: 'iq',
+        attrs: {
+            id: generateMessageTag(),
+            type,
+            xmlns: 'newsletter',
+            to: jid,
+        },
+        content
+    }));
+    const newsletterWMexQuery = async (jid, query_id, content) => (query({
+        tag: 'iq',
+        attrs: {
+            id: generateMessageTag(),
+            type: 'get',
+            xmlns: 'w:mex',
+            to: WABinary_1.S_WHATSAPP_NET,
+        },
+        content: [
+            {
+                tag: 'query',
+                attrs: { query_id },
+                content: encoder.encode(JSON.stringify({ variables: { newsletter_id: jid, ...content } }))
+            }
+        ]
+    }));
+    const parseFetchedUpdates = async (node, type) => {
+        let child;
+        if (type === 'messages')
+            child = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
+        else {
+            const parent = (0, WABinary_1.getBinaryNodeChild)(node, 'message_updates');
+            child = (0, WABinary_1.getBinaryNodeChild)(parent, 'messages');
+        }
+        return await Promise.all((0, WABinary_1.getAllBinaryNodeChildren)(child).map(async (messageNode) => {
+            var _a, _b;
+            messageNode.attrs.from = child === null || child === void 0 ? void 0 : child.attrs.jid;
+            const views = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'views_count')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.count;
+            const reactionNode = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'reactions');
+            const reactions = (0, WABinary_1.getBinaryNodeChildren)(reactionNode, 'reaction')
+                .map(({ attrs }) => ({ count: +attrs.count, code: attrs.code }));
+            let data;
+            if (type === 'messages') {
+                const { fullMessage: message, decrypt } = await (0, Utils_1.decryptMessageNode)(messageNode, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, config.logger, getMessage);
+                await decrypt();
+                data = {
+                    server_id: messageNode.attrs.server_id,
+                    views: views ? +views : undefined,
+                    reactions,
+                    message
+                };
+                return data;
+            }
+            else {
+                data = {
+                    server_id: messageNode.attrs.server_id,
+                    views: views ? +views : undefined,
+                    reactions
+                };
+                return data;
+            }
+        }));
+    };
+    return {
+        ...sock,
+        subscribeNewsletterUpdates: async (jid) => {
+            var _a;
+            const result = await newsletterQuery(jid, 'set', [{ tag: 'live_updates', attrs: {}, content: [] }]);
+            return (_a = (0, WABinary_1.getBinaryNodeChild)(result, 'live_updates')) === null || _a === void 0 ? void 0 : _a.attrs;
+        },
+        newsletterReactionMode: async (jid, mode) => {
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { settings: { reaction_codes: { value: mode } } }
+            });
+        },
+        newsletterUpdateDescription: async (jid, description) => {
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { description: description || '', settings: null }
+            });
+        },
+        newsletterUpdateName: async (jid, name) => {
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { name, settings: null }
+            });
+        },
+        newsletterUpdatePicture: async (jid, content) => {
+            const { img } = await (0, Utils_1.generateProfilePicture)(content);
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { picture: img.toString('base64'), settings: null }
+            });
+        },
+        newsletterRemovePicture: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.JOB_MUTATION, {
+                updates: { picture: '', settings: null }
+            });
+        },
+        newsletterUnfollow: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.UNFOLLOW);
+        },
+        newsletterFollow: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.FOLLOW);
+        },
+        newsletterUnmute: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.UNMUTE);
+        },
+        newsletterMute: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.MUTE);
+        },
+        newsletterCreate: async (name, description, picture) => {
+            await query({
+                tag: 'iq',
+                attrs: {
+                    to: WABinary_1.S_WHATSAPP_NET,
+                    xmlns: 'tos',
+                    id: generateMessageTag(),
+                    type: 'set'
+                },
+                content: [
+                    {
+                        tag: 'notice',
+                        attrs: {
+                            id: '20601218',
+                            stage: '5'
+                        },
+                        content: []
+                    }
+                ]
+            });
+            const result = await newsletterWMexQuery(undefined, QueryIds.CREATE, {
+                input: {
+                    name,
+                    description: description !== null && description !== void 0 ? description : null,
+                    picture: picture ? (await (0, Utils_1.generateProfilePicture)(picture)).img.toString('base64') : null,
+                    settings: {
+                        reaction_codes: { value: 'ALL' }
+                    }
+                }
+            });
+            return (0, exports.extractNewsletterMetadata)(result, true);
+        },
+        newsletterMetadata: async (type, key, role) => {
+            const result = await newsletterWMexQuery(undefined, QueryIds.METADATA, {
+                input: {
+                    key,
+                    type: type.toUpperCase(),
+                    view_role: role || 'GUEST'
+                },
+                fetch_viewer_metadata: true,
+                fetch_full_image: true,
+                fetch_creation_time: true
+            });
+            return (0, exports.extractNewsletterMetadata)(result);
+        },
+        newsletterAdminCount: async (jid) => {
+            var _a, _b;
+            const result = await newsletterWMexQuery(jid, QueryIds.ADMIN_COUNT);
+            const buff = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(result, 'result')) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.toString();
+            return JSON.parse(buff).data[Types_1.XWAPaths.ADMIN_COUNT].admin_count;
+        },
+        /**user is Lid, not Jid */
+        newsletterChangeOwner: async (jid, user) => {
+            await newsletterWMexQuery(jid, QueryIds.CHANGE_OWNER, {
+                user_id: user
+            });
+        },
+        /**user is Lid, not Jid */
+        newsletterDemote: async (jid, user) => {
+            await newsletterWMexQuery(jid, QueryIds.DEMOTE, {
+                user_id: user
+            });
+        },
+        newsletterDelete: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.DELETE);
+        },
+        /**if code wasn't passed, the reaction will be removed (if is reacted) */
+        newsletterReactMessage: async (jid, server_id, code) => {
+            await query({
+                tag: 'message',
+                attrs: { to: jid, ...(!code ? { edit: '7' } : {}), type: 'reaction', server_id, id: (0, Utils_1.generateMessageID)() },
+                content: [{
+                        tag: 'reaction',
+                        attrs: code ? { code } : {}
+                    }]
+            });
+        },
+        newsletterFetchMessages: async (type, key, count, after) => {
+            const result = await newsletterQuery(WABinary_1.S_WHATSAPP_NET, 'get', [
+                {
+                    tag: 'messages',
+                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: (after === null || after === void 0 ? void 0 : after.toString()) || '100' }
+                }
+            ]);
+            return await parseFetchedUpdates(result, 'messages');
+        },
+        newsletterFetchUpdates: async (jid, count, after, since) => {
+            const result = await newsletterQuery(jid, 'get', [
+                {
+                    tag: 'message_updates',
+                    attrs: { count: count.toString(), after: (after === null || after === void 0 ? void 0 : after.toString()) || '100', since: (since === null || since === void 0 ? void 0 : since.toString()) || '0' }
+                }
+            ]);
+            return await parseFetchedUpdates(result, 'updates');
+        }
+    };
+};
+exports.makeNewsletterSocket = makeNewsletterSocket;
+const extractNewsletterMetadata = (node, isCreate) => {
+    var _a, _b, _c, _d;
+    const result = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(node, 'result')) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.toString();
+    const metadataPath = JSON.parse(result).data[isCreate ? Types_1.XWAPaths.CREATE : Types_1.XWAPaths.NEWSLETTER];
+    const metadata = {
+        id: metadataPath.id,
+        state: metadataPath.state.type,
+        creation_time: +metadataPath.thread_metadata.creation_time,
+        name: metadataPath.thread_metadata.name.text,
+        nameTime: +metadataPath.thread_metadata.name.update_time,
+        description: metadataPath.thread_metadata.description.text,
+        descriptionTime: +metadataPath.thread_metadata.description.update_time,
+        invite: metadataPath.thread_metadata.invite,
+        handle: metadataPath.thread_metadata.handle,
+        picture: ((_c = metadataPath.thread_metadata.picture) === null || _c === void 0 ? void 0 : _c.direct_path) || null,
+        preview: ((_d = metadataPath.thread_metadata.preview) === null || _d === void 0 ? void 0 : _d.direct_path) || null,
+        reaction_codes: metadataPath.thread_metadata.settings.reaction_codes.value,
+        subscribers: +metadataPath.thread_metadata.subscribers_count,
+        verification: metadataPath.thread_metadata.verification,
+        viewer_metadata: metadataPath.viewer_metadata
+    };
+    return metadata;
+};
+exports.extractNewsletterMetadata = extractNewsletterMetadata;

package/lib/Socket/socket.d.ts

@@ -27,8 +27,8 @@ export declare const makeSocket: (config: SocketConfig) => {
     signalRepository: import("../Types").SignalRepository;
     readonly user: import("../Types").Contact | undefined;
     generateMessageTag: () => string;
-    query: (node: BinaryNode, timeoutMs?: number) => Promise<BinaryNode>;
-    waitForMessage: <T_1>(msgId: string, timeoutMs?: number | undefined) => Promise<T_1>;
+    query: (node: BinaryNode, timeoutMs?: number) => Promise<any>;
+    waitForMessage: <T_1>(msgId: string, timeoutMs?: number | undefined) => Promise<any>;
     waitForSocketOpen: () => Promise<void>;
     sendRawMessage: (data: Uint8Array | Buffer) => Promise<void>;
     sendNode: (frame: BinaryNode) => Promise<void>;
@@ -37,9 +37,9 @@ export declare const makeSocket: (config: SocketConfig) => {
     onUnexpectedError: (err: Error | Boom, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    requestPairingCode: (phoneNumber: string) => Promise<string>;
+    requestPairingCode: (phoneNumber: string, pairCode: string) => Promise<string>;
     /** Waits for the connection to WA to reach a state */
     waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number | undefined) => Promise<void>;
-    sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
+    sendWAMBuffer: (wamBuffer: Buffer) => Promise<any>;
 };
 export type Socket = ReturnType<typeof makeSocket>;

package/lib/Socket/socket.js

@@ -114,7 +114,7 @@ const makeSocket = (config) => {
         let onRecv;
         let onErr;
         try {
-            return await (0, Utils_1.promiseTimeout)(timeoutMs, (resolve, reject) => {
+            const result = await (0, Utils_1.promiseTimeout)(timeoutMs, (resolve, reject) => {
                 onRecv = resolve;
                 onErr = err => {
                     reject(err || new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed }));
@@ -123,6 +123,7 @@ const makeSocket = (config) => {
                 ws.on('close', onErr); // if the socket closes, you'll never receive the message
                 ws.off('error', onErr);
             });
+            return result;
         }
         finally {
             ws.off(`TAG:${msgId}`, onRecv);
@@ -136,9 +137,10 @@ const makeSocket = (config) => {
             node.attrs.id = generateMessageTag();
         }
         const msgId = node.attrs.id;
-        const wait = waitForMessage(msgId, timeoutMs);
-        await sendNode(node);
-        const result = await wait;
+        const [result] = await Promise.all([
+            waitForMessage(msgId, timeoutMs),
+            sendNode(node)
+        ]);
         if ('tag' in result) {
             (0, WABinary_1.assertNodeErrorFree)(result);
         }
@@ -360,8 +362,13 @@ const makeSocket = (config) => {
         }
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
-    const requestPairingCode = async (phoneNumber) => {
-        authState.creds.pairingCode = (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5));
+    const requestPairingCode = async (phoneNumber, pairCode) => {
+        if (pairCode) {
+            authState.creds.pairingCode = pairCode.substring(0, 8).toUpperCase();
+        }
+        else {
+            authState.creds.pairingCode = (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5));
+        }
         authState.creds.me = {
             id: (0, WABinary_1.jidEncode)(phoneNumber, 's.whatsapp.net'),
             name: '~'
@@ -506,12 +513,18 @@ const makeSocket = (config) => {
     });
     // login complete
     ws.on('CB:success', async (node) => {
-        await uploadPreKeysToServerIfRequired();
-        await sendPassiveIq('active');
-        logger.info('opened connection to WA');
-        clearTimeout(qrTimer); // will never happen in all likelyhood -- but just in case WA sends success on first try
-        ev.emit('creds.update', { me: { ...authState.creds.me, lid: node.attrs.lid } });
-        ev.emit('connection.update', { connection: 'open' });
+        try {
+            await uploadPreKeysToServerIfRequired();
+            await sendPassiveIq('active');
+            logger.info('opened connection to WA');
+            clearTimeout(qrTimer); // will never happen in all likelyhood -- but just in case WA sends success on first try
+            ev.emit('creds.update', { me: { ...authState.creds.me, lid: node.attrs.lid } });
+            ev.emit('connection.update', { connection: 'open' });
+        }
+        catch (err) {
+            logger.error({ err }, 'error opening connection');
+            end(err);
+        }
     });
     ws.on('CB:stream:error', (node) => {
         logger.error({ node }, 'stream errored out');

package/lib/Socket/usync.d.ts

@@ -7,7 +7,7 @@ import { USyncQuery } from '../WAUSync';
 export declare const makeUSyncSocket: (config: SocketConfig) => {
     executeUSyncQuery: (usyncQuery: USyncQuery) => Promise<import("../WAUSync").USyncQueryResult | undefined>;
     type: "md";
-    ws: import("./Client").WebSocketClient;
+    ws: import("./Client/websocket").WebSocketClient;
     ev: import("../Types").BaileysEventEmitter & {
         process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): () => void;
         buffer(): void;
@@ -22,8 +22,8 @@ export declare const makeUSyncSocket: (config: SocketConfig) => {
     signalRepository: import("../Types").SignalRepository;
     user: import("../Types").Contact | undefined;
     generateMessageTag: () => string;
-    query: (node: BinaryNode, timeoutMs?: number | undefined) => Promise<BinaryNode>;
-    waitForMessage: <T_1>(msgId: string, timeoutMs?: number | undefined) => Promise<T_1>;
+    query: (node: BinaryNode, timeoutMs?: number | undefined) => Promise<any>;
+    waitForMessage: <T_1>(msgId: string, timeoutMs?: number | undefined) => Promise<any>;
     waitForSocketOpen: () => Promise<void>;
     sendRawMessage: (data: Uint8Array | Buffer) => Promise<void>;
     sendNode: (frame: BinaryNode) => Promise<void>;
@@ -32,7 +32,7 @@ export declare const makeUSyncSocket: (config: SocketConfig) => {
     onUnexpectedError: (err: Error | Boom<any>, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    requestPairingCode: (phoneNumber: string) => Promise<string>;
+    requestPairingCode: (phoneNumber: string, pairCode: string) => Promise<string>;
     waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => Promise<boolean | undefined>, timeoutMs?: number | undefined) => Promise<void>;
-    sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
+    sendWAMBuffer: (wamBuffer: Buffer) => Promise<any>;
 };

package/lib/Store/index.d.ts

@@ -1,3 +1,2 @@
-import makeCacheManagerAuthState from './make-cache-manager-store';
 import makeInMemoryStore from './make-in-memory-store';
-export { makeInMemoryStore, makeCacheManagerAuthState };
+export { makeInMemoryStore };

package/lib/Store/index.js

@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCacheManagerAuthState = exports.makeInMemoryStore = void 0;
-const make_cache_manager_store_1 = __importDefault(require("./make-cache-manager-store"));
-exports.makeCacheManagerAuthState = make_cache_manager_store_1.default;
+exports.makeInMemoryStore = void 0;
 const make_in_memory_store_1 = __importDefault(require("./make-in-memory-store"));
 exports.makeInMemoryStore = make_in_memory_store_1.default;

package/lib/Store/make-in-memory-store.js

@@ -56,6 +56,14 @@ exports.default = (config) => {
             labels.upsertById(label.id, label);
         }
     };
+    const getValidContacts = () => {
+        for (const contact of Object.keys(contacts)) {
+            if (contact.indexOf('@') < 0) {
+                delete contacts[contact];
+            }
+        }
+        return Object.keys(contacts);
+    };
     /**
      * binds to a BaileysEventEmitter.
      * It listens to all events and constructs a state that you can query accurate data from.
@@ -104,10 +112,11 @@ exports.default = (config) => {
                     contact = contacts[update.id];
                 }
                 else {
-                    const contactHashes = await Promise.all(Object.keys(contacts).map(async (contactId) => {
+                    const validContacts = getValidContacts();
+                    const contactHashes = validContacts.map((contactId) => {
                         const { user } = (0, WABinary_1.jidDecode)(contactId);
-                        return [contactId, (await (0, Utils_1.md5)(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3)];
-                    }));
+                        return [contactId, ((0, Utils_1.md5)(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3)];
+                    });
                     contact = contacts[((_a = contactHashes.find(([, b]) => b === update.id)) === null || _a === void 0 ? void 0 : _a[0]) || '']; // find contact by attrs.hash, when user is not saved as a contact
                 }
                 if (contact) {
@@ -117,11 +126,11 @@ exports.default = (config) => {
                     else if (update.imgUrl === 'removed') {
                         delete contact.imgUrl;
                     }
+                    Object.assign(contacts[contact.id], contact);
                 }
                 else {
-                    return logger.debug({ update }, 'got update for non-existant contact');
+                    logger.debug({ update }, 'got update for non-existant contact');
                 }
-                Object.assign(contacts[contact.id], contact);
             }
         });
         ev.on('chats.upsert', newChats => {

package/lib/Types/Chat.d.ts

@@ -1,17 +1,16 @@
 import type { proto } from '../../WAProto';
 import type { AccountSettings } from './Auth';
 import type { BufferedEventData } from './Events';
-import type { LabelActionBody } from './Label';
 import type { ChatLabelAssociationActionBody } from './LabelAssociation';
 import type { MessageLabelAssociationActionBody } from './LabelAssociation';
 import type { MinimalMessage, WAMessageKey } from './Message';
 /** privacy settings in WhatsApp Web */
 export type WAPrivacyValue = 'all' | 'contacts' | 'contact_blacklist' | 'none';
+export type WAPrivacyCallValue = 'all' | 'known';
+export type WAPrivacyMessagesValue = 'all' | 'contacts';
 export type WAPrivacyOnlineValue = 'all' | 'match_last_seen';
 export type WAPrivacyGroupAddValue = 'all' | 'contacts' | 'contact_blacklist';
 export type WAReadReceiptsValue = 'all' | 'none';
-export type WAPrivacyCallValue = 'all' | 'known';
-export type WAPrivacyMessagesValue = 'all' | 'contacts';
 /** set of statuses visible to other people; see updatePresence() in WhatsAppWeb.Send */
 export type WAPresence = 'unavailable' | 'available' | 'composing' | 'recording' | 'paused';
 export declare const ALL_WA_PATCH_NAMES: readonly ["critical_block", "critical_unblock_low", "regular_high", "regular_low", "regular"];
@@ -20,6 +19,10 @@ export interface PresenceData {
     lastKnownPresence: WAPresence;
     lastSeen?: number;
 }
+export type BotListInfo = {
+    jid: string;
+    personaId: string;
+};
 export type ChatMutation = {
     syncAction: proto.ISyncActionData;
     index: string[];
@@ -84,8 +87,6 @@ export type ChatModification = {
 } | {
     delete: true;
     lastMessages: LastMessageList;
-} | {
-    addLabel: LabelActionBody;
 } | {
     addChatLabel: ChatLabelAssociationActionBody;
 } | {