xhyphersockets 1.4.3 → 2.4.3

package/WAProto/p.html

@@ -0,0 +1 @@
+xhypher

package/lib/Defaults/index.js

@@ -3,61 +3,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_CACHE_TTLS = exports.INITIAL_PREKEY_COUNT = exports.MIN_PREKEY_COUNT = exports.MEDIA_KEYS = exports.MEDIA_HKDF_KEY_MAPPING = exports.MEDIA_PATH_MAP = exports.DEFAULT_CONNECTION_CONFIG = exports.PROCESSABLE_HISTORY_TYPES = exports.WA_CERT_DETAILS = exports.URL_REGEX = exports.NOISE_WA_HEADER = exports.KEY_BUNDLE_TYPE = exports.DICT_VERSION = exports.NOISE_MODE = exports.WA_DEFAULT_EPHEMERAL = exports.PHONE_CONNECTION_CB = exports.DEF_TAG_PREFIX = exports.DEF_CALLBACK_PREFIX = exports.DEFAULT_ORIGIN = exports.UNAUTHORIZED_CODES = void 0;
+exports.DEFAULT_CACHE_TTLS = exports.MIN_UPLOAD_INTERVAL = exports.UPLOAD_TIMEOUT = exports.INITIAL_PREKEY_COUNT = exports.MIN_PREKEY_COUNT = exports.MEDIA_KEYS = exports.MEDIA_HKDF_KEY_MAPPING = exports.MEDIA_PATH_MAP = exports.DEFAULT_CONNECTION_CONFIG = exports.PROCESSABLE_HISTORY_TYPES = exports.WA_CERT_DETAILS = exports.URL_REGEX = exports.NOISE_WA_HEADER = exports.KEY_BUNDLE_TYPE = exports.DICT_VERSION = exports.NOISE_MODE = exports.WA_DEFAULT_EPHEMERAL = exports.WA_ADV_HOSTED_DEVICE_SIG_PREFIX = exports.WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = exports.WA_ADV_DEVICE_SIG_PREFIX = exports.WA_ADV_ACCOUNT_SIG_PREFIX = exports.UNAUTHORIZED_CODES = exports.version = void 0;
 const WAProto_1 = require("../../WAProto");
 const libsignal_1 = require("../Signal/libsignal");
-const Utils_1 = require("../Utils");
+const browser_utils_1 = require("../Utils/browser-utils");
 const logger_1 = __importDefault(require("../Utils/logger"));
-const baileys_version_json_1 = require("./baileys-version.json");
+exports.version = [2, 3000, 1027934701];
 exports.UNAUTHORIZED_CODES = [401, 403, 419];
 exports.DEFAULT_ORIGIN = 'https://web.whatsapp.com';
+exports.CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';
+exports.CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/';
 exports.DEF_CALLBACK_PREFIX = 'CB:';
 exports.DEF_TAG_PREFIX = 'TAG:';
 exports.PHONE_CONNECTION_CB = 'CB:Pong';
+exports.WA_ADV_ACCOUNT_SIG_PREFIX = Buffer.from([6, 0]);
+exports.WA_ADV_DEVICE_SIG_PREFIX = Buffer.from([6, 1]);
+exports.WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = Buffer.from([6, 5]);
+exports.WA_ADV_HOSTED_DEVICE_SIG_PREFIX = Buffer.from([6, 6]);
 exports.WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60;
 exports.NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0';
 exports.DICT_VERSION = 3;
 exports.KEY_BUNDLE_TYPE = Buffer.from([5]);
