cuki-bailx 1.2.4 → 1.2.6

package/lib/Socket/chats.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeChatsSocket = void 0;
 const boom_1 = require("@hapi/boom");
+const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Types_1 = require("../Types");
@@ -12,20 +13,33 @@ 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 chalk = require('chalk');
 const MAX_SYNC_ATTEMPTS = 2;
+const SyncState = {
+    Connecting: 'connecting',
+    AwaitingInitialSync: 'awaiting_initial_sync',
+    Syncing: 'syncing',
+    Online: 'online'
+};
 const makeChatsSocket = (config) => {
     const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config;
     const sock = (0, usync_1.makeUSyncSocket)(config);
-    const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError, } = sock;
+    const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError, } = sock;
     let privacySettings;
+    let syncState = SyncState.Connecting;
     let needToFlushWithAppStateSync = false;
     let pendingAppStateSync = false;
-    /** this mutex ensures that the notifications (receipts, messages etc.) are processed in order */
+    let awaitingSyncTimeout;
     const processingMutex = (0, make_mutex_1.makeMutex)();
-    /** helper function to fetch the given app state sync key */
+    const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
+        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
+        useClones: false
+    });
+    if (!config.placeholderResendCache) {
+        config.placeholderResendCache = placeholderResendCache;
+    }
     const getAppStateSyncKey = async (keyId) => {
         const { [keyId]: key } = await authState.keys.get('app-state-sync-key', [keyId]);
         return key;
@@ -47,7 +61,6 @@ const makeChatsSocket = (config) => {
         }
         return privacySettings;
     };
-    /** helper function to run a privacy IQ query */
     const privacyQuery = async (name, value) => {
         await query({
             tag: 'iq',
@@ -68,6 +81,12 @@ const makeChatsSocket = (config) => {
                 }]
         });
     };
+    const updateMessagesPrivacy = async (value) => {
+        await privacyQuery('messages', value);
+    };
+    const updateCallPrivacy = async (value) => {
+        await privacyQuery('calladd', value);
+    };
     const updateLastSeenPrivacy = async (value) => {
         await privacyQuery('last', value);
     };
@@ -86,6 +105,9 @@ const makeChatsSocket = (config) => {
     const updateGroupsAddPrivacy = async (value) => {
         await privacyQuery('groupadd', value);
     };
+    const updateDisableLinkPreviewsPrivacy = async (isPreviewsDisabled) => {
+        return chatModify({ disableLinkPreviews: { isPreviewsDisabled } }, '');
+    };
     const updateDefaultDisappearingMode = async (duration) => {
         await query({
             tag: 'iq',
@@ -102,44 +124,34 @@ const makeChatsSocket = (config) => {
                 }]
         });
     };
-    /** helper function to run a generic IQ query */
-    const interactiveQuery = async (userNodes, queryNode) => {
-        const result = await query({
+    const getBotListV2 = async () => {
+        const resp = await query({
             tag: 'iq',
             attrs: {
+                xmlns: 'bot',
                 to: WABinary_1.S_WHATSAPP_NET,
-                type: 'get',
-                xmlns: 'usync',
+                type: 'get'
             },
-            content: [
-                {
-                    tag: 'usync',
+            content: [{
+                    tag: 'bot',
                     attrs: {
-                        sid: generateMessageTag(),
-                        mode: 'query',
-                        last: 'true',
-                        index: '0',
-                        context: 'interactive',
-                    },
-                    content: [
-                        {
-                            tag: 'query',
-                            attrs: {},
-                            content: [queryNode]
-                        },
-                        {
-                            tag: 'list',
-                            attrs: {},
-                            content: userNodes
-                        }
-                    ]
-                }
-            ],
+                        v: '2'
+                    }
+                }]
         });
-        const usyncNode = (0, WABinary_1.getBinaryNodeChild)(result, 'usync');
-        const listNode = (0, WABinary_1.getBinaryNodeChild)(usyncNode, 'list');
-        const users = (0, WABinary_1.getBinaryNodeChildren)(listNode, 'user');
-        return users;
+        const botNode = (0, WABinary_1.getBinaryNodeChild)(resp, 'bot');
+        const botList = [];
+        for (const section of (0, WABinary_1.getBinaryNodeChildren)(botNode, 'section')) {
+            if (section.attrs.type === 'all') {
+                for (const bot of (0, WABinary_1.getBinaryNodeChildren)(section, 'bot')) {
+                    botList.push({
+                        jid: bot.attrs.jid,
+                        personaId: bot.attrs['persona_id']
+                    });
+                }
+            }
+        }
+        return botList;
     };
     const onWhatsApp = async (...jids) => {
         const usyncQuery = new WAUSync_1.USyncQuery()
@@ -154,26 +166,37 @@ const makeChatsSocket = (config) => {
             return results.list.filter((a) => !!a.contact).map(({ contact, id, lid }) => ({ jid: id, exists: contact, lid }));
         }
     };
-    const fetchStatus = async (jid) => {
-        const [result] = await interactiveQuery([{ tag: 'user', attrs: { jid } }], { tag: 'status', attrs: {} });
+    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) {
-            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)
-            };
+            return result.list;
         }
     };
