@badzz88/baileys 8.5.6 → 8.5.8

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

@@ -1,55 +1,57 @@
-'use strict';
-var __importDefault = (this && this.__importDefault) ||
-    function (mod) {
-        return mod && mod.__esModule ? mod : { default: 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 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 tc_token_utils_1 = require('../Utils/tc-token-utils');
-const WABinary_1 = require('../WABinary');
-const WAUSync_1 = require('../WAUSync');
-const socket_js_1 = require('./socket.js');
-const interop_js_1 = require('./interop.js');
-const makeChatsSocket = config => {
+import NodeCache from '@cacheable/node-cache';
+import { Boom } from '@hapi/boom';
+import { proto } from '../../WAProto/index.js';
+import { DEFAULT_CACHE_TTLS, HISTORY_SYNC_PAUSED_TIMEOUT_MS, PROCESSABLE_HISTORY_TYPES } from '../Defaults/index.js';
+import { ALL_WA_PATCH_NAMES } from '../Types/index.js';
+import { SyncState } from '../Types/State.js';
+import { chatModificationToAppPatch, decodePatches, decodeSyncdSnapshot, encodeSyncdPatch, ensureLTHashStateVersion, extractSyncdPatches, generateProfilePicture, getHistoryMsg, isAppStateSyncIrrecoverable, isMissingKeyError, MAX_SYNC_ATTEMPTS, newLTHashState, processSyncAction } from '../Utils/index.js';
+import { makeMutex } from '../Utils/make-mutex.js';
+import processMessage from '../Utils/process-message.js';
+import { buildTcTokenFromJid } from '../Utils/tc-token-utils.js';
+import { getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isLidUser, isPnUser, jidDecode, jidNormalizedUser, reduceBinaryNodeToDictionary, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { USyncQuery, USyncUser } from '../WAUSync/index.js';
+import { makeSocket } from './socket.js';
+export const makeChatsSocket = (config) => {
     const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, getMessage } = config;
-    const sock = (0, interop_js_1.makeInteropSocket)((0, socket_js_1.makeSocket)(config));
-    const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError, sendUnifiedSession, initInterop, fetchIntegrators, acceptInteropTOS, optInIntegrators, optOutIntegrators, resolveInteropUser, resolveInteropUsers, getReachabilitySettings, setReachabilitySettings, blockInteropUser, unblockInteropUser, reportInteropSpam, trustInteropContact, createInteropGroup, leaveInteropGroup, getInteropGroupAddPrivacy, INTEGRATOR_BIRDYCHAT, INTEGRATOR_HAIKET } = sock;
+    const sock = makeSocket(config);
+    const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError, sendUnifiedSession, registerSocketEndHandler } = sock;
     const getLIDForPN = signalRepository.lidMapping.getLIDForPN.bind(signalRepository.lidMapping);
     let privacySettings;
+    /** Server-assigned AB props for protocol behavior. */
     const serverProps = {
+        /** AB prop 10518: gate tctoken on 1:1 messages. Default true (safe: avoids 463). */
         privacyTokenOn1to1: true,
+        /** AB prop 9666: gate tctoken on profile picture IQs. WA Web default: true. */
         profilePicPrivacyToken: true,
+        /** AB prop 14303: issue tctokens to LID instead of PN. WA Web default: false. */
         lidTrustedTokenIssueToLid: false
     };
-    let syncState = State_1.SyncState.Connecting;
-    const messageMutex = (0, make_mutex_1.makeMutex)();
-    const receiptMutex = (0, make_mutex_1.makeMutex)();
-    const appStatePatchMutex = (0, make_mutex_1.makeMutex)();
-    const notificationMutex = (0, make_mutex_1.makeMutex)();
+    let syncState = SyncState.Connecting;
+    /** this mutex ensures that messages are processed in order */
+    const messageMutex = makeMutex();
+    /** this mutex ensures that receipts are processed in order */
+    const receiptMutex = makeMutex();
+    /** this mutex ensures that app state patches are processed in order */
+    const appStatePatchMutex = makeMutex();
+    /** this mutex ensures that notifications are processed in order */
+    const notificationMutex = makeMutex();
+    // Timeout for AwaitingInitialSync state
     let awaitingSyncTimeout;
+    // In-memory history sync completion tracking (resets on reconnection)
     const historySyncStatus = {
         initialBootstrapComplete: false,
         recentSyncComplete: false
     };
     let historySyncPausedTimeout;
+    // Collections blocked on missing app state sync keys (mirrors WA Web's "Blocked" state).
+    // When a key arrives via APP_STATE_SYNC_KEY_SHARE, these are re-synced.
     const blockedCollections = new Set();
     const placeholderResendCache = config.placeholderResendCache ||
-        new node_cache_1.default({
-            stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
             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;
@@ -60,21 +62,22 @@ const makeChatsSocket = config => {
                 tag: 'iq',
                 attrs: {
                     xmlns: 'privacy',
-                    to: WABinary_1.S_WHATSAPP_NET,
+                    to: S_WHATSAPP_NET,
                     type: 'get'
                 },
                 content: [{ tag: 'privacy', attrs: {} }]
             });
-            privacySettings = (0, WABinary_1.reduceBinaryNodeToDictionary)(content?.[0], 'category');
+            privacySettings = reduceBinaryNodeToDictionary(content?.[0], 'category');
         }
         return privacySettings;
     };
+    /** helper function to run a privacy IQ query */
     const privacyQuery = async (name, value) => {
         await query({
             tag: 'iq',
             attrs: {
                 xmlns: 'privacy',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set'
             },
             content: [
@@ -109,59 +112,6 @@ const makeChatsSocket = config => {
     const updateStatusPrivacy = async (value) => {
         await privacyQuery('status', value);
     };
-    const getStatusPrivacy = async () => {
-        const result = await query({
-            tag: 'iq',
-            attrs: {
-                xmlns: 'status',
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'get'
-            },
-            content: [{ tag: 'privacy', attrs: {} }]
-        });
-        const privacyNode = result?.content?.[0];
-        if (!privacyNode)
-            return null;
-        const lists = [];
-        for (const listNode of (privacyNode.content || [])) {
-            const { type, id, listname, emoji, selected, deleted } = listNode.attrs || {};
-            const members = (listNode.content || []).map(u => u.attrs?.jid).filter(Boolean);
-            lists.push({ type, id, listname, emoji, selected: selected === 'true', deleted: deleted === 'true', members });
-        }
-        return lists;
-    };
-    const setStatusPrivacy = async (type, jids = [], customLists = []) => {
-        const content = [];
-        const mainList = {
-            tag: 'list',
-            attrs: { type },
-            content: jids.map(jid => ({ tag: 'user', attrs: { jid }, content: [] }))
-        };
-        content.push(mainList);
-        for (const cl of customLists) {
-            const attrs = { type: 'customlist', id: cl.id, listname: cl.listname };
-            if (cl.emoji)
-                attrs.emoji = cl.emoji;
-            if (cl.selected)
-                attrs.selected = 'true';
-            if (cl.deleted)
-                attrs.deleted = 'true';
-            content.push({
-                tag: 'list',
-                attrs,
-                content: (cl.members || []).map(jid => ({ tag: 'user', attrs: { jid }, content: [] }))
-            });
-        }
-        await query({
-            tag: 'iq',
-            attrs: {
-                xmlns: 'status',
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'set'
-            },
-            content: [{ tag: 'privacy', attrs: {}, content }]
-        });
-    };
     const updateReadReceiptsPrivacy = async (value) => {
         await privacyQuery('readreceipts', value);
     };
@@ -173,7 +123,7 @@ const makeChatsSocket = config => {
             tag: 'iq',
             attrs: {
                 xmlns: 'disappearing_mode',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set'
             },
             content: [
@@ -186,35 +136,12 @@ const makeChatsSocket = config => {
             ]
         });
     };
-    const fetchBroadcastListQuota = async () => {
-        const result = await query({
-            tag: 'iq',
-            attrs: {
-                xmlns: 'w:biz',
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'get'
-            },
-            content: [{ tag: 'broadcast_list_quota', attrs: {}, content: [] }]
-        }, 32000);
-        const limitsNode = (0, WABinary_1.getBinaryNodeChild)(result, 'limits');
-        const timeframeNode = (0, WABinary_1.getBinaryNodeChild)(result, 'timeframe');
-        if (!limitsNode)
-            return null;
-        return {
-            messagesLeft: parseInt(limitsNode.attrs?.messages_left ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'messages_left')?.content ?? '0'),
-            totalLimit: parseInt(limitsNode.attrs?.total_limit ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'total_limit')?.content ?? '0'),
-            isHeavySender: (limitsNode.attrs?.is_heavy_sender ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'is_heavy_sender')?.content) === 'true',
-            startTs: parseInt(timeframeNode?.attrs?.start_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'start_ts_s')?.content ?? '0'),
-            endTs: parseInt(timeframeNode?.attrs?.end_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'end_ts_s')?.content ?? '0'),
-            resetTs: parseInt(timeframeNode?.attrs?.reset_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'reset_ts_s')?.content ?? '0')
-        };
-    };
     const getBotListV2 = async () => {
         const resp = await query({
             tag: 'iq',
             attrs: {
                 xmlns: 'bot',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get'
             },
             content: [
@@ -226,11 +153,11 @@ const makeChatsSocket = config => {
                 }
             ]
         });
-        const botNode = (0, WABinary_1.getBinaryNodeChild)(resp, 'bot');
+        const botNode = getBinaryNodeChild(resp, 'bot');
         const botList = [];
-        for (const section of (0, WABinary_1.getBinaryNodeChildren)(botNode, 'section')) {
+        for (const section of getBinaryNodeChildren(botNode, 'section')) {
             if (section.attrs.type === 'all') {
-                for (const bot of (0, WABinary_1.getBinaryNodeChildren)(section, 'bot')) {
+                for (const bot of getBinaryNodeChildren(section, 'bot')) {
                     botList.push({
                         jid: bot.attrs.jid,
                         personaId: bot.attrs['persona_id']
@@ -240,66 +167,10 @@ const makeChatsSocket = config => {
         }
         return botList;
     };
-    const getChatBlockingStatus = async () => {
-        const result = await query({
-            tag: 'iq',
-            attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                xmlns: 'w:comms:chat',
-                type: 'get'
-            },
-            content: [{ tag: 'query', attrs: {}, content: [{ tag: 'blocking_status', attrs: {} }] }]
-        });
-        const blocking = (0, WABinary_1.getBinaryNodeChild)(result, 'blocking') ||
-            (0, WABinary_1.getBinaryNodeChild)((0, WABinary_1.getBinaryNodeChild)(result, 'query'), 'blocking');
-        return blocking?.attrs?.status;
-    };
-    const updateChatBlockingStatus = async (action) => {
-        const result = await query({
-            tag: 'iq',
-            attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                xmlns: 'w:comms:chat',
-                type: 'set'
-            },
-            content: [{ tag: 'blocking', attrs: { action } }]
-        });
-        const blocking = (0, WABinary_1.getBinaryNodeChild)(result, 'blocking');
-        return blocking?.attrs?.status;
-    };
-    const getUserDisclosures = async (t = 0) => {
-        const result = await query({
-            tag: 'iq',
-            attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'tos', type: 'get' },
-            content: [{ tag: 'get_user_disclosures', attrs: { t: String(t) } }]
-        });
-        return (0, WABinary_1.getBinaryNodeChildren)(result, 'notice').map(n => ({ ...n.attrs }));
-    };
-    const getOptOutList = async () => {
-        return query({
-            tag: 'iq',
-            attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'optoutlist', type: 'get' }
-        });
-    };
-    const getPushConfig = async () => {
-        const result = await query({
-            tag: 'iq',
-            attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'urn:xmpp:whatsapp:push', type: 'get' },
-            content: [{ tag: 'settings', attrs: {} }]
-        });
-        return (0, WABinary_1.getBinaryNodeChild)(result, 'settings');
-    };
-    const setPushConfig = async (config) => {
-        await query({
-            tag: 'iq',
-            attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'urn:xmpp:whatsapp:push', type: 'set' },
-            content: [{ tag: 'config', attrs: config }]
-        });
-    };
     const fetchStatus = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery().withStatusProtocol();
+        const usyncQuery = new USyncQuery().withStatusProtocol();
         for (const jid of jids) {
-            usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid));
+            usyncQuery.withUser(new USyncUser().withId(jid));
         }
         const result = await sock.executeUSyncQuery(usyncQuery);
         if (result) {
@@ -307,31 +178,32 @@ const makeChatsSocket = config => {
         }
     };
     const fetchDisappearingDuration = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery().withDisappearingModeProtocol();
