@badzz88/baileys 8.5.4 → 8.5.5

package/lib/Socket/chats.js

@@ -15,7 +15,6 @@ const State_1 = require('../Types/State')
 const Utils_1 = require('../Utils')
 const make_mutex_1 = require('../Utils/make-mutex')
 const process_message_1 = __importDefault(require('../Utils/process-message'))
-const { unwrapSecretEncryptedMessage } = require('../Utils/process-message')
 const tc_token_utils_1 = require('../Utils/tc-token-utils')
 const WABinary_1 = require('../WABinary')
 const WAUSync_1 = require('../WAUSync')
@@ -63,47 +62,45 @@ const makeChatsSocket = config => {
 	} = sock
 	const getLIDForPN = signalRepository.lidMapping.getLIDForPN.bind(signalRepository.lidMapping)
 	let privacySettings
-	
+	/** Server-assigned AB props for protocol behavior. */
 	const serverProps = {
-		
+		/** AB prop 10518: gate tctoken on 1:1 messages. Default true (safe: avoids 463). */
 		privacyTokenOn1to1: true,
-		
+		/** AB prop 9666: gate tctoken on profile picture IQs. WA Web default: true. */
 		profilePicPrivacyToken: true,
-		
+		/** AB prop 14303: issue tctokens to LID instead of PN. WA Web default: false. */
 		lidTrustedTokenIssueToLid: false
 	}
 	let syncState = State_1.SyncState.Connecting
-	
+	/** this mutex ensures that messages are processed in order */
 	const messageMutex = (0, make_mutex_1.makeMutex)()
-	
+	/** this mutex ensures that receipts are processed in order */
 	const receiptMutex = (0, make_mutex_1.makeMutex)()
-	
+	/** this mutex ensures that app state patches are processed in order */
 	const appStatePatchMutex = (0, make_mutex_1.makeMutex)()
-	
+	/** this mutex ensures that notifications are processed in order */
 	const notificationMutex = (0, make_mutex_1.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 _nlServerIdCache = new Map()
 	const placeholderResendCache =
 		config.placeholderResendCache ||
 		new node_cache_1.default({
-			stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, 
+			stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
 			useClones: false
 		})
 	if (!config.placeholderResendCache) {
 		config.placeholderResendCache = placeholderResendCache
 	}
-	
+	/** helper function to fetch the given app state sync key */
 	const getAppStateSyncKey = async keyId => {
 		const { [keyId]: key } = await authState.keys.get('app-state-sync-key', [keyId])
 		return key
@@ -119,67 +116,11 @@ const makeChatsSocket = config => {
 				},
 				content: [{ tag: 'privacy', attrs: {} }]
 			})
-			const privacyNode = content?.[0]
-			privacySettings = (0, WABinary_1.reduceBinaryNodeToDictionary)(privacyNode, 'category')
-
-			
-			
-			const onlinePrivacy =
-				privacySettings['online'] ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'online_privacy_setting')?.attrs?.value ||
-				'all'
-
-			
-			const enhancedBlockEnabled =
-				privacyNode?.attrs?.enhanced_block_enabled === 'true' ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'enhanced_block')?.attrs?.enabled === 'true'
-
-			
-			const mdPrivacyV2 =
-				privacyNode?.attrs?.md_privacy_v2 === 'true' ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'md_privacy_v2')?.attrs?.value === 'true'
-
-			
-			const syncdClearChatDeleteChatEnabled =
-				privacyNode?.attrs?.syncd_clear_chat_delete_chat_enabled === 'true' ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'syncd_clear_chat')?.attrs?.delete_chat_enabled === 'true'
-
-			
-			const syncdAntiTamperingEnabled =
-				privacyNode?.attrs?.syncd_anti_tampering_fatal_exception_enabled === 'true' ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'syncd_anti_tampering')?.attrs?.fatal_exception_enabled ===
-					'true'
-
-			
-			const keyRotationEnabled =
-				privacyNode?.attrs?.syncd_key_rotation_enabled === 'true' ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'syncd_key_rotation')?.attrs?.enabled === 'true'
-
-			
-			ev.emit('settings.update', {
-				onlinePrivacy,
-				enhancedBlockEnabled,
-				mdPrivacyV2,
-				syncdClearChatDeleteChatEnabled,
-				...(syncdAntiTamperingEnabled ? { syncdAntiTamperingEnabled: true } : {}),
-				keyRotationEnabled
-			})
-
-			
-			ev.emit('creds.update', {
-				privacySettings: {
-					onlinePrivacy,
-					enhancedBlockEnabled,
-					mdPrivacyV2,
-					syncdClearChatDeleteChatEnabled,
-					syncdAntiTamperingEnabled,
-					keyRotationEnabled
-				}
-			})
+			privacySettings = (0, WABinary_1.reduceBinaryNodeToDictionary)(content?.[0], 'category')
 		}
 		return privacySettings
 	}
