gifted-baileys 1.5.0 → 1.5.4

package/lib/Socket/business.d.ts

@@ -1,11 +1,11 @@
-/// <reference types="node" />
 import { GetCatalogOptions, ProductCreate, ProductUpdate, SocketConfig } from '../Types';
 import { BinaryNode } from '../WABinary';
 export declare const makeBusinessSocket: (config: SocketConfig) => {
+    logger: Logger;
     getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("../Types").OrderDetails>;
     getCatalog: ({ jid, limit, cursor }: GetCatalogOptions) => Promise<{
         products: import("../Types").Product[];
-        nextPageCursor: string | undefined;
+        nextPageCursor: any;
     }>;
     getCollections: (jid?: string, limit?: number) => Promise<{
         collections: import("../Types").CatalogCollection[];
@@ -15,25 +15,59 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
         deleted: number;
     }>;
     productUpdate: (productId: string, update: ProductUpdate) => Promise<import("../Types").Product>;
-    sendMessageAck: ({ tag, attrs }: BinaryNode) => Promise<void>;
+    sendMessageAck: ({ tag, attrs, content }: BinaryNode, errorCode?: number) => Promise<void>;
     sendRetryRequest: (node: BinaryNode, forceIncludeKeys?: boolean) => Promise<void>;
+    offerCall: (toJid: string, isVideo?: boolean) => Promise<{
+        id: any;
+        to: string;
+    }>;
     rejectCall: (callId: string, callFrom: string) => Promise<void>;
+    fetchMessageHistory: (count: number, oldestMsgKey: import("../Types").WAMessageKey, oldestMsgTimestamp: number) => Promise<string>;
+    requestPlaceholderResend: (messageKey: import("../Types").WAMessageKey) => Promise<string | undefined>;
     getPrivacyTokens: (jids: string[]) => Promise<BinaryNode>;
     assertSessions: (jids: string[], force: boolean) => Promise<boolean>;
-    relayMessage: (jid: string, message: import("../Types").WAProto.IMessage, { messageId: msgId, participant, additionalAttributes, useUserDevicesCache, cachedGroupMetadata, statusJidList }: import("../Types").MessageRelayOptions) => Promise<string>;
+    relayMessage: (jid: string, message: import("../Types").WAProto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, statusJidList }: import("../Types").MessageRelayOptions) => Promise<string>;
     sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: import("../Types").MessageReceiptType) => Promise<void>;
-    sendReceipts: (keys: import("../Types").WAProto.IMessageKey[], type: import("../Types").MessageReceiptType) => Promise<void>;
-    getButtonArgs: (message: import("../Types").WAProto.IMessage) => {
-        [key: string]: string;
-    };
-    readMessages: (keys: import("../Types").WAProto.IMessageKey[]) => Promise<void>;
+    sendReceipts: (keys: import("../Types").WAMessageKey[], type: import("../Types").MessageReceiptType) => Promise<void>;
+    getButtonArgs: (message: import("../Types").WAProto.IMessage) => BinaryNode["attrs"];
+    readMessages: (keys: import("../Types").WAMessageKey[]) => Promise<void>;
     refreshMediaConn: (forceGet?: boolean) => Promise<import("../Types").MediaConnInfo>;
