@pontalabs/baileys 1.0.4 → 1.0.6

package/lib/Socket/chats.js

@@ -1,80 +1,87 @@
-"use strict"
-
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
-
-Object.defineProperty(exports, "__esModule", { value: true })
-
-const node_cache_1 = __importDefault(require("@cacheable/node-cache"))
-const boom_1 = require("@hapi/boom")
-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 WABinary_1 = require("../WABinary")
-const WAUSync_1 = require("../WAUSync")
-const socket_1 = require("./socket")
-const MAX_SYNC_ATTEMPTS = 2
-
-const makeChatsSocket = (config) => {
-    const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config
-    const sock = socket_1.makeSocket(config)
-    const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError, groupFetchAllParticipating } = sock
-    
-    let privacySettings
-    let syncState = Types_1.SyncState.Connecting
-    
-    /** this mutex ensures that the notifications (receipts, messages etc.) are processed in order */
-    const processingMutex = make_mutex_1.makeMutex()
-    
-    // Timeout for AwaitingInitialSync State
-    let awaitingSyncTimeout
-    
-    const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
-        useClones: false
-    })
-    
-    if (!config.placeholderResendCache) {
-        config.placeholderResendCache = placeholderResendCache
-    }
-    
+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 = 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 = 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])
-        return key
-    }
-    
+        const { [keyId]: key } = await authState.keys.get('app-state-sync-key', [keyId]);
+        return key;
+    };
     const fetchPrivacySettings = async (force = false) => {
         if (!privacySettings || force) {
             const { content } = await query({
                 tag: 'iq',
                 attrs: {
                     xmlns: 'privacy',
-                    to: WABinary_1.S_WHATSAPP_NET,
+                    to: S_WHATSAPP_NET,
                     type: 'get'
                 },
-                content: [
-                    { tag: 'privacy', attrs: {} }
-                ]
-            })
-            privacySettings = WABinary_1.reduceBinaryNodeToDictionary(content?.[0], 'category')
+                content: [{ tag: 'privacy', attrs: {} }]
+            });
+            privacySettings = reduceBinaryNodeToDictionary(content?.[0], 'category');
         }