+        const usyncQuery = new USyncQuery().withDisappearingModeProtocol();
         for (const jid of jids) {
-            usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid));
+            usyncQuery.withUser(new USyncUser().withId(jid));
         }
         const result = await sock.executeUSyncQuery(usyncQuery);
         if (result) {
             return result.list;
         }
     };
+    /** update the profile picture for yourself or a group */
     const updateProfilePicture = async (jid, content, 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');
+            throw new 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);
+        if (jidNormalizedUser(jid) !== jidNormalizedUser(authState.creds.me.id)) {
+            targetJid = jidNormalizedUser(jid); // in case it is someone other than us
         }
         else {
             targetJid = undefined;
         }
-        const { img } = await (0, Utils_1.generateProfilePicture)(content, dimensions);
+        const { img } = await generateProfilePicture(content, dimensions);
         await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'w:profile:picture',
                 ...(targetJid ? { target: targetJid } : {})
@@ -345,13 +217,14 @@ 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');
+            throw new 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);
+        if (jidNormalizedUser(jid) !== jidNormalizedUser(authState.creds.me.id)) {
+            targetJid = jidNormalizedUser(jid); // in case it is someone other than us
         }
         else {
             targetJid = undefined;
@@ -359,18 +232,19 @@ const makeChatsSocket = config => {
         await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'w:profile:picture',
                 ...(targetJid ? { target: targetJid } : {})
             }
         });
     };
