@hbmodsofc/baileys 1.7.8 → 2.2.0

package/lib/Socket/chats.js

@@ -4,38 +4,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeChatsSocket = void 0;
-const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
 const boom_1 = require("@hapi/boom");
-const index_js_1 = require("../../WAProto/index.js");
+const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
+const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Types_1 = require("../Types");
-const State_1 = require("../Types/State");
 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 WAUSync_1 = require("../WAUSync");
-const socket_js_1 = require("./socket.js");
+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, socket_js_1.makeSocket)(config);
-    const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError } = sock;
+    const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config;
+    const sock = (0, usync_1.makeUSyncSocket)(config);
+    const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError, } = sock;
     let privacySettings;
-    let syncState = State_1.SyncState.Connecting;
-    /** this mutex ensures that the notifications (receipts, messages etc.) are processed in order */
-    const processingMutex = (0, make_mutex_1.makeMutex)();
-    // Timeout for AwaitingInitialSync state
+    let syncState = SyncState.Connecting;
+    let needToFlushWithAppStateSync = false;
+    let pendingAppStateSync = false;
     let awaitingSyncTimeout;
-    const placeholderResendCache = config.placeholderResendCache ||
-        new node_cache_1.default({
-            stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
-            useClones: false
-        });
+    const processingMutex = (0, make_mutex_1.makeMutex)();
+    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;
     }
-    /** helper function to fetch the given app state sync key */
     const getAppStateSyncKey = async (keyId) => {
         const { [keyId]: key } = await authState.keys.get('app-state-sync-key', [keyId]);
         return key;
@@ -49,13 +53,14 @@ const makeChatsSocket = (config) => {
                     to: WABinary_1.S_WHATSAPP_NET,
                     type: 'get'
                 },
-                content: [{ tag: 'privacy', attrs: {} }]
+                content: [
+                    { tag: 'privacy', attrs: {} }
+                ]
             });
-            privacySettings = (0, WABinary_1.reduceBinaryNodeToDictionary)(content?.[0], 'category');
+            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 = async (name, value) => {
         await query({
             tag: 'iq',
@@ -64,8 +69,7 @@ const makeChatsSocket = (config) => {
                 to: WABinary_1.S_WHATSAPP_NET,
                 type: 'set'
             },
-            content: [
-                {
+            content: [{
                     tag: 'privacy',
                     attrs: {},
                     content: [
@@ -74,8 +78,7 @@ const makeChatsSocket = (config) => {
                             attrs: { name, value }
                         }
                     ]
-                }
-            ]
+                }]
         });
     };
     const updateMessagesPrivacy = async (value) => {
@@ -102,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',
@@ -110,14 +116,12 @@ const makeChatsSocket = (config) => {
                 to: WABinary_1.S_WHATSAPP_NET,
                 type: 'set'
             },
-            content: [
-                {
+            content: [{
                     tag: 'disappearing_mode',
                     attrs: {
                         duration: duration.toString()
                     }
-                }
-            ]
+                }]
         });
     };
     const getBotListV2 = async () => {
@@ -128,14 +132,12 @@ const makeChatsSocket = (config) => {
                 to: WABinary_1.S_WHATSAPP_NET,
                 type: 'get'
             },
-            content: [
-                {
+            content: [{
                     tag: 'bot',
                     attrs: {
                         v: '2'
                     }
-                }
-            ]
+                }]
         });
         const botNode = (0, WABinary_1.getBinaryNodeChild)(resp, 'bot');
         const botList = [];
@@ -151,8 +153,22 @@ const makeChatsSocket = (config) => {
         }
         return botList;
     };
+    const onWhatsApp = async (...jids) => {
+        const usyncQuery = new WAUSync_1.USyncQuery()
+            .withContactProtocol()
+            .withLIDProtocol();
+        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, lid }) => ({ jid: id, exists: contact, lid }));
+        }
+    };
     const fetchStatus = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery().withStatusProtocol();
+        const usyncQuery = new WAUSync_1.USyncQuery()
+            .withStatusProtocol();
         for (const jid of jids) {
             usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid));
         }
@@ -162,7 +178,8 @@ const makeChatsSocket = (config) => {
         }
     };
     const fetchDisappearingDuration = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery().withDisappearingModeProtocol();
+        const usyncQuery = new WAUSync_1.USyncQuery()
+            .withDisappearingModeProtocol();
         for (const jid of jids) {
             usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid));
         }
@@ -171,26 +188,22 @@ const makeChatsSocket = (config) => {
             return result.list;
         }
     };
-    /** update the profile picture for yourself or a group */
     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