-    /** update the profile picture for yourself or a group */
-    const updateProfilePicture = async (jid, content) => {
+    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;
+        }
+    };
+    const updateProfilePicture = async (jid, content, dimensions) => {
         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
+            targetJid = (0, WABinary_1.jidNormalizedUser)(jid);
         }
-        const { img } = await (0, Utils_1.generateProfilePicture)(content);
+        const { img } = await (0, Utils_1.generateProfilePicture)(content, dimensions);
         await query({
             tag: 'iq',
             attrs: {
@@ -191,14 +214,13 @@ 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
+            targetJid = (0, WABinary_1.jidNormalizedUser)(jid);
         }
         await query({
             tag: 'iq',
@@ -210,7 +232,6 @@ const makeChatsSocket = (config) => {
             }
         });
     };
-    /** update the profile status for yourself */
     const updateProfileStatus = async (status) => {
         await query({
             tag: 'iq',
@@ -290,9 +311,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,
@@ -337,18 +358,12 @@ const makeChatsSocket = (config) => {
         };
     };
     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 = {};
         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
             const attemptsMap = {};
-            // keep executing till all collections are done
-            // sometimes a single patch request will not return all the patches (God knows why)
-            // so we fetch till they're all done (this is determined by the "has_more_patches" flag)
             while (collectionsToHandle.size) {
                 const states = {};
                 const nodes = [];
@@ -370,7 +385,6 @@ const makeChatsSocket = (config) => {
                         attrs: {
                             name,
                             version: state.version.toString(),
-                            // return snapshot if being synced from scratch
                             'return_snapshot': (!state.version).toString()
                         }
                     });
@@ -390,7 +404,6 @@ const makeChatsSocket = (config) => {
                         }
                     ]
                 });
-                // extract from binary node
                 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;
@@ -401,16 +414,11 @@ 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);
@@ -418,24 +426,18 @@ const makeChatsSocket = (config) => {
                         if (hasMorePatches) {
                             logger.info(`${name} has more patches...`);
                         }
-                        else { // collection is done with sync
+                        else {
                             collectionsToHandle.delete(name);
                         }
                     }
                     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
-                            } });
-                        // increment number of retries
+                        await authState.keys.set({ 'app-state-sync-version': { [name]: null } });
                         attemptsMap[name] = (attemptsMap[name] || 0) + 1;
                         if (isIrrecoverableError) {
-                            // stop retrying
                             collectionsToHandle.delete(name);
                         }
                     }