-        return privacySettings
-    }
-    
+        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: [{
+            content: [
+                {
                     tag: 'privacy',
                     attrs: {},
                     content: [
@@ -83,172 +90,123 @@ const makeChatsSocket = (config) => {
                             attrs: { name, value }
                         }
                     ]
-                }]
-        })
-    }
-    
+                }
+            ]
+        });
+    };
     const updateMessagesPrivacy = async (value) => {
-        await privacyQuery('messages', value)
-    }
-    
+        await privacyQuery('messages', value);
+    };
     const updateCallPrivacy = async (value) => {
-        await privacyQuery('calladd', value)
-    }
-    
+        await privacyQuery('calladd', value);
+    };
     const updateLastSeenPrivacy = async (value) => {
-        await privacyQuery('last', value)
-    }
-    
+        await privacyQuery('last', value);
+    };
     const updateOnlinePrivacy = async (value) => {
-        await privacyQuery('online', value)
-    }
-    
+        await privacyQuery('online', value);
+    };
     const updateProfilePicturePrivacy = async (value) => {
-        await privacyQuery('profile', value)
-    }
-    
+        await privacyQuery('profile', value);
+    };
     const updateStatusPrivacy = async (value) => {
-        await privacyQuery('status', value)
-    }
-    
+        await privacyQuery('status', value);
+    };
     const updateReadReceiptsPrivacy = async (value) => {
-        await privacyQuery('readreceipts', value)
-    }
-    
+        await privacyQuery('readreceipts', value);
+    };
     const updateGroupsAddPrivacy = async (value) => {
-        await privacyQuery('groupadd', value)
-    }
-    
+        await privacyQuery('groupadd', value);
+    };
     const updateDefaultDisappearingMode = async (duration) => {
         await query({
             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 () => {
-	  const resp = await query({
-    		tag: 'iq',
-    		attrs: {
-     			xmlns: 'bot',
-     			to: WABinary_1.S_WHATSAPP_NET,
-     			type: 'get'
-    		},
-    		content: [{
-     			tag: 'bot',
-     			attrs: {
-      				v: '2'
-     			}
-    		}]
-   	})
-   
-		const botNode = WABinary_1.getBinaryNodeChild(resp, 'bot')
-		
-		const botList = []
-		
-		for(const section of WABinary_1.getBinaryNodeChildren(botNode, 'section')) {
-		  if(section.attrs.type === 'all') {
-				for(const bot of WABinary_1.getBinaryNodeChildren(section, 'bot')) {
-				  botList.push({
-						jid: bot.attrs.jid,
-						personaId: bot.attrs['persona_id']
-					})
-				}
-			}
-		}
-		return botList
-	}
-	
-	const getLidUser = async (jid) => {
-        if (!jid) {
-            throw new boom_1.Boom('Please input a jid user')
-        }
-        
-        if (!WABinary_1.isJidUser(jid)) {
-        	throw new boom_1.Boom('Invalid JID: Not a user JID!')
-        }
-        
-        const targetJid = WABinary_1.jidNormalizedUser(jid)
-        
-        const usyncQuery = new WAUSync_1.USyncQuery() 
-        usyncQuery.protocols.push({
-        	name: 'lid', 
-            getQueryElement: () => ({
-            	tag: 'lid', 
-                attrs: {}, 
-                content: undefined
-            }), 
-            getUserElement: () => null, 
-            parser: (node) => node.attrs.val
-        }) 
-        usyncQuery.users.push({
-        	id: targetJid
-        })
-        
-        const result = await sock.executeUSyncQuery(usyncQuery)
-        
-        if (result) {
-            return result.list
+        const resp = await query({
+            tag: 'iq',
+            attrs: {
+                xmlns: 'bot',
+                to: S_WHATSAPP_NET,
+                type: 'get'
+            },
+            content: [
+                {
+                    tag: 'bot',
+                    attrs: {
+                        v: '2'
+                    }
+                }
+            ]
+        });
+        const botNode = getBinaryNodeChild(resp, 'bot');
+        const botList = [];
+        for (const section of getBinaryNodeChildren(botNode, 'section')) {
+            if (section.attrs.type === 'all') {
+                for (const bot of getBinaryNodeChildren(section, 'bot')) {
+                    botList.push({
+                        jid: bot.attrs.jid,
+                        personaId: bot.attrs['persona_id']
+                    });
+                }
+            }
         }
-    }
-    
+        return botList;
+    };
     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)
-        
+        const result = await sock.executeUSyncQuery(usyncQuery);
         if (result) {
-            return result.list
+            return result.list;
         }
-    }
-    const fetchDisappearingDuration = async (...jids) => {   	
-        const usyncQuery = new WAUSync_1.USyncQuery().withDisappearingModeProtocol()
-        
+    };
+    const fetchDisappearingDuration = async (...jids) => {
+        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)
+        const result = await sock.executeUSyncQuery(usyncQuery);
         if (result) {
-            return result.list
+            return result.list;
         }
-    }
-    
+    };
     /** update the profile picture for yourself or a group */
-    const updateProfilePicture = async (jid, content) => {
-        let targetJid
-        
+    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 (jidNormalizedUser(jid) !== jidNormalizedUser(authState.creds.me.id)) {
+            targetJid = jidNormalizedUser(jid); // in case it is someone other than us
         }
-        
-        if (WABinary_1.jidNormalizedUser(jid) !== WABinary_1.jidNormalizedUser(authState.creds.me.id)) {
-            targetJid = WABinary_1.jidNormalizedUser(jid) // in case it is someone other than us
+        else {
+            targetJid = undefined;
         }
-        
-        const { img } = await Utils_1.generateProfilePicture(content)
-        
+        const { img } = await generateProfilePicture(content, dimensions);
         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: [
                 {
@@ -257,38 +215,36 @@ const makeChatsSocket = (config) => {
                     content: img
                 }
             ]
-        })
-    }
-    
+        });
+    };
     /** remove the profile picture for yourself or a group */
     const removeProfilePicture = async (jid) => {
-        let targetJid
-        
+        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 (WABinary_1.jidNormalizedUser(jid) !== WABinary_1.jidNormalizedUser(authState.creds.me.id)) {
-            targetJid = 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;
         }
-        
         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 } : {})
             }