-        }
-        else {
-            targetJid = undefined;
+            targetJid = (0, WABinary_1.jidNormalizedUser)(jid);
         }
         const { img } = await (0, Utils_1.generateProfilePicture)(content, dimensions);
         await query({
             tag: 'iq',
             attrs: {
+                target: targetJid,
                 to: WABinary_1.S_WHATSAPP_NET,
                 type: 'set',
-                xmlns: 'w:profile:picture',
-                ...(targetJid ? { target: targetJid } : {})
+                xmlns: 'w:profile:picture'
             },
             content: [
                 {
@@ -201,29 +214,24 @@ 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
-        }
-        else {
-            targetJid = undefined;
+            targetJid = (0, WABinary_1.jidNormalizedUser)(jid);
         }
         await query({
             tag: 'iq',
             attrs: {
+                target: targetJid,
                 to: WABinary_1.S_WHATSAPP_NET,
                 type: 'set',
-                xmlns: 'w:profile:picture',
-                ...(targetJid ? { target: targetJid } : {})
+                xmlns: 'w:profile:picture'
             }
         });
     };
-    /** update the profile status for yourself */
     const updateProfileStatus = async (status) => {
         await query({
             tag: 'iq',
@@ -254,7 +262,8 @@ const makeChatsSocket = (config) => {
             }
         });
         const listNode = (0, WABinary_1.getBinaryNodeChild)(result, 'list');
-        return (0, WABinary_1.getBinaryNodeChildren)(listNode, 'item').map(n => n.attrs.jid);
+        return (0, WABinary_1.getBinaryNodeChildren)(listNode, 'item')
+            .map(n => n.attrs.jid);
     };
     const updateBlockStatus = async (jid, action) => {
         await query({
@@ -276,6 +285,7 @@ const makeChatsSocket = (config) => {
         });
     };
     const getBusinessProfile = async (jid) => {
+        var _a, _b, _c, _d, _e, _f, _g;
         const results = await query({
             tag: 'iq',
             attrs: {
@@ -283,18 +293,14 @@ const makeChatsSocket = (config) => {
                 xmlns: 'w:biz',
                 type: 'get'
             },
-            content: [
-                {
+            content: [{
                     tag: 'business_profile',
                     attrs: { v: '244' },
-                    content: [
-                        {
+                    content: [{
                             tag: 'profile',
                             attrs: { jid }
-                        }
-                    ]
-                }
-            ]
+                        }]
+                }]
         });
         const profileNode = (0, WABinary_1.getBinaryNodeChild)(results, 'business_profile');
         const profiles = (0, WABinary_1.getBinaryNodeChild)(profileNode, 'profile');
@@ -308,17 +314,17 @@ const makeChatsSocket = (config) => {
             const businessHoursConfig = businessHours
                 ? (0, WABinary_1.getBinaryNodeChildren)(businessHours, 'business_hours_config')
                 : undefined;
-            const websiteStr = website?.content?.toString();
+            const websiteStr = (_a = website === null || website === void 0 ? void 0 : website.content) === null || _a === void 0 ? void 0 : _a.toString();
             return {
-                wid: profiles.attrs?.jid,
-                address: address?.content?.toString(),
-                description: description?.content?.toString() || '',
+                wid: (_b = profiles.attrs) === null || _b === void 0 ? void 0 : _b.jid,
+                address: (_c = address === null || address === void 0 ? void 0 : address.content) === null || _c === void 0 ? void 0 : _c.toString(),
+                description: ((_d = description === null || description === void 0 ? void 0 : description.content) === null || _d === void 0 ? void 0 : _d.toString()) || '',
                 website: websiteStr ? [websiteStr] : [],
-                email: email?.content?.toString(),
-                category: category?.content?.toString(),
-                business_hours: {
-                    timezone: businessHours?.attrs?.timezone,
-                    business_config: businessHoursConfig?.map(({ attrs }) => attrs)
+                email: (_e = email === null || email === void 0 ? void 0 : email.content) === null || _e === void 0 ? void 0 : _e.toString(),
+                category: (_f = category === null || category === void 0 ? void 0 : category.content) === null || _f === void 0 ? void 0 : _f.toString(),
+                'business_hours': {
+                    timezone: (_g = businessHours === null || businessHours === void 0 ? void 0 : businessHours.attrs) === null || _g === void 0 ? void 0 : _g.timezone,
+                    'business_config': businessHoursConfig === null || businessHoursConfig === void 0 ? void 0 : businessHoursConfig.map(({ attrs }) => attrs)
                 }
             };
         }
@@ -331,14 +337,14 @@ const makeChatsSocket = (config) => {
                 to: WABinary_1.S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'urn:xmpp:whatsapp:dirty',
-                id: generateMessageTag()
+                id: generateMessageTag(),
             },
             content: [
                 {
                     tag: 'clean',
                     attrs: {
                         type,
-                        ...(fromTimestamp ? { timestamp: fromTimestamp.toString() } : null)
+                        ...(fromTimestamp ? { timestamp: fromTimestamp.toString() } : null),
                     }
                 }
             ]
@@ -352,17 +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 = [];
@@ -384,8 +385,7 @@ const makeChatsSocket = (config) => {
                         attrs: {
                             name,
                             version: state.version.toString(),
-                            // return snapshot if being synced from scratch
-                            return_snapshot: (!state.version).toString()
+                            'return_snapshot': (!state.version).toString()
                         }
                     });
                 }
@@ -404,8 +404,7 @@ const makeChatsSocket = (config) => {
                         }
                     ]
                 });
-                // extract from binary node
-                const decoded = await (0, Utils_1.extractSyncdPatches)(result, 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];
@@ -417,7 +416,6 @@ const makeChatsSocket = (config) => {
                             logger.info(`restored state of ${name} from snapshot to v${newState.version} with mutations`);
                             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 } });
