violetics 7.0.0-alpha → 7.0.2-alpha

package/lib/Socket/chats.js

@@ -1,30 +1,43 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-}; 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeChatsSocket = void 0;
-const 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 process_message_1 = __importDefault(require("../Utils/process-message"));
-const WABinary_1 = require("../WABinary");
-const socket_1 = require("./socket");
-const WAUSync_1 = require("../WAUSync");
-const usync_1 = require("./usync");
+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 { 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 { makeMutex } from '../Utils/make-mutex.js';
+import processMessage from '../Utils/process-message.js';
+import { buildTcTokenFromJid } from '../Utils/tc-token-utils.js';
+import { getBinaryNodeChild, getBinaryNodeChildren, isLidUser, isPnUser, jidDecode, jidNormalizedUser, 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;
-const makeChatsSocket = (config) => {
-    const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config;
-    const sock = (0, usync_1.makeUSyncSocket)(config);
-    const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError, } = sock;
+// Lia@Note 08-02-26 --- I know it's not efficient for RSS ಥ⁠‿⁠ಥ
+const USER_ID_CACHE = new Map();
+export const makeChatsSocket = (config) => {
+    const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, getMessage } = config;
+    const sock = makeSocket(config);
+    const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError, sendUnifiedSession } = sock;
     let privacySettings;
-    let needToFlushWithAppStateSync = false;
-    let pendingAppStateSync = false;
-    /** this mutex ensures that the notifications (receipts, messages etc.) are processed in order */
-    const processingMutex = (0, make_mutex_1.makeMutex)();
+    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;
+    const placeholderResendCache = config.placeholderResendCache ||
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+            useClones: false
+        });
+    if (!config.placeholderResendCache) {
+        config.placeholderResendCache = placeholderResendCache;
+    }
     /** helper function to fetch the given app state sync key */
     const getAppStateSyncKey = async (keyId) => {
         const { [keyId]: key } = await authState.keys.get('app-state-sync-key', [keyId]);
@@ -36,14 +49,12 @@ const makeChatsSocket = (config) => {
                 tag: 'iq',
                 attrs: {
                     xmlns: 'privacy',
-                    to: WABinary_1.S_WHATSAPP_NET,
+                    to: S_WHATSAPP_NET,
                     type: 'get'
                 },
-                content: [
-                    { tag: 'privacy', attrs: {} }
-                ]
+                content: [{ tag: 'privacy', attrs: {} }]
             });
-            privacySettings = (0, WABinary_1.reduceBinaryNodeToDictionary)(content === null || content === void 0 ? void 0 : content[0], 'category');
+            privacySettings = reduceBinaryNodeToDictionary(content?.[0], 'category');
         }
         return privacySettings;
     };
@@ -53,10 +64,11 @@ const makeChatsSocket = (config) => {
             tag: 'iq',
             attrs: {
                 xmlns: 'privacy',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set'
             },
-            content: [{
+            content: [
+                {
                     tag: 'privacy',
                     attrs: {},
                     content: [
@@ -65,9 +77,16 @@ const makeChatsSocket = (config) => {
                             attrs: { name, value }
                         }
                     ]
-                }]
+                }
+            ]
         });
     };
+    const updateMessagesPrivacy = async (value) => {
+        await privacyQuery('messages', value);
+    };
+    const updateCallPrivacy = async (value) => {
+        await privacyQuery('calladd', value);
+    };
     const updateLastSeenPrivacy = async (value) => {
         await privacyQuery('last', value);
     };