-        })
-    }
-    
+        });
+    };
     /** 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'
             },
@@ -299,48 +255,75 @@ const makeChatsSocket = (config) => {
                     content: Buffer.from(status, 'utf-8')
                 }
             ]
-        })
-    }
-    
+        });
+    };
     const updateProfileName = async (name) => {
-        await chatModify({ pushNameSetting: name }, '')
-    }
-    
+        await chatModify({ pushNameSetting: name }, '');
+    };
     const fetchBlocklist = async () => {
         const result = await query({
             tag: 'iq',
             attrs: {
                 xmlns: 'blocklist',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get'
             }
-        })
-        
-        const listNode = WABinary_1.getBinaryNodeChild(result, 'list')
-        
-        return 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) => {
         const results = await query({
             tag: 'iq',
@@ -349,121 +332,133 @@ const makeChatsSocket = (config) => {
                 xmlns: 'w:biz',
                 type: 'get'
             },
-            content: [{
+            content: [
+                {
                     tag: 'business_profile',
                     attrs: { v: '244' },
-                    content: [{
+                    content: [
+                        {
                             tag: 'profile',
                             attrs: { jid }
-                        }]
-                }]
-        })
-        
-        const profileNode = WABinary_1.getBinaryNodeChild(results, 'business_profile')
-        
-        const profiles = WABinary_1.getBinaryNodeChild(profileNode, 'profile')
-        
+                        }
+                    ]
+                }
+            ]
+        });
+        const profileNode = getBinaryNodeChild(results, 'business_profile');
+        const profiles = getBinaryNodeChild(profileNode, 'profile');
         if (profiles) {
-            const address = WABinary_1.getBinaryNodeChild(profiles, 'address')
-            const description = WABinary_1.getBinaryNodeChild(profiles, 'description')
-            const website = WABinary_1.getBinaryNodeChild(profiles, 'website')
-            const email = WABinary_1.getBinaryNodeChild(profiles, 'email')
-            const category = WABinary_1.getBinaryNodeChild(WABinary_1.getBinaryNodeChild(profiles, 'categories'), 'category')
-            const businessHours = 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
-                ? WABinary_1.getBinaryNodeChildren(businessHours, 'business_hours_config')
-                : undefined
-            const websiteStr = website?.content?.toString()
-            
+                ? getBinaryNodeChildren(businessHours, 'business_hours_config')
+                : undefined;
+            const websiteStr = website?.content?.toString();
             return {
-                wid: profiles?.attrs?.jid,
+                wid: profiles.attrs?.jid,
                 address: address?.content?.toString(),
                 description: description?.content?.toString() || '',
                 website: websiteStr ? [websiteStr] : [],
                 email: email?.content?.toString(),
                 category: category?.content?.toString(),
-                'business_hours': {
+                business_hours: {
                     timezone: businessHours?.attrs?.timezone,
-                    'business_config': businessHoursConfig?.map(({ attrs }) => attrs)
+                    business_config: businessHoursConfig?.map(({ attrs }) => attrs)
                 }
-            }
+            };
         }
-    }
-    
+    };
     const cleanDirtyBits = async (type, fromTimestamp) => {
-        logger.info({ fromTimestamp }, 'clean dirty bits ' + type)
+        logger.info({ fromTimestamp }, 'clean dirty bits ' + type);
         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)
                     }
                 }
             ]
-        })
-    }
-    
+        });
+    };
     const newAppStateChunkHandler = (isInitialSync) => {
         return {
             onMutation(mutation) {
-                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 = {}
+        const initialVersionMap = {};
+        const globalMutationMap = {};
         await authState.keys.transaction(async () => {
-            const collectionsToHandle = new Set(collections)
+            const collectionsToHandle = new Set(collections);
             // in case something goes wrong -- ensure we don't enter a loop that cannot be exited from
-            const attemptsMap = {}
+            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 = []
-                
+                const states = {};
+                const nodes = [];
                 for (const name of collectionsToHandle) {
-                    const result = await authState.keys.get('app-state-sync-version', [name])
-                    let state = result[name]
+                    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
+                            initialVersionMap[name] = state.version;
                         }
                     }
                     else {
-                        state = Utils_1.newLTHashState()
+                        state = newLTHashState();
+                    }
+                    states[name] = state;
+                    const shouldForceSnapshot = forceSnapshotCollections.has(name);
+                    if (shouldForceSnapshot) {
+                        forceSnapshotCollections.delete(name);
                     }
-                    states[name] = state
-                    logger.info(`resyncing ${name} from v${state.version}`)
+                    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'
                     },
@@ -474,125 +469,159 @@ const makeChatsSocket = (config) => {
                             content: nodes
                         }
                     ]
-                })
-                
+                });
                 // extract from binary node
-                const decoded = await Utils_1.extractSyncdPatches(result, config?.options)
-                
+                const decoded = await extractSyncdPatches(result, config?.options);
                 for (const key in decoded) {
-                    const name = key
-                    const { patches, hasMorePatches, snapshot } = decoded[name]
+                    const name = key;
+                    const { patches, hasMorePatches, snapshot } = decoded[name];
                     try {
                         if (snapshot) {
-                            const { state: newState, mutationMap } = await Utils_1.decodeSyncdSnapshot(name, snapshot, getAppStateSyncKey, initialVersionMap[name], appStateMacVerification.snapshot)
-                            states[name] = newState
-                            Object.assign(globalMutationMap, mutationMap)
-                            logger.info(`restored state of ${name} from snapshot to v${newState.version} with mutations`)
-                            await authState.keys.set({ 'app-state-sync-version': { [name]: newState } })
+                            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 Utils_1.decodePatches(name, patches, states[name], getAppStateSyncKey, config.options, initialVersionMap[name], logger, appStateMacVerification.patch)
-                            await authState.keys.set({ 'app-state-sync-version': { [name]: newState } })
-                            logger.info(`synced ${name} to v${newState.version}`)
-                            initialVersionMap[name] = newState.version
-                            Object.assign(globalMutationMap, mutationMap)
+                            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;
+                            Object.assign(globalMutationMap, mutationMap);
                         }
-                        
                         if (hasMorePatches) {
-                            logger.info(`${name} has more patches...`)
-                        }                        
-                        else { // collection is done with sync
-                            collectionsToHandle.delete(name)
+                            logger.info(`${name} has more patches...`);
                         }
-                    }                     
+                        else {
+                            // collection is done with sync
+                            collectionsToHandle.delete(name);
+                        }
+                    }
                     catch (error) {
-                        // if retry attempts overshoot
-                        // or key not found
-                        const isIrrecoverableError = attemptsMap[name] >= MAX_SYNC_ATTEMPTS
-                            || error.output?.statusCode === 404
-                            || error.name === 'TypeError'
-                        logger.info({ name, error: error.stack }, `failed to sync state from version${isIrrecoverableError ? '' : ', removing and trying from scratch'}`)
-                        await authState.keys.set({ 'app-state-sync-version': { [name]: null } })
-                        // increment number of retries
-                        attemptsMap[name] = (attemptsMap[name] || 0) + 1
-                        
-                        if (isIrrecoverableError) {
-                            // stop retrying
-                            collectionsToHandle.delete(name)
+                        attemptsMap[name] = (attemptsMap[name] || 0) + 1;
+                        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)
-        
+        }, authState?.creds?.me?.id || 'resync-app-state');
+        const { onMutation } = newAppStateChunkHandler(isInitialSync);
         for (const key in globalMutationMap) {
-            onMutation(globalMutationMap[key])
+            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 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 === jidNormalizedUser(me.id) || (me.lid && normalizedJid === jidNormalizedUser(me.lid)));
+        let content = baseContent;
+        if (serverProps.profilePicPrivacyToken && isUserJid && !isSelf) {
+            content = await buildTcTokenFromJid({
+                authState,
+                jid: normalizedJid,
+                baseContent,
+                getLIDForPN
+            });
         }
-    })    
-    
-    // source: https://github.com/WhiskeySockets/Baileys/pull/1677
+        jid = jidNormalizedUser(jid);
+        const result = await query({
+            tag: 'iq',
+            attrs: {
+                target: jid,
+                to: S_WHATSAPP_NET,
+                type: 'get',
+                xmlns: 'w:profile:picture'
+            },
+            content
+        }, timeoutMs);
+        const child = getBinaryNodeChild(result, 'picture');
+        return child?.attrs?.url;
+    };
     const createCallLink = async (type, event, timeoutMs) => {
-    	type = type?.toLowerCase() 
-    
-    	if (!type || (type !== 'audio' && type !== 'video')) {
-    		throw new Error('Make sure the type is audio or video!') 
-    	}
-    
-    	const result = await query({
-    		tag: 'call',
-    		attrs: {
-    			id: generateMessageTag(), 
-    			to: '@call'
-    		}, 
-    		content: [{
-    			tag: 'link_create', 
-    			attrs: {
-    				media: type
-    			}, 
-    			content: event ? [{ 
-    				tag: 'event', 
-    				attrs: {
-    					start_time: String(event) 
-    				}
-    			}] : undefined
-    		}]
-    	}, timeoutMs) 
-    
-    	const child = WABinary_1.getBinaryNodeChild(result, 'link_create') 
-    	const token = child?.attrs?.token
-    
-    	return type === 'audio' ? Defaults_1.CALL_AUDIO_PREFIX + token : Defaults_1.CALL_VIDEO_PREFIX + token
-    }
-    
+        const result = await query({
+            tag: 'call',
+            attrs: {
+                id: generateMessageTag(),
+                to: '@call'
+            },
+            content: [
+                {
+                    tag: 'link_create',
+                    attrs: { media: type },
+                    content: event ? [{ tag: 'event', attrs: { start_time: String(event.startTime) } }] : undefined
+                }
+            ]
+        }, timeoutMs);
+        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 me = authState.creds.me;
+        const isAvailableType = type === 'available';
+        if (isAvailableType || type === 'unavailable') {
             if (!me.name) {
-                logger.warn('no name present, ignoring presence update request...')
-                return
+                logger.warn('no name present, ignoring presence update request...');
+                return;
+            }
+            ev.emit('connection.update', { isOnline: isAvailableType });
+            if (isAvailableType) {
+                void sendUnifiedSession();
             }
-            
-            ev.emit('connection.update', { isOnline: type === 'available' })
             await sendNode({
                 tag: 'presence',
                 attrs: {
                     name: me.name.replace(/@/g, ''),
                     type
                 }
-            })
+            });
         }
         else {
-        	const { server } = WABinary_1.jidDecode(toJid) 
-        
+            const { server } = jidDecode(toJid);
+            const isLid = server === 'lid';
             await sendNode({
                 tag: 'chatstate',
                 attrs: {
-                    from: server === 'lid' ? me.lid : me.id,
+                    from: isLid ? me.lid : me.id,
                     to: toJid
                 },
                 content: [
@@ -601,96 +630,82 @@ const makeChatsSocket = (config) => {
                         attrs: type === 'recording' ? { media: 'audio' } : {}
                     }
                 ]
-            })
+            });
         }
-    }
-    
+    };
     /**
      * @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 }) => {
-        let presence
-        const jid = attrs.from
-        const participant = attrs.participant || attrs.from
-        
-        if (shouldIgnoreJid(jid) && jid !== '@s.whatsapp.net') {
-            return
+        let presence;
+        const jid = attrs.from;
+        const participant = attrs.participant || attrs.from;
+        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)) {
-            const [firstChild] = content
-            let type = firstChild.tag
-            
+            const [firstChild] = content;
+            let type = firstChild.tag;
             if (type === 'paused') {
-                type = 'available'
+                type = 'available';
             }
-            
             if (firstChild.attrs?.media === 'audio') {
-                type = 'recording'
+                type = 'recording';
             }
-            
-            presence = { lastKnownPresence: type }
+            presence = { lastKnownPresence: type };
         }
-        
         else {
-            logger.error({ tag, attrs, content }, 'recv invalid presence node')
+            logger.error({ tag, attrs, content }, 'recv invalid presence node');
         }
-        
         if (presence) {
-            ev.emit('presence.update', { id: jid, presences: { [participant]: presence } })
+            ev.emit('presence.update', { id: jid, presences: { [participant]: presence } });
         }
-    }
-    
+    };
     const appPatch = async (patchCreate) => {
-        const name = patchCreate.type
-        const myAppStateKeyId = authState.creds.myAppStateKeyId
-        
+        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 () => {
+        let initial;
+        let encodeResult;
+        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 || Utils_1.newLTHashState()
-                encodeResult = await Utils_1.encodeSyncdPatch(patchCreate, myAppStateKeyId, initial, getAppStateSyncKey)
-                const { patch, state } = encodeResult
-                
+                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 ? 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'
                     },
@@ -704,88 +719,94 @@ 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()
                                         }
                                     ]
                                 }
                             ]
                         }
                     ]
-                }
-                await query(node)
-                await authState.keys.set({ 'app-state-sync-version': { [name]: state } })
-            }, authState?.creds?.me?.id || 'app-patch')
-        })
-        
+                };
+                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 Utils_1.decodePatches(name, [{ ...encodeResult.patch, version: { version: encodeResult.state.version }, }], initial, getAppStateSyncKey, config.options, undefined, logger)
-            
+            const { onMutation } = newAppStateChunkHandler(false);
+            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])
+                onMutation(mutationMap[key]);
             }
         }
-    }
-    
-    /** sending non-abt props may fix QR scan fail if server expects */
+    };
+    /** fetch AB props */
     const fetchProps = async () => {
         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: authState?.creds?.lastPropHash || ''
-                    } }
+                {
+                    tag: 'props',
+                    attrs: {
+                        protocol: '1',
+                        ...(authState?.creds?.lastPropHash ? { hash: authState.creds.lastPropHash } : {})
+                    }
+                }
             ]