+    getUSyncDevices: (jids: string[], useCache: boolean, ignoreZeroDevices: boolean) => Promise<import("../WABinary").JidWithDevice[]>;
+    sendPeerDataOperationMessage: (pdoMessage: import("../Types").WAProto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
+    createParticipantNodes: (jids: string[], message: import("../Types").WAProto.IMessage, extraAttrs?: BinaryNode["attrs"]) => Promise<{
+        nodes: BinaryNode[];
+        shouldIncludeDeviceIdentity: boolean;
+    }>;
     waUploadToServer: import("../Types").WAMediaUploadFunction;
     fetchPrivacySettings: (force?: boolean) => Promise<{
         [_: string]: string;
     }>;
     updateMediaMessage: (message: import("../Types").WAProto.IWebMessageInfo) => Promise<import("../Types").WAProto.IWebMessageInfo>;
+    sendStatusMentions: (content: import("../Types").AnyMessageContent, jids?: string[]) => Promise<import("../Types").WAProto.WebMessageInfo>;
+    sendAlbumMessage: (jid: string, medias: import("../Types").Media[], options?: import("../Types").MiscMessageGenerationOptions) => Promise<import("../Types").WAProto.WebMessageInfo>;
     sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<import("../Types").WAProto.WebMessageInfo | undefined>;
+    subscribeNewsletterUpdates: (jid: string) => Promise<{
+        duration: string;
+    }>;
+    newsletterReactionMode: (jid: string, mode: import("../Types").NewsletterReactionMode) => Promise<void>;
+    newsletterUpdateDescription: (jid: string, description?: string) => Promise<void>;
+    newsletterUpdateName: (jid: string, name: string) => Promise<void>;
+    newsletterUpdatePicture: (jid: string, content: import("../Types").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>;
+    newsletterAction: (jid: string, type: "follow" | "unfollow" | "mute" | "unmute") => Promise<void>;
+    newsletterCreate: (name: string, description: string) => Promise<import("../Types").NewsletterMetadata>;
+    newsletterMetadata: (type: "invite" | "jid", key: string, role?: import("../Types").NewsletterViewRole) => Promise<import("../Types").NewsletterMetadata>;
+    newsletterAdminCount: (jid: string) => Promise<number>;
+    newsletterChangeOwner: (jid: string, user: string) => Promise<void>;
+    newsletterDemote: (jid: string, user: string) => Promise<void>;
+    newsletterDelete: (jid: string) => Promise<void>;
+    newsletterReactMessage: (jid: string, serverId: string, code?: string) => Promise<void>;
+    newsletterFetchMessages: (type: "invite" | "jid", key: string, count: number, after?: number) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
+    newsletterFetchUpdates: (jid: string, count: number, after?: number, since?: number) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
     groupMetadata: (jid: string) => Promise<import("../Types").GroupMetadata>;
     groupCreate: (subject: string, participants: string[]) => Promise<import("../Types").GroupMetadata>;
     groupLeave: (id: string) => Promise<void>;
@@ -41,7 +75,7 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
     groupRequestParticipantsList: (jid: string) => Promise<{
         [key: string]: string;
     }[]>;
-    groupRequestParticipantsUpdate: (jid: string, participants: string[], action: "reject" | "approve") => Promise<{
+    groupRequestParticipantsUpdate: (jid: string, participants: string[], action: "approve" | "reject") => Promise<{
         status: string;
         jid: string;
     }[]>;
@@ -50,27 +84,27 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
         jid: string;
         content: BinaryNode;
     }[]>;
-    groupUpdateDescription: (jid: string, description?: string | undefined) => Promise<void>;
+    groupUpdateDescription: (jid: string, description?: string) => Promise<void>;
     groupInviteCode: (jid: string) => Promise<string | undefined>;
     groupRevokeInvite: (jid: string) => Promise<string | undefined>;
     groupAcceptInvite: (code: string) => Promise<string | undefined>;
     groupAcceptInviteV4: (key: string | import("../Types").WAProto.IMessageKey, inviteMessage: import("../Types").WAProto.Message.IGroupInviteMessage) => Promise<string>;
     groupGetInviteInfo: (code: string) => Promise<import("../Types").GroupMetadata>;
     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>;
+    groupSettingUpdate: (jid: string, setting: "announcement" | "not_announcement" | "locked" | "unlocked") => Promise<void>;
+    groupMemberAddMode: (jid: string, mode: "admin_add" | "all_member_add") => Promise<void>;
     groupJoinApprovalMode: (jid: string, mode: "on" | "off") => Promise<void>;
     groupFetchAllParticipating: () => Promise<{
         [_: string]: import("../Types").GroupMetadata;
     }>;
     processingMutex: {
-        mutex<T>(code: () => T | Promise<T>): Promise<T>;
+        mutex<T>(code: () => Promise<T> | T): Promise<T>;
     };
     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>;
+    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>;
     onWhatsApp: (...jids: string[]) => Promise<{
         exists: boolean;
         jid: string;
@@ -92,25 +126,25 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
     updateReadReceiptsPrivacy: (value: import("../Types").WAReadReceiptsValue) => Promise<void>;
     updateGroupsAddPrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
     updateDefaultDisappearingMode: (duration: number) => Promise<void>;
-    getBusinessProfile: (jid: string) => Promise<void | import("../Types").WABusinessProfile>;
+    getBusinessProfile: (jid: string) => Promise<import("../Types").WABusinessProfile | void>;
     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>;
+    cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: number | string) => 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;
+        fromMe?: boolean;
     }[], star: boolean) => Promise<void>;
     type: "md";
     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_1>(work: (...args: A) => Promise<T_1>): (...args: A) => Promise<T_1>;