-exports.NOISE_WA_HEADER = Buffer.from([87, 65, 6, exports.DICT_VERSION]); // last is "DICT_VERSION"
-/** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
+exports.NOISE_WA_HEADER = Buffer.from([87, 65, 6, exports.DICT_VERSION]);
 exports.URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
 exports.WA_CERT_DETAILS = {
-    SERIAL: 0,
+    SERIAL: 0
 };
 exports.PROCESSABLE_HISTORY_TYPES = [
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.INITIAL_BOOTSTRAP,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.PUSH_NAME,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.RECENT,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.FULL,
-    WAProto_1.proto.Message.HistorySyncNotification.HistorySyncType.ON_DEMAND,
+    WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP,
+    WAProto_1.proto.HistorySync.HistorySyncType.PUSH_NAME,
+    WAProto_1.proto.HistorySync.HistorySyncType.RECENT,
+    WAProto_1.proto.HistorySync.HistorySyncType.FULL,
+    WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND,
+    WAProto_1.proto.HistorySync.HistorySyncType.NON_BLOCKING_DATA,
+    WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_STATUS_V3,
 ];
 exports.DEFAULT_CONNECTION_CONFIG = {
-    version: baileys_version_json_1.version,
-    browser: Utils_1.Browsers.ubuntu('Chrome'),
+    version: exports.version,
+    browser: (0, browser_utils_1.Browsers)('Chrome'),
     waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
-    connectTimeoutMs: 20000,
-    keepAliveIntervalMs: 30000,
+    connectTimeoutMs: 20_000,
+    keepAliveIntervalMs: 30_000,
     logger: logger_1.default.child({ class: 'baileys' }),
-    printQRInTerminal: false,
     emitOwnEvents: true,
-    defaultQueryTimeoutMs: 60000,
+    defaultQueryTimeoutMs: 60_000,
     customUploadHosts: [],
     retryRequestDelayMs: 250,
     maxMsgRetryCount: 5,
     fireInitQueries: true,
     auth: undefined,
     markOnlineOnConnect: true,
-    syncFullHistory: false,
+    syncFullHistory: true,
     patchMessageBeforeSending: msg => msg,
     shouldSyncHistoryMessage: () => true,
     shouldIgnoreJid: () => false,
     linkPreviewImageThumbnailWidth: 192,
     transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
     generateHighQualityLinkPreview: false,
+    enableAutoSessionRecreation: true,
+    enableRecentMessageCache: true,
     options: {},
     appStateMacVerification: {
         patch: false,
-        snapshot: false,
+        snapshot: false
     },
     countryCode: 'US',
     getMessage: async () => undefined,
@@ -74,17 +82,18 @@ exports.MEDIA_PATH_MAP = {
     'product-catalog-image': '/product/image',
     'md-app-state': '',
     'md-msg-hist': '/mms/md-app-state',
+    'biz-cover-photo': '/pps/biz-cover-photo'
 };
 exports.MEDIA_HKDF_KEY_MAPPING = {
-    'audio': 'Audio',
-    'document': 'Document',
-    'gif': 'Video',
-    'image': 'Image',
-    'ppic': '',
-    'product': 'Image',
-    'ptt': 'Audio',
-    'sticker': 'Image',
-    'video': 'Video',
+    audio: 'Audio',
+    document: 'Document',
+    gif: 'Video',
+    image: 'Image',
+    ppic: '',
+    product: 'Image',
+    ptt: 'Audio',
+    sticker: 'Image',
+    video: 'Video',
     'thumbnail-document': 'Document Thumbnail',
     'thumbnail-image': 'Image Thumbnail',
     'thumbnail-video': 'Video Thumbnail',
@@ -93,14 +102,17 @@ exports.MEDIA_HKDF_KEY_MAPPING = {
     'md-app-state': 'App State',
     'product-catalog-image': '',
     'payment-bg-image': 'Payment Background',
-    'ptv': 'Video'
+    ptv: 'Video',
+    'biz-cover-photo': 'Image'
 };
 exports.MEDIA_KEYS = Object.keys(exports.MEDIA_PATH_MAP);
 exports.MIN_PREKEY_COUNT = 5;
-exports.INITIAL_PREKEY_COUNT = 30;
+exports.INITIAL_PREKEY_COUNT = 812;
+exports.UPLOAD_TIMEOUT = 30000;
+exports.MIN_UPLOAD_INTERVAL = 5000;
 exports.DEFAULT_CACHE_TTLS = {
-    SIGNAL_STORE: 5 * 60, // 5 minutes
-    MSG_RETRY: 60 * 60, // 1 hour
-    CALL_OFFER: 5 * 60, // 5 minutes
-    USER_DEVICES: 5 * 60, // 5 minutes
-};
+    SIGNAL_STORE: 5 * 60,
+    MSG_RETRY: 60 * 60,
+    CALL_OFFER: 5 * 60,
+    USER_DEVICES: 5 * 60
+};

package/lib/Defaults/wileys-version.json

@@ -0,0 +1,3 @@
+{
+    "version": [2, 3000, 1027934701]
+}

package/lib/Socket/chats.js

@@ -15,24 +15,31 @@ const process_message_1 = __importDefault(require("../Utils/process-message"));
 const WABinary_1 = require("../WABinary");
 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, onUnexpectedError, } = sock;
+    const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError, } = sock;
     let privacySettings;
+    let syncState = SyncState.Connecting;
     let needToFlushWithAppStateSync = false;
     let pendingAppStateSync = false;
-    /** this mutex ensures that the notifications (receipts, messages etc.) are processed in order */
+    let awaitingSyncTimeout;
     const processingMutex = (0, make_mutex_1.makeMutex)();
     const placeholderResendCache = config.placeholderResendCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
+        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;
@@ -54,7 +61,6 @@ const makeChatsSocket = (config) => {
         }
         return privacySettings;
     };