-	
+	/** helper function to run a privacy IQ query */
 	const privacyQuery = async (name, value) => {
 		await query({
 			tag: 'iq',
@@ -220,7 +161,11 @@ const makeChatsSocket = config => {
 	const updateStatusPrivacy = async value => {
 		await privacyQuery('status', value)
 	}
-	
+	/**
+	 * Fetch status privacy settings via `xmlns="status"` IQ GET.
+	 * Returns the current distribution type and any custom lists.
+	 * Source: GetStatusPrivacyJob.java, feature flag 3843 controls retry.
+	 */
 	const getStatusPrivacy = async () => {
 		const result = await query({
 			tag: 'iq',
@@ -234,24 +179,31 @@ const makeChatsSocket = config => {
 		const privacyNode = result?.content?.[0]
 		if (!privacyNode) return null
 		const lists = []
-		for (const listNode of privacyNode.content || []) {
+		for (const listNode of (privacyNode.content || [])) {
 			const { type, id, listname, emoji, selected, deleted } = listNode.attrs || {}
 			const members = (listNode.content || []).map(u => u.attrs?.jid).filter(Boolean)
 			lists.push({ type, id, listname, emoji, selected: selected === 'true', deleted: deleted === 'true', members })
 		}
 		return lists
 	}
-	
+	/**
+	 * Set status privacy via `xmlns="status"` IQ SET.
+	 * Supports simple distribution types and contact-level whitelist/blacklist/customlist.
+	 *
+	 * @param {'contacts'|'whitelist'|'blacklist'|'null'} type - Distribution type
+	 * @param {string[]} [jids] - JIDs for the list (whitelist/blacklist)
+	 * @param {Array<{id: string, listname: string, emoji?: string, selected?: boolean, deleted?: boolean, members?: string[]}>} [customLists]
+	 */
 	const setStatusPrivacy = async (type, jids = [], customLists = []) => {
 		const content = []
-		
+		// main distribution list
 		const mainList = {
 			tag: 'list',
 			attrs: { type },
 			content: jids.map(jid => ({ tag: 'user', attrs: { jid }, content: [] }))
 		}
 		content.push(mainList)
-		
+		// custom named lists
 		for (const cl of customLists) {
 			const attrs = { type: 'customlist', id: cl.id, listname: cl.listname }
 			if (cl.emoji) attrs.emoji = cl.emoji
@@ -297,7 +249,12 @@ const makeChatsSocket = config => {
 			]
 		})
 	}
-	
+	/**
+	 * Fetch broadcast list quota from the server.
+	 * Source: BroadcastListQuotaProtocol.java — IQ xmlns="w:biz", 32s timeout.
+	 *
+	 * Returns: { messagesLeft, totalLimit, isHeavySender, startTs, endTs, resetTs }
+	 */
 	const fetchBroadcastListQuota = async () => {
 		const result = await query(
 			{
@@ -315,35 +272,12 @@ const makeChatsSocket = config => {
 		const timeframeNode = (0, WABinary_1.getBinaryNodeChild)(result, 'timeframe')
 		if (!limitsNode) return null
 		return {
-			messagesLeft: parseInt(
-				limitsNode.attrs?.messages_left ??
-					(0, WABinary_1.getBinaryNodeChild)(limitsNode, 'messages_left')?.content ??
-					'0',
-				10
-			),
-			totalLimit: parseInt(
-				limitsNode.attrs?.total_limit ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'total_limit')?.content ?? '0',
-				10
-			),
-			isHeavySender:
-				(limitsNode.attrs?.is_heavy_sender ??
-					(0, WABinary_1.getBinaryNodeChild)(limitsNode, 'is_heavy_sender')?.content) === 'true',
-			startTs: parseInt(
-				timeframeNode?.attrs?.start_ts_s ??
-					(0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'start_ts_s')?.content ??
-					'0',
-				10
-			),
-			endTs: parseInt(
-				timeframeNode?.attrs?.end_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'end_ts_s')?.content ?? '0',
-				10
-			),
-			resetTs: parseInt(
-				timeframeNode?.attrs?.reset_ts_s ??
-					(0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'reset_ts_s')?.content ??
-					'0',
-				10
-			)
+			messagesLeft: parseInt(limitsNode.attrs?.messages_left ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'messages_left')?.content ?? '0'),
+			totalLimit: parseInt(limitsNode.attrs?.total_limit ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'total_limit')?.content ?? '0'),
+			isHeavySender: (limitsNode.attrs?.is_heavy_sender ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'is_heavy_sender')?.content) === 'true',
+			startTs: parseInt(timeframeNode?.attrs?.start_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'start_ts_s')?.content ?? '0'),
+			endTs: parseInt(timeframeNode?.attrs?.end_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'end_ts_s')?.content ?? '0'),
+			resetTs: parseInt(timeframeNode?.attrs?.reset_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'reset_ts_s')?.content ?? '0')
 		}
 	}
 
@@ -378,7 +312,11 @@ const makeChatsSocket = config => {
 		}
 		return botList
 	}
-	
+	/**
+	 * Get the global chat-blocking status (block messages from unknown accounts).
+	 * Ported from WhatsApp Web's WASmaxPsaChatBlockGetRPC (xmlns `w:comms:chat`).
+	 * @returns {Promise<'blocked' | 'unblocked' | undefined>}
+	 */
 	const getChatBlockingStatus = async () => {
 		const result = await query({
 			tag: 'iq',
@@ -394,7 +332,12 @@ const makeChatsSocket = config => {
 			(0, WABinary_1.getBinaryNodeChild)((0, WABinary_1.getBinaryNodeChild)(result, 'query'), 'blocking')
 		return blocking?.attrs?.status
 	}
-	
+	/**
+	 * Set the global chat-blocking status (block messages from unknown accounts).
+	 * Ported from WhatsApp Web's WASmaxPsaChatBlockSetRPC (xmlns `w:comms:chat`).
+	 * @param {'block' | 'unblock'} action
+	 * @returns {Promise<'blocked' | 'unblocked' | undefined>} the resulting status
+	 */
 	const updateChatBlockingStatus = async action => {
 		const result = await query({
 			tag: 'iq',
@@ -408,7 +351,12 @@ const makeChatsSocket = config => {
 		const blocking = (0, WABinary_1.getBinaryNodeChild)(result, 'blocking')
 		return blocking?.attrs?.status
 	}
-	
+	/**
+	 * Get the user's pending TOS disclosures / notices.
+	 * Ported from WhatsApp Web's WASmaxUserNoticeGetDisclosuresRPC (xmlns `tos`).
+	 * @param {number} [t] last-seen disclosure timestamp
+	 * @returns {Promise<Array<Record<string, string>>>} the `<notice>` attributes
+	 */
 	const getUserDisclosures = async (t = 0) => {
 		const result = await query({
 			tag: 'iq',
@@ -417,65 +365,18 @@ const makeChatsSocket = config => {
 		})
 		return (0, WABinary_1.getBinaryNodeChildren)(result, 'notice').map(n => ({ ...n.attrs }))
 	}
-	
-	const acceptTosNotice = async (noticeId, result = '105') => {
-		await query({
-			tag: 'iq',
-			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'tos', type: 'set' },
-			content: [{ tag: 'trackable', attrs: { id: String(noticeId), result: String(result) } }]
-		})
-	}
-	
-	const reportSpam = async (jid, messages, spamFlow = 'contact_info_report', subject) => {
-		const msgNodes = (messages || []).map(m => ({
-			tag: 'message',
-			attrs: {
-				from: String(jid),
-				t: String(m.t),
-				id: String(m.id)
-			}
-		}))
-		await query({
-			tag: 'iq',
-			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'spam', type: 'set' },
-			content: [
-				{
-					tag: 'spam_list',
-					attrs: {
-						jid: String(jid),
-						spam_flow: String(spamFlow),
-						...(subject ? { subject: String(subject) } : {})
-					},
-					content: msgNodes
-				}
-			]
-		})
-	}
-	
+	/**
+	 * Get the account opt-out list (`optoutlist` IQ). Returns the raw result node.
+	 */
 	const getOptOutList = async () => {
 		return query({
 			tag: 'iq',
 			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'optoutlist', type: 'get' }
 		})
 	}
-	
-	const signPrivateCredential = async blindedCredential => {
-		const result = await query({
-			tag: 'iq',
-			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'privatestats', type: 'get' },
-			content: [
-				{
-					tag: 'sign_credential',
-					attrs: { version: '1' },
-					content: [{ tag: 'blinded_credential', attrs: {}, content: blindedCredential }]
-				}
-			]
-		})
-		const signedNode = (0, WABinary_1.getBinaryNodeChild)(result, 'sign_credential')
-		const signedBytes = (0, WABinary_1.getBinaryNodeChild)(signedNode, 'signed_credential')
-		return signedBytes?.content instanceof Uint8Array ? Buffer.from(signedBytes.content) : undefined
-	}
-	
+	/**
+	 * Get push-notification settings (`urn:xmpp:whatsapp:push`).
+	 */
 	const getPushConfig = async () => {
 		const result = await query({
 			tag: 'iq',
@@ -484,7 +385,11 @@ const makeChatsSocket = config => {
 		})
 		return (0, WABinary_1.getBinaryNodeChild)(result, 'settings')
 	}
-	
+	/**
+	 * Set push-notification config (`urn:xmpp:whatsapp:push`). Mainly web push —
+	 * pass the FCM-style config (platform / endpoint / auth / p256dh).
+	 * @param {Record<string, string>} config
+	 */
 	const setPushConfig = async config => {
 		await query({
 			tag: 'iq',
@@ -497,7 +402,7 @@ const makeChatsSocket = config => {
 		for (const jid of jids) {
 			usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid))
 		}
-		const result = await executeUSyncQuery(usyncQuery)
+		const result = await sock.executeUSyncQuery(usyncQuery)
 		if (result) {
 			return result.list
 		}
@@ -507,12 +412,12 @@ const makeChatsSocket = config => {
 		for (const jid of jids) {
 			usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid))
 		}
-		const result = await executeUSyncQuery(usyncQuery)
+		const result = await sock.executeUSyncQuery(usyncQuery)
 		if (result) {
 			return result.list
 		}
 	}
-	
+	/** update the profile picture for yourself or a group */
 	const updateProfilePicture = async (jid, content, dimensions) => {
 		let targetJid
 		if (!jid) {
@@ -521,7 +426,7 @@ const makeChatsSocket = config => {
 			)
 		}
 		if ((0, WABinary_1.jidNormalizedUser)(jid) !== (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)) {
-			targetJid = (0, WABinary_1.jidNormalizedUser)(jid) 
+			targetJid = (0, WABinary_1.jidNormalizedUser)(jid) // in case it is someone other than us
 		} else {
 			targetJid = undefined
 		}
@@ -543,7 +448,7 @@ const makeChatsSocket = config => {
 			]
 		})
 	}
-	
+	/** remove the profile picture for yourself or a group */
 	const removeProfilePicture = async jid => {
 		let targetJid
 		if (!jid) {
@@ -552,7 +457,7 @@ const makeChatsSocket = config => {
 			)
 		}
 		if ((0, WABinary_1.jidNormalizedUser)(jid) !== (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)) {
-			targetJid = (0, WABinary_1.jidNormalizedUser)(jid) 
+			targetJid = (0, WABinary_1.jidNormalizedUser)(jid) // in case it is someone other than us
 		} else {
 			targetJid = undefined
 		}
@@ -566,7 +471,7 @@ const makeChatsSocket = config => {
 			}
 		})
 	}
-	
+	/** update the profile status for yourself */
 	const updateProfileStatus = async status => {
 		await query({
 			tag: 'iq',
@@ -587,24 +492,17 @@ const makeChatsSocket = config => {
 	const updateProfileName = async name => {
 		await chatModify({ pushNameSetting: name }, '')
 	}
-	
-	
-	
-	
-	const fetchBlocklist = async (dhash = null) => {
+	const fetchBlocklist = async () => {
 		const result = await query({
 			tag: 'iq',
 			attrs: {
 				xmlns: 'blocklist',
 				to: WABinary_1.S_WHATSAPP_NET,
 				type: 'get'
-			},
-			content: dhash ? [{ tag: 'item', attrs: { dhash } }] : null
+			}
 		})
 		const listNode = (0, WABinary_1.getBinaryNodeChild)(result, 'list')
-		const jids = (0, WABinary_1.getBinaryNodeChildren)(listNode, 'item').map(n => n.attrs.jid)
-		ev.emit('blocklist.set', { blocklist: jids })
-		return jids
+		return (0, WABinary_1.getBinaryNodeChildren)(listNode, 'item').map(n => n.attrs.jid)
 	}
 	const updateBlockStatus = async (jid, action) => {
 		await query({
@@ -626,67 +524,26 @@ const makeChatsSocket = config => {
 		})
 	}
 	const getBusinessProfile = async jid => {
-		
-		
-		
-		const [results, verifiedNameResult] = await Promise.all([
-			query({
-				tag: 'iq',
-				attrs: {
-					to: 's.whatsapp.net',
-					xmlns: 'w:biz',
-					type: 'get'
-				},
-				content: [
-					{
-						tag: 'business_profile',
-						attrs: { v: '116' },
-						content: [
-							{
-								tag: 'profile',
-								attrs: { jid }
-							}
-						]
-					}
-				]
-			}),
-			query({
-				tag: 'iq',
-				attrs: {
-					to: 's.whatsapp.net',
-					xmlns: 'w:biz',
-					type: 'get'
-				},
-				content: [
-					{
-						tag: 'verified_name',
-						attrs: { jid }
-					}
-				]
-			})
-		])
-		
-		const verifiedNameNode = (0, WABinary_1.getBinaryNodeChild)(verifiedNameResult, 'verified_name')
-		let verifiedNameCert
-		if (verifiedNameNode) {
-			const certNode = (0, WABinary_1.getBinaryNodeChild)(verifiedNameNode, 'certificate')
-			if (certNode) {
-				const detailsNode = (0, WABinary_1.getBinaryNodeChild)(certNode, 'details')
-				const localizedNames = (0, WABinary_1.getBinaryNodeChildren)(certNode, 'localized_name').map(n => ({
-					lg: n.attrs?.lg,
-					lc: n.attrs?.lc,
-					verifiedName: n.attrs?.verified_name || n.content?.toString()
-				}))
-				verifiedNameCert = {
-					certSerial: certNode.attrs?.serial ? +certNode.attrs.serial : undefined,
-					issuer: certNode.attrs?.issuer,
-					details: {
-						verifiedName: detailsNode?.attrs?.verified_name || detailsNode?.content?.toString(),
-						localizedNames
-					}
+		const results = await query({
+			tag: 'iq',
+			attrs: {
+				to: 's.whatsapp.net',
+				xmlns: 'w:biz',
+				type: 'get'
+			},
+			content: [
+				{
+					tag: 'business_profile',
+					attrs: { v: '244' },
+					content: [
+						{
+							tag: 'profile',
+							attrs: { jid }
+						}
+					]
 				}
-			}
-		}
+			]
+		})
 		const profileNode = (0, WABinary_1.getBinaryNodeChild)(results, 'business_profile')
 		const profiles = (0, WABinary_1.getBinaryNodeChild)(profileNode, 'profile')
 		if (profiles) {
@@ -703,31 +560,9 @@ const makeChatsSocket = config => {
 				? (0, WABinary_1.getBinaryNodeChildren)(businessHours, 'business_hours_config')
 				: undefined
 			const websiteStr = website?.content?.toString()
-
-			
-			const catalogStatus = {
-				exists: profiles.attrs?.catalog_exists === 'true' || profiles.attrs?.catalog_exists === true || false,
-				sendAll: profiles.attrs?.catalog_send_all === 'true' || profiles.attrs?.catalog_send_all === true || false
-			}
-
-			
-			const cartEnabled =
-				profiles.attrs?.cart_enabled !== undefined
-					? profiles.attrs.cart_enabled === 'true' || profiles.attrs.cart_enabled === true
-					: undefined
-			const webCartEnabled =
-				profiles.attrs?.web_cart_enabled !== undefined
-					? profiles.attrs.web_cart_enabled === 'true' || profiles.attrs.web_cart_enabled === true
-					: undefined
-			const webCartOnOff = profiles.attrs?.web_cart_on_off
-
-			
-			const commerceExperience = profiles.attrs?.commerce_experience
-
 			return {
 				wid: profiles.attrs?.jid,
 				address: address?.content?.toString(),
-				businessAddress: address?.content?.toString(),
 				description: description?.content?.toString() || '',
 				website: websiteStr ? [websiteStr] : [],
 				email: email?.content?.toString(),
@@ -735,24 +570,7 @@ const makeChatsSocket = config => {
 				business_hours: {
 					timezone: businessHours?.attrs?.timezone,
 					business_config: businessHoursConfig?.map(({ attrs }) => attrs)
-				},
-				businessHours: businessHoursConfig
-					? {
-							timezone: businessHours?.attrs?.timezone ?? null,
-							config: businessHoursConfig.map(({ attrs }) => ({
-								dayOfWeek: attrs?.day_of_week ?? null,
-								openTime: attrs?.open_time ?? null,
-								closeTime: attrs?.close_time ?? null,
-								mode: attrs?.mode ?? null
-							}))
-						}
-					: null,
-				catalogStatus,
-				cartEnabled,
-				webCartEnabled,
-				webCartOnOff,
-				commerceExperience,
-				verifiedNameCert
+				}
 			}
 		}
 	}
@@ -787,13 +605,6 @@ const makeChatsSocket = config => {
 					isInitialSync ? { accountSettings: authState.creds.accountSettings } : undefined,
 					logger
 				)
-				
-				const _nctSalt = mutation?.syncAction?.value?.nctSaltSyncAction?.salt
-				if (_nctSalt?.length) {
-					authState.keys
-						.set({ 'nct-salt': { default: Buffer.from(_nctSalt) } })
-						.catch(err => logger.debug({ err: err?.message }, 'nct: failed to persist salt'))
-				}
 			}
 		}
 	}
@@ -801,24 +612,24 @@ const makeChatsSocket = config => {
 		const appStateSyncKeyCache = new Map()
 		const getCachedAppStateSyncKey = async keyId => {
 			if (appStateSyncKeyCache.has(keyId)) {
-				return appStateSyncKeyCache.get(keyId)
+				return appStateSyncKeyCache.get(keyId) ?? undefined
 			}
 			const key = await getAppStateSyncKey(keyId)
 			appStateSyncKeyCache.set(keyId, key ?? null)
 			return key
 		}
-		
-		
+		// we use this to determine which events to fire
+		// otherwise when we resync from scratch -- all notifications will fire
 		const initialVersionMap = {}
 		const globalMutationMap = {}
 		await authState.keys.transaction(async () => {
 			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 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 = []
@@ -826,7 +637,7 @@ const makeChatsSocket = config => {
 					const result = await authState.keys.get('app-state-sync-version', [name])
 					let state = result[name]
 					if (state) {
-						if (initialVersionMap[name] === undefined) {
+						if (typeof initialVersionMap[name] === 'undefined') {
 							initialVersionMap[name] = state.version
 						}
 					} else {
@@ -843,7 +654,7 @@ const makeChatsSocket = config => {
 						attrs: {
 							name,
 							version: state.version.toString(),
-							
+							// return snapshot if syncing from scratch or forcing after a failed attempt
 							return_snapshot: (shouldForceSnapshot || !state.version).toString()
 						}
 					})
@@ -863,7 +674,7 @@ const makeChatsSocket = config => {
 						}
 					]
 				})
-				
+				// extract from binary node
 				const decoded = await (0, Utils_1.extractSyncdPatches)(result, config?.options)
 				for (const key in decoded) {
 					const name = key
@@ -882,7 +693,7 @@ const makeChatsSocket = config => {
 							logger.info(`restored state of ${name} from snapshot to v${newState.version} with mutations`)
 							await authState.keys.set({ 'app-state-sync-version': { [name]: newState } })
 						}
-						
+						// only process if there are syncd patches
 						if (patches.length) {
 							const { state: newState, mutationMap } = await (0, Utils_1.decodePatches)(
 								name,
@@ -902,7 +713,7 @@ const makeChatsSocket = config => {
 						if (hasMorePatches) {
 							logger.info(`${name} has more patches...`)
 						} else {
-							
+							// collection is done with sync
 							collectionsToHandle.delete(name)
 						}
 					} catch (error) {
@@ -944,15 +755,18 @@ const makeChatsSocket = config => {
 			onMutation(globalMutationMap[key])
 		}
 	})
-	
+	/**
+	 * fetch the profile picture of a user/group
+	 * type = "preview" for a low res picture
+	 * type = "image"   for the high res picture URL (adds query="url")
+	 * type = "avatar"  for the avatar variant (no query attr, confirmed from interop logs)
+	 */
 	const profilePictureUrl = async (jid, type = 'preview', timeoutMs) => {
-		
-		
-		const picAttrs = { type, query: 'url' }
+		const picAttrs = type === 'image' ? { type, query: 'url' } : { type }
 		const baseContent = [{ tag: 'picture', attrs: picAttrs }]
-		
-		
-		
+		// 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 = (0, WABinary_1.jidNormalizedUser)(jid)
 		const isUserJid = (0, WABinary_1.isPnUser)(normalizedJid) || (0, WABinary_1.isLidUser)(normalizedJid)
 		const me = authState.creds.me
@@ -1007,7 +821,13 @@ const makeChatsSocket = config => {
 		const child = (0, WABinary_1.getBinaryNodeChild)(result, 'link_create')
 		return child?.attrs?.token
 	}
-	
+	/**
+	 * Toggle the waiting room on an existing call link.
+	 * Ported from WhatsApp Web's WASmaxVoipWaitingRoomToggleCallLinkRPC.
+	 * @param {string} linkToken the call link token (from createCallLink)
+	 * @param {boolean} enabled
+	 * @param {'audio' | 'video'} [media]
+	 */
 	const toggleCallLinkWaitingRoom = async (linkToken, enabled, media = 'audio') => {
 		const result = await query({
 			tag: 'call',
@@ -1059,120 +879,25 @@ const makeChatsSocket = config => {
 			})
 		}
 	}
-	
-	const storePrivacyTokens = async entries => {
-		if (!entries?.length) return
-		const write = {}
-		for (const { jid, privacyToken, privacyModeTs } of entries) {
-			if (!jid || !privacyToken?.length) continue
-			write[jid] = {
-				token: Buffer.isBuffer(privacyToken) ? privacyToken : Buffer.from(privacyToken),
-				ts: String(privacyModeTs || '')
-			}
-		}
-		if (Object.keys(write).length) {
-			await authState.keys.set({ 'privacy-token': write })
-		}
-	}
-
-	
-	const executeUSyncQuery = async usyncQuery => {
-		const result = await sock.executeUSyncQuery(usyncQuery)
-		if (!result) return result
-
-		
-		const privacyEntries = []
-		const blockedContacts = []
-		for (const entry of [...(result.list || []), ...(result.sideList || [])]) {
-			if (entry.privacy?.token) {
-				privacyEntries.push({
-					jid: entry.id,
-					privacyToken: entry.privacy.token,
-					privacyModeTs: entry.privacy.modeTs
-				})
-			}
-			
-			if (entry.isBlockedByContact) {
-				blockedContacts.push({ id: entry.id, isBlockedByContact: true })
-			}
-		}
-		if (privacyEntries.length) {
-			storePrivacyTokens(privacyEntries).catch(err => logger.warn({ err }, 'failed to store privacy tokens from usync'))
-		}
-		if (blockedContacts.length) {
-			ev.emit('contacts.update', blockedContacts)
-		}
-		return result
-	}
-
-	
-	const presenceSubscribe = async (toJid, { presenceType, presenceName, groupJid } = {}) => {
-		
+	/**
+	 * @param toJid the jid to subscribe to
+	 * @param tcToken token for subscription, use if present
+	 */
+	const presenceSubscribe = async toJid => {
+		// Only include tctoken for user JIDs — groups/newsletters don't use tctokens
 		const normalizedToJid = (0, WABinary_1.jidNormalizedUser)(toJid)
 		const isUserJid = (0, WABinary_1.isPnUser)(normalizedToJid) || (0, WABinary_1.isLidUser)(normalizedToJid)
-
-		
-		const presenceAttrs = {
-			to: toJid,
-			id: generateMessageTag(),
-			type: 'subscribe'
-		}
-
-		
-		const presenceContent = []
-
-		
-		if (isUserJid) {
-			try {
-				const storageJid = await (0, tc_token_utils_1.resolveTcTokenJid)(normalizedToJid, getLIDForPN)
-				const tcTokenData = await authState.keys.get('tctoken', [storageJid])
-				const entry = tcTokenData?.[storageJid]
-				const tcTokenBuffer = entry?.token
-				if (tcTokenBuffer?.length && !(0, tc_token_utils_1.isTcTokenExpired)(entry?.timestamp)) {
-					presenceAttrs.tc_token = tcTokenBuffer.toString('base64')
-				}
-			} catch (e) {
-				
-			}
-
-			
-			
-			
-			try {
-				const privTokenData = await authState.keys.get('privacy-token', [normalizedToJid])
-				const privEntry = privTokenData?.[normalizedToJid]
-				if (privEntry?.token?.length) {
-					const privTokenAttrs = {}
-					if (privEntry.ts) privTokenAttrs.t = privEntry.ts
-					presenceContent.push({
-						tag: 'privacy_token',
-						attrs: privTokenAttrs,
-						content: privEntry.token
-					})
-				}
-			} catch (e) {
-				
-			}
-		}
-
-		
-		if (presenceType) {
-			presenceAttrs.presenceType = presenceType
-		}
-		if (presenceName) {
-			presenceAttrs.presenceName = presenceName
-		}
-
-		
-		if (groupJid) {
-			presenceAttrs.context = 'group'
-			presenceAttrs.group_jid = (0, WABinary_1.jidNormalizedUser)(groupJid)
-		}
-
+		const tcTokenContent = isUserJid
+			? await (0, tc_token_utils_1.buildTcTokenFromJid)({ authState, jid: normalizedToJid, getLIDForPN })
+			: undefined
 		return sendNode({
 			tag: 'presence',
-			attrs: presenceAttrs,
-			content: presenceContent.length ? presenceContent : undefined
+			attrs: {
+				to: toJid,
+				id: generateMessageTag(),
+				type: 'subscribe'
+			},
+			content: tcTokenContent
 		})
 	}
 	const handlePresenceUpdate = ({ tag, attrs, content }) => {
@@ -1271,9 +996,9 @@ const makeChatsSocket = config => {
 			}
 		}
 	}
-	
+	/** sending non-abt props may fix QR scan fail if server expects */
 	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: {
@@ -1295,13 +1020,13 @@ const makeChatsSocket = config => {
 		let props = {}
 		if (propsNode) {
 			if (propsNode.attrs?.hash) {
-				
+				// on some clients, the hash is returning as undefined
 				authState.creds.lastPropHash = propsNode?.attrs?.hash
 				ev.emit('creds.update', authState.creds)
 			}
 			props = (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop')
 		}
-		
+		// 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'
@@ -1317,12 +1042,18 @@ const makeChatsSocket = config => {
 		logger.debug({ serverProps }, 'fetched props')
 		return props
 	}
-	
+	/**
+	 * modify a chat -- mark unread, read etc.
+	 * lastMessages must be sorted in reverse chronologically
+	 * requires the last messages till the last message received; required for archive & unread
+	 */
 	const chatModify = (mod, jid) => {
 		const patch = (0, Utils_1.chatModificationToAppPatch)(mod, jid)
 		return appPatch(patch)
 	}
-	
+	/**
+	 * Enable/Disable link preview privacy, not related to baileys link preview generation
+	 */
 	const updateDisableLinkPreviewsPrivacy = isPreviewsDisabled => {
 		return chatModify(
 			{
@@ -1331,7 +1062,9 @@ const makeChatsSocket = config => {
 			''
 		)
 	}
-	
+	/**
+	 * Star or Unstar a message
+	 */
 	const star = (jid, messages, star) => {
 		return chatModify(
 			{
@@ -1343,7 +1076,9 @@ const makeChatsSocket = config => {
 			jid
 		)
 	}
-	
+	/**
+	 * Add or Edit Contact
+	 */
 	const addOrEditContact = (jid, contact) => {
 		return chatModify(
 			{
@@ -1352,7 +1087,9 @@ const makeChatsSocket = config => {
 			jid
 		)
 	}
-	
+	/**
+	 * Remove Contact
+	 */
 	const removeContact = jid => {
 		return chatModify(
 			{
@@ -1361,7 +1098,9 @@ const makeChatsSocket = config => {
 			jid
 		)
 	}
-	
+	/**
+	 * Adds label
+	 */
 	const addLabel = (jid, labels) => {
 		return chatModify(
 			{
@@ -1372,7 +1111,9 @@ const makeChatsSocket = config => {
 			jid
 		)
 	}
-	
+	/**
+	 * Adds label for the chats
+	 */
 	const addChatLabel = (jid, labelId) => {
 		return chatModify(
 			{
@@ -1383,7 +1124,9 @@ const makeChatsSocket = config => {
 			jid
 		)
 	}
-	
+	/**
+	 * Removes label for the chat
+	 */
 	const removeChatLabel = (jid, labelId) => {
 		return chatModify(
 			{
@@ -1394,7 +1137,9 @@ const makeChatsSocket = config => {
 			jid
 		)
 	}
-	
+	/**
+	 * Adds label for the message
+	 */
 	const addMessageLabel = (jid, messageId, labelId) => {
 		return chatModify(
 			{
@@ -1406,7 +1151,9 @@ const makeChatsSocket = config => {
 			jid
 		)
 	}
-	
+	/**
+	 * Removes label for the message
+	 */
 	const removeMessageLabel = (jid, messageId, labelId) => {
 		return chatModify(
 			{
@@ -1418,7 +1165,9 @@ const makeChatsSocket = config => {
 			jid
 		)
 	}
-	
+	/**
+	 * Add or Edit Quick Reply
+	 */
 	const addOrEditQuickReply = quickReply => {
 		return chatModify(
 			{
@@ -1427,7 +1176,9 @@ const makeChatsSocket = config => {
 			''
 		)
 	}
-	
+	/**
+	 * Remove Quick Reply
+	 */
 	const removeQuickReply = timestamp => {
 		return chatModify(
 			{
@@ -1436,49 +1187,34 @@ const makeChatsSocket = config => {
 			''
 		)
 	}
-	
+	/**
+	 * Rename an AI chat thread
+	 */
 	const renameAIThread = (jid, title) => {
 		return chatModify({ aiThreadRename: { title } }, jid)
 	}
-	
+	/**
+	 * Pin or unpin a message in a thread/AI chat
+	 */
 	const pinThreadMessage = (jid, messageId, pinned = true) => {
 		return chatModify({ threadPin: { pinned, messageId } }, jid)
 	}
-	
+	/**
+	 * Toggle AI private processing (end-to-end encrypted AI processing)
+	 */
 	const updatePrivateProcessingSetting = enabled => {
 		return chatModify({ privateProcessingSetting: enabled ? 'enabled' : 'disabled' }, '')
 	}
-	
-	const updateAIFeatures = (status = 'enabled', replyMode = 'suggestions') => {
-		const statusEnum =
-			require('../../WAProto/index.js').proto.SyncActionValue.MaibaAIFeaturesControlAction.MaibaAIFeatureStatus
-		const replyModeEnum =
-			require('../../WAProto/index.js').proto.SyncActionValue.MaibaAIFeaturesControlAction.MaibaAIReplyMode
-		const statusMap = {
-			enabled: statusEnum.ENABLED,
-			enabled_has_learning: statusEnum.ENABLED_HAS_LEARNING,
-			disabled: statusEnum.DISABLED
-		}
-		const replyModeMap = {
-			muted: replyModeEnum.MUTED,
-			ai_agent: replyModeEnum.AI_AGENT,
-			suggestions: replyModeEnum.SUGGESTIONS
-		}
-		return chatModify(
-			{
-				maibaAIFeatures: {
-					status: statusMap[status] ?? statusEnum.ENABLED,
-					replyMode: replyModeMap[replyMode] ?? replyModeEnum.SUGGESTIONS
-				}
-			},
-			''
-		)
-	}
-	
+	/**
+	 * Update bio/about privacy (who can see your About text)
+	 * @param value 'all' | 'contacts' | 'contact_blacklist' | 'none'
+	 */
 	const updateBioPrivacy = async value => {
 		await privacyQuery('about', value)
 	}
-	
+	/**
+	 * Block a bot JID
+	 */
 	const blockBot = async botJid => {
 		await query({
 			tag: 'iq',
@@ -1495,63 +1231,71 @@ const makeChatsSocket = config => {
 			]
 		})
 	}
-	
+	/**
+	 * Unblock a bot JID
+	 */
 	const unblockBot = async botJid => {
 		await updateBlockStatus(botJid, 'unblock')
 	}
-	
+	/**
+	 * Mute or unmute a contact's status updates
+	 */
 	const muteContactStatus = (jid, muted = true) => {
 		return chatModify({ muteStatus: { muted } }, jid)
 	}
-	
+	/**
+	 * Add or remove a contact from favorites
+	 */
 	const toggleFavorite = (jid, isFavorite = true) => {
 		return chatModify({ favorite: { isFavorite } }, jid)
 	}
-	
+	/**
+	 * Reorder labels
+	 * @param sortedLabelIds ordered array of label IDs
+	 */
 	const reorderLabels = sortedLabelIds => {
 		return chatModify({ reorderLabel: { sortedLabelIds } }, '')
 	}
-	
+	/**
+	 * Delete an individual call log entry
+	 */
 	const deleteCallLog = (callId, jid = '') => {
 		return chatModify({ deleteCallLog: { callId } }, jid)
 	}
-	
+	/**
+	 * Create or update a note/draft for a chat
+	 */
 	const setChatNote = (jid, note) => {
 		return chatModify({ noteEdit: { note } }, jid)
 	}
-	
+	/**
+	 * Delete the note/draft for a chat
+	 */
 	const deleteChatNote = jid => {
 		return chatModify({ noteEdit: { note: '', deleted: true } }, jid)
 	}
-	
+	/**
+	 * Explicitly mark a chat as unread (shows unread dot even if read)
+	 */
 	const markChatAsUnread = (jid, lastMessages) => {
 		return chatModify({ markAsUnread: true, lastMessages }, jid)
 	}
-	
+	/**
+	 * Set per-chat ephemeral message duration
+	 * @param duration seconds (0 = off, 86400 = 1d, 604800 = 7d, 7776000 = 90d)
+	 */
 	const setChatEphemeral = (jid, duration) => {
 		return chatModify({ setChatEphemeral: duration }, jid)
 	}
-	
+	/**
+	 * Silence a chat (mute without timestamp = permanent, or provide until timestamp)
+	 */
 	const silenceChat = (jid, silent = true, until = null) => {
 		return chatModify({ silenceChat: { silent, until } }, jid)
 	}
-	
-	const clearChat = (jid, lastMessages) => {
-		return chatModify({ clear: true, lastMessages }, jid)
-	}
-	
-	const pinChat = (jid, pinned = true) => {
-		return chatModify({ pin: { pinned } }, jid)
-	}
-	
-	const starMessages = (jid, messageIds, starred = true) => {
-		return chatModify({ star: { messages: messageIds, star: starred } }, jid)
-	}
-	
-	const setQuickReply = (text, shortcut) => {
-		return chatModify({ quickReply: { text, shortcut } }, '')
-	}
-	
+	/**
+	 * Fetch bot profiles for a list of JIDs using USyncBotProfileProtocol
+	 */
 	const fetchBotProfiles = async jids => {
 		const { USyncQuery, USyncUser, USyncBotProfileProtocol } = require('../WAUSync')
 		const q = new USyncQuery()
@@ -1559,25 +1303,37 @@ const makeChatsSocket = config => {
 		for (const jid of jids) {
 			q.withUser(new USyncUser().withId(jid))
 		}
-		const result = await executeUSyncQuery(q)
+		const result = await sock.executeUSyncQuery(q)
 		return result?.list || []
 	}
-	
+	/**
+	 * Lock or unlock a chat with an optional secret code
+	 */
 	const updateChatLock = (jid, locked) => {
 		return chatModify({ chatLock: { locked } }, jid)
 	}
-	
+	/**
+	 * Set a custom wallpaper for a chat
+	 * @param jid the chat JID
+	 * @param wallpaper wallpaper data or null to remove
+	 */
 	const updateChatWallpaper = (jid, wallpaper) => {
 		if (!wallpaper) {
 			return chatModify({ wallpaper: { remove: true } }, jid)
 		}
 		return chatModify({ wallpaper }, jid)
 	}
-	
+	/**
+	 * Set media visibility (auto-download) for a chat
+	 * @param jid the chat JID
+	 * @param visibility 'default' | 'on' | 'off'
+	 */
 	const updateChatMediaVisibility = (jid, visibility) => {
 		return chatModify({ mediaVisibility: visibility }, jid)
 	}
-	
+	/**
+	 * Fetch details for a specific bot by JID
+	 */
 	const getBotProfile = async botJid => {
 		const resp = await query({
 			tag: 'iq',
@@ -1602,16 +1358,15 @@ const makeChatsSocket = config => {
 			description: botNode.attrs.description
 		}
 	}
-	
-	const fetchABProps = async (protocol = '1', hash = '', refreshId = null, group = null) => {
-		const propAttrs =
-			group != null
-				? { group: String(group) }
-				: {
-						protocol,
-						...(hash ? { hash } : {}),
-						...(refreshId != null ? { refresh_id: String(refreshId) } : {})
-					}
+	/**
+	 * Fetch AB-test (abt) props from server.
+	 * Mirrors ABPropsProtocolHelper — protocol 1 or 2, optional hash/refresh_id/group.
+	 */
+	const fetchABProps = async (protocol = '2', hash = '', refreshId = null, group = null) => {
+		const propAttrs = { protocol }
+		if (hash) propAttrs.hash = hash
+		if (refreshId != null) propAttrs.refresh_id = String(refreshId)
+		if (group != null) propAttrs.group = String(group)
 		const result = await query({
 			tag: 'iq',
 			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'abt', type: 'get' },
@@ -1621,20 +1376,29 @@ const makeChatsSocket = config => {
 		if (!propsNode) return {}
 		return (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop')
 	}
-	
-	const removeCompanionDevice = async (jid, reason = 'user_initiated') => {
+	/**
+	 * Remove a companion (linked) device from the account.
+	 * Mirrors CompanionDeviceRemovalJob — xmlns="md", child tag "remove-companion-device".
+	 * reason: "user_initiated" | "server_initiated" | any WA-defined reason string.
+	 */
+	const removeCompanionDevice = async (keyIndex, reason = 'user_initiated') => {
 		await query({
 			tag: 'iq',
 			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'md', type: 'set' },
 			content: [
 				{
 					tag: 'remove-companion-device',
-					attrs: { jid, reason }
+					attrs: { platform: 'true', reason, id: String(keyIndex) }
 				}
 			]
 		})
 	}
-	
+	/**
+	 * Push an updated key-index-list to the server (multi-device key announcement).
+	 * Mirrors KeyIndexListJob — xmlns="md", child tag "key-index-list" with a binary proto body.
+	 * ts: unix timestamp seconds (string or number).
+	 * content: Buffer — serialized proto KeyIndexList.
+	 */
 	const updateKeyIndexList = async (ts, content) => {
 		await query({
 			tag: 'iq',
@@ -1648,39 +1412,11 @@ const makeChatsSocket = config => {
 			]
 		})
 	}
-	
-	const sendKeyIndexList = async () => {
-		const account = authState.creds.account
-		const signedIdentityKey = authState.creds.signedIdentityKey
-		if (!account?.details || !signedIdentityKey?.private) {
-			logger.debug('no ADV account / signed identity key, skipping key-index-list')
-			return
-		}
-		const deviceIdentity = index_js_1.proto.ADVDeviceIdentity.decode(account.details)
-		const keyIndex = deviceIdentity.keyIndex || 0
-		const accountType = deviceIdentity.accountType ?? index_js_1.proto.ADVEncryptionType.E2EE
-		const isHosted = accountType === index_js_1.proto.ADVEncryptionType.HOSTED
-		const ts = Math.floor(Date.now() / 1000)
-		const details = index_js_1.proto.ADVKeyIndexList.encode({
-			rawId: deviceIdentity.rawId || 0,
-			timestamp: ts,
-			currentIndex: keyIndex,
-			validIndexes: [keyIndex],
-			accountType
-		}).finish()
-		const sigPrefix = isHosted
-			? Defaults_1.WA_ADV_HOSTED_KEY_INDEX_LIST_SIG_PREFIX
-			: Defaults_1.WA_ADV_KEY_INDEX_LIST_SIG_PREFIX
-		const accountSignature = Utils_1.Curve.sign(signedIdentityKey.private, Buffer.concat([sigPrefix, details]))
-		const signedKeyIndexList = { details, accountSignature }
-		if (isHosted && account.accountSignatureKey?.length) {
-			signedKeyIndexList.accountSignatureKey = account.accountSignatureKey
-		}
-		const content = index_js_1.proto.ADVSignedKeyIndexList.encode(signedKeyIndexList).finish()
-		await updateKeyIndexList(ts, Buffer.from(content))
-		logger.info({ ts, keyIndex }, 'sent key-index-list')
-	}
-	
+	/**
+	 * Request a media upload connection token from the server.
+	 * Mirrors MediaConnFetcher — xmlns="w:m", type="set", optional last_id.
+	 * Returns the raw media_conn node.
+	 */
 	const fetchMediaConn = async (lastId = null) => {
 		const attrs = {}
 		if (lastId != null) attrs.last_id = String(lastId)
@@ -1691,7 +1427,10 @@ const makeChatsSocket = config => {
 		})
 		return (0, WABinary_1.getBinaryNodeChild)(result, 'media_conn') || null
 	}
-	
+	/**
+	 * Delete a broadcast list by ID.
+	 * Mirrors BroadcastListDeleteJob — xmlns="w:b", wraps <delete><list id="..."/></delete>.
+	 */
 	const deleteBroadcastList = async listId => {
 		await query({
 			tag: 'iq',
@@ -1705,7 +1444,11 @@ const makeChatsSocket = config => {
 			]
 		})
 	}
-	
+	/**
+	 * Fetch a QR code from the server (e.g. for linked-device linking).
+	 * Mirrors QRCodeFetcher — xmlns="w:qr", type="get".
+	 * addressingMode: "lid" | undefined — set to "lid" for LID-addressed QR.
+	 */
 	const fetchQRCode = async (code, addressingMode = null) => {
 		const attrs = { code }
 		if (addressingMode) attrs.addressing_mode = addressingMode
@@ -1716,13 +1459,15 @@ const makeChatsSocket = config => {
 		})
 		return (0, WABinary_1.getBinaryNodeChild)(result, 'qr') || null
 	}
-	
+	/**
+	 * Confirm or deny a device-logout request from the server.
+	 * Mirrors AccountDefenceDeviceLogoutJob — xmlns="w:account_defence", smax_id=87.
+	 * approve: true to confirm the logout, false to deny.
+	 */
 	const confirmDeviceLogout = async (id, approve = true) => {
 		await query({
 			tag: 'iq',
 			attrs: {
-				
-				id: String(id),
 				to: WABinary_1.S_WHATSAPP_NET,
 				xmlns: 'w:account_defence',
 				type: 'set',
@@ -1736,78 +1481,14 @@ const makeChatsSocket = config => {
 			]
 		})
 	}
-	
+	/**
+	 * queries need to be fired on connection open
+	 * help ensure parity with WA Web
+	 * */
 	const executeInitQueries = async () => {
-		
-		
-		const shouldInitInterop = authState.creds.interopEnabled !== false
-		const [, , , abProps] = await Promise.all([
-			fetchProps(),
-			fetchBlocklist(),
-			fetchPrivacySettings(),
-			fetchABProps(),
-			...(shouldInitInterop ? [initInterop()] : [])
-		])
-		const INTEROP_FLAGS = ['stella_interop_enabled', 'stella_ios_enabled']
-		for (const flag of INTEROP_FLAGS) {
-			if (flag in abProps) {
-				const enabled = abProps[flag] === 'true' || abProps[flag] === '1'
-				ev.emit('interop.feature-update', { feature: flag, enabled })
-			}
-		}
-		
-		const abCredsUpdate = {}
-		if ('stella_interop_enabled' in abProps) {
-			abCredsUpdate.interopEnabled =
-				abProps['stella_interop_enabled'] === 'true' || abProps['stella_interop_enabled'] === '1'
-		}
-		if ('stella_ios_enabled' in abProps) {
-			abCredsUpdate.interopIosEnabled =
-				abProps['stella_ios_enabled'] === 'true' || abProps['stella_ios_enabled'] === '1'
-		}
-		if ('md_privacy_v2' in abProps) {
-			abCredsUpdate.mdPrivacyV2 = abProps['md_privacy_v2'] === 'true' || abProps['md_privacy_v2'] === '1'
-		}
-		
-		const MEDIA_AB_PROPS = [
-			'hd_image_dual_upload',
-			'hd_video_dual_upload',
-			'hevc_video_dual_upload',
-			'partial_pjpeg_enabled',
-			'multi_scan_pjpeg',
-			'media_poll'
-		]
-		const mediaAbProps = {}
-		for (const prop of MEDIA_AB_PROPS) {
-			if (prop in abProps) {
-				mediaAbProps[prop] = abProps[prop] === 'true' || abProps[prop] === '1'
-			}
-		}
-		if (Object.keys(mediaAbProps).length) {
-			abCredsUpdate.mediaAbProps = { ...(authState.creds.mediaAbProps || {}), ...mediaAbProps }
-		}
-		if (Object.keys(abCredsUpdate).length) {
-			ev.emit('creds.update', abCredsUpdate)
-		}
+		await Promise.all([fetchProps(), fetchBlocklist(), fetchPrivacySettings(), initInterop()])
 	}
 	const upsertMessage = ev.createBufferedFunction(async (msg, type) => {
-		
-		if (msg.newsletter && msg.newsletter_server_id && msg.key?.id) {
-			_nlServerIdCache.set(msg.key.id, msg.newsletter_server_id)
-		}
-		
-		if (msg.message) {
-			const ci = Object.values(msg.message).find(v => v?.contextInfo)?.contextInfo
-			if (ci?.stanzaId && (0, WABinary_1.isJidNewsletter)(ci.remoteJid)) {
-				const sid = _nlServerIdCache.get(ci.stanzaId)
-				if (sid != null) msg.quotedNewsletterServerId = sid
-			}
-		}
-		if (msg.message?.secretEncryptedMessage || msg.message?.editedMessage?.message?.secretEncryptedMessage) {
-			
-			
-			await unwrapSecretEncryptedMessage(msg, { creds: authState.creds, getMessage, logger })
-		}
 		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
@@ -1815,7 +1496,7 @@ const makeChatsSocket = config => {
 			if (!msg.key.fromMe) {
 				ev.emit('contacts.update', [{ id: jid, notify: msg.pushName, verifiedName: msg.verifiedBizName }])
 			}
-			
+			// update our pushname too
 			if (msg.key.fromMe && msg.pushName && authState.creds.me?.name !== msg.pushName) {
 				ev.emit('creds.update', { me: { ...authState.creds.me, name: msg.pushName } })
 			}
@@ -1826,7 +1507,7 @@ const makeChatsSocket = config => {
 			: false
 		if (historyMsg && shouldProcessHistoryMsg) {
 			const syncType = historyMsg.syncType
-			
+			// INITIAL_BOOTSTRAP — fire immediately, no progress check
 			if (
 				syncType === index_js_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP &&
 				!historySyncStatus.initialBootstrapComplete
@@ -1838,7 +1519,7 @@ const makeChatsSocket = config => {
 					explicit: true
 				})
 			}
-			
+			// RECENT with progress === 100 — explicit completion
 			if (
 				syncType === index_js_1.proto.HistorySync.HistorySyncType.RECENT &&
 				historyMsg.progress === 100 &&
@@ -1853,7 +1534,7 @@ const makeChatsSocket = config => {
 					explicit: true
 				})
 			}
-			
+			// Reset 120s paused timeout on any RECENT chunk
 			if (syncType === index_js_1.proto.HistorySync.HistorySyncType.RECENT && !historySyncStatus.recentSyncComplete) {
 				clearTimeout(historySyncPausedTimeout)
 				historySyncPausedTimeout = setTimeout(() => {
@@ -1869,7 +1550,7 @@ const makeChatsSocket = config => {
 				}, Defaults_1.HISTORY_SYNC_PAUSED_TIMEOUT_MS)
 			}
 		}
-		
+		// State machine: decide on sync and flush
 		if (historyMsg && syncState === State_1.SyncState.AwaitingInitialSync) {
 			if (awaitingSyncTimeout) {
 				clearTimeout(awaitingSyncTimeout)
@@ -1878,7 +1559,7 @@ const makeChatsSocket = config => {
 			if (shouldProcessHistoryMsg) {
 				syncState = State_1.SyncState.Syncing
 				logger.info('Transitioned to Syncing state')
-				
+				// Let doAppStateSync handle the final flush after it's done
 			} else {
 				syncState = State_1.SyncState.Online
 				logger.info('History sync skipped, transitioning to Online state and flushing buffer')
@@ -1887,11 +1568,11 @@ const makeChatsSocket = config => {
 		}
 		const doAppStateSync = async () => {
 			if (syncState === State_1.SyncState.Syncing) {
-				
+				// All collections will be synced, so clear any blocked ones
 				blockedCollections.clear()
 				logger.info('Doing app state sync')
 				await resyncAppState(Types_1.ALL_WA_PATCH_NAMES, true)
-				
+				// Sync is complete, go online and flush everything
 				syncState = State_1.SyncState.Online
 				logger.info('App state sync complete, transitioning to Online state and flushing buffer')
 				ev.flush()
@@ -1917,7 +1598,7 @@ const makeChatsSocket = config => {
 				getMessage
 			})
 		])
-		
+		// If the app state key arrives and we are waiting to sync, trigger the sync now.
 		if (msg.message?.protocolMessage?.appStateSyncKeyShare && syncState === State_1.SyncState.Syncing) {
 			logger.info('App state sync key arrived, triggering app state sync')
 			await doAppStateSync()
@@ -1925,20 +1606,6 @@ const makeChatsSocket = config => {
 	})
 	ws.on('CB:presence', handlePresenceUpdate)
 	ws.on('CB:chatstate', handlePresenceUpdate)
-	
-	
-	
-	ws.on('CB:iq,xmlns:w:account_defence', async node => {
-		const deviceLogout = (0, WABinary_1.getBinaryNodeChild)(node, 'device_logout')
-		if (!deviceLogout) return
-		const id = node.attrs.id
-		logger.info({ id }, 'received account_defence device_logout challenge, approving')
-		try {
-			await confirmDeviceLogout(id, true)
-		} catch (error) {
-			onUnexpectedError(error, 'account_defence device_logout approve')
-		}
-	})
 	ws.on('CB:ib,,dirty', async node => {
 		const { attrs } = (0, WABinary_1.getBinaryNodeChild)(node, 'dirty')
 		const type = attrs.type
@@ -1954,7 +1621,7 @@ const makeChatsSocket = config => {
 				}
 				break
 			case 'groups':
-				
+				// handled in groups.ts
 				break
 			default:
 				logger.info({ node }, 'received unknown sync')
@@ -1974,9 +1641,6 @@ const makeChatsSocket = config => {
 			sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable').catch(error =>
 				onUnexpectedError(error, 'presence update requests')
 			)
-			
-			
-			sendKeyIndexList().catch(error => onUnexpectedError(error, 'send key-index-list'))
 		}
 		if (!receivedPendingNotifications || syncState !== State_1.SyncState.Connecting) {
 			return
@@ -1999,9 +1663,9 @@ const makeChatsSocket = config => {
 			setTimeout(() => ev.flush(), 0)
 			return
 		}
-		
-		
-		
+		// On reconnection (accountSyncCounter > 0), the server does not push
+		// history sync notifications — the device already has its data.
+		// Skip the 20s wait and go online immediately.
 		if (authState.creds.accountSyncCounter > 0) {
 			logger.info('Reconnection with existing sync data, skipping history sync wait. Transitioning to Online.')
 			syncState = State_1.SyncState.Online
@@ -2017,18 +1681,18 @@ const makeChatsSocket = config => {
 				logger.warn('Timeout in AwaitingInitialSync, forcing state to Online and flushing buffer')
 				syncState = State_1.SyncState.Online
 				ev.flush()
-				
+				// Increment so subsequent reconnections skip the 20s wait.
 				const accountSyncCounter = (authState.creds.accountSyncCounter || 0) + 1
 				ev.emit('creds.update', { accountSyncCounter })
 			}
 		}, 20000)
 	})
-	
+	// When an app state sync key arrives and there are collections blocked on a missing key, re-sync them.
 	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 === State_1.SyncState.Syncing) {
 			blockedCollections.clear()
 			return
@@ -2054,12 +1718,9 @@ const makeChatsSocket = config => {
 		getChatBlockingStatus,
 		updateChatBlockingStatus,
 		getUserDisclosures,
-		acceptTosNotice,
-		reportSpam,
 		getOptOutList,
 		getPushConfig,
 		setPushConfig,
-		signPrivateCredential,
 		messageMutex,
 		receiptMutex,
 		appStatePatchMutex,
@@ -2108,7 +1769,6 @@ const makeChatsSocket = config => {
 		renameAIThread,
 		pinThreadMessage,
 		updatePrivateProcessingSetting,
-		updateAIFeatures,
 		updateBioPrivacy,
 		blockBot,
 		unblockBot,
@@ -2122,10 +1782,6 @@ const makeChatsSocket = config => {
 		markChatAsUnread,
 		setChatEphemeral,
 		silenceChat,
-		clearChat,
-		pinChat,
-		starMessages,
-		setQuickReply,
 		fetchBotProfiles,
 		updateChatLock,
 		updateChatWallpaper,
@@ -2154,12 +1810,7 @@ const makeChatsSocket = config => {
 		fetchMediaConn,
 		deleteBroadcastList,
 		fetchQRCode,
-		confirmDeviceLogout,
-		updateKeyIndexList,
-		sendKeyIndexList,
-		storePrivacyTokens,
-		executeUSyncQuery,
-		newsletterServerIdCache: _nlServerIdCache
+		confirmDeviceLogout
 	}
 }
 exports.makeChatsSocket = makeChatsSocket