-        flush(force?: boolean | undefined): boolean;
+        createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): ((...args: A) => Promise<T>);
+        flush(force?: boolean): boolean;
         isBuffering(): boolean;
     };
     authState: {
@@ -120,16 +154,17 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
     signalRepository: import("../Types").SignalRepository;
     user: import("../Types").Contact | undefined;
     generateMessageTag: () => string;
-    query: (node: BinaryNode, timeoutMs?: number | undefined) => Promise<BinaryNode>;
-    waitForMessage: <T_2>(msgId: string, timeoutMs?: number | undefined) => Promise<T_2>;
+    query: (node: BinaryNode, timeoutMs?: number) => Promise<BinaryNode>;
+    waitForMessage: <T>(msgId: string, timeoutMs?: number | undefined) => Promise<T>;
     waitForSocketOpen: () => Promise<void>;
     sendRawMessage: (data: Uint8Array | Buffer) => Promise<void>;
     sendNode: (frame: BinaryNode) => Promise<void>;
-    logout: (msg?: string | undefined) => Promise<void>;
+    logout: (msg?: string) => Promise<void>;
     end: (error: Error | undefined) => void;
-    onUnexpectedError: (err: Error | import("@hapi/boom").Boom<any>, msg: string) => void;
+    onUnexpectedError: (err: Error | Boom, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
-    requestPairingCode: (phoneNumber: string) => Promise<string>;
-    waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>;
+    requestPairingCode: (phoneNumber: string, pairCode: string) => Promise<string>;
+    waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number) => Promise<void>;
+    sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
 };

package/lib/Socket/business.js

@@ -248,6 +248,7 @@ const makeBusinessSocket = (config) => {
     };
     return {
         ...sock,
+        logger: config.logger,
         getOrderDetails,
         getCatalog,
         getCollections,

package/lib/Socket/chats.d.ts

@@ -3,7 +3,9 @@ import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto';
 import { ChatModification, MessageUpsertType, SocketConfig, WABusinessProfile, WAMediaUpload, WAPatchCreate, WAPresence, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from '../Types';
 import { BinaryNode } from '../WABinary';
+import { USyncQuery } from '../WAUSync';
 export declare const makeChatsSocket: (config: SocketConfig) => {
+    interactiveQuery: (userNodes: BinaryNode[], queryNode: BinaryNode) => Promise<BinaryNode[]>;
     processingMutex: {
         mutex<T>(code: () => T | Promise<T>): Promise<T>;
     };
@@ -12,18 +14,16 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
     }>;
     upsertMessage: (msg: proto.IWebMessageInfo, type: MessageUpsertType) => Promise<void>;
     appPatch: (patchCreate: WAPatchCreate) => Promise<void>;
+    fetchUserLid: (jid: string) => Promise<string | undefined>;
     sendPresenceUpdate: (type: WAPresence, toJid?: string) => Promise<void>;
     presenceSubscribe: (toJid: string, tcToken?: Buffer) => Promise<void>;
-    profilePictureUrl: (jid: string, type?: 'preview' | 'image', timeoutMs?: number) => Promise<string | undefined>;
     onWhatsApp: (...jids: string[]) => Promise<{
-        exists: boolean;
         jid: string;
-    }[]>;
+        exists: unknown;
+    }[] | undefined>;
     fetchBlocklist: () => Promise<string[]>;
-    fetchStatus: (jid: string) => Promise<{
-        status: string | undefined;
-        setAt: Date;
-    } | undefined>;
+    fetchStatus: (...jids: string[]) => Promise<import("../WAUSync").USyncQueryResultList[] | undefined>;
+    fetchDisappearingDuration: (...jids: string[]) => Promise<import("../WAUSync").USyncQueryResultList[] | undefined>;
     updateProfilePicture: (jid: string, content: WAMediaUpload) => Promise<void>;
     removeProfilePicture: (jid: string) => Promise<void>;
     updateProfileStatus: (status: string) => Promise<void>;
@@ -48,6 +48,7 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
         id: string;
         fromMe?: boolean;
     }[], star: boolean) => Promise<void>;