@@ -429,52 +427,60 @@ const makeChatsSocket = (config) => {
                             logger.info(`${name} has more patches...`);
                         }
                         else {
-                            // collection is done with sync
                             collectionsToHandle.delete(name);
                         }
                     }
                     catch (error) {
-                        // if retry attempts overshoot
-                        // or key not found
-                        const isIrrecoverableError = attemptsMap[name] >= MAX_SYNC_ATTEMPTS ||
-                            error.output?.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
                         attemptsMap[name] = (attemptsMap[name] || 0) + 1;
                         if (isIrrecoverableError) {
-                            // stop retrying
                             collectionsToHandle.delete(name);
                         }
                     }
                 }
             }
-        }, authState?.creds?.me?.id || 'resync-app-state');
+        });
         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 = async (jid, type = 'preview', timeoutMs) => {
+        var _a;
         jid = (0, WABinary_1.jidNormalizedUser)(jid);
-        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 child?.attrs?.url;
+        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({
@@ -517,7 +523,7 @@ const makeChatsSocket = (config) => {
                 tag: 'chatstate',
                 attrs: {
                     from: isLid ? me.lid : me.id,
-                    to: toJid
+                    to: toJid,
                 },
                 content: [
                     {
@@ -528,11 +534,7 @@ const makeChatsSocket = (config) => {
             });
         }
     };
-    /**
-     * @param toJid the jid to subscribe to
-     * @param tcToken token for subscription, use if present
-     */
-    const presenceSubscribe = (toJid, tcToken) => sendNode({
+    const presenceSubscribe = (toJid, tcToken) => (sendNode({
         tag: 'presence',
         attrs: {
             to: toJid,
@@ -548,12 +550,13 @@ const makeChatsSocket = (config) => {
                 }
             ]
             : 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') {
@@ -568,7 +571,7 @@ const makeChatsSocket = (config) => {
             if (type === 'paused') {
                 type = 'available';
             }
-            if (firstChild.attrs?.media === 'audio') {
+            if (((_a = firstChild.attrs) === null || _a === void 0 ? void 0 : _a.media) === 'audio') {
                 type = 'recording';
             }
             presence = { lastKnownPresence: type };
@@ -613,13 +616,13 @@ const makeChatsSocket = (config) => {
                                     attrs: {
                                         name,
                                         version: (state.version - 1).toString(),
-                                        return_snapshot: 'false'
+                                        'return_snapshot': 'false'
                                     },
                                     content: [
                                         {
                                             tag: 'patch',
                                             attrs: {},
-                                            content: index_js_1.proto.SyncdPatch.encode(patch).finish()
+                                            content: WAProto_1.proto.SyncdPatch.encode(patch).finish()
                                         }
                                     ]
                                 }
@@ -629,41 +632,37 @@ const makeChatsSocket = (config) => {
                 };
                 await query(node);
                 await authState.keys.set({ 'app-state-sync-version': { [name]: state } });
-            }, authState?.creds?.me?.id || 'app-patch');
+            });
         });
         if (config.emitOwnEvents) {
             const { onMutation } = newAppStateChunkHandler(false);
-            const { mutationMap } = await (0, Utils_1.decodePatches)(name, [{ ...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 = async () => {
+        var _a, _b, _c;
         const resultNode = await query({
             tag: 'iq',
             attrs: {
                 to: WABinary_1.S_WHATSAPP_NET,
                 xmlns: 'w',
-                type: 'get'
+                type: 'get',
             },
             content: [
-                {
-                    tag: 'props',
-                    attrs: {
+                { tag: 'props', attrs: {
                         protocol: '2',
-                        hash: authState?.creds?.lastPropHash || ''
-                    }
-                }
+                        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) {
-            if (propsNode.attrs?.hash) {
-                // on some clients, the hash is returning as undefined
-                authState.creds.lastPropHash = propsNode?.attrs?.hash;
+            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');
@@ -671,26 +670,10 @@ const makeChatsSocket = (config) => {
         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);
     };
-    /**
-     * Enable/Disable link preview privacy, not related to baileys link preview generation
-     */
-    const updateDisableLinkPreviewsPrivacy = (isPreviewsDisabled) => {
-        return chatModify({
-            disableLinkPreviews: { isPreviewsDisabled }
-        }, '');
-    };
-    /**
-     * Star or Unstar a message
-     */
     const star = (jid, messages, star) => {
         return chatModify({
             star: {
@@ -699,35 +682,15 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * Add or Edit Contact
-     */
     const addOrEditContact = (jid, contact) => {
-        return chatModify({
-            contact
-        }, jid);
+        return chatModify({ contact }, jid);
     };
-    /**
-     * Remove Contact
-     */
     const removeContact = (jid) => {
-        return chatModify({
-            contact: null
-        }, jid);
+        return chatModify({ contact: null }, jid);
     };
-    /**
-     * Adds label
-     */
     const addLabel = (jid, labels) => {
-        return chatModify({
-            addLabel: {
-                ...labels
-            }
-        }, jid);
+        return chatModify({ addLabel: { ...labels } }, jid);
     };
-    /**
-     * Adds label for the chats
-     */
     const addChatLabel = (jid, labelId) => {
         return chatModify({
             addChatLabel: {
@@ -735,9 +698,6 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * Removes label for the chat
-     */
     const removeChatLabel = (jid, labelId) => {
         return chatModify({
             removeChatLabel: {
@@ -745,9 +705,6 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * Adds label for the message
-     */
     const addMessageLabel = (jid, messageId, labelId) => {
         return chatModify({
             addMessageLabel: {
@@ -756,9 +713,6 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * Removes label for the message
-     */
     const removeMessageLabel = (jid, messageId, labelId) => {
         return chatModify({
             removeMessageLabel: {
@@ -767,78 +721,65 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    /**
-     * Add or Edit Quick Reply
-     */
-    const addOrEditQuickReply = (quickReply) => {
-        return chatModify({
-            quickReply
-        }, '');
-    };
-    /**
-     * Remove Quick Reply
-     */
-    const removeQuickReply = (timestamp) => {
-        return chatModify({
-            quickReply: { timestamp, deleted: true }
-        }, '');
-    };
-    /**
-     * queries need to be fired on connection open
-     * help ensure parity with WA Web
-     * */
     const executeInitQueries = async () => {
-        await Promise.all([fetchProps(), fetchBlocklist(), fetchPrivacySettings()]);
+        await Promise.all([
+            fetchProps(),
+            fetchBlocklist(),
+            fetchPrivacySettings(),
+        ]);
     };
     const upsertMessage = ev.createBufferedFunction(async (msg, type) => {
+        var _a, _b, _c;
         ev.emit('messages.upsert', { messages: [msg], type });
         if (!!msg.pushName) {
-            let jid = msg.key.fromMe ? authState.creds.me.id : msg.key.participant || msg.key.remoteJid;
+            let jid = msg.key.fromMe ? authState.creds.me.id : (msg.key.participant || msg.key.remoteJid);
             jid = (0, WABinary_1.jidNormalizedUser)(jid);
             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 && authState.creds.me?.name !== msg.pushName) {
+            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)
+            ? (shouldSyncHistoryMessage(historyMsg)
+                && Defaults_1.PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType))
             : false;
-        // State machine: decide on sync and flush
-        if (historyMsg && syncState === State_1.SyncState.AwaitingInitialSync) {
+        if (historyMsg && syncState === SyncState.AwaitingInitialSync) {
             if (awaitingSyncTimeout) {
                 clearTimeout(awaitingSyncTimeout);
                 awaitingSyncTimeout = undefined;
             }
             if (shouldProcessHistoryMsg) {
-                syncState = State_1.SyncState.Syncing;
+                syncState = SyncState.Syncing;
                 logger.info('Transitioned to Syncing state');
-                // Let doAppStateSync handle the final flush after it's done
-            }
-            else {
-                syncState = State_1.SyncState.Online;
+            } else {
+                syncState = SyncState.Online;
                 logger.info('History sync skipped, transitioning to Online state and flushing buffer');
                 ev.flush();
             }
         }
         const doAppStateSync = async () => {
-            if (syncState === State_1.SyncState.Syncing) {
+            if (syncState === SyncState.Syncing) {
                 logger.info('Doing app state sync');
                 await resyncAppState(Types_1.ALL_WA_PATCH_NAMES, true);
-                // Sync is complete, go online and flush everything
-                syncState = State_1.SyncState.Online;
+                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 (shouldProcessHistoryMsg) {
+                if (historyMsg
+                    && authState.creds.myAppStateKeyId) {
+                    pendingAppStateSync = false;
                     await doAppStateSync();
                 }
             })(),
@@ -850,13 +791,14 @@ const makeChatsSocket = (config) => {
                 creds: authState.creds,
                 keyStore: authState.keys,
                 logger,
-                options: config.options
+                options: config.options,
+                getMessage: config.getMessage,
             })
         ]);
-        // If the app state key arrives and we are waiting to sync, trigger the sync now.
-        if (msg.message?.protocolMessage?.appStateSyncKeyShare && syncState === State_1.SyncState.Syncing) {
-            logger.info('App state sync key arrived, triggering app state sync');
+        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;
         }
     });
     ws.on('CB:presence', handlePresenceUpdate);
@@ -876,7 +818,6 @@ const makeChatsSocket = (config) => {
                 }
                 break;
             case 'groups':
-                // handled in groups.ts
                 break;
             default:
                 logger.info({ node }, 'received unknown sync');
@@ -884,24 +825,34 @@ const makeChatsSocket = (config) => {
         }
     });
     ev.on('connection.update', ({ connection, receivedPendingNotifications }) => {
+        var _a;
         if (connection === 'open') {
             if (fireInitQueries) {
-                executeInitQueries().catch(error => onUnexpectedError(error, 'init queries'));
+                executeInitQueries()
+                    .catch(error => onUnexpectedError(error, 'init queries'));
             }
-            sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable').catch(error => onUnexpectedError(error, 'presence update requests'));
+            sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable')
+                .catch(error => onUnexpectedError(error, 'presence update requests'));
+        }
+        if (receivedPendingNotifications &&
+            !((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId)) {
+            ev.buffer();
+            needToFlushWithAppStateSync = true;
         }
-        if (!receivedPendingNotifications || syncState !== State_1.SyncState.Connecting) {
+        if (!receivedPendingNotifications || syncState !== SyncState.Connecting) {
             return;
         }
-        syncState = State_1.SyncState.AwaitingInitialSync;
+        syncState = SyncState.AwaitingInitialSync;
         logger.info('Connection is now AwaitingInitialSync, buffering events');
         ev.buffer();
-        const willSyncHistory = shouldSyncHistoryMessage(index_js_1.proto.Message.HistorySyncNotification.create({
-            syncType: index_js_1.proto.HistorySync.HistorySyncType.RECENT
-        }));
+        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 = State_1.SyncState.Online;
+            syncState = SyncState.Online;
             setTimeout(() => ev.flush(), 0);
             return;
         }
@@ -910,9 +861,9 @@ const makeChatsSocket = (config) => {
             clearTimeout(awaitingSyncTimeout);
         }
         awaitingSyncTimeout = setTimeout(() => {
-            if (syncState === State_1.SyncState.AwaitingInitialSync) {
+            if (syncState === SyncState.AwaitingInitialSync) {
                 logger.warn('Timeout in AwaitingInitialSync, forcing state to Online and flushing buffer');
-                syncState = State_1.SyncState.Online;
+                syncState = SyncState.Online;
                 ev.flush();
             }
         }, 20000);
@@ -928,9 +879,10 @@ const makeChatsSocket = (config) => {
         sendPresenceUpdate,
         presenceSubscribe,
         profilePictureUrl,
+        onWhatsApp,
         fetchBlocklist,
-        fetchStatus,
         fetchDisappearingDuration,
+        fetchStatus,
         updateProfilePicture,
         removeProfilePicture,
         updateProfileStatus,
@@ -957,9 +909,7 @@ const makeChatsSocket = (config) => {
         removeChatLabel,
         addMessageLabel,
         removeMessageLabel,
-        star,
-        addOrEditQuickReply,
-        removeQuickReply
+        star
     };
 };
-exports.makeChatsSocket = makeChatsSocket;
+exports.makeChatsSocket = makeChatsSocket;