gifted-baileys 1.5.6 → 1.5.7

package/{src → lib}/Socket/chats.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -21,25 +12,26 @@ 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;
     /** this mutex ensures that the notifications (receipts, messages etc.) are processed in order */
     const processingMutex = (0, make_mutex_1.makeMutex)();
     /** helper function to fetch the given app state sync key */
-    const getAppStateSyncKey = (keyId) => __awaiter(void 0, void 0, void 0, function* () {
-        const { [keyId]: key } = yield authState.keys.get('app-state-sync-key', [keyId]);
+    const getAppStateSyncKey = async (keyId) => {
+        const { [keyId]: key } = await authState.keys.get('app-state-sync-key', [keyId]);
         return key;
-    });
-    const fetchPrivacySettings = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* (force = false) {
+    };
+    const fetchPrivacySettings = async (force = false) => {
         if (!privacySettings || force) {
-            const { content } = yield query({
+            const { content } = await query({
                 tag: 'iq',
                 attrs: {
                     xmlns: 'privacy',
@@ -53,10 +45,10 @@ const makeChatsSocket = (config) => {
             privacySettings = (0, WABinary_1.reduceBinaryNodeToDictionary)(content === null || content === void 0 ? void 0 : content[0], 'category');
         }
         return privacySettings;
-    });
+    };
     /** helper function to run a privacy IQ query */
-    const privacyQuery = (name, value) => __awaiter(void 0, void 0, void 0, function* () {
-        yield query({
+    const privacyQuery = async (name, value) => {
+        await query({
             tag: 'iq',
             attrs: {
                 xmlns: 'privacy',
@@ -74,27 +66,27 @@ const makeChatsSocket = (config) => {
                     ]
                 }]
         });
-    });
-    const updateLastSeenPrivacy = (value) => __awaiter(void 0, void 0, void 0, function* () {
-        yield privacyQuery('last', value);
-    });
-    const updateOnlinePrivacy = (value) => __awaiter(void 0, void 0, void 0, function* () {
-        yield privacyQuery('online', value);
-    });
-    const updateProfilePicturePrivacy = (value) => __awaiter(void 0, void 0, void 0, function* () {
-        yield privacyQuery('profile', value);
-    });
-    const updateStatusPrivacy = (value) => __awaiter(void 0, void 0, void 0, function* () {
-        yield privacyQuery('status', value);
-    });
-    const updateReadReceiptsPrivacy = (value) => __awaiter(void 0, void 0, void 0, function* () {
-        yield privacyQuery('readreceipts', value);
-    });
-    const updateGroupsAddPrivacy = (value) => __awaiter(void 0, void 0, void 0, function* () {
-        yield privacyQuery('groupadd', value);
-    });
-    const updateDefaultDisappearingMode = (duration) => __awaiter(void 0, void 0, void 0, function* () {
-        yield query({
+    };
+    const updateLastSeenPrivacy = async (value) => {
+        await privacyQuery('last', value);
+    };
+    const updateOnlinePrivacy = async (value) => {
+        await privacyQuery('online', value);
+    };
+    const updateProfilePicturePrivacy = async (value) => {
+        await privacyQuery('profile', value);
+    };
+    const updateStatusPrivacy = async (value) => {
+        await privacyQuery('status', value);
+    };
+    const updateReadReceiptsPrivacy = async (value) => {
+        await privacyQuery('readreceipts', value);
+    };
+    const updateGroupsAddPrivacy = async (value) => {
+        await privacyQuery('groupadd', value);
+    };
+    const updateDefaultDisappearingMode = async (duration) => {
+        await query({
             tag: 'iq',
             attrs: {
                 xmlns: 'disappearing_mode',
@@ -108,10 +100,10 @@ const makeChatsSocket = (config) => {
                     }
                 }]
         });
-    });
+    };
     /** helper function to run a generic IQ query */
-    const interactiveQuery = (userNodes, queryNode) => __awaiter(void 0, void 0, void 0, function* () {
-        const result = yield query({
+    const interactiveQuery = async (userNodes, queryNode) => {
+        const result = await query({
             tag: 'iq',
             attrs: {
                 to: WABinary_1.S_WHATSAPP_NET,
@@ -147,40 +139,58 @@ const makeChatsSocket = (config) => {
         const listNode = (0, WABinary_1.getBinaryNodeChild)(usyncNode, 'list');
         const users = (0, WABinary_1.getBinaryNodeChildren)(listNode, 'user');
         return users;
-    });
-    const onWhatsApp = (...jids) => __awaiter(void 0, void 0, void 0, function* () {
-        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 = yield 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 = (jid) => __awaiter(void 0, void 0, void 0, function* () {
-        const [result] = yield 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 = (jid, content) => __awaiter(void 0, void 0, void 0, function* () {
+    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');
@@ -188,8 +198,8 @@ const makeChatsSocket = (config) => {
         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 } = yield (0, Utils_1.generateProfilePicture)(content);
-        yield query({
+        const { img } = await (0, Utils_1.generateProfilePicture)(content);
+        await query({
             tag: 'iq',
             attrs: {
                 target: targetJid,
@@ -205,9 +215,9 @@ const makeChatsSocket = (config) => {
                 }
             ]
         });
-    });
+    };
     /** remove the profile picture for yourself or a group */
-    const removeProfilePicture = (jid) => __awaiter(void 0, void 0, void 0, function* () {
+    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');
@@ -215,7 +225,7 @@ const makeChatsSocket = (config) => {
         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
         }
-        yield query({
+        await query({
             tag: 'iq',
             attrs: {
                 target: targetJid,
@@ -224,10 +234,10 @@ const makeChatsSocket = (config) => {
                 xmlns: 'w:profile:picture'
             }
         });
-    });
+    };
     /** update the profile status for yourself */
-    const updateProfileStatus = (status) => __awaiter(void 0, void 0, void 0, function* () {
-        yield query({
+    const updateProfileStatus = async (status) => {
+        await query({
             tag: 'iq',
             attrs: {
                 to: WABinary_1.S_WHATSAPP_NET,
@@ -242,12 +252,12 @@ const makeChatsSocket = (config) => {
                 }
             ]
         });
-    });
-    const updateProfileName = (name) => __awaiter(void 0, void 0, void 0, function* () {
-        yield chatModify({ pushNameSetting: name }, '');
-    });
-    const fetchBlocklist = () => __awaiter(void 0, void 0, void 0, function* () {
-        const result = yield query({
+    };
+    const updateProfileName = async (name) => {
+        await chatModify({ pushNameSetting: name }, '');
+    };
+    const fetchBlocklist = async () => {
+        const result = await query({
             tag: 'iq',
             attrs: {
                 xmlns: 'blocklist',
@@ -258,9 +268,9 @@ const makeChatsSocket = (config) => {
         const listNode = (0, WABinary_1.getBinaryNodeChild)(result, 'list');
         return (0, WABinary_1.getBinaryNodeChildren)(listNode, 'item')
             .map(n => n.attrs.jid);
-    });
-    const updateBlockStatus = (jid, action) => __awaiter(void 0, void 0, void 0, function* () {
-        yield query({
+    };
+    const updateBlockStatus = async (jid, action) => {
+        await query({
             tag: 'iq',
             attrs: {
                 xmlns: 'blocklist',
@@ -277,10 +287,10 @@ const makeChatsSocket = (config) => {
                 }
             ]
         });
-    });
-    const getBusinessProfile = (jid) => __awaiter(void 0, void 0, void 0, function* () {
+    };
+    const getBusinessProfile = async (jid) => {
         var _a, _b, _c, _d, _e, _f, _g;
-        const results = yield query({
+        const results = await query({
             tag: 'iq',
             attrs: {
                 to: 's.whatsapp.net',
@@ -322,10 +332,10 @@ const makeChatsSocket = (config) => {
                 }
             };
         }
-    });
-    const cleanDirtyBits = (type, fromTimestamp) => __awaiter(void 0, void 0, void 0, function* () {
+    };
+    const cleanDirtyBits = async (type, fromTimestamp) => {
         logger.info({ fromTimestamp }, 'clean dirty bits ' + type);
-        yield sendNode({
+        await sendNode({
             tag: 'iq',
             attrs: {
                 to: WABinary_1.S_WHATSAPP_NET,
@@ -336,11 +346,14 @@ const makeChatsSocket = (config) => {
             content: [
                 {
                     tag: 'clean',
-                    attrs: Object.assign({ type }, (fromTimestamp ? { timestamp: fromTimestamp.toString() } : null))
+                    attrs: {
+                        type,
+                        ...(fromTimestamp ? { timestamp: fromTimestamp.toString() } : null),
+                    }
                 }
             ]
         });
-    });
+    };
     const newAppStateChunkHandler = (isInitialSync) => {
         return {
             onMutation(mutation) {
@@ -348,12 +361,12 @@ const makeChatsSocket = (config) => {
             }
         };
     };
-    const resyncAppState = ev.createBufferedFunction((collections, isInitialSync) => __awaiter(void 0, void 0, void 0, function* () {
+    const resyncAppState = ev.createBufferedFunction(async (collections, isInitialSync) => {
         // we use this to determine which events to fire
         // otherwise when we resync from scratch -- all notifications will fire
         const initialVersionMap = {};
         const globalMutationMap = {};
-        yield authState.keys.transaction(() => __awaiter(void 0, void 0, void 0, function* () {
+        await authState.keys.transaction(async () => {
             var _a;
             const collectionsToHandle = new Set(collections);
             // in case something goes wrong -- ensure we don't enter a loop that cannot be exited from
@@ -365,7 +378,7 @@ const makeChatsSocket = (config) => {
                 const states = {};
                 const nodes = [];
                 for (const name of collectionsToHandle) {
-                    const result = yield authState.keys.get('app-state-sync-version', [name]);
+                    const result = await authState.keys.get('app-state-sync-version', [name]);
                     let state = result[name];
                     if (state) {
                         if (typeof initialVersionMap[name] === 'undefined') {
@@ -387,7 +400,7 @@ const makeChatsSocket = (config) => {
                         }
                     });
                 }
-                const result = yield query({
+                const result = await query({
                     tag: 'iq',
                     attrs: {
                         to: WABinary_1.S_WHATSAPP_NET,
@@ -403,24 +416,24 @@ const makeChatsSocket = (config) => {
                     ]
                 });
                 // extract from binary node
-                const decoded = yield (0, Utils_1.extractSyncdPatches)(result, config === null || config === void 0 ? void 0 : config.options);
+                const decoded = await (0, Utils_1.extractSyncdPatches)(result, config === null || config === void 0 ? void 0 : config.options);
                 for (const key in decoded) {
                     const name = key;
                     const { patches, hasMorePatches, snapshot } = decoded[name];
                     try {
                         if (snapshot) {
-                            const { state: newState, mutationMap } = yield (0, Utils_1.decodeSyncdSnapshot)(name, snapshot, getAppStateSyncKey, initialVersionMap[name], appStateMacVerification.snapshot);
+                            const { state: newState, mutationMap } = await (0, Utils_1.decodeSyncdSnapshot)(name, snapshot, getAppStateSyncKey, initialVersionMap[name], appStateMacVerification.snapshot);
                             states[name] = newState;
                             Object.assign(globalMutationMap, mutationMap);
                             logger.info(`restored state of ${name} from snapshot to v${newState.version} with mutations`);
-                            yield authState.keys.set({ 'app-state-sync-version': {
+                            await authState.keys.set({ 'app-state-sync-version': {
                                     [name]: newState
                                 } });
                         }
                         // only process if there are syncd patches
                         if (patches.length) {
-                            const { state: newState, mutationMap } = yield (0, Utils_1.decodePatches)(name, patches, states[name], getAppStateSyncKey, config.options, initialVersionMap[name], logger, appStateMacVerification.patch);
-                            yield authState.keys.set({ 'app-state-sync-version': {
+                            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
                                 } });
                             logger.info(`synced ${name} to v${newState.version}`);
@@ -441,7 +454,7 @@ const makeChatsSocket = (config) => {
                             ((_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'}`);
-                        yield authState.keys.set({ 'app-state-sync-version': {
+                        await authState.keys.set({ 'app-state-sync-version': {
                                 [name]: null
                             } });
                         // increment number of retries
@@ -453,36 +466,18 @@ const makeChatsSocket = (config) => {
                     }
                 }
             }
-        }));
+        });
         const { onMutation } = newAppStateChunkHandler(isInitialSync);
         for (const key in globalMutationMap) {
             onMutation(globalMutationMap[key]);
         }
-    }));
+    });
     /**
      * fetch the profile picture of a user/group
      * type = "preview" for a low res picture
      * type = "image for the high res picture"
      */
-    const profilePictureUrl = (jid_1, ...args_1) => __awaiter(void 0, [jid_1, ...args_1], void 0, function* (jid, type = 'preview', timeoutMs) {
-        var _a;
-        jid = (0, WABinary_1.jidNormalizedUser)(jid);
-        const result = yield query({
-            tag: 'iq',
-            attrs: {
-                target: jid,
-                to: WABinary_1.S_WHATSAPP_NET,
-                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 = (type, toJid) => __awaiter(void 0, void 0, void 0, function* () {
+    const sendPresenceUpdate = async (type, toJid) => {
         const me = authState.creds.me;
         if (type === 'available' || type === 'unavailable') {
             if (!me.name) {
@@ -490,7 +485,7 @@ const makeChatsSocket = (config) => {
                 return;
             }
             ev.emit('connection.update', { isOnline: type === 'available' });
-            yield sendNode({
+            await sendNode({
                 tag: 'presence',
                 attrs: {
                     name: me.name,
@@ -499,7 +494,7 @@ const makeChatsSocket = (config) => {
             });
         }
         else {
-            yield sendNode({
+            await sendNode({
                 tag: 'chatstate',
                 attrs: {
                     from: me.id,
@@ -513,7 +508,7 @@ const makeChatsSocket = (config) => {
                 ]
             });
         }
-    });
+    };
     /**
      * @param toJid the jid to subscribe to
      * @param tcToken token for subscription, use if present
@@ -569,7 +564,7 @@ const makeChatsSocket = (config) => {
                 } });
         }
     };
-    const appPatch = (patchCreate) => __awaiter(void 0, void 0, void 0, function* () {
+    const appPatch = async (patchCreate) => {
         const name = patchCreate.type;
         const myAppStateKeyId = authState.creds.myAppStateKeyId;
         if (!myAppStateKeyId) {
@@ -577,13 +572,13 @@ const makeChatsSocket = (config) => {
         }
         let initial;
         let encodeResult;
-        yield processingMutex.mutex(() => __awaiter(void 0, void 0, void 0, function* () {
-            yield authState.keys.transaction(() => __awaiter(void 0, void 0, void 0, function* () {
+        await processingMutex.mutex(async () => {
+            await authState.keys.transaction(async () => {
                 logger.debug({ patch: patchCreate }, 'applying app patch');
-                yield resyncAppState([name], false);
-                const { [name]: currentSyncVersion } = yield authState.keys.get('app-state-sync-version', [name]);
+                await resyncAppState([name], false);
+                const { [name]: currentSyncVersion } = await authState.keys.get('app-state-sync-version', [name]);
                 initial = currentSyncVersion || (0, Utils_1.newLTHashState)();
-                encodeResult = yield (0, Utils_1.encodeSyncdPatch)(patchCreate, myAppStateKeyId, initial, getAppStateSyncKey);
+                encodeResult = await (0, Utils_1.encodeSyncdPatch)(patchCreate, myAppStateKeyId, initial, getAppStateSyncKey);
                 const { patch, state } = encodeResult;
                 const node = {
                     tag: 'iq',
@@ -616,24 +611,24 @@ const makeChatsSocket = (config) => {
                         }
                     ]
                 };
-                yield query(node);
-                yield authState.keys.set({ 'app-state-sync-version': {
+                await query(node);
+                await authState.keys.set({ 'app-state-sync-version': {
                         [name]: state
                     } });
-            }));
-        }));
+            });
+        });
         if (config.emitOwnEvents) {
             const { onMutation } = newAppStateChunkHandler(false);
-            const { mutationMap } = yield (0, Utils_1.decodePatches)(name, [Object.assign(Object.assign({}, encodeResult.patch), { version: { version: encodeResult.state.version } })], initial, getAppStateSyncKey, config.options, undefined, logger);
+            const { mutationMap } = await (0, Utils_1.decodePatches)(name, [{ ...encodeResult.patch, version: { version: encodeResult.state.version }, }], initial, getAppStateSyncKey, config.options, undefined, logger);
             for (const key in mutationMap) {
                 onMutation(mutationMap[key]);
             }
         }
-    });
+    };
     /** sending non-abt props may fix QR scan fail if server expects */
-    const fetchProps = () => __awaiter(void 0, void 0, void 0, function* () {
+    const fetchProps = async () => {
         var _a, _b;
-        const resultNode = yield query({
+        const resultNode = await query({
             tag: 'iq',
             attrs: {
                 to: WABinary_1.S_WHATSAPP_NET,
@@ -659,7 +654,7 @@ const makeChatsSocket = (config) => {
         }
         logger.debug('fetched props');
         return props;
-    });
+    };
     /**
      * modify a chat -- mark unread, read etc.
      * lastMessages must be sorted in reverse chronologically
@@ -726,14 +721,14 @@ const makeChatsSocket = (config) => {
      * queries need to be fired on connection open
      * help ensure parity with WA Web
      * */
-    const executeInitQueries = () => __awaiter(void 0, void 0, void 0, function* () {
-        yield Promise.all([
+    const executeInitQueries = async () => {
+        await Promise.all([
             fetchProps(),
             fetchBlocklist(),
             fetchPrivacySettings(),
         ]);
-    });
-    const upsertMessage = ev.createBufferedFunction((msg, type) => __awaiter(void 0, void 0, void 0, function* () {
+    };
+    const upsertMessage = ev.createBufferedFunction(async (msg, type) => {
         var _a, _b, _c;
         ev.emit('messages.upsert', { messages: [msg], type });
         if (!!msg.pushName) {
@@ -744,7 +739,7 @@ const makeChatsSocket = (config) => {
             }
             // update our pushname too
             if (msg.key.fromMe && msg.pushName && ((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.name) !== msg.pushName) {
-                ev.emit('creds.update', { me: Object.assign(Object.assign({}, authState.creds.me), { name: msg.pushName }) });
+                ev.emit('creds.update', { me: { ...authState.creds.me, name: msg.pushName } });
             }
         }
         const historyMsg = (0, Utils_1.getHistoryMsg)(msg.message);
@@ -756,14 +751,14 @@ const makeChatsSocket = (config) => {
             logger.warn('skipping app state sync, as myAppStateKeyId is not set');
             pendingAppStateSync = true;
         }
-        yield Promise.all([
-            (() => __awaiter(void 0, void 0, void 0, function* () {
+        await Promise.all([
+            (async () => {
                 if (historyMsg &&
                     authState.creds.myAppStateKeyId) {
                     pendingAppStateSync = false;
-                    yield doAppStateSync();
+                    await doAppStateSync();
                 }
-            }))(),
+            })(),
             (0, process_message_1.default)(msg, {
                 shouldProcessHistoryMsg,
                 ev,
@@ -776,27 +771,25 @@ const makeChatsSocket = (config) => {
         ]);
         if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.appStateSyncKeyShare) &&
             pendingAppStateSync) {
-            yield doAppStateSync();
+            await doAppStateSync();
             pendingAppStateSync = false;
         }
-        function doAppStateSync() {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (!authState.creds.accountSyncCounter) {
-                    logger.info('doing initial app state sync');
-                    yield resyncAppState(Types_1.ALL_WA_PATCH_NAMES, true);
-                    const accountSyncCounter = (authState.creds.accountSyncCounter || 0) + 1;
-                    ev.emit('creds.update', { accountSyncCounter });
-                    if (needToFlushWithAppStateSync) {
-                        logger.debug('flushing with app state sync');
-                        ev.flush();
-                    }
+        async function doAppStateSync() {
+            if (!authState.creds.accountSyncCounter) {
+                logger.info('doing initial app state sync');
+                await resyncAppState(Types_1.ALL_WA_PATCH_NAMES, true);
+                const accountSyncCounter = (authState.creds.accountSyncCounter || 0) + 1;
+                ev.emit('creds.update', { accountSyncCounter });
+                if (needToFlushWithAppStateSync) {
+                    logger.debug('flushing with app state sync');
+                    ev.flush();
                 }
-            });
+            }
         }
-    }));
+    });
     ws.on('CB:presence', handlePresenceUpdate);
     ws.on('CB:chatstate', handlePresenceUpdate);
-    ws.on('CB:ib,,dirty', (node) => __awaiter(void 0, void 0, void 0, function* () {
+    ws.on('CB:ib,,dirty', async (node) => {
         const { attrs } = (0, WABinary_1.getBinaryNodeChild)(node, 'dirty');
         const type = attrs.type;
         switch (type) {
@@ -804,7 +797,7 @@ const makeChatsSocket = (config) => {
                 if (attrs.timestamp) {
                     let { lastAccountSyncTimestamp } = authState.creds;
                     if (lastAccountSyncTimestamp) {
-                        yield cleanDirtyBits('account_sync', lastAccountSyncTimestamp);
+                        await cleanDirtyBits('account_sync', lastAccountSyncTimestamp);
                     }
                     lastAccountSyncTimestamp = +attrs.timestamp;
                     ev.emit('creds.update', { lastAccountSyncTimestamp });
@@ -817,7 +810,7 @@ const makeChatsSocket = (config) => {
                 logger.info({ node }, 'received unknown sync');
                 break;
         }
-    }));
+    });
     ev.on('connection.update', ({ connection, receivedPendingNotifications }) => {
         var _a;
         if (connection === 'open') {
@@ -838,16 +831,20 @@ const makeChatsSocket = (config) => {
             }
         }
     });
-    return Object.assign(Object.assign({}, sock), { processingMutex,
+    return {
+        ...sock,
+        interactiveQuery,
+        processingMutex,
         fetchPrivacySettings,
         upsertMessage,
         appPatch,
+        fetchUserLid,
         sendPresenceUpdate,
         presenceSubscribe,
-        profilePictureUrl,
         onWhatsApp,
         fetchBlocklist,
         fetchStatus,
+        fetchDisappearingDuration,
         updateProfilePicture,
         removeProfilePicture,
         updateProfileStatus,
@@ -868,6 +865,7 @@ const makeChatsSocket = (config) => {
         removeChatLabel,
         addMessageLabel,
         removeMessageLabel,
-        star });
+        star
+    };
 };
 exports.makeChatsSocket = makeChatsSocket;