-        })
-        
-        const propsNode = WABinary_1.getBinaryNodeChild(resultNode, 'props')
-        let 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)
+            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 = WABinary_1.reduceBinaryNodeToDictionary(propsNode, 'prop')
+            props = reduceBinaryNodeToDictionary(propsNode, 'prop');
         }
-        logger.debug('fetched props')
-        return props
-    }
-    
+        // 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({ 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
-    */
+     * requires the last messages till the last message received; required for archive & unread
+     */
     const chatModify = (mod, jid) => {
-        const patch = Utils_1.chatModificationToAppPatch(mod, jid)
-        return appPatch(patch)
-    }
-    
+        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
-    		}
-    	}, '') 
-    } 
-    
+        return chatModify({
+            disableLinkPreviews: { isPreviewsDisabled }
+        }, '');
+    };
     /**
      * Star or Unstar a message
      */
@@ -795,27 +816,24 @@ const makeChatsSocket = (config) => {
                 messages,
                 star
             }
-        }, jid)
-    }
-    
+        }, jid);
+    };
     /**
-     * Add Or Edit Contact
+     * Add or Edit Contact
      */
     const addOrEditContact = (jid, contact) => {
-    	return chatModify({
-    	    contact
-        }, jid) 
-    }
-    
+        return chatModify({
+            contact
+        }, jid);
+    };
     /**
      * Remove Contact
      */
