@hbmodsofc/baileys 2.3.0 → 2.5.0

package/lib/Socket/chats.js

@@ -1,11 +1,10 @@
 "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 node_cache_1 = __importDefault(require("@cacheable/node-cache"));
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Types_1 = require("../Types");
@@ -13,33 +12,20 @@ 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");
-const chalk = require('chalk');
 const MAX_SYNC_ATTEMPTS = 2;
-const SyncState = {
-    Connecting: 'connecting',
-    AwaitingInitialSync: 'awaiting_initial_sync',
-    Syncing: 'syncing',
-    Online: 'online'
-};
 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, signalRepository, onUnexpectedError, } = sock;
+    const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError, } = sock;
     let privacySettings;
-    let syncState = SyncState.Connecting;
     let needToFlushWithAppStateSync = false;
     let pendingAppStateSync = false;
-    let awaitingSyncTimeout;
+    /** this mutex ensures that the notifications (receipts, messages etc.) are processed in order */
     const processingMutex = (0, make_mutex_1.makeMutex)();
-    const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY,
-        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;
@@ -61,6 +47,7 @@ const makeChatsSocket = (config) => {
         }
         return privacySettings;
     };
+    /** helper function to run a privacy IQ query */
     const privacyQuery = async (name, value) => {
         await query({
             tag: 'iq',
@@ -81,12 +68,6 @@ const makeChatsSocket = (config) => {
                 }]
         });
     };
-    const updateMessagesPrivacy = async (value) => {
-        await privacyQuery('messages', value);
-    };
-    const updateCallPrivacy = async (value) => {
-        await privacyQuery('calladd', value);
-    };
     const updateLastSeenPrivacy = async (value) => {
         await privacyQuery('last', value);
     };
@@ -105,8 +86,73 @@ const makeChatsSocket = (config) => {
     const updateGroupsAddPrivacy = async (value) => {
         await privacyQuery('groupadd', value);
     };
-    const updateDisableLinkPreviewsPrivacy = async (isPreviewsDisabled) => {
-        return chatModify({ disableLinkPreviews: { isPreviewsDisabled } }, '');
+    /** check whether your WhatsApp account is blocked or not */
+    const checkStatusWA = async (phoneNumber) => {
+        if (!phoneNumber) {
+            throw new Error('enter number');
+        }
+    
+        let resultData = {
+            isBanned: false,
+            isNeedOfficialWa: false,
+            number: phoneNumber
+        };
+    
+        let formattedNumber = phoneNumber;
+        if (!formattedNumber.startsWith('+')) {
+            formattedNumber = '+' + formattedNumber;
+        }
+    
+        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: Browsers.ubuntu("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);
+        }
     };
     const updateDefaultDisappearingMode = async (duration) => {
         await query({
@@ -124,79 +170,160 @@ const makeChatsSocket = (config) => {
                 }]
         });
     };
-    const getBotListV2 = async () => {
-        const resp = await query({
+    /** helper function to run a generic IQ query */
+    const interactiveQuery = async (userNodes, queryNode) => {
+        const result = await query({
             tag: 'iq',
             attrs: {
-                xmlns: 'bot',
                 to: WABinary_1.S_WHATSAPP_NET,
+                type: 'get',
+                xmlns: 'usync',
+            },
+            content: [
+                {
+                    tag: 'usync',
+                    attrs: {
+                        sid: generateMessageTag(),
+                        mode: 'query',
+                        last: 'true',
+                        index: '0',
+                        context: 'interactive',
+                    },
+                    content: [
+                        {
+                            tag: 'query',
+                            attrs: {},
+                            content: [queryNode]
+                        },
+                        {
+                            tag: 'list',
+                            attrs: {},
+                            content: userNodes
+                        }
+                    ]
+                }
+            ],
+        });
+        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: 'bot',
-                    attrs: {
-                        v: '2'
-                    }
+                    tag: 'business_profile',
+                    attrs: { v: '244' },
+                    content: [{
+                            tag: 'profile',
+                            attrs: { jid }
+                        }]
                 }]
         });
-        const botNode = (0, WABinary_1.getBinaryNodeChild)(resp, 'bot');
-        const botList = [];
-        for (const section of (0, WABinary_1.getBinaryNodeChildren)(botNode, 'section')) {
-            if (section.attrs.type === 'all') {
-                for (const bot of (0, WABinary_1.getBinaryNodeChildren)(section, 'bot')) {
-                    botList.push({
-                        jid: bot.attrs.jid,
-                        personaId: bot.attrs['persona_id']
-                    });
+        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)
                 }
-            }
+            };
         }