+    /** update the profile status for yourself */
     const updateProfileStatus = async (status) => {
         await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'status'
             },
@@ -391,28 +265,61 @@ const makeChatsSocket = config => {
             tag: 'iq',
             attrs: {
                 xmlns: 'blocklist',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get'
             }
         });
-        const listNode = (0, WABinary_1.getBinaryNodeChild)(result, 'list');
-        return (0, WABinary_1.getBinaryNodeChildren)(listNode, 'item').map(n => n.attrs.jid);
+        const listNode = getBinaryNodeChild(result, 'list');
+        return getBinaryNodeChildren(listNode, 'item').map(n => n.attrs.jid);
     };
     const updateBlockStatus = async (jid, action) => {
+        const normalizedJid = jidNormalizedUser(jid);
+        let lid;
+        let pn_jid;
+        if (isLidUser(normalizedJid) || isHostedLidUser(normalizedJid)) {
+            lid = normalizedJid;
+            if (action === 'block') {
+                const pn = await signalRepository.lidMapping.getPNForLID(normalizedJid);
+                if (!pn) {
+                    throw new Boom(`Unable to resolve PN JID for LID: ${jid}`, { statusCode: 400 });
+                }
+                pn_jid = jidNormalizedUser(pn);
+            }
+        }
+        else if (isPnUser(normalizedJid) || isHostedPnUser(normalizedJid)) {
+            const mapped = await signalRepository.lidMapping.getLIDForPN(normalizedJid);
+            if (!mapped) {
+                throw new Boom(`Unable to resolve LID for PN JID: ${jid}`, { statusCode: 400 });
+            }
+            lid = mapped;
+            if (action === 'block') {
+                pn_jid = jidNormalizedUser(normalizedJid);
+            }
+        }
+        else {
+            throw new Boom(`Invalid jid: ${jid}`, { statusCode: 400 });
+        }
+        const itemAttrs = {
+            action,
+            jid: lid
+        };
+        if (action === 'block') {
+            if (!pn_jid) {
+                throw new Boom(`pn_jid required for block: ${jid}`, { statusCode: 400 });
+            }
+            itemAttrs.pn_jid = pn_jid;
+        }
         await query({
             tag: 'iq',
             attrs: {
                 xmlns: 'blocklist',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set'
             },
             content: [
                 {
                     tag: 'item',
-                    attrs: {
-                        action,
-                        jid
-                    }
+                    attrs: itemAttrs
                 }
             ]
         });
@@ -438,17 +345,17 @@ const makeChatsSocket = config => {
                 }
             ]
         });