-     const removeContact = (jid) => {
-     	return chatModify({
-     	    contact: null
-         }, jid) 
-     }
-    
+    const removeContact = (jid) => {
+        return chatModify({
+            contact: null
+        }, jid);
+    };
     /**
      * Adds label
      */
@@ -824,9 +842,8 @@ const makeChatsSocket = (config) => {
             addLabel: {
                 ...labels
             }
-        }, jid)
-    }
-    
+        }, jid);
+    };
     /**
      * Adds label for the chats
      */
@@ -835,9 +852,8 @@ const makeChatsSocket = (config) => {
             addChatLabel: {
                 labelId
             }
-        }, jid)
-    }
-    
+        }, jid);
+    };
     /**
      * Removes label for the chat
      */
@@ -846,9 +862,8 @@ const makeChatsSocket = (config) => {
             removeChatLabel: {
                 labelId
             }
-        }, jid)
-    }
-    
+        }, jid);
+    };
     /**
      * Adds label for the message
      */
@@ -858,9 +873,8 @@ const makeChatsSocket = (config) => {
                 messageId,
                 labelId
             }
-        }, jid)
-    }
-    
+        }, jid);
+    };
     /**
      * Removes label for the message
      */
@@ -870,114 +884,129 @@ const makeChatsSocket = (config) => {
                 messageId,
                 labelId
             }