-        return botList;
     };
     const onWhatsApp = async (...jids) => {
         const usyncQuery = new WAUSync_1.USyncQuery()
-            .withContactProtocol()
-            .withLIDProtocol();
+        .withContactProtocol()
+        .withLIDProtocol();
+        
         for (const jid of jids) {
             const phone = `+${jid.replace('+', '').split('@')[0].split(':')[0]}`;
             usyncQuery.withUser(new WAUSync_1.USyncUser().withPhone(phone));
         }
+        
         const results = await sock.executeUSyncQuery(usyncQuery);
         if (results) {
-            return results.list.filter((a) => !!a.contact).map(({ contact, id, lid }) => ({ jid: id, exists: contact, lid }));
-        }
-    };
-    const fetchStatus = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery()
-            .withStatusProtocol();
-        for (const jid of jids) {
-            usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid));
-        }
-        const result = await sock.executeUSyncQuery(usyncQuery);
-        if (result) {
-            return result.list;
+            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;
         }
     };
-    const fetchDisappearingDuration = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery()
-            .withDisappearingModeProtocol();
-        for (const jid of jids) {
-            usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid));
-        }
-        const result = await sock.executeUSyncQuery(usyncQuery);
+    const fetchStatus = async (jid) => {
+        const [result] = await interactiveQuery([{ tag: 'user', attrs: { jid } }], { tag: 'status', attrs: {} });
         if (result) {
-            return result.list;
+            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)
+            };
         }
     };
-    const updateProfilePicture = async (jid, content, dimensions) => {
+    /** update the profile picture for yourself or a group */
+    const updateProfilePicture = async (jid, content) => {
         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');
         }
         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
         }
-        const { img } = await (0, Utils_1.generateProfilePicture)(content, dimensions);
+        const { img } = await (0, Utils_1.generateProfilePicture)(content);
         await query({
             tag: 'iq',
             attrs: {
@@ -214,13 +341,14 @@ const makeChatsSocket = (config) => {
             ]
         });
     };
+    /** remove the profile picture for yourself or a group */
     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');
         }
         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
         }
         await query({
             tag: 'iq',
@@ -232,6 +360,7 @@ const makeChatsSocket = (config) => {
             }
         });
     };
+    /** update the profile status for yourself */
     const updateProfileStatus = async (status) => {
         await query({
             tag: 'iq',
@@ -284,51 +413,6 @@ const makeChatsSocket = (config) => {
             ]
         });
     };
-    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 cleanDirtyBits = async (type, fromTimestamp) => {
         logger.info({ fromTimestamp }, 'clean dirty bits ' + type);
         await sendNode({
@@ -358,12 +442,18 @@ const makeChatsSocket = (config) => {
         };
     };
     const resyncAppState = ev.createBufferedFunction(async (collections, isInitialSync) => {
+        // 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 = {};
+            // 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 = [];
@@ -385,6 +475,7 @@ const makeChatsSocket = (config) => {
                         attrs: {
                             name,
                             version: state.version.toString(),
+                            // return snapshot if being synced from scratch
                             'return_snapshot': (!state.version).toString()
                         }
                     });
@@ -404,6 +495,7 @@ const makeChatsSocket = (config) => {
                         }
                     ]
                 });
