@fer2809fl/baileys 1.4.9 → 7.0.0

package/lib/Socket/chats.js

@@ -1,37 +1,64 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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, WAMessageStubType } 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 buildProfilePictureQueryContent = (type, tcTokenContent) => {
+    const picture = { tag: 'picture', attrs: { type, query: 'url' } };
+    if (tcTokenContent?.length) {
+        picture.content = tcTokenContent;
+    }
+    return [picture];
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeChatsSocket = void 0;
-const boom_1 = require("@hapi/boom");
-const node_cache_1 = __importDefault(require("@cacheable/node-cache"));
-const WAProto_1 = require("../../WAProto");
-const Defaults_1 = require("../Defaults");
-const Types_1 = require("../Types");
-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 usync_1 = require("./usync");
-const MAX_SYNC_ATTEMPTS = 2;
-const makeChatsSocket = (config) => {
-    const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config;
-    const sock = (0, usync_1.makeUSyncSocket)(config);
-    const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError, } = sock;
+const USER_ID_CACHE = new Map();
+export const makeChatsSocket = (config) => {
+    const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, getMessage } = config;
+    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;
-    let needToFlushWithAppStateSync = false;
-    let pendingAppStateSync = false;
-    /** this mutex ensures that the notifications (receipts, messages etc.) are processed in order */
-    const processingMutex = (0, make_mutex_1.makeMutex)();
-    const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
-        useClones: false
-    });
-    if (!config.placeholderResendCache) {
-        config.placeholderResendCache = placeholderResendCache;
-    }
+    /** 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 = 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 NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+            useClones: false
+        });
     /** 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]);
@@ -43,14 +70,12 @@ const makeChatsSocket = (config) => {
                 tag: 'iq',
                 attrs: {
                     xmlns: 'privacy',
-                    to: WABinary_1.S_WHATSAPP_NET,
+                    to: S_WHATSAPP_NET,
                     type: 'get'
                 },
-                content: [
-                    { tag: 'privacy', attrs: {} }
-                ]
+                content: [{ tag: 'privacy', attrs: {} }]
             });
-            privacySettings = (0, WABinary_1.reduceBinaryNodeToDictionary)(content === null || content === void 0 ? void 0 : content[0], 'category');
+            privacySettings = reduceBinaryNodeToDictionary(content?.[0], 'category');
         }
         return privacySettings;
     };
@@ -60,10 +85,11 @@ const makeChatsSocket = (config) => {
             tag: 'iq',
             attrs: {
                 xmlns: 'privacy',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set'
             },
-            content: [{
+            content: [
+                {
                     tag: 'privacy',
                     attrs: {},
                     content: [
@@ -72,7 +98,8 @@ const makeChatsSocket = (config) => {
                             attrs: { name, value }
                         }
                     ]
-                }]
+                }
+            ]
         });
     };
     const updateMessagesPrivacy = async (value) => {
@@ -104,15 +131,17 @@ const makeChatsSocket = (config) => {
             tag: 'iq',
             attrs: {
                 xmlns: 'disappearing_mode',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set'
             },
-            content: [{
+            content: [
+                {
                     tag: 'disappearing_mode',
                     attrs: {
                         duration: duration.toString()
                     }
-                }]
+                }
+            ]
         });
     };
     const getBotListV2 = async () => {
@@ -120,21 +149,23 @@ const makeChatsSocket = (config) => {
             tag: 'iq',
             attrs: {
                 xmlns: 'bot',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get'
             },
-            content: [{
+            content: [
+                {
                     tag: 'bot',
                     attrs: {
                         v: '2'
                     }
-                }]
+                }
+            ]
         });
-        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']
@@ -144,24 +175,10 @@ 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 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) {
@@ -169,33 +186,68 @@ 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;
         }
     };
+    const findUserId = async (pnOrLid) => {
+        const cached = USER_ID_CACHE.get(pnOrLid);
+        if (cached) {
+            return cached;
+        }
+        const userId = { phoneNumber: '', lid: '' };
+        if (isPnUser(pnOrLid) || isHostedPnUser(pnOrLid)) {
+            userId.phoneNumber = pnOrLid;
+            const lid = await signalRepository.lidMapping.getLIDForPN(pnOrLid);
+            if (!lid) {
+                userId.lid = 'id-not-found';
+                return userId;
+            }
+            userId.lid = lid;
+        }
+        else if (isLidUser(pnOrLid) || isHostedLidUser(pnOrLid)) {
+            userId.lid = pnOrLid;
+            const pn = await signalRepository.lidMapping.getPNForLID(pnOrLid);
+            if (!pn) {
+                userId.phoneNumber = 'id-not-found';
+                return userId;
+            }
+            userId.phoneNumber = pn;
+        }
+        else {
+            throw new Boom('Invalid id input to find user ids', { statusCode: 400 });
+        }
+        userId.phoneNumber = jidNormalizedUser(userId.phoneNumber);
+        userId.lid = jidNormalizedUser(userId.lid);
+        USER_ID_CACHE.set(userId.phoneNumber, userId);
+        USER_ID_CACHE.set(userId.lid, userId);
+        return userId;
+    };
     /** update the profile picture for yourself or a group */