-        }, jid)
-    }
-    
+        }, jid);
+    };
     /**
-     * Removes Chats 
-     */
-     const clearMessage = (jid, key, timeStamp) => {
-         return chatModify({
-           delete: true,
-           lastMessages: [{
-                key: key,
-                messageTimestamp: timeStamp
-            }],
-        }, jid)
-     }
-     
-     /**
      * Add or Edit Quick Reply
      */
     const addOrEditQuickReply = (quickReply) => {
         return chatModify({
             quickReply
-        }, '')
-    }
-    
+        }, '');
+    };
     /**
      * Remove Quick Reply
      */
     const removeQuickReply = (timestamp) => {
         return chatModify({
             quickReply: { timestamp, deleted: true }
-        }, '')
-    }
-     
+        }, '');
+    };
     /**
      * queries need to be fired on connection open
      * help ensure parity with WA Web
      * */
     const executeInitQueries = async () => {
-        await Promise.all([
-            fetchProps(),
-            fetchBlocklist(),
-            fetchPrivacySettings(),
-        ])
-    }
-    
+        await Promise.all([fetchProps(), fetchBlocklist(), fetchPrivacySettings()]);
+    };
     const upsertMessage = ev.createBufferedFunction(async (msg, type) => {
-        ev.emit('messages.upsert', { messages: [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 = 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 }])
+                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 } })
+                ev.emit('creds.update', { me: { ...authState.creds.me, name: msg.pushName } });
             }
         }