+                // extract from binary node
                 const decoded = await (0, Utils_1.extractSyncdPatches)(result, config === null || config === void 0 ? void 0 : config.options);
                 for (const key in decoded) {
                     const name = key;
@@ -414,11 +506,16 @@ const makeChatsSocket = (config) => {
                             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 } });
+                            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);
@@ -426,18 +523,24 @@ const makeChatsSocket = (config) => {
                         if (hasMorePatches) {
                             logger.info(`${name} has more patches...`);
                         }
-                        else {
+                        else { // collection is done with sync
                             collectionsToHandle.delete(name);
                         }
                     }
                     catch (error) {
-                        const isIrrecoverableError = attemptsMap[name] >= MAX_SYNC_ATTEMPTS
-                            || ((_a = error.output) === null || _a === void 0 ? void 0 : _a.statusCode) === 404
-                            || error.name === 'TypeError';
+                        // if retry attempts overshoot
+                        // or key not found
+                        const isIrrecoverableError = attemptsMap[name] >= MAX_SYNC_ATTEMPTS ||
+                            ((_a = error.output) === null || _a === void 0 ? void 0 : _a.statusCode) === 404 ||
+                            error.name === 'TypeError';
                         logger.info({ name, error: error.stack }, `failed to sync state from version${isIrrecoverableError ? '' : ', removing and trying from scratch'}`);
-                        await authState.keys.set({ 'app-state-sync-version': { [name]: null } });
+                        await authState.keys.set({ 'app-state-sync-version': {
+                                [name]: null
+                            } });
+                        // increment number of retries
                         attemptsMap[name] = (attemptsMap[name] || 0) + 1;
                         if (isIrrecoverableError) {
+                            // stop retrying
                             collectionsToHandle.delete(name);
                         }
                     }
@@ -449,56 +552,28 @@ 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"
+     */
     const profilePictureUrl = async (jid, type = 'preview', timeoutMs) => {
         var _a;
         jid = (0, WABinary_1.jidNormalizedUser)(jid);
-        try {
-            const result = await query({
-                tag: 'iq',
-                attrs: {
-                    target: jid,
-                    to: WABinary_1.S_WHATSAPP_NET,
-                    type: 'get',
-                    xmlns: 'w:profile:picture'
-                },
-                content: [
-                    { tag: 'picture', attrs: { type, query: 'url' } }
-                ]
-            }, 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;
-        } catch (error) {
-            if (error.message?.includes('item-not-found') || 
-                error.output?.payload?.statusCode === 404 || 
-                error.statusCode === 404) {
-                logger.info(chalk.gray(`[INFO] Profile pic not found for ${jid}, using fallback`));
-                return {
-                    eurl: undefined,
-                    id: jid.split('@')[0],
-                    status: null,
-                    img: null
-                };
-            }
-            throw error;
-        }
-    };
-    const createCallLink = async (type, event, timeoutMs) => {
         const result = await query({
-            tag: 'call',
+            tag: 'iq',
             attrs: {
-                id: generateMessageTag(),
-                to: '@call'
+                target: jid,
+                to: WABinary_1.S_WHATSAPP_NET,
+                type: 'get',
+                xmlns: 'w:profile:picture'
             },
             content: [
-                {
-                    tag: 'link_create',
-                    attrs: { media: type },
-                    content: event ? [{ tag: 'event', attrs: { start_time: String(event.startTime) } }] : undefined
-                }
+                { tag: 'picture', attrs: { type, query: 'url' } }
             ]
         }, timeoutMs);
-        const child = (0, WABinary_1.getBinaryNodeChild)(result, 'link_create');
-        return child?.attrs?.token;
+        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 sendPresenceUpdate = async (type, toJid) => {
         const me = authState.creds.me;
@@ -511,7 +586,7 @@ const makeChatsSocket = (config) => {
             await sendNode({
                 tag: 'presence',
                 attrs: {
-                    name: me.name.replace(/@/g, ''),
+                    name: me.name,
                     type
                 }
             });
@@ -534,6 +609,10 @@ 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: {
@@ -541,22 +620,22 @@ const makeChatsSocket = (config) => {
             id: generateMessageTag(),
             type: 'subscribe'
         },
-        content: tcToken
-            ? [
+        content: tcToken ?
+            [
                 {
                     tag: 'tctoken',
                     attrs: {},
                     content: tcToken
                 }
-            ]
-            : undefined
+            ] :
+            undefined
     }));
     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') {
@@ -580,7 +659,9 @@ 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) => {
@@ -631,7 +712,9 @@ 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
+                    } });
             });
         });
         if (config.emitOwnEvents) {
@@ -642,8 +725,9 @@ const makeChatsSocket = (config) => {
             }
         }
     };