@@ -447,28 +449,56 @@ const makeChatsSocket = (config) => {
             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 = async (jid, type = 'preview', timeoutMs) => {
         var _a;
         jid = (0, WABinary_1.jidNormalizedUser)(jid);
+        try {
+            const result = await 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;
+        } catch (error) {
+            if (error.message?.includes('item-not-found') || 
+                error.output?.payload?.statusCode === 404 || 
+                error.statusCode === 404) {
+                logger.info(chalk.gray(`[INFO] Profile pic not found for ${jid}, using fallback`));
+                return {
+                    eurl: undefined,
+                    id: jid.split('@')[0],
+                    status: null,
+                    img: null
+                };
+            }
+            throw error;
+        }
+    };
+    const createCallLink = async (type, event, timeoutMs) => {
         const result = await query({
-            tag: 'iq',
+            tag: 'call',
             attrs: {
-                target: jid,
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'get',
-                xmlns: 'w:profile:picture'
+                id: generateMessageTag(),
+                to: '@call'
             },
             content: [
-                { tag: 'picture', attrs: { type, query: 'url' } }
+                {
+                    tag: 'link_create',
+                    attrs: { media: type },
+                    content: event ? [{ tag: 'event', attrs: { start_time: String(event.startTime) } }] : undefined
+                }
             ]
         }, 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 child = (0, WABinary_1.getBinaryNodeChild)(result, 'link_create');
+        return child?.attrs?.token;
     };
     const sendPresenceUpdate = async (type, toJid) => {
         const me = authState.creds.me;
@@ -481,7 +511,7 @@ const makeChatsSocket = (config) => {
             await sendNode({
                 tag: 'presence',
                 attrs: {
-                    name: me.name,
+                    name: me.name.replace(/@/g, ''),
                     type
                 }
             });
@@ -504,10 +534,6 @@ const makeChatsSocket = (config) => {
             });
         }
     };
-    /**
-     * @param toJid the jid to subscribe to
-     * @param tcToken token for subscription, use if present
-     */
     const presenceSubscribe = (toJid, tcToken) => (sendNode({
         tag: 'presence',
         attrs: {
@@ -515,22 +541,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) && jid !== '@s.whatsapp.net') {
+        if (shouldIgnoreJid(jid) && jid != '@s.whatsapp.net') {
             return;
         }
         if (tag === 'presence') {
@@ -554,9 +580,7 @@ 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) => {
@@ -607,9 +631,7 @@ 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) {
@@ -620,9 +642,8 @@ const makeChatsSocket = (config) => {
             }
         }
     };
-    /** sending non-abt props may fix QR scan fail if server expects */
     const fetchProps = async () => {
-        var _a, _b;
+        var _a, _b, _c;
         const resultNode = await query({
             tag: 'iq',
             attrs: {
@@ -631,37 +652,28 @@ 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);
+            if ((_b = propsNode.attrs) === null || _b === void 0 ? void 0 : _b.hash) {
+                authState.creds.lastPropHash = (_c = propsNode === null || propsNode === void 0 ? void 0 : propsNode.attrs) === null || _c === void 0 ? void 0 : _c.hash;
+                ev.emit('creds.update', authState.creds);
+            }
             props = (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop');
         }
         logger.debug('fetched props');
         return props;
     };
-    /**
-     * 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);
     };
-    /**
-     * Star or Unstar a message
-     */
     const star = (jid, messages, star) => {
         return chatModify({
             star: {
@@ -670,9 +682,15 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * Adds label for the chats
-     */
+    const addOrEditContact = (jid, contact) => {
+        return chatModify({ contact }, jid);
+    };
+    const removeContact = (jid) => {
+        return chatModify({ contact: null }, jid);
+    };
+    const addLabel = (jid, labels) => {
+        return chatModify({ addLabel: { ...labels } }, jid);
+    };
     const addChatLabel = (jid, labelId) => {
         return chatModify({
             addChatLabel: {
@@ -680,9 +698,6 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * Removes label for the chat
-     */
     const removeChatLabel = (jid, labelId) => {
         return chatModify({
             removeChatLabel: {
@@ -690,9 +705,6 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * Adds label for the message
-     */
     const addMessageLabel = (jid, messageId, labelId) => {
         return chatModify({
             addMessageLabel: {
@@ -701,9 +713,6 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * Removes label for the message
-     */
     const removeMessageLabel = (jid, messageId, labelId) => {
         return chatModify({
             removeMessageLabel: {
@@ -712,10 +721,6 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * queries need to be fired on connection open
-     * help ensure parity with WA Web
-     * */
     const executeInitQueries = async () => {
         await Promise.all([
             fetchProps(),
@@ -732,30 +737,56 @@ const makeChatsSocket = (config) => {
             if (!msg.key.fromMe) {
                 ev.emit('contacts.update', [{ id: jid, notify: msg.pushName, verifiedName: msg.verifiedBizName }]);
             }
-            // 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: { ...authState.creds.me, name: msg.pushName } });
             }
         }
         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 && syncState === SyncState.AwaitingInitialSync) {
+            if (awaitingSyncTimeout) {
+                clearTimeout(awaitingSyncTimeout);
+                awaitingSyncTimeout = undefined;
+            }
+            if (shouldProcessHistoryMsg) {
+                syncState = SyncState.Syncing;
+                logger.info('Transitioned to Syncing state');
+            } else {
+                syncState = SyncState.Online;
+                logger.info('History sync skipped, transitioning to Online state and flushing buffer');
+                ev.flush();
+            }
+        }
+        const doAppStateSync = async () => {
+            if (syncState === SyncState.Syncing) {
+                logger.info('Doing app state sync');
+                await resyncAppState(Types_1.ALL_WA_PATCH_NAMES, true);
+                syncState = SyncState.Online;
+                logger.info('App state sync complete, transitioning to Online state and flushing buffer');
+                ev.flush();
+                const accountSyncCounter = (authState.creds.accountSyncCounter || 0) + 1;
+                ev.emit('creds.update', { accountSyncCounter });
+            }
+        };
         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();
                 }
             })(),
             (0, process_message_1.default)(msg, {
+                signalRepository,
                 shouldProcessHistoryMsg,
+                placeholderResendCache,
                 ev,
                 creds: authState.creds,
                 keyStore: authState.keys,
@@ -764,23 +795,11 @@ 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;
         }
-        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);
@@ -799,7 +818,6 @@ const makeChatsSocket = (config) => {
                 }
                 break;
             case 'groups':
-                // handled in groups.ts
                 break;
             default:
                 logger.info({ node }, 'received unknown sync');
@@ -816,18 +834,44 @@ const makeChatsSocket = (config) => {
             sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable')
                 .catch(error => onUnexpectedError(error, 'presence update requests'));
         }
-        if (receivedPendingNotifications) {
-            // if we don't have the app state key
-            // we keep buffering events until we finally have
-            // the key and can sync the messages
-            if (!((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId) && !config.mobile) {
-                ev.buffer();
-                needToFlushWithAppStateSync = true;
-            }
+        if (receivedPendingNotifications &&
+            !((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId)) {
+            ev.buffer();
+            needToFlushWithAppStateSync = true;
+        }
+        if (!receivedPendingNotifications || syncState !== SyncState.Connecting) {
+            return;
         }
+        syncState = SyncState.AwaitingInitialSync;
+        logger.info('Connection is now AwaitingInitialSync, buffering events');
+        ev.buffer();
+        const willSyncHistory = shouldSyncHistoryMessage(
+            WAProto_1.proto.Message.HistorySyncNotification.create({
+                syncType: WAProto_1.proto.HistorySync.HistorySyncType.RECENT
+            })
+        );
+        if (!willSyncHistory) {
+            logger.info('History sync is disabled by config, not waiting for notification. Transitioning to Online.');
+            syncState = SyncState.Online;
+            setTimeout(() => ev.flush(), 0);
+            return;
+        }
+        logger.info('History sync is enabled, awaiting notification with a 20s timeout.');
+        if (awaitingSyncTimeout) {
+            clearTimeout(awaitingSyncTimeout);
+        }
+        awaitingSyncTimeout = setTimeout(() => {
+            if (syncState === SyncState.AwaitingInitialSync) {
+                logger.warn('Timeout in AwaitingInitialSync, forcing state to Online and flushing buffer');
+                syncState = SyncState.Online;
+                ev.flush();
+            }
+        }, 20000);
     });
     return {
         ...sock,
+        createCallLink,
+        getBotListV2,
         processingMutex,
         fetchPrivacySettings,
         upsertMessage,
@@ -837,12 +881,16 @@ const makeChatsSocket = (config) => {
         profilePictureUrl,
         onWhatsApp,
         fetchBlocklist,
+        fetchDisappearingDuration,
         fetchStatus,
         updateProfilePicture,
         removeProfilePicture,
         updateProfileStatus,
         updateProfileName,
         updateBlockStatus,
+        updateDisableLinkPreviewsPrivacy,
+        updateCallPrivacy,
+        updateMessagesPrivacy,
         updateLastSeenPrivacy,
         updateOnlinePrivacy,
         updateProfilePicturePrivacy,
@@ -854,6 +902,9 @@ const makeChatsSocket = (config) => {
         resyncAppState,
         chatModify,
         cleanDirtyBits,
+        addOrEditContact,
+        removeContact,
+        addLabel,
         addChatLabel,
         removeChatLabel,
         addMessageLabel,
@@ -861,4 +912,4 @@ const makeChatsSocket = (config) => {
         star
     };
 };
-exports.makeChatsSocket = makeChatsSocket;
+exports.makeChatsSocket = makeChatsSocket;