-    const updateProfilePicture = async (jid, content) => {
+    const updateProfilePicture = async (jid, content, dimensions, options) => {
         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); // in case it is someone other than us
+        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);
+        const { img } = await generateProfilePicture(content, dimensions, options);
         await query({
             tag: 'iq',
             attrs: {
-                target: targetJid,
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
-                xmlns: 'w:profile:picture'
+                xmlns: 'w:profile:picture',
+                ...(targetJid ? { target: targetJid } : {})
             },
             content: [
                 {
@@ -210,18 +262,21 @@ const makeChatsSocket = (config) => {
     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 (jidNormalizedUser(jid) !== jidNormalizedUser(authState.creds.me.id)) {
+            targetJid = jidNormalizedUser(jid); // in case it is someone other than us
         }
-        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;
         }
         await query({
             tag: 'iq',
             attrs: {
-                target: targetJid,
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
-                xmlns: 'w:profile:picture'
+                xmlns: 'w:profile:picture',
+                ...(targetJid ? { target: targetJid } : {})
             }
         });
     };
@@ -230,7 +285,7 @@ const makeChatsSocket = (config) => {
         await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'status'
             },
@@ -251,35 +306,66 @@ 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
                 }
             ]
         });
     };
     const getBusinessProfile = async (jid) => {
-        var _a, _b, _c, _d, _e, _f, _g;
         const results = await query({
             tag: 'iq',
             attrs: {
@@ -287,38 +373,42 @@ 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');
+        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 = (_a = website === null || website === void 0 ? void 0 : website.content) === null || _a === void 0 ? void 0 : _a.toString();
+            const websiteStr = website?.content?.toString();
             return {
-                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()) || '',
+                wid: profiles.attrs?.jid,
+                address: address?.content?.toString(),
+                description: description?.content?.toString() || '',
                 website: websiteStr ? [websiteStr] : [],
-                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)
+                email: email?.content?.toString(),
+                category: category?.content?.toString(),
+                business_hours: {
+                    timezone: businessHours?.attrs?.timezone,
+                    business_config: businessHoursConfig?.map(({ attrs }) => attrs)
                 }
             };
         }
@@ -328,17 +418,17 @@ 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(),
+                id: generateMessageTag()
             },
             content: [
                 {
                     tag: 'clean',
                     attrs: {
                         type,
-                        ...(fromTimestamp ? { timestamp: fromTimestamp.toString() } : null),
+                        ...(fromTimestamp ? { timestamp: fromTimestamp.toString() } : null)
                     }
                 }
             ]