-    /** helper function to run a privacy IQ query */
     const privacyQuery = async (name, value) => {
         await query({
             tag: 'iq',
@@ -99,6 +105,9 @@ const makeChatsSocket = (config) => {
     const updateGroupsAddPrivacy = async (value) => {
         await privacyQuery('groupadd', value);
     };
+    const updateDisableLinkPreviewsPrivacy = async (isPreviewsDisabled) => {
+        return chatModify({ disableLinkPreviews: { isPreviewsDisabled } }, '');
+    };
     const updateDefaultDisappearingMode = async (duration) => {
         await query({
             tag: 'iq',
@@ -168,42 +177,6 @@ const makeChatsSocket = (config) => {
             return result.list;
         }
     };
-const checkStatusWA = async (numberOrJid) => {
-    try {
-        const jid = numberOrJid.includes('@s.whatsapp.net')
-            ? numberOrJid
-            : numberOrJid.replace(/[^0-9]/g, '') + '@s.whatsapp.net'
-
-        const exists = await onWhatsApp(jid)
-        if (!exists || !exists[0]?.exists) {
-            return {
-                jid,
-                IsBanned: true,
-                Statusbio: null,
-                setAt: null
-            }
-        }
-
-        const fetched = await fetchStatus(jid).catch(() => [])
-        const status = fetched?.[0]?.status?.status || null
-        const setAt = fetched?.[0]?.status?.setAt || null
-
-        return {
-            jid,
-            IsBanned: false,
-            Statusbio: status,
-            setAt
-        }
-    } catch (e) {
-        return {
-            jid: numberOrJid,
-            IsBanned: true,
-            Statusbio: null,
-            setAt: null,
-            error: e.message
-        }
-    }
-}
     const fetchDisappearingDuration = async (...jids) => {
         const usyncQuery = new WAUSync_1.USyncQuery()
             .withDisappearingModeProtocol();
@@ -215,16 +188,15 @@ const checkStatusWA = async (numberOrJid) => {
             return result.list;
         }
     };
-    /** 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');
         }
         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
+            targetJid = (0, WABinary_1.jidNormalizedUser)(jid);
         }
-        const { img } = await (0, Utils_1.generateProfilePicture)(content);
+        const { img } = await (0, Utils_1.generateProfilePicture)(content, dimensions);
         await query({
             tag: 'iq',
             attrs: {
@@ -242,14 +214,13 @@ const checkStatusWA = async (numberOrJid) => {
             ]
         });
     };
-    /** 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); // in case it is someone other than us
+            targetJid = (0, WABinary_1.jidNormalizedUser)(jid);
         }
         await query({
             tag: 'iq',
@@ -261,7 +232,6 @@ const checkStatusWA = async (numberOrJid) => {
             }
         });
     };
-    /** update the profile status for yourself */
     const updateProfileStatus = async (status) => {
         await query({
             tag: 'iq',
@@ -388,18 +358,12 @@ const checkStatusWA = async (numberOrJid) => {
         };
     };
     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 = [];
@@ -421,7 +385,6 @@ const checkStatusWA = async (numberOrJid) => {
                         attrs: {
                             name,
                             version: state.version.toString(),
-                            // return snapshot if being synced from scratch
                             'return_snapshot': (!state.version).toString()
                         }
                     });
@@ -441,7 +404,6 @@ const checkStatusWA = async (numberOrJid) => {
                         }
                     ]
                 });
-                // 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;
@@ -454,7 +416,6 @@ const checkStatusWA = async (numberOrJid) => {
                             logger.info(`restored state of ${name} from snapshot to v${newState.version} with mutations`);
                             await authState.keys.set({ 'app-state-sync-version': { [name]: newState } });
                         }
-                        // only process if there are syncd patches
                         if (patches.length) {
                             const { state: newState, mutationMap } = await (0, Utils_1.decodePatches)(name, patches, states[name], getAppStateSyncKey, config.options, initialVersionMap[name], logger, appStateMacVerification.patch);
                             await authState.keys.set({ 'app-state-sync-version': { [name]: newState } });
@@ -465,22 +426,18 @@ const checkStatusWA = async (numberOrJid) => {
                         if (hasMorePatches) {
                             logger.info(`${name} has more patches...`);
                         }
-                        else { // collection is done with sync
+                        else {
                             collectionsToHandle.delete(name);
                         }
                     }
                     catch (error) {
-                        // 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 } });
-                        // increment number of retries
                         attemptsMap[name] = (attemptsMap[name] || 0) + 1;
                         if (isIrrecoverableError) {
-                            // stop retrying
                             collectionsToHandle.delete(name);
                         }
                     }
@@ -492,28 +449,56 @@ const checkStatusWA = async (numberOrJid) => {
             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: 'iq',
+            tag: 'call',
             attrs: {
-                target: jid,
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'get',
-                xmlns: 'w:profile:picture'
+                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 = (0, WABinary_1.getBinaryNodeChild)(result, 'link_create');
+        return child?.attrs?.token;
     };
     const sendPresenceUpdate = async (type, toJid) => {
         const me = authState.creds.me;
@@ -549,10 +534,6 @@ const checkStatusWA = async (numberOrJid) => {
             });
         }
     };
-    /**
-     * @param toJid the jid to subscribe to
-     * @param tcToken token for subscription, use if present
-     */
     const presenceSubscribe = (toJid, tcToken) => (sendNode({
         tag: 'presence',
         attrs: {
@@ -661,7 +642,6 @@ const checkStatusWA = async (numberOrJid) => {
             }
         }
     };
-    /** sending non-abt props may fix QR scan fail if server expects */
     const fetchProps = async () => {
         var _a, _b, _c;
         const resultNode = await query({
@@ -681,7 +661,7 @@ const checkStatusWA = async (numberOrJid) => {
         const propsNode = (0, WABinary_1.getBinaryNodeChild)(resultNode, 'props');
         let props = {};
         if (propsNode) {
-            if ((_b = propsNode.attrs) === null || _b === void 0 ? void 0 : _b.hash) { // on some clients, the hash is returning as undefined
+            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);
             }
@@ -690,18 +670,10 @@ const checkStatusWA = async (numberOrJid) => {
         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: {
@@ -710,9 +682,15 @@ const checkStatusWA = async (numberOrJid) => {
             }
         }, jid);
     };
-    /**
-     * Adds label for the chats
-     */
+    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);
+    };
     const addChatLabel = (jid, labelId) => {
         return chatModify({
             addChatLabel: {
@@ -720,9 +698,6 @@ const checkStatusWA = async (numberOrJid) => {
             }
         }, jid);
     };
-    /**
-     * Removes label for the chat
-     */
     const removeChatLabel = (jid, labelId) => {
         return chatModify({
             removeChatLabel: {
@@ -730,9 +705,6 @@ const checkStatusWA = async (numberOrJid) => {
             }
         }, jid);
     };
-    /**
-     * Adds label for the message
-     */
     const addMessageLabel = (jid, messageId, labelId) => {
         return chatModify({
             addMessageLabel: {
@@ -741,9 +713,6 @@ const checkStatusWA = async (numberOrJid) => {
             }
         }, jid);
     };
-    /**
-     * Removes label for the message
-     */
     const removeMessageLabel = (jid, messageId, labelId) => {
         return chatModify({
             removeMessageLabel: {
@@ -752,10 +721,6 @@ const checkStatusWA = async (numberOrJid) => {
             }
         }, jid);
     };
-    /**
-     * queries need to be fired on connection open
-     * help ensure parity with WA Web
-     * */
     const executeInitQueries = async () => {
         await Promise.all([
             fetchProps(),
@@ -772,7 +737,6 @@ const checkStatusWA = async (numberOrJid) => {
             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 } });
             }
@@ -782,6 +746,31 @@ const checkStatusWA = async (numberOrJid) => {
             ? (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 });
+            }
+        };
         if (historyMsg && !authState.creds.myAppStateKeyId) {
             logger.warn('skipping app state sync, as myAppStateKeyId is not set');
             pendingAppStateSync = true;
@@ -795,6 +784,7 @@ const checkStatusWA = async (numberOrJid) => {
                 }
             })(),
             (0, process_message_1.default)(msg, {
+                signalRepository,
                 shouldProcessHistoryMsg,
                 placeholderResendCache,
                 ev,
@@ -810,18 +800,6 @@ const checkStatusWA = async (numberOrJid) => {
             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);
@@ -840,7 +818,6 @@ const checkStatusWA = async (numberOrJid) => {
                 }
                 break;
             case 'groups':
-                // handled in groups.ts
                 break;
             default:
                 logger.info({ node }, 'received unknown sync');
@@ -857,16 +834,43 @@ const checkStatusWA = async (numberOrJid) => {
             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 (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();
+            }
+        }, 20000);
     });
     return {
         ...sock,
+        createCallLink,
         getBotListV2,
         processingMutex,
         fetchPrivacySettings,
@@ -884,6 +888,7 @@ const checkStatusWA = async (numberOrJid) => {
         updateProfileStatus,
         updateProfileName,
         updateBlockStatus,
+        updateDisableLinkPreviewsPrivacy,
         updateCallPrivacy,
         updateMessagesPrivacy,
         updateLastSeenPrivacy,
@@ -897,12 +902,14 @@ const checkStatusWA = async (numberOrJid) => {
         resyncAppState,
         chatModify,
         cleanDirtyBits,
+        addOrEditContact,
+        removeContact,
+        addLabel,
         addChatLabel,
         removeChatLabel,
         addMessageLabel,
         removeMessageLabel,
-        star,
-        checkStatusWA
+        star
     };
 };
-exports.makeChatsSocket = makeChatsSocket;
+exports.makeChatsSocket = makeChatsSocket;