+    /** sending non-abt props may fix QR scan fail if server expects */
     const fetchProps = async () => {
-        var _a, _b, _c;
+        var _a, _b;
         const resultNode = await query({
             tag: 'iq',
             attrs: {
@@ -652,28 +736,37 @@ const makeChatsSocket = (config) => {
                 type: 'get',
             },
             content: [
-                { tag: 'props', attrs: {
+                {
+                    tag: 'props',
+                    attrs: {
                         protocol: '2',
                         hash: ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.lastPropHash) || ''
-                    } }
+                    }
+                }
             ]
         });
         const propsNode = (0, WABinary_1.getBinaryNodeChild)(resultNode, 'props');
         let props = {};
         if (propsNode) {
-            if ((_b = propsNode.attrs) === null || _b === void 0 ? void 0 : _b.hash) {
-                authState.creds.lastPropHash = (_c = propsNode === null || propsNode === void 0 ? void 0 : propsNode.attrs) === null || _c === void 0 ? void 0 : _c.hash;
-                ev.emit('creds.update', authState.creds);
-            }
+            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');
         }
         logger.debug('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);
     };
+    /**
+     * Star or Unstar a message
+     */
     const star = (jid, messages, star) => {
         return chatModify({
             star: {
@@ -682,15 +775,9 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
-    const addOrEditContact = (jid, contact) => {
-        return chatModify({ contact }, jid);
-    };
-    const removeContact = (jid) => {
-        return chatModify({ contact: null }, jid);
-    };
-    const addLabel = (jid, labels) => {
-        return chatModify({ addLabel: { ...labels } }, jid);
-    };
+    /**
+     * Adds label for the chats
+     */
     const addChatLabel = (jid, labelId) => {
         return chatModify({
             addChatLabel: {
@@ -698,6 +785,9 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
+    /**
+     * Removes label for the chat
+     */
     const removeChatLabel = (jid, labelId) => {
         return chatModify({
             removeChatLabel: {
@@ -705,6 +795,9 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
+    /**
+     * Adds label for the message
+     */
     const addMessageLabel = (jid, messageId, labelId) => {
         return chatModify({
             addMessageLabel: {
@@ -713,6 +806,9 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
+    /**
+     * Removes label for the message
+     */
     const removeMessageLabel = (jid, messageId, labelId) => {
         return chatModify({
             removeMessageLabel: {
@@ -721,6 +817,10 @@ const makeChatsSocket = (config) => {
             }
         }, jid);
     };
+    /**
+     * queries need to be fired on connection open
+     * help ensure parity with WA Web
+     * */
     const executeInitQueries = async () => {
         await Promise.all([
             fetchProps(),
@@ -737,56 +837,30 @@ 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 && ((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.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 && syncState === SyncState.AwaitingInitialSync) {
-            if (awaitingSyncTimeout) {
-                clearTimeout(awaitingSyncTimeout);
-                awaitingSyncTimeout = undefined;
-            }
-            if (shouldProcessHistoryMsg) {
-                syncState = SyncState.Syncing;
-                logger.info('Transitioned to Syncing state');
-            } 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(Types_1.ALL_WA_PATCH_NAMES, true);
-                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 });
-            }
-        };
+        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;
         }
         await Promise.all([
             (async () => {
-                if (historyMsg
-                    && authState.creds.myAppStateKeyId) {
+                if (historyMsg &&
+                    authState.creds.myAppStateKeyId) {
                     pendingAppStateSync = false;
                     await doAppStateSync();
                 }
             })(),
             (0, process_message_1.default)(msg, {
-                signalRepository,
                 shouldProcessHistoryMsg,
-                placeholderResendCache,
                 ev,
                 creds: authState.creds,
                 keyStore: authState.keys,
@@ -795,11 +869,23 @@ const makeChatsSocket = (config) => {
                 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) {
+        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.appStateSyncKeyShare) &&
+            pendingAppStateSync) {
             await doAppStateSync();
             pendingAppStateSync = false;
         }
+        async function doAppStateSync() {
+            if (!authState.creds.accountSyncCounter) {
+                logger.info('doing initial app state sync');
+                await resyncAppState(Types_1.ALL_WA_PATCH_NAMES, true);
+                const accountSyncCounter = (authState.creds.accountSyncCounter || 0) + 1;
+                ev.emit('creds.update', { accountSyncCounter });
+                if (needToFlushWithAppStateSync) {
+                    logger.debug('flushing with app state sync');
+                    ev.flush();
+                }
+            }
+        }
     });
     ws.on('CB:presence', handlePresenceUpdate);
     ws.on('CB:chatstate', handlePresenceUpdate);
@@ -818,6 +904,7 @@ const makeChatsSocket = (config) => {
                 }
                 break;
             case 'groups':
+                // handled in groups.ts
                 break;
             default:
                 logger.info({ node }, 'received unknown sync');
@@ -834,44 +921,18 @@ const makeChatsSocket = (config) => {
             sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable')
                 .catch(error => onUnexpectedError(error, 'presence update requests'));
         }
-        if (receivedPendingNotifications &&
-            !((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId)) {
-            ev.buffer();
-            needToFlushWithAppStateSync = true;
-        }
-        if (!receivedPendingNotifications || syncState !== SyncState.Connecting) {
-            return;
-        }
-        syncState = SyncState.AwaitingInitialSync;
-        logger.info('Connection is now AwaitingInitialSync, buffering events');
-        ev.buffer();
-        const willSyncHistory = shouldSyncHistoryMessage(
-            WAProto_1.proto.Message.HistorySyncNotification.create({
-                syncType: WAProto_1.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) {
-                logger.warn('Timeout in AwaitingInitialSync, forcing state to Online and flushing buffer');
-                syncState = SyncState.Online;
-                ev.flush();
+        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;
             }
-        }, 20000);
+        }
     });
     return {
         ...sock,
-        createCallLink,
-        getBotListV2,
         processingMutex,
         fetchPrivacySettings,
         upsertMessage,
@@ -881,16 +942,12 @@ const makeChatsSocket = (config) => {
         profilePictureUrl,
         onWhatsApp,
         fetchBlocklist,
-        fetchDisappearingDuration,
         fetchStatus,
         updateProfilePicture,
         removeProfilePicture,
         updateProfileStatus,
         updateProfileName,
         updateBlockStatus,
-        updateDisableLinkPreviewsPrivacy,
-        updateCallPrivacy,
-        updateMessagesPrivacy,
         updateLastSeenPrivacy,
         updateOnlinePrivacy,
         updateProfilePicturePrivacy,
@@ -902,14 +959,12 @@ const makeChatsSocket = (config) => {
         resyncAppState,
         chatModify,
         cleanDirtyBits,
-        addOrEditContact,
-        removeContact,
-        addLabel,
         addChatLabel,
         removeChatLabel,
         addMessageLabel,
+        checkStatusWA,
         removeMessageLabel,
         star
     };
 };
-exports.makeChatsSocket = makeChatsSocket;
+exports.makeChatsSocket = makeChatsSocket;