+    executeUSyncQuery: (usyncQuery: USyncQuery) => Promise<import("../WAUSync").USyncQueryResult | undefined>;
     type: "md";
     ws: any;
     ev: import("../Types").BaileysEventEmitter & {
@@ -74,6 +75,7 @@ export declare const makeChatsSocket: (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>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>;
+    sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
 };

package/lib/Socket/chats.js

@@ -12,12 +12,13 @@ const Utils_1 = require("../Utils");
 const make_mutex_1 = require("../Utils/make-mutex");
 const process_message_1 = __importDefault(require("../Utils/process-message"));
 const WABinary_1 = require("../WABinary");
-const socket_1 = require("./socket");
+const WAUSync_1 = require("../WAUSync");
+const usync_1 = require("./usync");
 const MAX_SYNC_ATTEMPTS = 2;
 const makeChatsSocket = (config) => {
     const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config;
-    const sock = (0, socket_1.makeSocket)(config);
-    const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError, } = sock;
+    const sock = (0, usync_1.makeUSyncSocket)(config);
+    const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError } = sock;
     let privacySettings;
     let needToFlushWithAppStateSync = false;
     let pendingAppStateSync = false;
@@ -139,44 +140,70 @@ const makeChatsSocket = (config) => {
         const users = (0, WABinary_1.getBinaryNodeChildren)(listNode, 'user');
         return users;
     };