@@ -347,20 +437,31 @@ const makeChatsSocket = (config) => {
     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);
             }
         };
     };
     const resyncAppState = ev.createBufferedFunction(async (collections, isInitialSync) => {
+        const appStateSyncKeyCache = new Map();
+        const getCachedAppStateSyncKey = async (keyId) => {
+            if (appStateSyncKeyCache.has(keyId)) {
+                return appStateSyncKeyCache.get(keyId) ?? undefined;
+            }
+            const key = await getAppStateSyncKey(keyId);
+            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 () => {
-            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 = {};
+            // 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)
@@ -371,29 +472,34 @@ 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;
-                    logger.info(`resyncing ${name} from v${state.version}`);
+                    const shouldForceSnapshot = forceSnapshotCollections.has(name);
+                    if (shouldForceSnapshot) {
+                        forceSnapshotCollections.delete(name);
+                    }
+                    logger.info(`resyncing ${name} from v${state.version}${shouldForceSnapshot ? ' (forcing snapshot)' : ''}`);
                     nodes.push({
                         tag: 'collection',
                         attrs: {
                             name,
                             version: state.version.toString(),
-                            // return snapshot if being synced from scratch
-                            'return_snapshot': (!state.version).toString()
+                            // return snapshot if syncing from scratch or forcing after a failed attempt
+                            return_snapshot: (shouldForceSnapshot || !state.version).toString()
                         }
                     });
                 }
                 const result = await query({
                     tag: 'iq',
                     attrs: {
-                        to: WABinary_1.S_WHATSAPP_NET,
+                        to: S_WHATSAPP_NET,
                         xmlns: 'w:sync:app:state',
                         type: 'set'
                     },
@@ -406,13 +512,13 @@ const makeChatsSocket = (config) => {
                     ]
                 });
                 // extract from binary node
-                const decoded = await (0, Utils_1.extractSyncdPatches)(result, config === null || config === void 0 ? void 0 : config.options);
+                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, getAppStateSyncKey, 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`);
@@ -420,7 +526,7 @@ const makeChatsSocket = (config) => {
                         }
                         // 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);
+                            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;
@@ -429,28 +535,47 @@ const makeChatsSocket = (config) => {
                         if (hasMorePatches) {
                             logger.info(`${name} has more patches...`);
                         }
-                        else { // collection is done with sync
+                        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
-                            || ((_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
+                        const logData = {
+                            name,
+                            attempt: attemptsMap[name],
+                            version: states[name].version,
+                            statusCode: error.output?.statusCode,
+                            errorType: error.name,
+                            error: error.stack
+                        };
+                        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 (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 (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);
+                        }
                     }
                 }
             }
-        });
+        }, authState?.creds?.me?.id || 'resync-app-state');
         const { onMutation } = newAppStateChunkHandler(isInitialSync);
         for (const key in globalMutationMap) {
             onMutation(globalMutationMap[key]);
@@ -462,31 +587,65 @@ const makeChatsSocket = (config) => {
      * type = "image for the high res picture"
      */
     const profilePictureUrl = async (jid, type = 'preview', timeoutMs) => {
-        var _a;
-        jid = (0, WABinary_1.jidNormalizedUser)(jid);
+        // 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 === jidNormalizedUser(me.id) || (me.lid && normalizedJid === jidNormalizedUser(me.lid)));
+        let tcTokenContent;
+        if (serverProps.profilePicPrivacyToken && isUserJid && !isSelf) {
+            tcTokenContent = await buildTcTokenFromJid({
+                authState,
+                jid: normalizedJid,
+                getLIDForPN
+            });
+        }
+        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: buildProfilePictureQueryContent(type, tcTokenContent)
+        }, timeoutMs);
+        const child = getBinaryNodeChild(result, 'picture');
+        return child?.attrs?.url;
+    };
+    const createCallLink = async (type, event, timeoutMs) => {
+        const result = await query({
+            tag: 'call',
+            attrs: {
+                id: generateMessageTag(),
+                to: '@call'
+            },
             content: [
-                { tag: 'picture', attrs: { type, query: 'url' } }
+                {
+                    tag: 'link_create',
+                    attrs: { media: type },
+                    content: event ? [{ tag: 'event', attrs: { start_time: String(event.startTime) } }] : undefined
+                }
             ]
         }, timeoutMs);
-        const child = (0, WABinary_1.getBinaryNodeChild)(result, 'picture');
-        return (_a = child === null || child === void 0 ? void 0 : child.attrs) === null || _a === void 0 ? void 0 : _a.url;
+        const child = getBinaryNodeChild(result, 'link_create');
+        return child?.attrs?.token;
     };
     const sendPresenceUpdate = async (type, toJid) => {
         const me = authState.creds.me;
-        if (type === 'available' || type === 'unavailable') {
+        const isAvailableType = type === 'available';
+        if (isAvailableType || type === 'unavailable') {
             if (!me.name) {
                 logger.warn('no name present, ignoring presence update request...');
                 return;
             }
-            ev.emit('connection.update', { isOnline: type === 'available' });
+            ev.emit('connection.update', { isOnline: isAvailableType });
+            if (isAvailableType) {
+                void sendUnifiedSession();
+            }
             await sendNode({
                 tag: 'presence',
                 attrs: {
@@ -496,13 +655,13 @@ const makeChatsSocket = (config) => {
             });
         }
         else {
-            const { server } = (0, WABinary_1.jidDecode)(toJid);
+            const { server } = jidDecode(toJid);
             const isLid = server === 'lid';
             await sendNode({
                 tag: 'chatstate',
                 attrs: {
                     from: isLid ? me.lid : me.id,
-                    to: toJid,
+                    to: toJid
                 },
                 content: [
                     {
@@ -517,35 +676,35 @@ const makeChatsSocket = (config) => {
      * @param toJid the jid to subscribe to
      * @param tcToken token for subscription, use if present
      */
-    const presenceSubscribe = (toJid, tcToken) => (sendNode({
-        tag: 'presence',
-        attrs: {
-            to: toJid,
-            id: generateMessageTag(),
-            type: 'subscribe'
-        },
-        content: tcToken
-            ? [
-                {
-                    tag: 'tctoken',
-                    attrs: {},
-                    content: tcToken
-                }
-            ]
-            : undefined
-    }));
+    const presenceSubscribe = async (toJid) => {
+        // 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 buildTcTokenFromJid({ authState, jid: normalizedToJid, getLIDForPN })
+            : undefined;
+        return sendNode({
+            tag: 'presence',
+            attrs: {
+                to: toJid,
+                id: generateMessageTag(),
+                type: 'subscribe'
+            },
+            content: tcTokenContent
+        });
+    };
     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') {
             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)) {
@@ -554,7 +713,7 @@ const makeChatsSocket = (config) => {
             if (type === 'paused') {
                 type = 'available';
             }
-            if (((_a = firstChild.attrs) === null || _a === void 0 ? void 0 : _a.media) === 'audio') {
+            if (firstChild.attrs?.media === 'audio') {
                 type = 'recording';
             }
             presence = { lastKnownPresence: type };
@@ -570,22 +729,22 @@ 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;
-        await processingMutex.mutex(async () => {
+        await appStatePatchMutex.mutex(async () => {
             await authState.keys.transaction(async () => {
                 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'
                     },
@@ -599,13 +758,13 @@ const makeChatsSocket = (config) => {
                                     attrs: {
                                         name,
                                         version: (state.version - 1).toString(),
-                                        'return_snapshot': 'false'
+                                        return_snapshot: 'false'
                                     },
                                     content: [
                                         {
                                             tag: 'patch',
                                             attrs: {},
-                                            content: WAProto_1.proto.SyncdPatch.encode(patch).finish()
+                                            content: proto.SyncdPatch.encode(patch).finish()
                                         }
                                     ]
                                 }
@@ -615,54 +774,78 @@ 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 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 */
+    /** fetch AB props */
     const fetchProps = async () => {
-        var _a, _b, _c;
         const resultNode = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                xmlns: 'w',
-                type: 'get',
+                to: S_WHATSAPP_NET,
+                xmlns: 'abt',
+                type: 'get'
             },
             content: [
-                { tag: 'props', attrs: {
-                        protocol: '2',
-                        hash: ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.lastPropHash) || ''
-                    } }
+                {
+                    tag: 'props',
+                    attrs: {
+                        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 ((_b = propsNode.attrs) === null || _b === void 0 ? void 0 : _b.hash) { // on some clients, the hash is returning as undefined
-                authState.creds.lastPropHash = (_c = propsNode === null || propsNode === void 0 ? void 0 : propsNode.attrs) === null || _c === void 0 ? void 0 : _c.hash;
+            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';
+        }
+        const profilePicProp = props['9666'] ?? props['profile_scraping_privacy_token_in_photo_iq'];
+        if (profilePicProp !== undefined) {
+            serverProps.profilePicPrivacyToken = profilePicProp === 'true' || profilePicProp === '1';
+        }
+        const lidIssueProp = props['14303'] ?? props['lid_trusted_token_issue_to_lid'];
+        if (lidIssueProp !== undefined) {
+            serverProps.lidTrustedTokenIssueToLid = lidIssueProp === 'true' || lidIssueProp === '1';
         }
-        logger.debug('fetched props');
+        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);
     };
+    /**
+     * Enable/Disable link preview privacy, not related to baileys link preview generation
+     */
+    const updateDisableLinkPreviewsPrivacy = (isPreviewsDisabled) => {
+        return chatModify({
+            disableLinkPreviews: { isPreviewsDisabled }
+        }, '');
+    };
     /**
      * Star or Unstar a message
      */
@@ -674,6 +857,32 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
+    /**
+     * Add or Edit Contact
+     */
+    const addOrEditContact = (jid, contact) => {
+        return chatModify({
+            contact
+        }, jid);
+    };
+    /**
+     * Remove Contact
+     */
+    const removeContact = (jid) => {
+        return chatModify({
+            contact: null
+        }, jid);
+    };
+    /**
+     * Adds label
+     */
+    const addLabel = (jid, labels) => {
+        return chatModify({
+            addLabel: {
+                ...labels
+            }
+        }, jid);
+    };
     /**
      * Adds label for the chats
      */
@@ -716,49 +925,156 @@ 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 isWASystemNotification = (msg) => {
+        const content = msg?.message;
+        if (!content)
+            return false;
+        const protoType = content.protocolMessage?.type;
+        if (protoType === proto.Message.ProtocolMessage.Type.HISTORY_SYNC_NOTIFICATION ||
+            protoType === proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_SHARE ||
+            protoType === proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE ||
+            protoType === proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC) {
+            return true;
+        }
+        if (msg.messageStubType && !content.conversation && !content.extendedTextMessage) {
+            const stub = msg.messageStubType;
+            const SYSTEM_STUB_TYPES = new Set([
+                WAMessageStubType.E2E_DEVICE_CHANGED,
+                WAMessageStubType.E2E_ENCRYPTED,
+                WAMessageStubType.E2E_IDENTITY_CHANGED,
+                WAMessageStubType.CIPHERTEXT,
+                WAMessageStubType.BIZ_PRIVACY_MODE_TO_BSP,
+                WAMessageStubType.BIZ_PRIVACY_MODE_TO_FB
+            ]);
+            if (SYSTEM_STUB_TYPES.has(stub))
+                return true;
+        }
+        return false;
     };
     const upsertMessage = ev.createBufferedFunction(async (msg, type) => {
-        var _a, _b, _c;
+        if (isWASystemNotification(msg)) {
+            msg.isSystemNotification = true;
+        }
         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);
+            let jid = msg.key.fromMe ? authState.creds.me.id : msg.key.participant || msg.key.remoteJid;
+            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 && ((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.name) !== msg.pushName) {
+            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 && !authState.creds.myAppStateKeyId) {
-            logger.warn('skipping app state sync, as myAppStateKeyId is not set');
-            pendingAppStateSync = true;
+        if (historyMsg && shouldProcessHistoryMsg) {
+            const syncType = historyMsg.syncType;
+            // 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', {
+                    syncType,
+                    status: 'complete',
+                    explicit: true
+                });
+            }
+            // RECENT with progress === 100 — explicit completion
+            if (syncType === proto.HistorySync.HistorySyncType.RECENT &&
+                historyMsg.progress === 100 &&
+                !historySyncStatus.recentSyncComplete) {
+                historySyncStatus.recentSyncComplete = true;
+                clearTimeout(historySyncPausedTimeout);
+                historySyncPausedTimeout = undefined;
+                ev.emit('messaging-history.status', {
+                    syncType,
+                    status: 'complete',
+                    explicit: true
+                });
+            }
+            // 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: proto.HistorySync.HistorySyncType.RECENT,
+                            status: 'paused',
+                            explicit: false
+                        });
+                    }
+                    historySyncPausedTimeout = undefined;
+                }, HISTORY_SYNC_PAUSED_TIMEOUT_MS);
+            }
+        }
+        // State machine: decide on sync and flush
+        if (historyMsg && syncState === SyncState.AwaitingInitialSync) {
+            if (awaitingSyncTimeout) {
+                clearTimeout(awaitingSyncTimeout);
+                awaitingSyncTimeout = undefined;
+            }
+            if (shouldProcessHistoryMsg) {
+                syncState = SyncState.Syncing;
+                logger.info('Transitioned to Syncing state');
+                // Let doAppStateSync handle the final flush after it's done
+            }
+            else {
+                syncState = SyncState.Online;
+                logger.info('History sync skipped, transitioning to Online state and flushing buffer');
+                ev.flush();
+            }
         }
+        const doAppStateSync = async () => {
+            if (syncState === SyncState.Syncing) {
+                // All collections will be synced, so clear any blocked ones
+                blockedCollections.clear();
+                logger.info('Doing app state sync');
+                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;
+                ev.emit('creds.update', { accountSyncCounter });
+            }
+        };
         await Promise.all([
             (async () => {
-                if (historyMsg
-                    && authState.creds.myAppStateKeyId) {
-                    pendingAppStateSync = false;
+                if (shouldProcessHistoryMsg) {
                     await doAppStateSync();
                 }
             })(),
-            (0, process_message_1.default)(msg, {
+            processMessage(msg, {
+                signalRepository,
                 shouldProcessHistoryMsg,
                 placeholderResendCache,
                 ev,
@@ -766,31 +1082,19 @@ const makeChatsSocket = (config) => {
                 keyStore: authState.keys,
                 logger,
                 options: config.options,
-                getMessage: config.getMessage,
+                getMessage
             })
         ]);
-        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.appStateSyncKeyShare)
-            && pendingAppStateSync) {
+        // 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();
-            pendingAppStateSync = false;
-        }
-        async function doAppStateSync() {
-            if (!authState.creds.accountSyncCounter) {
-                logger.info('doing initial app state sync');
-                await resyncAppState(Types_1.ALL_WA_PATCH_NAMES, true);
-                const accountSyncCounter = (authState.creds.accountSyncCounter || 0) + 1;
-                ev.emit('creds.update', { accountSyncCounter });
-                if (needToFlushWithAppStateSync) {
-                    logger.debug('flushing with app state sync');
-                    ev.flush();
-                }
-            }
         }
     });
     ws.on('CB:presence', handlePresenceUpdate);
     ws.on('CB:chatstate', handlePresenceUpdate);
     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':
@@ -812,42 +1116,123 @@ const makeChatsSocket = (config) => {
         }
     });
     ev.on('connection.update', ({ connection, receivedPendingNotifications }) => {
-        var _a;
+        if (connection === 'close') {
+            blockedCollections.clear();
+            clearTimeout(historySyncPausedTimeout);
+            historySyncPausedTimeout = undefined;
+        }
         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 && // if we don't have the app state key
-            // we keep buffering events until we finally have
-            // the key and can sync the messages
-            !((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId)) {
-            ev.buffer();
-            needToFlushWithAppStateSync = true;
+        if (!receivedPendingNotifications || syncState !== SyncState.Connecting) {
+            return;
+        }
+        historySyncStatus.initialBootstrapComplete = false;
+        historySyncStatus.recentSyncComplete = false;
+        clearTimeout(historySyncPausedTimeout);
+        historySyncPausedTimeout = undefined;
+        syncState = SyncState.AwaitingInitialSync;
+        logger.info('Connection is now AwaitingInitialSync, buffering events');
+        ev.buffer();
+        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 = 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 = SyncState.Online;
+            setTimeout(() => ev.flush(), 0);
+            return;
+        }
+        logger.info('First connection, awaiting history sync notification with a 20s timeout.');
+        if (awaitingSyncTimeout) {
+            clearTimeout(awaitingSyncTimeout);
+        }
+        awaitingSyncTimeout = setTimeout(() => {
+            if (syncState === SyncState.AwaitingInitialSync) {
+                logger.warn('Timeout in AwaitingInitialSync, forcing state to Online and flushing buffer');
+                syncState = SyncState.Online;
+                ev.flush();
+                // 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 we're in the middle of a full sync, doAppStateSync handles all collections
+        if (syncState === SyncState.Syncing) {
+            blockedCollections.clear();
+            return;
+        }
+        const collections = [...blockedCollections];
+        blockedCollections.clear();
+        logger.info({ collections }, 'app state sync key arrived, re-syncing blocked collections');
+        resyncAppState(collections, false).catch(error => onUnexpectedError(error, 'blocked collections resync'));
+    });
+    ev.on('lid-mapping.update', async ({ lid, pn }) => {
+        try {
+            await signalRepository.lidMapping.storeLIDPNMappings([{ lid, pn }]);
+        }
+        catch (error) {
+            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,
         getBotListV2,
-        processingMutex,
+        messageMutex,
+        receiptMutex,
+        appStatePatchMutex,
+        notificationMutex,
         fetchPrivacySettings,
         upsertMessage,
         appPatch,
         sendPresenceUpdate,
         presenceSubscribe,
         profilePictureUrl,
-        onWhatsApp,
         fetchBlocklist,
-        fetchDisappearingDuration,
         fetchStatus,
+        fetchDisappearingDuration,
+        findUserId,
         updateProfilePicture,
         removeProfilePicture,
         updateProfileStatus,
         updateProfileName,
         updateBlockStatus,
+        updateDisableLinkPreviewsPrivacy,
         updateCallPrivacy,
         updateMessagesPrivacy,
         updateLastSeenPrivacy,
@@ -861,11 +1246,17 @@ const makeChatsSocket = (config) => {
         resyncAppState,
         chatModify,
         cleanDirtyBits,
+        addOrEditContact,
+        removeContact,
+        placeholderResendCache,
+        addLabel,
         addChatLabel,
         removeChatLabel,
         addMessageLabel,
         removeMessageLabel,
-        star
+        star,
+        addOrEditQuickReply,
+        removeQuickReply
     };
 };
-exports.makeChatsSocket = makeChatsSocket;
+//# sourceMappingURL=chats.js.map