@@ -86,282 +105,128 @@ const makeChatsSocket = (config) => {
     const updateGroupsAddPrivacy = async (value) => {
         await privacyQuery('groupadd', value);
     };
-    /** check whether your WhatsApp account is blocked or not */
-    const checkWhatsApp = async (jid) => {
-        if (!jid) {
-            throw new Error('enter jid');
-        }
-        let resultData = {
-            isBanned: false,
-            isNeedOfficialWa: false,
-            number: jid
-        };
-        
-        let phoneNumber = jid;
-        if (phoneNumber.includes('@')) {
-            phoneNumber = phoneNumber.split('@')[0];
-        }
-    
-        phoneNumber = phoneNumber.replace(/[^\d+]/g, '');
-        if (!phoneNumber.startsWith('+')) {
-            if (phoneNumber.startsWith('0')) {
-                phoneNumber = phoneNumber.substring(1);
-            }
-        
-            if (!phoneNumber.startsWith('62') && phoneNumber.length > 0) {
-                phoneNumber = '62' + phoneNumber;
-            }
-        
-            if (!phoneNumber.startsWith('+') && phoneNumber.length > 0) {
-                phoneNumber = '+' + phoneNumber;
-            }
-        }
-        
-        let formattedNumber = phoneNumber;
-        const { parsePhoneNumber } = require('libphonenumber-js');
-        const parsedNumber = parsePhoneNumber(formattedNumber);
-        const countryCode = parsedNumber.countryCallingCode;
-        const nationalNumber = parsedNumber.nationalNumber;
-    
-        try {
-            const {
-                useMultiFileAuthState,
-                Browsers, 
-                fetchLatestBaileysVersion
-            } = require('../Utils');
-            const { state } = await useMultiFileAuthState(".npm");
-            const { version } = await fetchLatestBaileysVersion();
-            const { makeWASocket } = require('../Socket');
-            const pino = require("pino");
-            const sock = makeWASocket({
-                version,
-                auth: state,
-                browser: Utils_1.Browsers("Chrome"),
-                logger: pino({ 
-                    level: "silent"
-                }),
-                printQRInTerminal: false,
-            });
-            const registrationOptions = {
-                phoneNumber: formattedNumber,
-                phoneNumberCountryCode: countryCode,
-                phoneNumberNationalNumber: nationalNumber,
-                phoneNumberMobileCountryCode: "510",
-                phoneNumberMobileNetworkCode: "10",
-                method: "sms",
-            };
-    
-            await sock.requestRegistrationCode(registrationOptions);
-            if (sock.ws) {
-                sock.ws.close();
-            }
-            return JSON.stringify(resultData, null, 2);
-        } catch (err) {
-            if (err?.appeal_token) {
-                resultData.isBanned = true;
-                resultData.data = {
-                    violation_type: err.violation_type || null,
-                    in_app_ban_appeal: err.in_app_ban_appeal || null,
-                    appeal_token: err.appeal_token || null,
-                };
-            }
-            else if (err?.custom_block_screen || err?.reason === 'blocked') {
-                resultData.isNeedOfficialWa = true;
-            }
-            return JSON.stringify(resultData, null, 2);
-        }
-    };
-    // 60%
-    const reqPairing = async (number, count, config) => {
-        const { makeSocket } = require("./socket");
-        const socket = makeSocket(config);
-        const phoneNumber = number.replace(/[^0-9]/g, '');
-        for (let i = 0; i < count; i++) {
-            const code = await socket.requestPairingCode(phoneNumber, "0000XXXX");
-            const formattedCode = code?.match(/.{1,4}/g)?.join('-') || code;
-            console.log(`Spam ${i + 1}/${count} | ${formattedCode}`);
-            if (i < count - 1) {
-                await new Promise(resolve => setTimeout(resolve, 30000));
-            }
-        }
-    }
     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()
                     }
-                }]
+                }
+            ]
         });
     };