-        
-        const historyMsg = Utils_1.getHistoryMsg(msg.message)
+        const historyMsg = getHistoryMsg(msg.message);
         const shouldProcessHistoryMsg = historyMsg
-            ? (shouldSyncHistoryMessage(historyMsg)
-                && Defaults_1.PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType))
-            : false
-            
-        if (historyMsg && syncState === Types_1.SyncState.AwaitingInitialSync) {
+            ? shouldSyncHistoryMessage(historyMsg) &&
+                PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType)
+            : false;
+        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
+                clearTimeout(awaitingSyncTimeout);
+                awaitingSyncTimeout = undefined;
             }
-            
             if (shouldProcessHistoryMsg) {
-            	syncState = Types_1.SyncState.Syncing
-            	logger.info('Transitioned to Syncing state') 
-            	// Let doAppStateSync handle the final flush after it`s done
-            } else {
-            	syncState = Types_1.SyncState.Online
-            	logger.info('History sync skipped, transitioning to Online state and flushing buffer') 
-            	ev.flush() 
+                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 === Types_1.SyncState.Syncing) {
-        		logger.info('Doing app state sync') 
-        		await resyncAppState(Types_1.ALL_WA_PATCH_NAMES, true)
-        
-        		// Sync is complete, go online and flush everything
-        		syncState = Types_1.SyncState.Online
-        		logger.info('App state sync complete, transitioning to Online state and flushing buffer') 
-        		ev.flush() 
-        
-        		const accountSyncCounter = (authState.creds.accountSyncCounter || 0) + 1
-        		ev.emit('creds.update', { accountSyncCounter }) 
-        	}
-        }
-        
+            if (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 (shouldProcessHistoryMsg) {
-                    await doAppStateSync()
+                    await doAppStateSync();
                 }
             })(),
-            Utils_1.processMessage(msg, {
-            	signalRepository, 
+            processMessage(msg, {
+                signalRepository,
                 shouldProcessHistoryMsg,
                 placeholderResendCache,
                 ev,
@@ -985,101 +1014,147 @@ const makeChatsSocket = (config) => {
                 keyStore: authState.keys,
                 logger,
                 options: config.options,
-                getMessage: config.getMessage,
+                getMessage
             })
-        ])
-        
-        if (msg.message?.protocolMessage?.appStateSyncKeyShare && syncState === Types_1.SyncState.Syncing) {
-        	logger.info('App state sync key arrived, triggering app state sync') 
-        	await doAppStateSync() 
+        ]);
+        // 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();
         }