-        const profileNode = (0, WABinary_1.getBinaryNodeChild)(results, 'business_profile');
-        const profiles = (0, WABinary_1.getBinaryNodeChild)(profileNode, 'profile');
+        const profileNode = getBinaryNodeChild(results, 'business_profile');
+        const profiles = getBinaryNodeChild(profileNode, 'profile');
         if (profiles) {
-            const address = (0, WABinary_1.getBinaryNodeChild)(profiles, 'address');
-            const description = (0, WABinary_1.getBinaryNodeChild)(profiles, 'description');
-            const website = (0, WABinary_1.getBinaryNodeChild)(profiles, 'website');
-            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 address = getBinaryNodeChild(profiles, 'address');
+            const description = getBinaryNodeChild(profiles, 'description');
+            const website = getBinaryNodeChild(profiles, 'website');
+            const email = getBinaryNodeChild(profiles, 'email');
+            const category = getBinaryNodeChild(getBinaryNodeChild(profiles, 'categories'), 'category');
+            const businessHours = getBinaryNodeChild(profiles, 'business_hours');
             const businessHoursConfig = businessHours
-                ? (0, WABinary_1.getBinaryNodeChildren)(businessHours, 'business_hours_config')
+                ? getBinaryNodeChildren(businessHours, 'business_hours_config')
                 : undefined;
             const websiteStr = website?.content?.toString();
             return {
@@ -470,7 +377,7 @@ const makeChatsSocket = config => {
         await sendNode({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'urn:xmpp:whatsapp:dirty',
                 id: generateMessageTag()
@@ -486,11 +393,10 @@ const makeChatsSocket = config => {
             ]
         });
     };
-    const newAppStateChunkHandler = isInitialSync => {
+    const newAppStateChunkHandler = (isInitialSync) => {
         return {
             onMutation(mutation) {
-                ;
-                (0, Utils_1.processSyncAction)(mutation, ev, authState.creds.me, isInitialSync ? { accountSettings: authState.creds.accountSettings } : undefined, logger);
+                processSyncAction(mutation, ev, authState.creds.me, isInitialSync ? { accountSettings: authState.creds.accountSettings } : undefined, logger);
             }
         };
     };
@@ -504,12 +410,20 @@ const makeChatsSocket = config => {
             appStateSyncKeyCache.set(keyId, key ?? null);
             return key;
         };
+        // 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 () => {
             const collectionsToHandle = new Set(collections);
+            // in case something goes wrong -- ensure we don't enter a loop that cannot be exited from
             const attemptsMap = {};
+            // collections that failed and need a full snapshot on retry
+            // mirrors WA Web's ErrorFatal -> force snapshot behavior
             const forceSnapshotCollections = new Set();
+            // 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 = [];
@@ -517,12 +431,13 @@ const makeChatsSocket = config => {
                     const result = await authState.keys.get('app-state-sync-version', [name]);
                     let state = result[name];
                     if (state) {
+                        state = ensureLTHashStateVersion(state);
                         if (typeof initialVersionMap[name] === 'undefined') {
                             initialVersionMap[name] = state.version;
                         }
                     }
                     else {
-                        state = (0, Utils_1.newLTHashState)();
+                        state = newLTHashState();
                     }
                     states[name] = state;
                     const shouldForceSnapshot = forceSnapshotCollections.has(name);
@@ -535,6 +450,7 @@ const makeChatsSocket = config => {
                         attrs: {
                             name,
                             version: state.version.toString(),
+                            // return snapshot if syncing from scratch or forcing after a failed attempt
                             return_snapshot: (shouldForceSnapshot || !state.version).toString()
                         }
                     });
@@ -542,7 +458,7 @@ const makeChatsSocket = config => {
                 const result = await query({
                     tag: 'iq',
                     attrs: {
-                        to: WABinary_1.S_WHATSAPP_NET,
+                        to: S_WHATSAPP_NET,
                         xmlns: 'w:sync:app:state',
                         type: 'set'
                     },
@@ -554,20 +470,22 @@ const makeChatsSocket = config => {
                         }
                     ]
                 });
-                const decoded = await (0, Utils_1.extractSyncdPatches)(result, config?.options);
+                // extract from binary node
+                const decoded = await extractSyncdPatches(result, config?.options);
                 for (const key in decoded) {
                     const name = key;
                     const { patches, hasMorePatches, snapshot } = decoded[name];
                     try {
                         if (snapshot) {
-                            const { state: newState, mutationMap } = await (0, Utils_1.decodeSyncdSnapshot)(name, snapshot, getCachedAppStateSyncKey, initialVersionMap[name], appStateMacVerification.snapshot);
+                            const { state: newState, mutationMap } = await decodeSyncdSnapshot(name, snapshot, getCachedAppStateSyncKey, initialVersionMap[name], appStateMacVerification.snapshot, logger);
                             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 } });
                         }
+                        // only process if there are syncd patches
                         if (patches.length) {
-                            const { state: newState, mutationMap } = await (0, Utils_1.decodePatches)(name, patches, states[name], getCachedAppStateSyncKey, config.options, initialVersionMap[name], logger, appStateMacVerification.patch);
+                            const { state: newState, mutationMap } = await decodePatches(name, patches, states[name], getCachedAppStateSyncKey, 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}`);
                             initialVersionMap[name] = newState.version;
@@ -577,6 +495,7 @@ const makeChatsSocket = config => {
                             logger.info(`${name} has more patches...`);
                         }
                         else {
+                            // collection is done with sync
                             collectionsToHandle.delete(name);
                         }
                     }
@@ -590,21 +509,26 @@ const makeChatsSocket = config => {
                             errorType: error.name,
                             error: error.stack
                         };
-                        if ((0, Utils_1.isMissingKeyError)(error) && attemptsMap[name] >= Utils_1.MAX_SYNC_ATTEMPTS) {
+                        if (isMissingKeyError(error) && attemptsMap[name] >= MAX_SYNC_ATTEMPTS) {
+                            // WA Web treats missing keys as "Blocked" — park the collection
+                            // until the key arrives via APP_STATE_SYNC_KEY_SHARE.
                             logger.warn(logData, `${name} blocked on missing key from v${states[name].version}, parking after ${attemptsMap[name]} attempts`);
                             blockedCollections.add(name);
                             collectionsToHandle.delete(name);
                         }
-                        else if ((0, Utils_1.isMissingKeyError)(error)) {
+                        else if (isMissingKeyError(error)) {
+                            // Retry with a snapshot which may use a different key.
                             logger.info(logData, `${name} blocked on missing key from v${states[name].version}, retrying with snapshot`);
                             forceSnapshotCollections.add(name);
                         }
-                        else if ((0, Utils_1.isAppStateSyncIrrecoverable)(error, attemptsMap[name])) {
+                        else if (isAppStateSyncIrrecoverable(error, attemptsMap[name])) {
                             logger.warn(logData, `failed to sync ${name} from v${states[name].version}, giving up`);
                             collectionsToHandle.delete(name);
                         }
                         else {
                             logger.info(logData, `failed to sync ${name} from v${states[name].version}, forcing snapshot retry`);
+                            // force a full snapshot on retry to recover from
+                            // corrupted local state (e.g. LTHash MAC mismatch)
                             forceSnapshotCollections.add(name);
                         }
                     }
@@ -616,36 +540,41 @@ 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) => {
-        const picAttrs = type === 'image' ? { type, query: 'url' } : { type };
-        const baseContent = [{ tag: 'picture', attrs: picAttrs }];
-        const normalizedJid = (0, WABinary_1.jidNormalizedUser)(jid);
-        const isUserJid = (0, WABinary_1.isPnUser)(normalizedJid) || (0, WABinary_1.isLidUser)(normalizedJid);
+        const baseContent = [{ tag: 'picture', attrs: { type, query: 'url' } }];
+        // WA Web only includes tctoken for user JIDs (not groups/newsletters)
+        // and never for own profile pic (Chat model for self has no tcToken).
+        // Including tctoken for own JID causes the server to never respond.
+        const normalizedJid = jidNormalizedUser(jid);
+        const isUserJid = isPnUser(normalizedJid) || isLidUser(normalizedJid);
         const me = authState.creds.me;
-        const isSelf = me &&
-            (normalizedJid === (0, WABinary_1.jidNormalizedUser)(me.id) ||
-                (me.lid && normalizedJid === (0, WABinary_1.jidNormalizedUser)(me.lid)));
+        const isSelf = me && (normalizedJid === jidNormalizedUser(me.id) || (me.lid && normalizedJid === jidNormalizedUser(me.lid)));
         let content = baseContent;
         if (serverProps.profilePicPrivacyToken && isUserJid && !isSelf) {
-            content = await (0, tc_token_utils_1.buildTcTokenFromJid)({
+            content = await buildTcTokenFromJid({
                 authState,
                 jid: normalizedJid,
                 baseContent,
                 getLIDForPN
             });
         }
-        jid = (0, WABinary_1.jidNormalizedUser)(jid);
+        jid = jidNormalizedUser(jid);
         const result = await query({
             tag: 'iq',
             attrs: {
                 target: jid,
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get',
                 xmlns: 'w:profile:picture'
             },
             content
         }, timeoutMs);
-        const child = (0, WABinary_1.getBinaryNodeChild)(result, 'picture');
+        const child = getBinaryNodeChild(result, 'picture');
         return child?.attrs?.url;
     };
     const createCallLink = async (type, event, timeoutMs) => {
@@ -663,23 +592,9 @@ const makeChatsSocket = config => {
                 }
             ]
         }, timeoutMs);
-        const child = (0, WABinary_1.getBinaryNodeChild)(result, 'link_create');
+        const child = getBinaryNodeChild(result, 'link_create');
         return child?.attrs?.token;
     };
-    const toggleCallLinkWaitingRoom = async (linkToken, enabled, media = 'audio') => {
-        const result = await query({
-            tag: 'call',
-            attrs: { id: generateMessageTag(), to: '@call' },
-            content: [
-                {
-                    tag: 'waiting_room_toggle',
-                    attrs: { enabled: enabled ? '1' : '0', 'link-token': linkToken, media }
-                }
-            ]
-        });
-        const child = (0, WABinary_1.getBinaryNodeChild)(result, 'waiting_room_toggle');
-        return child?.attrs;
-    };
     const sendPresenceUpdate = async (type, toJid) => {
         const me = authState.creds.me;
         const isAvailableType = type === 'available';
@@ -701,7 +616,7 @@ const makeChatsSocket = config => {
             });
         }
         else {
-            const { server } = (0, WABinary_1.jidDecode)(toJid);
+            const { server } = jidDecode(toJid);
             const isLid = server === 'lid';
             await sendNode({
                 tag: 'chatstate',
@@ -718,11 +633,16 @@ const makeChatsSocket = config => {
             });
         }
     };
+    /**
+     * @param toJid the jid to subscribe to
+     * @param tcToken token for subscription, use if present
+     */
     const presenceSubscribe = async (toJid) => {
-        const normalizedToJid = (0, WABinary_1.jidNormalizedUser)(toJid);
-        const isUserJid = (0, WABinary_1.isPnUser)(normalizedToJid) || (0, WABinary_1.isLidUser)(normalizedToJid);
+        // Only include tctoken for user JIDs — groups/newsletters don't use tctokens
+        const normalizedToJid = jidNormalizedUser(toJid);
+        const isUserJid = isPnUser(normalizedToJid) || isLidUser(normalizedToJid);
         const tcTokenContent = isUserJid
-            ? await (0, tc_token_utils_1.buildTcTokenFromJid)({ authState, jid: normalizedToJid, getLIDForPN })
+            ? await buildTcTokenFromJid({ authState, jid: normalizedToJid, getLIDForPN })
             : undefined;
         return sendNode({
             tag: 'presence',
@@ -738,13 +658,14 @@ const makeChatsSocket = config => {
         let presence;
         const jid = attrs.from;
         const participant = attrs.participant || attrs.from;
-        if (shouldIgnoreJid(jid) && jid !== WABinary_1.S_WHATSAPP_NET) {
+        if (shouldIgnoreJid(jid) && jid !== S_WHATSAPP_NET) {
             return;
         }
         if (tag === 'presence') {
             presence = {
                 lastKnownPresence: attrs.type === 'unavailable' ? 'unavailable' : 'available',
-                lastSeen: attrs.last && attrs.last !== 'deny' ? +attrs.last : undefined
+                lastSeen: attrs.last && attrs.last !== 'deny' ? +attrs.last : undefined,
+                groupOnlineCount: attrs.count ? +attrs.count : undefined
             };
         }
         else if (Array.isArray(content)) {
@@ -769,7 +690,7 @@ const makeChatsSocket = config => {
         const name = patchCreate.type;
         const myAppStateKeyId = authState.creds.myAppStateKeyId;
         if (!myAppStateKeyId) {
-            throw new boom_1.Boom('App state key not present!', { statusCode: 400 });
+            throw new Boom('App state key not present!', { statusCode: 400 });
         }
         let initial;
         let encodeResult;
@@ -778,13 +699,13 @@ const makeChatsSocket = config => {
                 logger.debug({ patch: patchCreate }, 'applying app patch');
                 await resyncAppState([name], false);
                 const { [name]: currentSyncVersion } = await authState.keys.get('app-state-sync-version', [name]);
-                initial = currentSyncVersion || (0, Utils_1.newLTHashState)();
-                encodeResult = await (0, Utils_1.encodeSyncdPatch)(patchCreate, myAppStateKeyId, initial, getAppStateSyncKey);
+                initial = currentSyncVersion ? ensureLTHashStateVersion(currentSyncVersion) : newLTHashState();
+                encodeResult = await encodeSyncdPatch(patchCreate, myAppStateKeyId, initial, getAppStateSyncKey);
                 const { patch, state } = encodeResult;
                 const node = {
                     tag: 'iq',
                     attrs: {
-                        to: WABinary_1.S_WHATSAPP_NET,
+                        to: S_WHATSAPP_NET,
                         type: 'set',
                         xmlns: 'w:sync:app:state'
                     },
@@ -804,7 +725,7 @@ const makeChatsSocket = config => {
                                         {
                                             tag: 'patch',
                                             attrs: {},
-                                            content: index_js_1.proto.SyncdPatch.encode(patch).finish()
+                                            content: proto.SyncdPatch.encode(patch).finish()
                                         }
                                     ]
                                 }
@@ -818,39 +739,42 @@ const makeChatsSocket = config => {
         });
         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 decodePatches(name, [{ ...encodeResult.patch, version: { version: encodeResult.state.version } }], initial, getAppStateSyncKey, config.options, undefined, logger);
             for (const key in mutationMap) {
                 onMutation(mutationMap[key]);
             }
         }
     };
+    /** fetch AB props */
     const fetchProps = async () => {
         const resultNode = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                xmlns: 'w',
+                to: S_WHATSAPP_NET,
+                xmlns: 'abt',
                 type: 'get'
             },
             content: [
                 {
                     tag: 'props',
                     attrs: {
-                        protocol: '2',
-                        hash: authState?.creds?.lastPropHash || ''
+                        protocol: '1',
+                        ...(authState?.creds?.lastPropHash ? { hash: authState.creds.lastPropHash } : {})
                     }
                 }
             ]
         });
-        const propsNode = (0, WABinary_1.getBinaryNodeChild)(resultNode, 'props');
+        const propsNode = 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;
                 ev.emit('creds.update', authState.creds);
             }
-            props = (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop');
+            props = reduceBinaryNodeToDictionary(propsNode, 'prop');
         }
+        // Extract protocol-relevant AB props (only the ones we need)
         const privacyTokenProp = props['10518'] ?? props['privacy_token_sending_on_all_1_on_1_messages'];
         if (privacyTokenProp !== undefined) {
             serverProps.privacyTokenOn1to1 = privacyTokenProp === 'true' || privacyTokenProp === '1';
@@ -866,15 +790,26 @@ const makeChatsSocket = config => {
         logger.debug({ serverProps }, '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);
+        const patch = chatModificationToAppPatch(mod, jid);
         return appPatch(patch);
     };
-    const updateDisableLinkPreviewsPrivacy = isPreviewsDisabled => {
+    /**
+     * 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: {
@@ -883,16 +818,25 @@ const makeChatsSocket = config => {
             }
         }, jid);
     };
+    /**
+     * Add or Edit Contact
+     */
     const addOrEditContact = (jid, contact) => {
         return chatModify({
             contact
         }, jid);
     };
-    const removeContact = jid => {
+    /**
+     * Remove Contact
+     */
+    const removeContact = (jid) => {
         return chatModify({
             contact: null
         }, jid);
     };
+    /**
+     * Adds label
+     */
     const addLabel = (jid, labels) => {
         return chatModify({
             addLabel: {
@@ -900,6 +844,9 @@ const makeChatsSocket = config => {
             }
         }, jid);
     };
+    /**
+     * Adds label for the chats
+     */
     const addChatLabel = (jid, labelId) => {
         return chatModify({
             addChatLabel: {
@@ -907,6 +854,9 @@ const makeChatsSocket = config => {
             }
         }, jid);
     };
+    /**
+     * Removes label for the chat
+     */
     const removeChatLabel = (jid, labelId) => {
         return chatModify({
             removeChatLabel: {
@@ -914,6 +864,9 @@ const makeChatsSocket = config => {
             }
         }, jid);
     };
+    /**
+     * Adds label for the message
+     */
     const addMessageLabel = (jid, messageId, labelId) => {
         return chatModify({
             addMessageLabel: {
@@ -922,6 +875,9 @@ const makeChatsSocket = config => {
             }
         }, jid);
     };
+    /**
+     * Removes label for the message
+     */
     const removeMessageLabel = (jid, messageId, labelId) => {
         return chatModify({
             removeMessageLabel: {
@@ -930,238 +886,51 @@ const makeChatsSocket = config => {
             }
         }, jid);
     };
-    const addOrEditQuickReply = quickReply => {
+    /**
+     * Add or Edit Quick Reply
+     */
+    const addOrEditQuickReply = (quickReply) => {
         return chatModify({
             quickReply
         }, '');
     };
-    const removeQuickReply = timestamp => {
+    /**
+     * Remove Quick Reply
+     */
+    const removeQuickReply = (timestamp) => {
         return chatModify({
             quickReply: { timestamp, deleted: true }
         }, '');
     };
-    const renameAIThread = (jid, title) => {
-        return chatModify({ aiThreadRename: { title } }, jid);
-    };
-    const pinThreadMessage = (jid, messageId, pinned = true) => {
-        return chatModify({ threadPin: { pinned, messageId } }, jid);
-    };
-    const updatePrivateProcessingSetting = enabled => {
-        return chatModify({ privateProcessingSetting: enabled ? 'enabled' : 'disabled' }, '');
-    };
-    const updateBioPrivacy = async (value) => {
-        await privacyQuery('about', value);
-    };
-    const blockBot = async (botJid) => {
-        await query({
-            tag: 'iq',
-            attrs: {
-                xmlns: 'disappearing_mode',
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'set'
-            },
-            content: [
-                {
-                    tag: 'block',
-                    attrs: { jid: botJid }
-                }
-            ]
-        });
-    };
-    const unblockBot = async (botJid) => {
-        await updateBlockStatus(botJid, 'unblock');
-    };
-    const muteContactStatus = (jid, muted = true) => {
-        return chatModify({ muteStatus: { muted } }, jid);
-    };
-    const toggleFavorite = (jid, isFavorite = true) => {
-        return chatModify({ favorite: { isFavorite } }, jid);
-    };
-    const reorderLabels = sortedLabelIds => {
-        return chatModify({ reorderLabel: { sortedLabelIds } }, '');
-    };
-    const deleteCallLog = (callId, jid = '') => {
-        return chatModify({ deleteCallLog: { callId } }, jid);
-    };
-    const setChatNote = (jid, note) => {
-        return chatModify({ noteEdit: { note } }, jid);
-    };
-    const deleteChatNote = jid => {
-        return chatModify({ noteEdit: { note: '', deleted: true } }, jid);
-    };
-    const markChatAsUnread = (jid, lastMessages) => {
-        return chatModify({ markAsUnread: true, lastMessages }, jid);
-    };
-    const setChatEphemeral = (jid, duration) => {
-        return chatModify({ setChatEphemeral: duration }, jid);
-    };
-    const silenceChat = (jid, silent = true, until = null) => {
-        return chatModify({ silenceChat: { silent, until } }, jid);
-    };
-    const fetchBotProfiles = async (jids) => {
-        const { USyncQuery, USyncUser, USyncBotProfileProtocol } = require('../WAUSync');
-        const q = new USyncQuery();
-        q.protocols.push(new USyncBotProfileProtocol());
-        for (const jid of jids) {
-            q.withUser(new USyncUser().withId(jid));
-        }
-        const result = await sock.executeUSyncQuery(q);
-        return result?.list || [];
-    };
-    const updateChatLock = (jid, locked) => {
-        return chatModify({ chatLock: { locked } }, jid);
-    };
-    const updateChatWallpaper = (jid, wallpaper) => {
-        if (!wallpaper) {
-            return chatModify({ wallpaper: { remove: true } }, jid);
-        }
-        return chatModify({ wallpaper }, jid);
-    };
-    const updateChatMediaVisibility = (jid, visibility) => {
-        return chatModify({ mediaVisibility: visibility }, jid);
-    };
-    const getBotProfile = async (botJid) => {
-        const resp = await query({
-            tag: 'iq',
-            attrs: {
-                xmlns: 'bot',
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'get'
-            },
-            content: [
-                {
-                    tag: 'bot',
-                    attrs: { v: '2', jid: botJid }
-                }
-            ]
-        });
-        const botNode = (0, WABinary_1.getBinaryNodeChild)(resp, 'bot');
-        if (!botNode)
-            return null;
-        return {
-            jid: botNode.attrs.jid,
-            personaId: botNode.attrs['persona_id'],
-            name: botNode.attrs.name,
-            description: botNode.attrs.description
-        };
-    };
-    const fetchABProps = async (protocol = '2', hash = '', refreshId = null, group = null) => {
-        const propAttrs = { protocol };
-        if (hash)
-            propAttrs.hash = hash;
-        if (refreshId != null)
-            propAttrs.refresh_id = String(refreshId);
-        if (group != null)
-            propAttrs.group = String(group);
-        const result = await query({
-            tag: 'iq',
-            attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'abt', type: 'get' },
-            content: [{ tag: 'props', attrs: propAttrs }]
-        });
-        const propsNode = (0, WABinary_1.getBinaryNodeChild)(result, 'props');
-        if (!propsNode)
-            return {};
-        return (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop');
-    };
-    const removeCompanionDevice = async (keyIndex, reason = 'user_initiated') => {
-        await query({
-            tag: 'iq',
-            attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'md', type: 'set' },
-            content: [
-                {
-                    tag: 'remove-companion-device',
-                    attrs: { platform: 'true', reason, id: String(keyIndex) }
-                }
-            ]
-        });
-    };
-    const updateKeyIndexList = async (ts, content) => {
-        await query({
-            tag: 'iq',
-            attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'md', type: 'set' },
-            content: [
-                {
-                    tag: 'key-index-list',
-                    attrs: { ts: String(ts) },
-                    content
-                }
-            ]
-        });
-    };
-    const fetchMediaConn = async (lastId = null) => {
-        const attrs = {};
-        if (lastId != null)
-            attrs.last_id = String(lastId);
-        const result = await query({
-            tag: 'iq',
-            attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'w:m', type: 'set' },
-            content: [{ tag: 'media_conn', attrs }]
-        });
-        return (0, WABinary_1.getBinaryNodeChild)(result, 'media_conn') || null;
-    };
-    const deleteBroadcastList = async (listId) => {
-        await query({
-            tag: 'iq',
-            attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'w:b', type: 'set' },
-            content: [
-                {
-                    tag: 'delete',
-                    attrs: {},
-                    content: [{ tag: 'list', attrs: { id: String(listId) } }]
-                }
-            ]
-        });
-    };
-    const fetchQRCode = async (code, addressingMode = null) => {
-        const attrs = { code };
-        if (addressingMode)
-            attrs.addressing_mode = addressingMode;
-        const result = await query({
-            tag: 'iq',
-            attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'w:qr', type: 'get' },
-            content: [{ tag: 'qr', attrs }]
-        });
-        return (0, WABinary_1.getBinaryNodeChild)(result, 'qr') || null;
-    };
-    const confirmDeviceLogout = async (id, approve = true) => {
-        await query({
-            tag: 'iq',
-            attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                xmlns: 'w:account_defence',
-                type: 'set',
-                smax_id: '87'
-            },
-            content: [
-                {
-                    tag: 'device_logout',
-                    attrs: { approve: approve ? 'true' : 'false', id: String(id) }
-                }
-            ]
-        });
-    };
+    /**
+     * queries need to be fired on connection open
+     * help ensure parity with WA Web
+     * */
     const executeInitQueries = async () => {
-        await Promise.all([fetchProps(), fetchBlocklist(), fetchPrivacySettings(), initInterop()]);
+        await Promise.all([fetchProps(), fetchBlocklist(), fetchPrivacySettings()]);
     };
     const upsertMessage = ev.createBufferedFunction(async (msg, type) => {
         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;
-            jid = (0, WABinary_1.jidNormalizedUser)(jid);
+            jid = 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) {
                 ev.emit('creds.update', { me: { ...authState.creds.me, name: msg.pushName } });
             }
         }
-        const historyMsg = (0, Utils_1.getHistoryMsg)(msg.message);
+        const historyMsg = getHistoryMsg(msg.message);
         const shouldProcessHistoryMsg = historyMsg
-            ? shouldSyncHistoryMessage(historyMsg) && Defaults_1.PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType)
+            ? shouldSyncHistoryMessage(historyMsg) &&
+                PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType)
             : false;
         if (historyMsg && shouldProcessHistoryMsg) {
             const syncType = historyMsg.syncType;
-            if (syncType === index_js_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP &&
+            // INITIAL_BOOTSTRAP — fire immediately, no progress check (same as WA Web K function)
+            if (syncType === proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP &&
                 !historySyncStatus.initialBootstrapComplete) {
                 historySyncStatus.initialBootstrapComplete = true;
                 ev.emit('messaging-history.status', {
@@ -1170,7 +939,8 @@ const makeChatsSocket = config => {
                     explicit: true
                 });
             }
-            if (syncType === index_js_1.proto.HistorySync.HistorySyncType.RECENT &&
+            // RECENT with progress === 100 — explicit completion
+            if (syncType === proto.HistorySync.HistorySyncType.RECENT &&
                 historyMsg.progress === 100 &&
                 !historySyncStatus.recentSyncComplete) {
                 historySyncStatus.recentSyncComplete = true;
@@ -1182,42 +952,47 @@ const makeChatsSocket = config => {
                     explicit: true
                 });
             }
-            if (syncType === index_js_1.proto.HistorySync.HistorySyncType.RECENT && !historySyncStatus.recentSyncComplete) {
+            // Reset 120s paused timeout on any RECENT chunk (like WA Web's handleChunkProgress)
+            if (syncType === proto.HistorySync.HistorySyncType.RECENT && !historySyncStatus.recentSyncComplete) {
                 clearTimeout(historySyncPausedTimeout);
                 historySyncPausedTimeout = setTimeout(() => {
                     if (!historySyncStatus.recentSyncComplete) {
                         historySyncStatus.recentSyncComplete = true;
                         ev.emit('messaging-history.status', {
-                            syncType: index_js_1.proto.HistorySync.HistorySyncType.RECENT,
+                            syncType: proto.HistorySync.HistorySyncType.RECENT,
                             status: 'paused',
                             explicit: false
                         });
                     }
                     historySyncPausedTimeout = undefined;
-                }, Defaults_1.HISTORY_SYNC_PAUSED_TIMEOUT_MS);
+                }, HISTORY_SYNC_PAUSED_TIMEOUT_MS);
             }
         }
-        if (historyMsg && syncState === State_1.SyncState.AwaitingInitialSync) {
+        // State machine: decide on sync and flush
+        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;
+                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) {
+                // All collections will be synced, so clear any blocked ones
                 blockedCollections.clear();
                 logger.info('Doing app state sync');
-                await resyncAppState(Types_1.ALL_WA_PATCH_NAMES, true);
-                syncState = State_1.SyncState.Online;
+                await resyncAppState(ALL_WA_PATCH_NAMES, true);
+                // Sync is complete, go online and flush everything
+                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;
@@ -1230,7 +1005,7 @@ const makeChatsSocket = config => {
                     await doAppStateSync();
                 }
             })(),
-            (0, process_message_1.default)(msg, {
+            processMessage(msg, {
                 signalRepository,
                 shouldProcessHistoryMsg,
                 placeholderResendCache,
@@ -1242,7 +1017,8 @@ const makeChatsSocket = config => {
                 getMessage
             })
         ]);
-        if (msg.message?.protocolMessage?.appStateSyncKeyShare && syncState === State_1.SyncState.Syncing) {
+        // If the app state key arrives and we are waiting to sync, trigger the sync now.
+        if (msg.message?.protocolMessage?.appStateSyncKeyShare && syncState === SyncState.Syncing) {
             logger.info('App state sync key arrived, triggering app state sync');
             await doAppStateSync();
         }
@@ -1250,7 +1026,7 @@ const makeChatsSocket = config => {
     ws.on('CB:presence', handlePresenceUpdate);
     ws.on('CB:chatstate', handlePresenceUpdate);
     ws.on('CB:ib,,dirty', async (node) => {
-        const { attrs } = (0, WABinary_1.getBinaryNodeChild)(node, 'dirty');
+        const { attrs } = getBinaryNodeChild(node, 'dirty');
         const type = attrs.type;
         switch (type) {
             case 'account_sync':
@@ -1264,6 +1040,7 @@ const makeChatsSocket = config => {
                 }
                 break;
             case 'groups':
+                // handled in groups.ts
                 break;
             default:
                 logger.info({ node }, 'received unknown sync');
@@ -1282,28 +1059,31 @@ const makeChatsSocket = config => {
             }
             sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable').catch(error => onUnexpectedError(error, 'presence update requests'));
         }
-        if (!receivedPendingNotifications || syncState !== State_1.SyncState.Connecting) {
+        if (!receivedPendingNotifications || syncState !== SyncState.Connecting) {
             return;
         }
         historySyncStatus.initialBootstrapComplete = false;
         historySyncStatus.recentSyncComplete = false;
         clearTimeout(historySyncPausedTimeout);
         historySyncPausedTimeout = undefined;
-        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(proto.Message.HistorySyncNotification.create({
+            syncType: 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;
         }
+        // On reconnection (accountSyncCounter > 0), the server does not push
+        // history sync notifications — the device already has its data.
+        // Skip the 20s wait and go online immediately.
         if (authState.creds.accountSyncCounter > 0) {
             logger.info('Reconnection with existing sync data, skipping history sync wait. Transitioning to Online.');
-            syncState = State_1.SyncState.Online;
+            syncState = SyncState.Online;
             setTimeout(() => ev.flush(), 0);
             return;
         }
@@ -1312,20 +1092,27 @@ 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();
+                // Increment so subsequent reconnections skip the 20s wait.
+                // Late-arriving history is still processed via processMessage
+                // regardless of the state machine phase.
                 const accountSyncCounter = (authState.creds.accountSyncCounter || 0) + 1;
                 ev.emit('creds.update', { accountSyncCounter });
             }
         }, 20000);
     });
+    // When an app state sync key arrives (myAppStateKeyId is set) and there are
+    // collections blocked on a missing key, trigger a re-sync for just those collections.
+    // This mirrors WA Web's Blocked → retry-on-key-arrival behavior.
     ev.on('creds.update', ({ myAppStateKeyId }) => {
         if (!myAppStateKeyId || blockedCollections.size === 0) {
             return;
         }
-        if (syncState === State_1.SyncState.Syncing) {
+        // If we're in the middle of a full sync, doAppStateSync handles all collections
+        if (syncState === SyncState.Syncing) {
             blockedCollections.clear();
             return;
         }
@@ -1342,18 +1129,22 @@ const makeChatsSocket = config => {
             logger.warn({ lid, pn, error }, 'Failed to store LID-PN mapping');
         }
     });
+    registerSocketEndHandler(() => {
+        if (awaitingSyncTimeout) {
+            clearTimeout(awaitingSyncTimeout);
+            awaitingSyncTimeout = undefined;
+        }
+        if (!config.placeholderResendCache && placeholderResendCache.close) {
+            placeholderResendCache.close();
+        }
+        syncState = SyncState.Connecting;
+        privacySettings = undefined;
+    });
     return {
         ...sock,
         serverProps,
         createCallLink,
-        toggleCallLinkWaitingRoom,
         getBotListV2,
-        getChatBlockingStatus,
-        updateChatBlockingStatus,
-        getUserDisclosures,
-        getOptOutList,
-        getPushConfig,
-        setPushConfig,
         messageMutex,
         receiptMutex,
         appStatePatchMutex,
@@ -1379,18 +1170,16 @@ const makeChatsSocket = config => {
         updateOnlinePrivacy,
         updateProfilePicturePrivacy,
         updateStatusPrivacy,
-        getStatusPrivacy,
-        setStatusPrivacy,
         updateReadReceiptsPrivacy,
         updateGroupsAddPrivacy,
         updateDefaultDisappearingMode,
-        fetchBroadcastListQuota,
         getBusinessProfile,
         resyncAppState,
         chatModify,
         cleanDirtyBits,
         addOrEditContact,
         removeContact,
+        placeholderResendCache,
         addLabel,
         addChatLabel,
         removeChatLabel,
@@ -1398,52 +1187,7 @@ const makeChatsSocket = config => {
         removeMessageLabel,
         star,
         addOrEditQuickReply,
-        removeQuickReply,
-        renameAIThread,
-        pinThreadMessage,
-        updatePrivateProcessingSetting,
-        updateBioPrivacy,
-        blockBot,
-        unblockBot,
-        getBotProfile,
-        muteContactStatus,
-        toggleFavorite,
-        reorderLabels,
-        deleteCallLog,
-        setChatNote,
-        deleteChatNote,
-        markChatAsUnread,
-        setChatEphemeral,
-        silenceChat,
-        fetchBotProfiles,
-        updateChatLock,
-        updateChatWallpaper,
-        updateChatMediaVisibility,
-        fetchIntegrators,
-        acceptInteropTOS,
-        optInIntegrators,
-        optOutIntegrators,
-        resolveInteropUser,
-        resolveInteropUsers,
-        getReachabilitySettings,
-        setReachabilitySettings,
-        blockInteropUser,
-        unblockInteropUser,
-        reportInteropSpam,
-        trustInteropContact,
-        initInterop,
-        createInteropGroup,
-        leaveInteropGroup,
-        getInteropGroupAddPrivacy,
-        INTEGRATOR_BIRDYCHAT,
-        INTEGRATOR_HAIKET,
-        fetchABProps,
-        removeCompanionDevice,
-        updateKeyIndexList,
-        fetchMediaConn,
-        deleteBroadcastList,
-        fetchQRCode,
-        confirmDeviceLogout
+        removeQuickReply
     };
 };
-exports.makeChatsSocket = makeChatsSocket;
+//# sourceMappingURL=chats.js.map