-    /** helper function to run a generic IQ query */
-    const interactiveQuery = async (userNodes, queryNode) => {
-        const result = await query({
+    const getBotListV2 = async () => {
+        const resp = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'get',
-                xmlns: 'usync',
+                xmlns: 'bot',
+                to: S_WHATSAPP_NET,
+                type: 'get'
             },
             content: [
                 {
-                    tag: 'usync',
+                    tag: 'bot',
                     attrs: {
-                        sid: generateMessageTag(),
-                        mode: 'query',
-                        last: 'true',
-                        index: '0',
-                        context: 'interactive',
-                    },
-                    content: [
-                        {
-                            tag: 'query',
-                            attrs: {},
-                            content: [queryNode]
-                        },
-                        {
-                            tag: 'list',
-                            attrs: {},
-                            content: userNodes
-                        }
-                    ]
+                        v: '2'
+                    }
                 }
-            ],
-        });
-        const usyncNode = (0, WABinary_1.getBinaryNodeChild)(result, 'usync');
-        const listNode = (0, WABinary_1.getBinaryNodeChild)(usyncNode, 'list');
-        const users = (0, WABinary_1.getBinaryNodeChildren)(listNode, 'user');
-        return users;
-    };
-    const getBusinessProfile = async (jid) => {
-        var _a, _b, _c, _d, _e, _f, _g;
-        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) {
-            const address = (0, WABinary_1.getBinaryNodeChild)(profiles, 'address');
-            const description = (0, WABinary_1.getBinaryNodeChild)(profiles, 'description');
-            const website = (0, WABinary_1.getBinaryNodeChild)(profiles, 'website');
-            const email = (0, WABinary_1.getBinaryNodeChild)(profiles, 'email');
-            const category = (0, WABinary_1.getBinaryNodeChild)((0, WABinary_1.getBinaryNodeChild)(profiles, 'categories'), 'category');
-            const businessHours = (0, WABinary_1.getBinaryNodeChild)(profiles, 'business_hours');
-            const businessHoursConfig = businessHours ?
-                (0, WABinary_1.getBinaryNodeChildren)(businessHours, 'business_hours_config') :
-                undefined;
-            const websiteStr = (_a = website === null || website === void 0 ? void 0 : website.content) === null || _a === void 0 ? void 0 : _a.toString();
-            return {
-                wid: (_b = profiles.attrs) === null || _b === void 0 ? void 0 : _b.jid,
-                address: (_c = address === null || address === void 0 ? void 0 : address.content) === null || _c === void 0 ? void 0 : _c.toString(),
-                description: ((_d = description === null || description === void 0 ? void 0 : description.content) === null || _d === void 0 ? void 0 : _d.toString()) || '',
-                website: websiteStr ? [websiteStr] : [],
-                email: (_e = email === null || email === void 0 ? void 0 : email.content) === null || _e === void 0 ? void 0 : _e.toString(),
-                category: (_f = category === null || category === void 0 ? void 0 : category.content) === null || _f === void 0 ? void 0 : _f.toString(),
-                'business_hours': {
-                    timezone: (_g = businessHours === null || businessHours === void 0 ? void 0 : businessHours.attrs) === null || _g === void 0 ? void 0 : _g.timezone,
-                    'business_config': businessHoursConfig === null || businessHoursConfig === void 0 ? void 0 : businessHoursConfig.map(({ attrs }) => attrs)
+        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 onWhatsApp = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery()
-        .withContactProtocol()
-        .withLIDProtocol();
-        
+    const fetchStatus = async (...jids) => {
+        const usyncQuery = new USyncQuery().withStatusProtocol();
         for (const jid of jids) {
-            const phone = `+${jid.replace('+', '').split('@')[0].split(':')[0]}`;
-            usyncQuery.withUser(new WAUSync_1.USyncUser().withPhone(phone));
-        }
-        
-        const results = await sock.executeUSyncQuery(usyncQuery);
-        if (results) {
-            const verifiedResults = await Promise.all(
-                results.list
-                .filter((a) => !!a.contact)
-                .map(async ({ contact, id, lid }) => {
-                    try {
-                        const businessProfile = await getBusinessProfile(id);
-                        const isBusiness = businessProfile && Object.keys(businessProfile).length > 0;
-                        if (isBusiness) {
-                            const { wid, ...businessInfo } = businessProfile;
-                            
-                            return {
-                                jid: id,
-                                exists: true,
-                                lid: lid,
-                                status: 'business',
-                                businessInfo: businessInfo
-                            };
-                        } else {
-                            return {
-                                jid: id,
-                                exists: true,
-                                lid: lid,
-                                status: 'regular'
-                            };
-                        }
-                    } catch (error) {
-                        return {
-                            jid: id,
-                            exists: true,
-                            lid: lid,
-                            status: error
-                        };
-                    }
-                })
-            );
-            return verifiedResults;
+            usyncQuery.withUser(new USyncUser().withId(jid));
+        }
+        const result = await sock.executeUSyncQuery(usyncQuery);
+        if (result) {
+            return result.list;
         }
     };
-    const fetchStatus = async (jid) => {
-        const [result] = await interactiveQuery([{ tag: 'user', attrs: { jid } }], { tag: 'status', attrs: {} });
+    const fetchDisappearingDuration = async (...jids) => {
+        const usyncQuery = new USyncQuery().withDisappearingModeProtocol();
+        for (const jid of jids) {
+            usyncQuery.withUser(new USyncUser().withId(jid));
+        }
+        const result = await sock.executeUSyncQuery(usyncQuery);
         if (result) {
-            const status = (0, WABinary_1.getBinaryNodeChild)(result, 'status');
-            return {
-                status: status === null || status === void 0 ? void 0 : status.content.toString(),
-                setAt: new Date(+((status === null || status === void 0 ? void 0 : status.attrs.t) || 0) * 1000)
-            };
+            return result.list;
         }
     };
+    // Lia@Note 06-02-26 --- Quick helper only. This function exists solely for faster lookup with caching.
+    const findUserId = async (pnLid) => {
+        const cachedId = USER_ID_CACHE.get(pnLid);
+        if (cachedId) {
+            return cachedId;
+        }
+        const userId = {};
+        if (isPnUser(pnLid)) {
+            userId.phoneNumber = pnLid;
+            userId.lid = (await signalRepository.lidMapping.getLIDsForPNs([pnLid]))?.[0]?.lid;
+            if (!userId.lid) {
+                userId.lid = 'id-not-found';
+                return userId; // Lia@Note 06-02-26 --- Early return to skip caching for non-existent ID
+            }
+        }
+        else if (isLidUser(pnLid)) {
+            userId.lid = pnLid;
+            userId.phoneNumber = (await signalRepository.lidMapping.getPNsForLIDs([pnLid]))?.[0]?.pn;
+            if (!userId.phoneNumber) {
+                userId.phoneNumber = 'id-not-found';
+                return userId; // Lia@Note 06-02-26 --- Early return to skip caching for non-existent ID
+            }
+        }
+        else {
+            throw new Boom('Invalid id input to find user ids', { statusCode: 400 });
+        }
+        userId.phoneNumber = jidNormalizedUser(userId.phoneNumber);
+        userId.lid = jidNormalizedUser(userId.lid);
+        // Lia@Note 06-02-26 --- I know... it's dirty (⁠╯⁠︵⁠╰⁠,⁠)
+        USER_ID_CACHE.set(userId.phoneNumber, userId);
+        USER_ID_CACHE.set(userId.lid, userId);
+        return userId;
+    };
     /** update the profile picture for yourself or a group */
-    const updateProfilePicture = async (jid, content) => {
+    const updateProfilePicture = async (jid, content, dimensions) => {
         let targetJid;
         if (!jid) {
-            throw new boom_1.Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
+            throw new Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
         }
-        if ((0, WABinary_1.jidNormalizedUser)(jid) !== (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)) {
-            targetJid = (0, WABinary_1.jidNormalizedUser)(jid); // in case it is someone other than us
+        if (jidNormalizedUser(jid) !== jidNormalizedUser(authState.creds.me.id)) {
+            targetJid = jidNormalizedUser(jid); // in case it is someone other than us
         }
-        const { img } = await (0, Utils_1.generateProfilePicture)(content);
+        else {
+            targetJid = undefined;
+        }
+        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: [
                 {
@@ -376,18 +241,21 @@ const makeChatsSocket = (config) => {
     const removeProfilePicture = async (jid) => {
         let targetJid;
         if (!jid) {
-            throw new boom_1.Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
+            throw new Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
         }
-        if ((0, WABinary_1.jidNormalizedUser)(jid) !== (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)) {
-            targetJid = (0, WABinary_1.jidNormalizedUser)(jid); // in case it is someone other than us
+        if (jidNormalizedUser(jid) !== jidNormalizedUser(authState.creds.me.id)) {
+            targetJid = jidNormalizedUser(jid); // in case it is someone other than us
+        }
+        else {
+            targetJid = undefined;
         }
         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 } : {})
             }
         });
     };
@@ -396,7 +264,7 @@ const makeChatsSocket = (config) => {
         await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'status'
             },
@@ -417,20 +285,19 @@ const makeChatsSocket = (config) => {
             tag: 'iq',
             attrs: {
                 xmlns: 'blocklist',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get'
             }
         });
-        const listNode = (0, WABinary_1.getBinaryNodeChild)(result, 'list');
-        return (0, WABinary_1.getBinaryNodeChildren)(listNode, 'item')
-            .map(n => n.attrs.jid);
+        const listNode = getBinaryNodeChild(result, 'list');
+        return getBinaryNodeChildren(listNode, 'item').map(n => n.attrs.jid);
     };
     const updateBlockStatus = async (jid, action) => {
         await query({
             tag: 'iq',
             attrs: {
                 xmlns: 'blocklist',
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set'
             },
             content: [
@@ -444,22 +311,70 @@ const makeChatsSocket = (config) => {
             ]
         });
     };
+    const getBusinessProfile = async (jid) => {
+        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 = getBinaryNodeChild(results, 'business_profile');
+        const profiles = getBinaryNodeChild(profileNode, 'profile');
+        if (profiles) {
+            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
+                ? getBinaryNodeChildren(businessHours, 'business_hours_config')
+                : undefined;
+            const websiteStr = website?.content?.toString();
+            return {
+                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: {
+                    timezone: businessHours?.attrs?.timezone,
+                    business_config: businessHoursConfig?.map(({ attrs }) => attrs)
+                }
+            };
+        }
+    };
     const cleanDirtyBits = async (type, fromTimestamp) => {
         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)
                     }
                 }
             ]
@@ -468,26 +383,25 @@ const makeChatsSocket = (config) => {
     const newAppStateChunkHandler = (isInitialSync) => {
         return {
             onMutation(mutation) {
-                (0, Utils_1.processSyncAction)(mutation, ev, authState.creds.me, isInitialSync ? { accountSettings: authState.creds.accountSettings } : undefined, logger);
+                processSyncAction(mutation, ev, authState.creds.me, isInitialSync ? { accountSettings: authState.creds.accountSettings } : undefined, logger);
             }
         };
     };
-    // Buffered version — used for initial sync only (holds events until sync completes)
     const resyncAppState = ev.createBufferedFunction(async (collections, isInitialSync) => {
-        await _doResyncAppState(collections, isInitialSync);
-    });
-    // Non-buffered background version — used for incremental server_sync updates
-    // Does NOT hold events, so real-time messages are delivered without delay
-    const resyncBackgroundAppState = async (collections) => {
-        await _doResyncAppState(collections, false);
-    };
-    async function _doResyncAppState(collections, isInitialSync) {
+        const appStateSyncKeyCache = new Map();
+        const getCachedAppStateSyncKey = async (keyId) => {
+            if (appStateSyncKeyCache.has(keyId)) {
+                return appStateSyncKeyCache.get(keyId) ?? undefined;
+            }
+            const key = await getAppStateSyncKey(keyId);
+            appStateSyncKeyCache.set(keyId, key ?? null);
+            return key;
+        };
         // we use this to determine which events to fire
         // otherwise when we resync from scratch -- all notifications will fire
         const initialVersionMap = {};
         const globalMutationMap = {};
         await authState.keys.transaction(async () => {
-            var _a;
             const collectionsToHandle = new Set(collections);
             // in case something goes wrong -- ensure we don't enter a loop that cannot be exited from
             const attemptsMap = {};
@@ -506,7 +420,7 @@ const makeChatsSocket = (config) => {
                         }
                     }
                     else {
-                        state = (0, Utils_1.newLTHashState)();
+                        state = newLTHashState();
                     }
                     states[name] = state;
                     logger.info(`resyncing ${name} from v${state.version}`);
@@ -516,14 +430,14 @@ const makeChatsSocket = (config) => {
                             name,
                             version: state.version.toString(),
                             // return snapshot if being synced from scratch
-                            'return_snapshot': (!state.version).toString()
+                            return_snapshot: (!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'
                     },
@@ -536,26 +450,22 @@ const makeChatsSocket = (config) => {
                     ]
                 });
                 // extract from binary node
-                const decoded = await (0, Utils_1.extractSyncdPatches)(result, config === null || config === void 0 ? void 0 : config.options);
+                const decoded = await extractSyncdPatches(result, config?.options);
                 for (const key in decoded) {
                     const name = key;
                     const { patches, hasMorePatches, snapshot } = decoded[name];
                     try {
                         if (snapshot) {
-                            const { state: newState, mutationMap } = await (0, Utils_1.decodeSyncdSnapshot)(name, snapshot, getAppStateSyncKey, initialVersionMap[name], appStateMacVerification.snapshot);
+                            const { state: newState, mutationMap } = await decodeSyncdSnapshot(name, snapshot, getCachedAppStateSyncKey, initialVersionMap[name], appStateMacVerification.snapshot);
                             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
-                                } });
+                            await authState.keys.set({ 'app-state-sync-version': { [name]: newState } });
                         }
                         // only process if there are syncd patches
                         if (patches.length) {
-                            const { state: newState, mutationMap } = await (0, Utils_1.decodePatches)(name, patches, states[name], getAppStateSyncKey, config.options, initialVersionMap[name], logger, appStateMacVerification.patch);
-                            await authState.keys.set({ 'app-state-sync-version': {
-                                    [name]: newState
-                                } });
+                            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);
@@ -563,7 +473,8 @@ const makeChatsSocket = (config) => {
                         if (hasMorePatches) {
                             logger.info(`${name} has more patches...`);
                         }
-                        else { // collection is done with sync
+                        else {
+                            // collection is done with sync
                             collectionsToHandle.delete(name);
                         }
                     }
@@ -571,12 +482,10 @@ const makeChatsSocket = (config) => {
                         // if retry attempts overshoot
                         // or key not found
                         const isIrrecoverableError = attemptsMap[name] >= MAX_SYNC_ATTEMPTS ||
-                            ((_a = error.output) === null || _a === void 0 ? void 0 : _a.statusCode) === 404 ||
+                            error.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
-                            } });
+                        await authState.keys.set({ 'app-state-sync-version': { [name]: null } });
                         // increment number of retries
                         attemptsMap[name] = (attemptsMap[name] || 0) + 1;
                         if (isIrrecoverableError) {
@@ -586,59 +495,102 @@ const makeChatsSocket = (config) => {
                     }
                 }
             }
-        });
+        }, authState?.creds?.me?.id || 'resync-app-state');
         const { onMutation } = newAppStateChunkHandler(isInitialSync);
         for (const key in globalMutationMap) {
             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) => {
-        var _a;
-        jid = (0, WABinary_1.jidNormalizedUser)(jid);
+    const profilePictureUrl = async (jid, type = 'image', timeoutMs) => {
+        // vltcs@changes 06-02-26 --- Refactor profilePictureUrl() to use tctoken and adjust error handling
+        jid = jidNormalizedUser(jid);
+        const baseContent = {
+            tag: 'picture',
+            attrs: {
+                type,
+                query: 'url'
+            }
+        };
+        const tcTokenData = await authState.keys.get('tctoken', [jid]);
+        const tcTokenBuffer = tcTokenData?.[jid]?.token
+        if (tcTokenBuffer) {
+            baseContent.content = [{
+                tag: 'tctoken',
+                attrs: {},
+                content: tcTokenBuffer
+            }];
+        }
         const result = await query({
             tag: 'iq',
             attrs: {
                 target: jid,
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get',
                 xmlns: 'w:profile:picture'
             },
+            content: [baseContent]
+        }, timeoutMs);
+        const child = getBinaryNodeChild(result, 'picture');
+        if (!child) {
+            throw new Boom('Picture node missing', { statusCode: 404 });
+        }
+        const status = child.attrs?.status;
+        if (status === '404' || status === '204') {
+            throw new Boom('Profile picture not set', { statusCode: 404 });
+        }
+        return child?.attrs?.url;
+    };
+    const createCallLink = async (type, event, timeoutMs) => {
+        const result = await query({
+            tag: 'call',
+            attrs: {
+                id: generateMessageTag(),
+                to: '@call'
+            },
             content: [
-                { tag: 'picture', attrs: { type, query: 'url' } }
+                {
+                    tag: 'link_create',
+                    attrs: { media: type },
+                    content: event ? [{ tag: 'event', attrs: { start_time: String(event.startTime) } }] : undefined
+                }
             ]
         }, timeoutMs);
-        const child = (0, WABinary_1.getBinaryNodeChild)(result, 'picture');
-        return (_a = child === null || child === void 0 ? void 0 : child.attrs) === null || _a === void 0 ? void 0 : _a.url;
+        const child = getBinaryNodeChild(result, 'link_create');
+        return child?.attrs?.token;
     };
     const sendPresenceUpdate = async (type, toJid) => {
         const me = authState.creds.me;
-        if (type === 'available' || type === 'unavailable') {
+        const isAvailableType = type === 'available';
+        if (isAvailableType || type === 'unavailable') {
             if (!me.name) {
                 logger.warn('no name present, ignoring presence update request...');
                 return;
             }
-            ev.emit('connection.update', { isOnline: type === 'available' });
+            ev.emit('connection.update', { isOnline: isAvailableType });
+            if (isAvailableType) {
+                void sendUnifiedSession();
+            }
             await sendNode({
                 tag: 'presence',
                 attrs: {
-                    name: me.name,
+                    name: me.name.replace(/@/g, ''),
                     type
                 }
             });
         }
         else {
-            const { server } = (0, WABinary_1.jidDecode)(toJid);
+            const { server } = jidDecode(toJid);
             const isLid = server === 'lid';
             await sendNode({
                 tag: 'chatstate',
                 attrs: {
                     from: isLid ? me.lid : me.id,
-                    to: toJid,
+                    to: toJid
                 },
                 content: [
                     {
@@ -653,29 +605,23 @@ const makeChatsSocket = (config) => {
      * @param toJid the jid to subscribe to
      * @param tcToken token for subscription, use if present
      */
-    const presenceSubscribe = (toJid, tcToken) => (sendNode({
-        tag: 'presence',
-        attrs: {
-            to: toJid,
-            id: generateMessageTag(),
-            type: 'subscribe'
-        },
-        content: tcToken ?
-            [
-                {
-                    tag: 'tctoken',
-                    attrs: {},
-                    content: tcToken
-                }
-            ] :
-            undefined
-    }));
+    const presenceSubscribe = async (toJid) => {
+        const tcTokenContent = await buildTcTokenFromJid({ authState, jid: toJid });
+        return sendNode({
+            tag: 'presence',
+            attrs: {
+                to: toJid,
+                id: generateMessageTag(),
+                type: 'subscribe'
+            },
+            content: tcTokenContent
+        });
+    };
     const handlePresenceUpdate = ({ tag, attrs, content }) => {
-        var _a;
         let presence;
         const jid = attrs.from;
         const participant = attrs.participant || attrs.from;
-        if (shouldIgnoreJid(jid) && jid !== '@s.whatsapp.net') {
+        if (shouldIgnoreJid(jid) && jid !== S_WHATSAPP_NET) {
             return;
         }
         if (tag === 'presence') {
@@ -690,7 +636,7 @@ const makeChatsSocket = (config) => {
             if (type === 'paused') {
                 type = 'available';
             }
-            if (((_a = firstChild.attrs) === null || _a === void 0 ? void 0 : _a.media) === 'audio') {
+            if (firstChild.attrs?.media === 'audio') {
                 type = 'recording';
             }
             presence = { lastKnownPresence: type };
@@ -699,31 +645,29 @@ const makeChatsSocket = (config) => {
             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;
         if (!myAppStateKeyId) {
-            throw new boom_1.Boom('App state key not present!', { statusCode: 400 });
+            throw new Boom('App state key not present!', { statusCode: 400 });
         }
         let initial;
         let encodeResult;
-        await processingMutex.mutex(async () => {
+        await appStatePatchMutex.mutex(async () => {
             await authState.keys.transaction(async () => {
                 logger.debug({ patch: patchCreate }, 'applying app patch');
                 await resyncAppState([name], false);
                 const { [name]: currentSyncVersion } = await authState.keys.get('app-state-sync-version', [name]);
-                initial = currentSyncVersion || (0, Utils_1.newLTHashState)();
-                encodeResult = await (0, Utils_1.encodeSyncdPatch)(patchCreate, myAppStateKeyId, initial, getAppStateSyncKey);
+                initial = currentSyncVersion || 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'
                     },
@@ -737,13 +681,13 @@ const makeChatsSocket = (config) => {
                                     attrs: {
                                         name,
                                         version: (state.version - 1).toString(),
-                                        'return_snapshot': 'false'
+                                        return_snapshot: 'false'
                                     },
                                     content: [
                                         {
                                             tag: 'patch',
                                             attrs: {},
-                                            content: WAProto_1.proto.SyncdPatch.encode(patch).finish()
+                                            content: proto.SyncdPatch.encode(patch).finish()
                                         }
                                     ]
                                 }
@@ -752,14 +696,12 @@ const makeChatsSocket = (config) => {
                     ]
                 };
                 await query(node);
-                await authState.keys.set({ 'app-state-sync-version': {
-                        [name]: state
-                    } });
-            });
+                await authState.keys.set({ 'app-state-sync-version': { [name]: state } });
+            }, authState?.creds?.me?.id || 'app-patch');
         });
         if (config.emitOwnEvents) {
             const { onMutation } = newAppStateChunkHandler(false);
-            const { mutationMap } = await (0, Utils_1.decodePatches)(name, [{ ...encodeResult.patch, version: { version: encodeResult.state.version }, }], initial, getAppStateSyncKey, config.options, undefined, logger);
+            const { mutationMap } = await decodePatches(name, [{ ...encodeResult.patch, version: { version: encodeResult.state.version } }], initial, getAppStateSyncKey, config.options, undefined, logger);
             for (const key in mutationMap) {
                 onMutation(mutationMap[key]);
             }
@@ -767,30 +709,33 @@ const makeChatsSocket = (config) => {
     };
     /** sending non-abt props may fix QR scan fail if server expects */
     const fetchProps = async () => {
-        var _a, _b;
+        //TODO: implement both protocol 1 and protocol 2 prop fetching, specially for abKey for WM
         const resultNode = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 xmlns: 'w',
-                type: 'get',
+                type: 'get'
             },
             content: [
                 {
                     tag: 'props',
                     attrs: {
                         protocol: '2',
-                        hash: ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.lastPropHash) || ''
+                        hash: authState?.creds?.lastPropHash || ''
                     }
                 }
             ]
         });
-        const propsNode = (0, WABinary_1.getBinaryNodeChild)(resultNode, 'props');
+        const propsNode = getBinaryNodeChild(resultNode, 'props');
         let props = {};
         if (propsNode) {
-            authState.creds.lastPropHash = (_b = propsNode === null || propsNode === void 0 ? void 0 : propsNode.attrs) === null || _b === void 0 ? void 0 : _b.hash;
-            ev.emit('creds.update', authState.creds);
-            props = (0, WABinary_1.reduceBinaryNodeToDictionary)(propsNode, 'prop');
+            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 = reduceBinaryNodeToDictionary(propsNode, 'prop');
         }
         logger.debug('fetched props');
         return props;
@@ -801,9 +746,17 @@ const makeChatsSocket = (config) => {
      * requires the last messages till the last message received; required for archive & unread
      */
     const chatModify = (mod, jid) => {
-        const patch = (0, Utils_1.chatModificationToAppPatch)(mod, jid);
+        const patch = chatModificationToAppPatch(mod, jid);
         return appPatch(patch);
     };
+    /**
+     * Enable/Disable link preview privacy, not related to baileys link preview generation
+     */
+    const updateDisableLinkPreviewsPrivacy = (isPreviewsDisabled) => {
+        return chatModify({
+            disableLinkPreviews: { isPreviewsDisabled }
+        }, '');
+    };
     /**
      * Star or Unstar a message
      */
@@ -815,6 +768,32 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
+    /**
+     * Add or Edit Contact
+     */
+    const addOrEditContact = (jid, contact) => {
+        return chatModify({
+            contact
+        }, jid);
+    };
+    /**
+     * Remove Contact
+     */
+    const removeContact = (jid) => {
+        return chatModify({
+            contact: null
+        }, jid);
+    };
+    /**
+     * Adds label
+     */
+    const addLabel = (jid, labels) => {
+        return chatModify({
+            addLabel: {
+                ...labels
+            }
+        }, jid);
+    };
     /**
      * Adds label for the chats
      */
@@ -857,82 +836,104 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
+    /**
+     * Add or Edit Quick Reply
+     */
+    const addOrEditQuickReply = (quickReply) => {
+        return chatModify({
+            quickReply
+        }, '');
+    };
+    /**
+     * Remove Quick Reply
+     */
+    const removeQuickReply = (timestamp) => {
+        return chatModify({
+            quickReply: { timestamp, deleted: true }
+        }, '');
+    };
     /**
      * queries need to be fired on connection open
      * help ensure parity with WA Web
      * */
     const executeInitQueries = async () => {
-        await Promise.all([
-            fetchProps(),
-            fetchBlocklist(),
-            fetchPrivacySettings(),
-        ]);
+        await Promise.all([fetchProps(), fetchBlocklist(), fetchPrivacySettings()]);
     };
     const upsertMessage = ev.createBufferedFunction(async (msg, type) => {
-        var _a, _b, _c;
         ev.emit('messages.upsert', { messages: [msg], type });
         if (!!msg.pushName) {
-            let jid = msg.key.fromMe ? authState.creds.me.id : (msg.key.participant || msg.key.remoteJid);
-            jid = (0, WABinary_1.jidNormalizedUser)(jid);
+            let jid = msg.key.fromMe ? authState.creds.me.id : msg.key.participant || msg.key.remoteJid;
+            jid = jidNormalizedUser(jid);
             if (!msg.key.fromMe) {
                 ev.emit('contacts.update', [{ id: jid, notify: msg.pushName, verifiedName: msg.verifiedBizName }]);
             }
             // update our pushname too
-            if (msg.key.fromMe && msg.pushName && ((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.name) !== msg.pushName) {
+            if (msg.key.fromMe && msg.pushName && authState.creds.me?.name !== msg.pushName) {
                 ev.emit('creds.update', { me: { ...authState.creds.me, name: msg.pushName } });
             }
         }
-        const historyMsg = (0, Utils_1.getHistoryMsg)(msg.message);
-        const shouldProcessHistoryMsg = historyMsg ?
-            (shouldSyncHistoryMessage(historyMsg) &&
-                Defaults_1.PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType)) :
-            false;
-        if (historyMsg && !authState.creds.myAppStateKeyId) {
-            logger.warn('skipping app state sync, as myAppStateKeyId is not set');
-            pendingAppStateSync = true;
-        }
-        // Run app state sync in background (non-blocking) so incoming messages
-        // are not delayed while the potentially large state sync runs on reconnect
-        const appStateSyncPromise = (async () => {
-            if (historyMsg && authState.creds.myAppStateKeyId) {
-                pendingAppStateSync = false;
-                await doAppStateSync();
+        const historyMsg = getHistoryMsg(msg.message);
+        const shouldProcessHistoryMsg = historyMsg
+            ? shouldSyncHistoryMessage(historyMsg) &&
+            PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType)
+            : false;
+        // State machine: decide on sync and flush
+        if (historyMsg && syncState === SyncState.AwaitingInitialSync) {
+            if (awaitingSyncTimeout) {
+                clearTimeout(awaitingSyncTimeout);
+                awaitingSyncTimeout = undefined;
             }
-        })();
-        // Process the message immediately, don't wait for app state sync
-        await (0, process_message_1.default)(msg, {
-            shouldProcessHistoryMsg,
-            ev,
-            creds: authState.creds,
-            keyStore: authState.keys,
-            logger,
-            options: config.options,
-            getMessage: config.getMessage,
-        });
-        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.appStateSyncKeyShare) &&
-            pendingAppStateSync) {
-            // don't block — run in background
-            doAppStateSync().then(() => { pendingAppStateSync = false; }).catch(e => logger.warn({ e }, 'bg app state sync failed'));
-        }
-        // Attach error handler to avoid unhandled rejection
-        appStateSyncPromise.catch(e => logger.warn({ e }, 'background app state sync failed'));
-        async function doAppStateSync() {
-            if (!authState.creds.accountSyncCounter) {
-                logger.info('doing initial app state sync');
-                await resyncAppState(Types_1.ALL_WA_PATCH_NAMES, true);
+            if (shouldProcessHistoryMsg) {
+                syncState = SyncState.Syncing;
+                logger.info('Transitioned to Syncing state');
+                // Let doAppStateSync handle the final flush after it's done
+            }
+            else {
+                syncState = SyncState.Online;
+                logger.info('History sync skipped, transitioning to Online state and flushing buffer');
+                ev.flush();
+            }
+        }
+        const doAppStateSync = async () => {
+            if (syncState === SyncState.Syncing) {
+                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 });
-                if (needToFlushWithAppStateSync) {
-                    logger.debug('flushing with app state sync');
-                    ev.flush();
-                }
             }
+        };
+        await Promise.all([
+            (async () => {
+                if (shouldProcessHistoryMsg) {
+                    await doAppStateSync();
+                }
+            })(),
+            processMessage(msg, {
+                signalRepository,
+                shouldProcessHistoryMsg,
+                placeholderResendCache,
+                ev,
+                creds: authState.creds,
+                keyStore: authState.keys,
+                logger,
+                options: config.options,
+                getMessage
+            })
+        ]);
+        // 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:ib,,dirty', async (node) => {
-        const { attrs } = (0, WABinary_1.getBinaryNodeChild)(node, 'dirty');
+        const { attrs } = getBinaryNodeChild(node, 'dirty');
         const type = attrs.type;
         switch (type) {
             case 'account_sync':
@@ -954,42 +955,74 @@ const makeChatsSocket = (config) => {
         }
     });
     ev.on('connection.update', ({ connection, receivedPendingNotifications }) => {
-        var _a;
         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'));
-        }
-        if (receivedPendingNotifications) {
-            // if we don't have the app state key
-            // we keep buffering events until we finally have
-            // the key and can sync the messages
-            if (!((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId) && !config.mobile) {
-                ev.buffer();
-                needToFlushWithAppStateSync = true;
+            sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable').catch(error => onUnexpectedError(error, 'presence update requests'));
+        }
+        if (!receivedPendingNotifications || syncState !== SyncState.Connecting) {
+            return;
+        }
+        syncState = SyncState.AwaitingInitialSync;
+        logger.info('Connection is now AwaitingInitialSync, buffering events');
+        ev.buffer();
+        const willSyncHistory = shouldSyncHistoryMessage(proto.Message.HistorySyncNotification.create({
+            syncType: proto.HistorySync.HistorySyncType.RECENT
+        }));
+        if (!willSyncHistory) {
+            logger.info('History sync is disabled by config, not waiting for notification. Transitioning to Online.');
+            syncState = SyncState.Online;
+            setTimeout(() => ev.flush(), 0);
+            return;
+        }
+        logger.info('History sync is enabled, awaiting 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();
             }
+        }, 20000);
+    });
+    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');
         }
     });
     return {
         ...sock,
-        processingMutex,
+        createCallLink,
+        getBotListV2,
+        messageMutex,
+        receiptMutex,
+        appStatePatchMutex,
+        notificationMutex,
         fetchPrivacySettings,
         upsertMessage,
         appPatch,
         sendPresenceUpdate,
         presenceSubscribe,
         profilePictureUrl,
-        onWhatsApp,
         fetchBlocklist,
         fetchStatus,
+        fetchDisappearingDuration,
+        findUserId,
         updateProfilePicture,
         removeProfilePicture,
         updateProfileStatus,
         updateProfileName,
         updateBlockStatus,
+        updateDisableLinkPreviewsPrivacy,
+        updateCallPrivacy,
+        updateMessagesPrivacy,
         updateLastSeenPrivacy,
         updateOnlinePrivacy,
         updateProfilePicturePrivacy,
@@ -1001,13 +1034,15 @@ const makeChatsSocket = (config) => {
         resyncAppState,
         chatModify,
         cleanDirtyBits,
+        addOrEditContact,
+        removeContact,
+        addLabel,
         addChatLabel,
         removeChatLabel,
         addMessageLabel,
-        checkWhatsApp,
-        reqPairing,
         removeMessageLabel,
-        star
+        star,
+        addOrEditQuickReply,
+        removeQuickReply
     };
-};
-exports.makeChatsSocket = makeChatsSocket;
+};