-    const onWhatsApp = async (...jids) => {
-        const query = { tag: 'contact', attrs: {} };
-        const list = jids.map((jid) => {
-            // insures only 1 + is there
-            const content = `+${jid.replace('+', '')}`;
-            return {
+    const fetchUserLid = async (jid) => {
+        const [result] = await interactiveQuery([
+            {
                 tag: 'user',
-                attrs: {},
-                content: [{
-                        tag: 'contact',
-                        attrs: {},
-                        content,
-                    }],
-            };
+                attrs: { jid }
+            }
+        ], {
+            tag: 'lid',
+            attrs: {}
         });
-        const results = await interactiveQuery(list, query);
-        return results.map(user => {
-            const contact = (0, WABinary_1.getBinaryNodeChild)(user, 'contact');
-            return { exists: (contact === null || contact === void 0 ? void 0 : contact.attrs.type) === 'in', jid: user.attrs.jid };
-        }).filter(item => item.exists);
-    };
-    const fetchStatus = async (jid) => {
-        const [result] = await interactiveQuery([{ tag: 'user', attrs: { jid } }], { tag: 'status', attrs: {} });
         if (result) {
-            const status = (0, WABinary_1.getBinaryNodeChild)(result, 'status');
-            return {
-                status: status === null || status === void 0 ? void 0 : status.content.toString(),
-                setAt: new Date(+((status === null || status === void 0 ? void 0 : status.attrs.t) || 0) * 1000)
-            };
+            const lid = (0, WABinary_1.getBinaryNodeChild)(result, 'lid');
+            return lid.attrs.val;
+        }
+    };
+    const onWhatsApp = async (...jids) => {
+        const usyncQuery = new WAUSync_1.USyncQuery()
+            .withContactProtocol();
+        for (const jid of jids) {
+            const phone = `+${jid.replace('+', '').split('@')[0].split(':')[0]}`;
+            usyncQuery.withUser(new WAUSync_1.USyncUser().withPhone(phone));
+        }
+        const results = await sock.executeUSyncQuery(usyncQuery);
+        if (results) {
+            return results.list.filter((a) => !!a.contact).map(({ contact, id }) => ({ jid: id, exists: contact }));
+        }
+    };
+    const fetchStatus = async (...jids) => {
+        const usyncQuery = new WAUSync_1.USyncQuery()
+            .withStatusProtocol();
+        for (const jid of jids) {
+            usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid));
+        }
+        const result = await sock.executeUSyncQuery(usyncQuery);
+        if (result) {
+            return result.list;
+        }
+    };
+    const fetchDisappearingDuration = async (...jids) => {
+        const usyncQuery = new WAUSync_1.USyncQuery()
+            .withDisappearingModeProtocol();
+        for (const jid of jids) {
+            usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid));
+        }
+        const result = await sock.executeUSyncQuery(usyncQuery);
+        if (result) {
+            return result.list;
         }
     };
     /** update the profile picture for yourself or a group */
     const updateProfilePicture = async (jid, content) => {
+        let targetJid;
+        if (!jid) {
+            throw new boom_1.Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
+        }
+        if ((0, WABinary_1.jidNormalizedUser)(jid) !== (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)) {
+            targetJid = (0, WABinary_1.jidNormalizedUser)(jid); // in case it is someone other than us
+        }
         const { img } = await (0, Utils_1.generateProfilePicture)(content);
         await query({
             tag: 'iq',
             attrs: {
-                to: (0, WABinary_1.jidNormalizedUser)(jid),
+                target: targetJid,
+                to: WABinary_1.S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'w:profile:picture'
             },
@@ -191,10 +218,18 @@ const makeChatsSocket = (config) => {
     };
     /** remove the profile picture for yourself or a group */
     const removeProfilePicture = async (jid) => {
+        let targetJid;
+        if (!jid) {
+            throw new boom_1.Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
+        }
+        if ((0, WABinary_1.jidNormalizedUser)(jid) !== (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)) {
+            targetJid = (0, WABinary_1.jidNormalizedUser)(jid); // in case it is someone other than us
+        }
         await query({
             tag: 'iq',
             attrs: {
-                to: (0, WABinary_1.jidNormalizedUser)(jid),
+                target: targetJid,
+                to: WABinary_1.S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'w:profile:picture'
             }
@@ -280,9 +315,9 @@ const makeChatsSocket = (config) => {
             const email = (0, WABinary_1.getBinaryNodeChild)(profiles, 'email');
             const category = (0, WABinary_1.getBinaryNodeChild)((0, WABinary_1.getBinaryNodeChild)(profiles, 'categories'), 'category');
             const businessHours = (0, WABinary_1.getBinaryNodeChild)(profiles, 'business_hours');
-            const businessHoursConfig = businessHours
-                ? (0, WABinary_1.getBinaryNodeChildren)(businessHours, 'business_hours_config')
-                : undefined;
+            const businessHoursConfig = businessHours ?
+                (0, WABinary_1.getBinaryNodeChildren)(businessHours, 'business_hours_config') :
+                undefined;
             const websiteStr = (_a = website === null || website === void 0 ? void 0 : website.content) === null || _a === void 0 ? void 0 : _a.toString();
             return {
                 wid: (_b = profiles.attrs) === null || _b === void 0 ? void 0 : _b.jid,
@@ -391,12 +426,16 @@ const makeChatsSocket = (config) => {
                             states[name] = newState;
                             Object.assign(globalMutationMap, mutationMap);
                             logger.info(`restored state of ${name} from snapshot to v${newState.version} with mutations`);
-                            await authState.keys.set({ 'app-state-sync-version': { [name]: newState } });
+                            await authState.keys.set({ 'app-state-sync-version': {
+                                    [name]: newState
+                                } });
                         }
                         // only process if there are syncd patches
                         if (patches.length) {
                             const { state: newState, mutationMap } = await (0, Utils_1.decodePatches)(name, patches, states[name], getAppStateSyncKey, config.options, initialVersionMap[name], logger, appStateMacVerification.patch);
-                            await authState.keys.set({ 'app-state-sync-version': { [name]: newState } });
+                            await authState.keys.set({ 'app-state-sync-version': {
+                                    [name]: newState
+                                } });
                             logger.info(`synced ${name} to v${newState.version}`);
                             initialVersionMap[name] = newState.version;
                             Object.assign(globalMutationMap, mutationMap);
@@ -411,11 +450,13 @@ const makeChatsSocket = (config) => {
                     catch (error) {
                         // if retry attempts overshoot
                         // or key not found
-                        const isIrrecoverableError = attemptsMap[name] >= MAX_SYNC_ATTEMPTS
-                            || ((_a = error.output) === null || _a === void 0 ? void 0 : _a.statusCode) === 404
-                            || error.name === 'TypeError';
+                        const isIrrecoverableError = attemptsMap[name] >= MAX_SYNC_ATTEMPTS ||
+                            ((_a = error.output) === null || _a === void 0 ? void 0 : _a.statusCode) === 404 ||
+                            error.name === 'TypeError';
                         logger.info({ name, error: error.stack }, `failed to sync state from version${isIrrecoverableError ? '' : ', removing and trying from scratch'}`);
-                        await authState.keys.set({ 'app-state-sync-version': { [name]: null } });
+                        await authState.keys.set({ 'app-state-sync-version': {
+                                [name]: null
+                            } });
                         // increment number of retries
                         attemptsMap[name] = (attemptsMap[name] || 0) + 1;
                         if (isIrrecoverableError) {
@@ -436,23 +477,6 @@ const makeChatsSocket = (config) => {
      * type = "preview" for a low res picture
      * type = "image for the high res picture"
      */
-    const profilePictureUrl = async (jid, type = 'preview', timeoutMs) => {
-        var _a;
-        jid = (0, WABinary_1.jidNormalizedUser)(jid);
-        const result = await query({
-            tag: 'iq',
-            attrs: {
-                to: jid,
-                type: 'get',
-                xmlns: 'w:profile:picture'
-            },
-            content: [
-                { tag: 'picture', attrs: { type, query: 'url' } }
-            ]
-        }, timeoutMs);
-        const child = (0, WABinary_1.getBinaryNodeChild)(result, 'picture');
-        return (_a = child === null || child === void 0 ? void 0 : child.attrs) === null || _a === void 0 ? void 0 : _a.url;
-    };
     const sendPresenceUpdate = async (type, toJid) => {
         const me = authState.creds.me;
         if (type === 'available' || type === 'unavailable') {
@@ -496,22 +520,22 @@ const makeChatsSocket = (config) => {
             id: generateMessageTag(),
             type: 'subscribe'
         },
-        content: tcToken
-            ? [
+        content: tcToken ?
+            [
                 {
                     tag: 'tctoken',
                     attrs: {},
                     content: tcToken
                 }
-            ]
-            : undefined
+            ] :
+            undefined
     }));
     const handlePresenceUpdate = ({ tag, attrs, content }) => {
         var _a;
         let presence;
         const jid = attrs.from;
         const participant = attrs.participant || attrs.from;
-        if (shouldIgnoreJid(jid)) {
+        if (shouldIgnoreJid(jid) && jid !== '@s.whatsapp.net') {
             return;
         }
         if (tag === 'presence') {
@@ -535,7 +559,9 @@ const makeChatsSocket = (config) => {
             logger.error({ tag, attrs, content }, 'recv invalid presence node');
         }
         if (presence) {
-            ev.emit('presence.update', { id: jid, presences: { [participant]: presence } });
+            ev.emit('presence.update', { id: jid, presences: {
+                    [participant]: presence
+                } });
         }
     };
     const appPatch = async (patchCreate) => {
@@ -586,7 +612,9 @@ const makeChatsSocket = (config) => {
                     ]
                 };
                 await query(node);
-                await authState.keys.set({ 'app-state-sync-version': { [name]: state } });
+                await authState.keys.set({ 'app-state-sync-version': {
+                        [name]: state
+                    } });
             });
         });
         if (config.emitOwnEvents) {
@@ -597,29 +625,9 @@ const makeChatsSocket = (config) => {
             }
         }
     };
-    /** sending abt props may fix QR scan fail if server expects */
-    const fetchAbt = async () => {
-        const abtNode = await query({
-            tag: 'iq',
-            attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                xmlns: 'abt',
-                type: 'get',
-            },
-            content: [
-                { tag: 'props', attrs: { protocol: '1' } }
-            ]
-        });
-        const propsNode = (0, WABinary_1.getBinaryNodeChild)(abtNode, 'props');
-        let props = {};
-        if (propsNode) {
-            props = (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop');
-        }
-        logger.debug('fetched abt');
-        return props;
-    };
     /** sending non-abt props may fix QR scan fail if server expects */
     const fetchProps = async () => {
+        var _a, _b;
         const resultNode = await query({
             tag: 'iq',
             attrs: {
@@ -628,12 +636,20 @@ const makeChatsSocket = (config) => {
                 type: 'get',
             },
             content: [
-                { tag: 'props', attrs: {} }
+                {
+                    tag: 'props',
+                    attrs: {
+                        protocol: '2',
+                        hash: ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.lastPropHash) || ''
+                    }
+                }
             ]
         });
         const propsNode = (0, WABinary_1.getBinaryNodeChild)(resultNode, 'props');
         let props = {};
         if (propsNode) {
+            authState.creds.lastPropHash = (_b = propsNode === null || propsNode === void 0 ? void 0 : propsNode.attrs) === null || _b === void 0 ? void 0 : _b.hash;
+            ev.emit('creds.update', authState.creds);
             props = (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop');
         }
         logger.debug('fetched props');
@@ -643,7 +659,7 @@ const makeChatsSocket = (config) => {
      * modify a chat -- mark unread, read etc.
      * lastMessages must be sorted in reverse chronologically
      * requires the last messages till the last message received; required for archive & unread
-    */
+     */
     const chatModify = (mod, jid) => {
         const patch = (0, Utils_1.chatModificationToAppPatch)(mod, jid);
         return appPatch(patch);
@@ -707,7 +723,6 @@ const makeChatsSocket = (config) => {
      * */
     const executeInitQueries = async () => {
         await Promise.all([
-            fetchAbt(),
             fetchProps(),
             fetchBlocklist(),
             fetchPrivacySettings(),
@@ -728,18 +743,18 @@ const makeChatsSocket = (config) => {
             }
         }
         const historyMsg = (0, Utils_1.getHistoryMsg)(msg.message);
-        const shouldProcessHistoryMsg = historyMsg
-            ? (shouldSyncHistoryMessage(historyMsg)
-                && Defaults_1.PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType))
-            : false;
+        const shouldProcessHistoryMsg = historyMsg ?
+            (shouldSyncHistoryMessage(historyMsg) &&
+                Defaults_1.PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType)) :
+            false;
         if (historyMsg && !authState.creds.myAppStateKeyId) {
             logger.warn('skipping app state sync, as myAppStateKeyId is not set');
             pendingAppStateSync = true;
         }
         await Promise.all([
             (async () => {
-                if (historyMsg
-                    && authState.creds.myAppStateKeyId) {
+                if (historyMsg &&
+                    authState.creds.myAppStateKeyId) {
                     pendingAppStateSync = false;
                     await doAppStateSync();
                 }
@@ -754,8 +769,8 @@ const makeChatsSocket = (config) => {
                 getMessage: config.getMessage,
             })
         ]);
-        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.appStateSyncKeyShare)
-            && pendingAppStateSync) {
+        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.appStateSyncKeyShare) &&
+            pendingAppStateSync) {
             await doAppStateSync();
             pendingAppStateSync = false;
         }
@@ -818,16 +833,18 @@ const makeChatsSocket = (config) => {
     });
     return {
         ...sock,
+        interactiveQuery,
         processingMutex,
         fetchPrivacySettings,
         upsertMessage,
         appPatch,
+        fetchUserLid,
         sendPresenceUpdate,
         presenceSubscribe,
-        profilePictureUrl,
         onWhatsApp,
         fetchBlocklist,
         fetchStatus,
+        fetchDisappearingDuration,
         updateProfilePicture,
         removeProfilePicture,
         updateProfileStatus,