@twsxtd/baileys 7.0.0-rc.9.commit.71ed75d4aae0 → 7.0.0-rc.9.commit.8d1e795328c7

package/lib/Socket/chats.d.ts

@@ -6,6 +6,15 @@ import type { LabelActionBody } from '../Types/Label.js';
 import { type BinaryNode } from '../WABinary/index.js';
 import { USyncQuery } from '../WAUSync/index.js';
 export declare const makeChatsSocket: (config: SocketConfig) => {
+    serverProps: {
+        /** AB prop 10518: gate tctoken on 1:1 messages. Default true (safe: avoids 463). */
+        privacyTokenOn1to1: boolean;
+        /** AB prop 9666: gate tctoken on profile picture IQs. WA Web default: true. */
+        profilePicPrivacyToken: boolean;
+        /** AB prop 14303: issue tctokens to LID instead of PN. WA Web default: false. */
+        lidTrustedTokenIssueToLid: boolean;
+    };
+    end: (error: Error | undefined) => Promise<void>;
     createCallLink: (type: "audio" | "video", event?: {
         startTime: number;
     }, timeoutMs?: number) => Promise<string | undefined>;
@@ -76,8 +85,6 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
         createBufferedFunction<A extends any[], T>(work: (...args: A) => Promise<T>): (...args: A) => Promise<T>;
         flush(): boolean;
         isBuffering(): boolean;
-        release(): void;
-        removeAllListeners<T extends keyof import("../Types/index.js").BaileysEventMap>(event?: T): void;
     };
     authState: {
         creds: import("../Types/index.js").AuthenticationCreds;
@@ -92,7 +99,6 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
     sendRawMessage: (data: Uint8Array | Buffer) => Promise<void>;
     sendNode: (frame: BinaryNode) => Promise<void>;
     logout: (msg?: string) => Promise<void>;
-    end: (error: Error | undefined) => Promise<void>;
     onUnexpectedError: (err: Error | Boom, msg: string) => void;
     uploadPreKeys: (count?: number, retryCount?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;

package/lib/Socket/chats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chats.d.ts","sourceRoot":"","sources":["../../src/Socket/chats.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE9C,OAAO,KAAK,EACX,WAAW,EAEX,gBAAgB,EAGhB,iBAAiB,EAEjB,YAAY,EAEZ,iBAAiB,EACjB,aAAa,EACb,SAAS,EACT,aAAa,EAEb,UAAU,EACV,kBAAkB,EAClB,sBAAsB,EACtB,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,EACd,mBAAmB,EACnB,MAAM,UAAU,CAAA;AAEjB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAiBrD,OAAO,EACN,KAAK,UAAU,EAOf,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,UAAU,EAAa,MAAM,YAAY,CAAA;AAIlD,eAAO,MAAM,eAAe,GAAI,QAAQ,YAAY;2BA0lBf,OAAO,GAAG,OAAO,UAAU;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,cAAc,MAAM;;;;;;;;;;;;;;;;;;4BAqHnE,aAAa;+BA/FV,UAAU,UAAU,MAAM;+BA8C1B,MAAM;6BA3FR,MAAM,SAAQ,SAAS,GAAG,OAAO,cAA0B,MAAM;;2BAzYnE,MAAM,EAAE;yCAaM,MAAM,EAAE;gCAepD,MAAM,WACF,aAAa,eACT;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;gCAmCN,MAAM;kCA0BJ,MAAM;8BAkBV,MAAM;6BAkBP,MAAM,UAAU,OAAO,GAAG,SAAS;2DAshBX,OAAO;+BAvuB7B,kBAAkB;mCAJd,sBAAsB;mCAQtB,cAAc;iCAIhB,oBAAoB;yCAIZ,cAAc;iCAItB,cAAc;uCAIR,mBAAmB;oCAItB,sBAAsB;8CAIZ,MAAM;8BAyMtB,MAAM,KAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;;sBA0fxD,gBAAgB,OAAO,MAAM;2BAxclB,cAAc,GAAG,QAAQ,kBAAkB,MAAM,GAAG,MAAM;4BA2e/D,MAAM,WAAW,KAAK,CAAC,eAAe,CAAC,cAAc;yBAYxD,MAAM;oBAYX,MAAM,UAAU,eAAe;wBAc3B,MAAM,WAAW,MAAM;2BAcpB,MAAM,WAAW,MAAM;2BAcvB,MAAM,aAAa,MAAM,WAAW,MAAM;8BAevC,MAAM,aAAa,MAAM,WAAW,MAAM;gBAhGxD,MAAM,YAAY;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,QAAQ,OAAO;sCA+G7C,gBAAgB;kCAYpB,MAAM;;;;;;0DAj9BzC,GAAG,0BACD,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsrCP,CAAA"}
+{"version":3,"file":"chats.d.ts","sourceRoot":"","sources":["../../src/Socket/chats.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAE9C,OAAO,KAAK,EACX,WAAW,EAEX,gBAAgB,EAGhB,iBAAiB,EAEjB,YAAY,EAEZ,iBAAiB,EACjB,aAAa,EACb,SAAS,EACT,aAAa,EAEb,UAAU,EACV,kBAAkB,EAClB,sBAAsB,EACtB,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,EACd,mBAAmB,EACnB,MAAM,UAAU,CAAA;AAEjB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAsBrD,OAAO,EACN,KAAK,UAAU,EAWf,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,UAAU,EAAa,MAAM,YAAY,CAAA;AAGlD,eAAO,MAAM,eAAe,GAAI,QAAQ,YAAY;;QA6BlD,oFAAoF;;QAEpF,+EAA+E;;QAE/E,iFAAiF;;;iBAg3C9D,KAAK,GAAG,SAAS;2BA7qBD,OAAO,GAAG,OAAO,UAAU;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,cAAc,MAAM;;;;;;;;;;;;;;;;;;4BA0HnE,aAAa;+BApGV,UAAU,UAAU,MAAM;+BA8C1B,MAAM;6BA5GR,MAAM,SAAQ,SAAS,GAAG,OAAO,cAA0B,MAAM;;2BAhdnE,MAAM,EAAE;yCAaM,MAAM,EAAE;gCAepD,MAAM,WACF,aAAa,eACT;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;gCAmCN,MAAM;kCA0BJ,MAAM;8BAkBV,MAAM;6BAkBP,MAAM,UAAU,OAAO,GAAG,SAAS;2DAkoBX,OAAO;+BAn1B7B,kBAAkB;mCAJd,sBAAsB;mCAQtB,cAAc;iCAIhB,oBAAoB;yCAIZ,cAAc;iCAItB,cAAc;uCAIR,mBAAmB;oCAItB,sBAAsB;8CAIZ,MAAM;8BAqPtB,MAAM,KAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;;sBA0jBxD,gBAAgB,OAAO,MAAM;2BAxgBlB,cAAc,GAAG,QAAQ,kBAAkB,MAAM,GAAG,MAAM;4BA2iB/D,MAAM,WAAW,KAAK,CAAC,eAAe,CAAC,cAAc;yBAYxD,MAAM;oBAYX,MAAM,UAAU,eAAe;wBAc3B,MAAM,WAAW,MAAM;2BAcpB,MAAM,WAAW,MAAM;2BAcvB,MAAM,aAAa,MAAM,WAAW,MAAM;8BAevC,MAAM,aAAa,MAAM,WAAW,MAAM;gBAhGxD,MAAM,YAAY;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,QAAQ,OAAO;sCA+G7C,gBAAgB;kCAYpB,MAAM;;;;;;0DAvnClB,GAAG,0BACzB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAo8CN,CAAA"}

package/lib/Socket/chats.js

@@ -1,22 +1,31 @@
 import NodeCache from '@cacheable/node-cache';
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
-import { DEFAULT_CACHE_TTLS, PROCESSABLE_HISTORY_TYPES } from '../Defaults/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, extractSyncdPatches, generateProfilePicture, getHistoryMsg, newLTHashState, processSyncAction } from '../Utils/index.js';
+import { chatModificationToAppPatch, decodePatches, decodeSyncdSnapshot, encodeSyncdPatch, ensureLTHashStateVersion, extractSyncdPatches, bindCleanupOnConnectionClose, 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, jidDecode, jidNormalizedUser, reduceBinaryNodeToDictionary, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { getBinaryNodeChild, getBinaryNodeChildren, isLidUser, isPnUser, jidDecode, jidNormalizedUser, isHostedLidUser, isHostedPnUser, reduceBinaryNodeToDictionary, S_WHATSAPP_NET } from '../WABinary/index.js';
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
 import { makeSocket } from './socket.js';
-const MAX_SYNC_ATTEMPTS = 2;
 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 } = 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();
@@ -28,14 +37,44 @@ export const makeChatsSocket = (config) => {
     const notificationMutex = makeMutex();
     // Timeout for AwaitingInitialSync state
     let awaitingSyncTimeout;
-    const placeholderResendCache = config.placeholderResendCache ||
-        new NodeCache({
+    // 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 internalPlaceholderResendCache = config.placeholderResendCache
+        ? undefined
+        : new NodeCache({
             stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
             useClones: false
         });
+    const placeholderResendCache = config.placeholderResendCache || internalPlaceholderResendCache;
     if (!config.placeholderResendCache) {
         config.placeholderResendCache = placeholderResendCache;
     }
+    let cleanedUp = false;
+    const cleanupInternalResources = async () => {
+        if (cleanedUp) {
+            return;
+        }
+        cleanedUp = true;
+        if (awaitingSyncTimeout) {
+            clearTimeout(awaitingSyncTimeout);
+            awaitingSyncTimeout = undefined;
+        }
+        if (historySyncPausedTimeout) {
+            clearTimeout(historySyncPausedTimeout);
+            historySyncPausedTimeout = undefined;
+        }
+        if (internalPlaceholderResendCache) {
+            await Promise.resolve(internalPlaceholderResendCache.close());
+        }
+    };
+    bindCleanupOnConnectionClose(ev, cleanupInternalResources);
     /** 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]);
@@ -258,6 +297,42 @@ export const makeChatsSocket = (config) => {
         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: {
@@ -268,10 +343,7 @@ export const makeChatsSocket = (config) => {
             content: [
                 {
                     tag: 'item',
-                    attrs: {
-                        action,
-                        jid
-                    }
+                    attrs: itemAttrs
                 }
             ]
         });
@@ -370,6 +442,9 @@ export const makeChatsSocket = (config) => {
             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)
@@ -380,6 +455,7 @@ export 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;
                         }
@@ -388,14 +464,18 @@ export const makeChatsSocket = (config) => {
                         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()
                         }
                     });
                 }
@@ -444,19 +524,37 @@ export const makeChatsSocket = (config) => {
                         }
                     }
                     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
+                        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);
+                        }
                     }
                 }
             }
@@ -473,7 +571,22 @@ export const makeChatsSocket = (config) => {
      */
     const profilePictureUrl = async (jid, type = 'preview', timeoutMs) => {
         const baseContent = [{ tag: 'picture', attrs: { type, query: 'url' } }];
-        const tcTokenContent = await buildTcTokenFromJid({ authState, jid, baseContent });
+        // 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
+            });
+        }
         jid = jidNormalizedUser(jid);
         const result = await query({
             tag: 'iq',
@@ -483,7 +596,7 @@ export const makeChatsSocket = (config) => {
                 type: 'get',
                 xmlns: 'w:profile:picture'
             },
-            content: tcTokenContent
+            content
         }, timeoutMs);
         const child = getBinaryNodeChild(result, 'picture');
         return child?.attrs?.url;
@@ -549,7 +662,12 @@ export const makeChatsSocket = (config) => {
      * @param tcToken token for subscription, use if present
      */
     const presenceSubscribe = async (toJid) => {
-        const tcTokenContent = await buildTcTokenFromJid({ authState, jid: 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: {
@@ -604,7 +722,7 @@ export const makeChatsSocket = (config) => {
                 logger.debug({ patch: patchCreate }, 'applying app patch');
                 await resyncAppState([name], false);
                 const { [name]: currentSyncVersion } = await authState.keys.get('app-state-sync-version', [name]);
-                initial = currentSyncVersion || newLTHashState();
+                initial = currentSyncVersion ? ensureLTHashStateVersion(currentSyncVersion) : newLTHashState();
                 encodeResult = await encodeSyncdPatch(patchCreate, myAppStateKeyId, initial, getAppStateSyncKey);
                 const { patch, state } = encodeResult;
                 const node = {
@@ -650,22 +768,21 @@ export const makeChatsSocket = (config) => {
             }
         }
     };
-    /** sending non-abt props may fix QR scan fail if server expects */
+    /** fetch AB props */
     const fetchProps = async () => {
-        //TODO: implement both protocol 1 and protocol 2 prop fetching, specially for abKey for WM
         const resultNode = await query({
             tag: 'iq',
             attrs: {
                 to: S_WHATSAPP_NET,
-                xmlns: 'w',
+                xmlns: 'abt',
                 type: 'get'
             },
             content: [
                 {
                     tag: 'props',
                     attrs: {
-                        protocol: '2',
-                        hash: authState?.creds?.lastPropHash || ''
+                        protocol: '1',
+                        ...(authState?.creds?.lastPropHash ? { hash: authState.creds.lastPropHash } : {})
                     }
                 }
             ]
@@ -680,7 +797,20 @@ export const makeChatsSocket = (config) => {
             }
             props = reduceBinaryNodeToDictionary(propsNode, 'prop');
         }
-        logger.debug('fetched 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;
     };
     /**
@@ -820,6 +950,47 @@ export const makeChatsSocket = (config) => {
             ? 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) {
@@ -839,6 +1010,8 @@ export const makeChatsSocket = (config) => {
         }
         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
@@ -898,6 +1071,11 @@ export const makeChatsSocket = (config) => {
         }
     });
     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'));
@@ -907,6 +1085,10 @@ export const makeChatsSocket = (config) => {
         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();
@@ -919,19 +1101,49 @@ export const makeChatsSocket = (config) => {
             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);
         }
         awaitingSyncTimeout = setTimeout(() => {
             if (syncState === SyncState.AwaitingInitialSync) {
-                // TODO: investigate
                 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 }]);
@@ -942,6 +1154,11 @@ export const makeChatsSocket = (config) => {
     });
     return {
         ...sock,
+        serverProps,
+        end: async (error) => {
+            await cleanupInternalResources();
+            await sock.end(error);
+        },
         createCallLink,
         getBotListV2,
         messageMutex,