-    })
-    
-    ws.on('CB:presence', handlePresenceUpdate)
-    ws.on('CB:chatstate', handlePresenceUpdate)
+    });
+    ws.on('CB:presence', handlePresenceUpdate);
+    ws.on('CB:chatstate', handlePresenceUpdate);
     ws.on('CB:ib,,dirty', async (node) => {
-        const { attrs } = WABinary_1.getBinaryNodeChild(node, 'dirty')
-        const type = attrs.type
-        
+        const { attrs } = getBinaryNodeChild(node, 'dirty');
+        const type = attrs.type;
         switch (type) {
             case 'account_sync':
                 if (attrs.timestamp) {
-                    let { lastAccountSyncTimestamp } = authState.creds
+                    let { lastAccountSyncTimestamp } = authState.creds;
                     if (lastAccountSyncTimestamp) {
-                        await cleanDirtyBits('account_sync', lastAccountSyncTimestamp)
+                        await cleanDirtyBits('account_sync', lastAccountSyncTimestamp);
                     }
-                    lastAccountSyncTimestamp = +attrs.timestamp
-                    ev.emit('creds.update', { lastAccountSyncTimestamp })
+                    lastAccountSyncTimestamp = +attrs.timestamp;
+                    ev.emit('creds.update', { lastAccountSyncTimestamp });
                 }
-                break
+                break;
             case 'groups':
-                await groupFetchAllParticipating()
-                await cleanDirtyBits('groups')
-                break
+                // handled in groups.ts
+                break;
             default:
-                logger.info({ node }, 'received unknown sync')
-                break
+                logger.info({ node }, 'received unknown sync');
+                break;
         }
-    })
-    
+    });
     ev.on('connection.update', ({ connection, receivedPendingNotifications }) => {
+        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 || syncState !== Types_1.SyncState.Connecting) {
-        	return
+        if (!receivedPendingNotifications || syncState !== SyncState.Connecting) {
+            return;
         }
-        
-        syncState = Types_1.AwaitingInitialSync
-        logger.info('Connection is now AwaitingInitialSync, buffering events') 
-        ev.buffer() 
-        
-        const willSyncHistory = shouldSyncHistoryMessage(WAProto_1.proto.Message.HistorySyncNotification.fromObject({
-        	syncType: WAProto_1.proto.HistorySync.HistorySyncType.RECENT
-        })) 
-        
+        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 = Types_1.SyncState.Online
-        	setTimeout(() => ev.flush(), 0) 
-        	return 
+            logger.info('History sync is disabled by config, not waiting for notification. Transitioning to Online.');
+            syncState = SyncState.Online;
+            setTimeout(() => ev.flush(), 0);
+            return;
         }
-        
-        logger.info('History sync is enabled, awaiting notification with a 20s timeout.') 
-        
+        // 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) 
+            clearTimeout(awaitingSyncTimeout);
         }
-        
         awaitingSyncTimeout = setTimeout(() => {
-        	if (syncState === Types_1.SyncState.AwaitingInitialSync) {
-        		logger.warn('Timeout in AwaitingInitialSync, forcing state to Online and flushing buffer') 
-        		syncState = Types_1.SyncState.Online
-        		ev.flush() 
-        	}
-        }, 20_000) 
-    })
-    
+            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, 
-        star, 
-        addOrEditContact, 
-        removeContact, 
-        processingMutex,
+        ...sock,
+        serverProps,
+        createCallLink,
+        getBotListV2,
+        messageMutex,
+        receiptMutex,
+        appStatePatchMutex,
+        notificationMutex,
         fetchPrivacySettings,
         upsertMessage,
         appPatch,
-        createCallLink, 
         sendPresenceUpdate,
-        presenceSubscribe, 
-        getBotListV2,  
-        getLidUser, 
+        presenceSubscribe,
+        profilePictureUrl,
         fetchBlocklist,
         fetchStatus,
         fetchDisappearingDuration,
@@ -1088,8 +1163,9 @@ const makeChatsSocket = (config) => {
         updateProfileStatus,
         updateProfileName,
         updateBlockStatus,
+        updateDisableLinkPreviewsPrivacy,
         updateCallPrivacy,
-        updateMessagesPrivacy, 
+        updateMessagesPrivacy,
         updateLastSeenPrivacy,
         updateOnlinePrivacy,
         updateProfilePicturePrivacy,
@@ -1097,22 +1173,21 @@ const makeChatsSocket = (config) => {
         updateReadReceiptsPrivacy,
         updateGroupsAddPrivacy,
         updateDefaultDisappearingMode,
-        updateDisableLinkPreviewsPrivacy, 
         getBusinessProfile,
         resyncAppState,
         chatModify,
         cleanDirtyBits,
+        addOrEditContact,
+        removeContact,
+        placeholderResendCache,
         addLabel,
         addChatLabel,
         removeChatLabel,
         addMessageLabel,
         removeMessageLabel,
-        clearMessage, 
+        star,
         addOrEditQuickReply,
         removeQuickReply
-    }
-}
-
-module.exports = {
-  makeChatsSocket
-}
+    };
+};
+//# sourceMappingURL=chats.js.map