@zetagoaurum-socket/decagramton 3.2.4 → 3.2.7

package/lib/Socket/business.d.ts

@@ -106,9 +106,10 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
     presenceSubscribe: (toJid: string, tcToken?: Buffer | undefined) => Promise<void>;
     profilePictureUrl: (jid: string, type?: "image" | "preview", timeoutMs?: number | undefined) => Promise<string | undefined>;
     onWhatsApp: (...jids: string[]) => Promise<{
-        exists: boolean;
         jid: string;
-    }[]>;
+        exists: unknown;
+        lid: unknown;
+    }[] | undefined>;
     fetchBlocklist: () => Promise<string[]>;
     fetchStatus: (jid: string) => Promise<{
         status: string | undefined;

package/lib/Socket/chats.d.ts

@@ -1,20 +1,115 @@
 /// <reference types="node" />
-import { Boom } from '@hapi/boom';
-import { proto } from '../../WAProto';
-import { ChatModification, MessageUpsertType, SocketConfig, WABusinessProfile, WAMediaUpload, WAPatchCreate, WAPresence, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from '../Types';
-import { BinaryNode } from '../WABinary';
-export declare const makeChatsSocket: (config: SocketConfig) => {
-    processingMutex: {
-        mutex<T>(code: () => T | Promise<T>): Promise<T>;
+import { AxiosRequestConfig } from 'axios';
+import { KeyPair, SignedKeyPair, SocketConfig } from '../Types';
+export declare const makeRegistrationSocket: (config: SocketConfig) => {
+    register: (code: string) => Promise<ExistsResponse>;
+    requestRegistrationCode: (registrationOptions?: RegistrationOptions) => Promise<ExistsResponse>;
+    logger: import("pino").Logger<import("pino").LoggerOptions>;
+    getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("../Types").OrderDetails>;
+    getCatalog: ({ jid, limit, cursor }: import("../Types").GetCatalogOptions) => Promise<{
+        products: import("../Types").Product[];
+        nextPageCursor: string | undefined;
+    }>;
+    getCollections: (jid?: string | undefined, limit?: number) => Promise<{
+        collections: import("../Types").CatalogCollection[];
+    }>;
+    productCreate: (create: import("../Types").ProductCreate) => Promise<import("../Types").Product>;
+    productDelete: (productIds: string[]) => Promise<{
+        deleted: number;
+    }>;
+    productUpdate: (productId: string, update: import("../Types").ProductUpdate) => Promise<import("../Types").Product>;
+    sendMessageAck: ({ tag, attrs, content }: import("../WABinary").BinaryNode) => Promise<void>;
+    sendRetryRequest: (node: import("../WABinary").BinaryNode, forceIncludeKeys?: boolean) => Promise<void>;
+    offerCall: (toJid: string, isVideo?: boolean) => Promise<{
+        id: string;
+        to: string;
+    }>;
+    rejectCall: (callId: string, callFrom: string) => Promise<void>;
+    getPrivacyTokens: (jids: string[]) => Promise<import("../WABinary").BinaryNode>;
+    assertSessions: (jids: string[], force: boolean) => Promise<boolean>;
+    relayMessage: (jid: string, message: import("../Types").WAProto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, statusJidList }: import("../Types").MessageRelayOptions) => Promise<string>;
+    sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: import("../Types").MessageReceiptType) => Promise<void>;
+    sendReceipts: (keys: import("../Types").WAProto.IMessageKey[], type: import("../Types").MessageReceiptType) => Promise<void>;
+    getButtonArgs: (message: import("../Types").WAProto.IMessage) => {
+        [key: string]: string;
     };
+    readMessages: (keys: import("../Types").WAProto.IMessageKey[]) => Promise<void>;
+    refreshMediaConn: (forceGet?: boolean) => Promise<import("../Types").MediaConnInfo>;
+    getUSyncDevices: (jids: string[], useCache: boolean, ignoreZeroDevices: boolean) => Promise<import("../WABinary").JidWithDevice[]>;
+    createParticipantNodes: (jids: string[], message: import("../Types").WAProto.IMessage, extraAttrs?: {
+        [key: string]: string;
+    } | undefined) => Promise<{
+        nodes: import("../WABinary").BinaryNode[];
+        shouldIncludeDeviceIdentity: boolean;
+    }>;
+    waUploadToServer: import("../Types").WAMediaUploadFunction;
     fetchPrivacySettings: (force?: boolean) => Promise<{
         [_: string]: string;
     }>;
-    upsertMessage: (msg: proto.IWebMessageInfo, type: MessageUpsertType) => Promise<void>;
-    appPatch: (patchCreate: WAPatchCreate) => Promise<void>;
-    sendPresenceUpdate: (type: WAPresence, toJid?: string) => Promise<void>;
-    presenceSubscribe: (toJid: string, tcToken?: Buffer) => Promise<void>;
-    profilePictureUrl: (jid: string, type?: 'preview' | 'image', timeoutMs?: number) => Promise<string | undefined>;
+    updateMediaMessage: (message: import("../Types").WAProto.IWebMessageInfo) => Promise<import("../Types").WAProto.IWebMessageInfo>;
+    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<import("../Types").WAProto.WebMessageInfo | undefined>;
+    subscribeNewsletterUpdates: (jid: string) => Promise<{
+        duration: string;
+    }>;
+    newsletterReactionMode: (jid: string, mode: import("../Types").NewsletterReactionMode) => Promise<void>;
+    newsletterUpdateDescription: (jid: string, description?: string | undefined) => Promise<void>;
+    newsletterUpdateName: (jid: string, name: string) => Promise<void>;
+    newsletterUpdatePicture: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
+    newsletterRemovePicture: (jid: string) => Promise<void>;
+    newsletterUnfollow: (jid: string) => Promise<void>;
+    newsletterFollow: (jid: string) => Promise<void>;
+    newsletterUnmute: (jid: string) => Promise<void>;
+    newsletterMute: (jid: string) => Promise<void>;
+    newsletterAction: (jid: string, type: "mute" | "follow" | "unfollow" | "unmute") => Promise<void>;
+    newsletterCreate: (name: string, description: string, reaction_codes: string) => Promise<import("../Types").NewsletterMetadata>;
+    newsletterMetadata: (type: "invite" | "jid", key: string, role?: import("../Types").NewsletterViewRole | undefined) => Promise<import("../Types").NewsletterMetadata>;
+    newsletterAdminCount: (jid: string) => Promise<number>;
+    newsletterChangeOwner: (jid: string, user: string) => Promise<void>;
+    newsletterDemote: (jid: string, user: string) => Promise<void>;
+    newsletterDelete: (jid: string) => Promise<void>;
+    newsletterReactMessage: (jid: string, serverId: string, code?: string | undefined) => Promise<void>;
+    newsletterFetchMessages: (type: "invite" | "jid", key: string, count: number, after?: number | undefined) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
+    newsletterFetchUpdates: (jid: string, count: number, after?: number | undefined, since?: number | undefined) => Promise<import("../Types").NewsletterFetchedUpdate[]>;
+    groupMetadata: (jid: string) => Promise<import("../Types").GroupMetadata>;
+    groupCreate: (subject: string, participants: string[]) => Promise<import("../Types").GroupMetadata>;
+    groupLeave: (id: string) => Promise<void>;
+    /** the network code of your mobile network
+     * @see {@link https://de.wikipedia.org/wiki/Mobile_Network_Code}
+     */
+    groupUpdateSubject: (jid: string, subject: string) => Promise<void>;
+    groupRequestParticipantsList: (jid: string) => Promise<{
+        [key: string]: string;
+    }[]>;
+    groupRequestParticipantsUpdate: (jid: string, participants: string[], action: "reject" | "approve") => Promise<{
+        status: string;
+        jid: string;
+    }[]>;
+    groupParticipantsUpdate: (jid: string, participants: string[], action: import("../Types").ParticipantAction) => Promise<{
+        status: string;
+        jid: string;
+        content: import("../WABinary").BinaryNode;
+    }[]>;
+    groupUpdateDescription: (jid: string, description?: string | undefined) => Promise<void>;
+    groupInviteCode: (jid: string) => Promise<string | undefined>;
+    groupRevokeInvite: (jid: string) => Promise<string | undefined>;
+    groupAcceptInvite: (code: string) => Promise<string | undefined>;
+    groupAcceptInviteV4: (key: string | import("../Types").WAProto.IMessageKey, inviteMessage: import("../Types").WAProto.Message.IGroupInviteMessage) => Promise<string>;
+    groupGetInviteInfo: (code: string) => Promise<import("../Types").GroupMetadata>;
+    groupToggleEphemeral: (jid: string, ephemeralExpiration: number) => Promise<void>;
+    groupSettingUpdate: (jid: string, setting: "announcement" | "locked" | "not_announcement" | "unlocked") => Promise<void>;
+    groupMemberAddMode: (jid: string, mode: "all_member_add" | "admin_add") => Promise<void>;
+    groupJoinApprovalMode: (jid: string, mode: "on" | "off") => Promise<void>;
+    groupFetchAllParticipating: () => Promise<{
+        [_: string]: import("../Types").GroupMetadata;
+    }>;
+    processingMutex: {
+        mutex<T>(code: () => T | Promise<T>): Promise<T>;
+    };
+    upsertMessage: (msg: import("../Types").WAProto.IWebMessageInfo, type: import("../Types").MessageUpsertType) => Promise<void>;
+    appPatch: (patchCreate: import("../Types").WAPatchCreate) => Promise<void>;
+    sendPresenceUpdate: (type: import("../Types").WAPresence, toJid?: string | undefined) => Promise<void>;
+    presenceSubscribe: (toJid: string, tcToken?: Buffer | undefined) => Promise<void>;
+    profilePictureUrl: (jid: string, type?: "image" | "preview", timeoutMs?: number | undefined) => Promise<string | undefined>;
     onWhatsApp: (...jids: string[]) => Promise<{
         exists: boolean;
         jid: string;
@@ -24,29 +119,29 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
         status: string | undefined;
         setAt: Date;
     } | undefined>;
-    updateProfilePicture: (jid: string, content: WAMediaUpload) => Promise<void>;
+    updateProfilePicture: (jid: string, content: import("../Types").WAMediaUpload) => Promise<void>;
     removeProfilePicture: (jid: string) => Promise<void>;
     updateProfileStatus: (status: string) => Promise<void>;
     updateProfileName: (name: string) => Promise<void>;
-    updateBlockStatus: (jid: string, action: 'block' | 'unblock') => Promise<void>;
-    updateLastSeenPrivacy: (value: WAPrivacyValue) => Promise<void>;
-    updateOnlinePrivacy: (value: WAPrivacyOnlineValue) => Promise<void>;
-    updateProfilePicturePrivacy: (value: WAPrivacyValue) => Promise<void>;
-    updateStatusPrivacy: (value: WAPrivacyValue) => Promise<void>;
-    updateReadReceiptsPrivacy: (value: WAReadReceiptsValue) => Promise<void>;
-    updateGroupsAddPrivacy: (value: WAPrivacyValue) => Promise<void>;
+    updateBlockStatus: (jid: string, action: "block" | "unblock") => Promise<void>;
+    updateLastSeenPrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
+    updateOnlinePrivacy: (value: import("../Types").WAPrivacyOnlineValue) => Promise<void>;
+    updateProfilePicturePrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
+    updateStatusPrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
+    updateReadReceiptsPrivacy: (value: import("../Types").WAReadReceiptsValue) => Promise<void>;
+    updateGroupsAddPrivacy: (value: import("../Types").WAPrivacyValue) => Promise<void>;
     updateDefaultDisappearingMode: (duration: number) => Promise<void>;
-    getBusinessProfile: (jid: string) => Promise<WABusinessProfile | void>;
+    getBusinessProfile: (jid: string) => Promise<void | import("../Types").WABusinessProfile>;
     resyncAppState: (collections: readonly ("critical_block" | "critical_unblock_low" | "regular_high" | "regular_low" | "regular")[], isInitialSync: boolean) => Promise<void>;
-    chatModify: (mod: ChatModification, jid: string) => Promise<void>;
-    cleanDirtyBits: (type: 'account_sync' | 'groups', fromTimestamp?: number | string) => Promise<void>;
+    chatModify: (mod: import("../Types").ChatModification, jid: string) => Promise<void>;
+    cleanDirtyBits: (type: "account_sync" | "groups", fromTimestamp?: string | number | undefined) => Promise<void>;
     addChatLabel: (jid: string, labelId: string) => Promise<void>;
     removeChatLabel: (jid: string, labelId: string) => Promise<void>;
     addMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;
     removeMessageLabel: (jid: string, messageId: string, labelId: string) => Promise<void>;
     star: (jid: string, messages: {
         id: string;
-        fromMe?: boolean;
+        fromMe?: boolean | undefined;
     }[], star: boolean) => Promise<void>;
     type: "md";
     ws: any;
@@ -64,17 +159,109 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
     signalRepository: import("../Types").SignalRepository;
     user: import("../Types").Contact | undefined;
     generateMessageTag: () => string;
-    query: (node: BinaryNode, timeoutMs?: number | undefined) => Promise<BinaryNode>;
+    query: (node: import("../WABinary").BinaryNode, timeoutMs?: number | undefined) => Promise<import("../WABinary").BinaryNode>;
     waitForMessage: <T_2>(msgId: string, timeoutMs?: number | undefined) => Promise<T_2>;
     waitForSocketOpen: () => Promise<void>;
     sendRawMessage: (data: Uint8Array | Buffer) => Promise<void>;
-    sendNode: (frame: BinaryNode) => Promise<void>;
+    sendNode: (frame: import("../WABinary").BinaryNode) => Promise<void>;
     logout: (msg?: string | undefined) => Promise<void>;
     end: (error: Error | undefined) => void;
-    onUnexpectedError: (err: Error | Boom<any>, msg: string) => void;
+    onUnexpectedError: (err: Error | import("@hapi/boom").Boom<any>, msg: string) => void;
     uploadPreKeys: (count?: number) => Promise<void>;
     uploadPreKeysToServerIfRequired: () => Promise<void>;
     requestPairingCode: (phoneNumber: string) => Promise<string>;
     waitForConnectionUpdate: (check: (u: Partial<import("../Types").ConnectionState>) => boolean | undefined, timeoutMs?: number | undefined) => Promise<void>;
-    sendWAMBuffer: (wamBuffer: Buffer) => Promise<BinaryNode>;
+    sendWAMBuffer: (wamBuffer: Buffer) => Promise<import("../WABinary").BinaryNode>;
+};
+export interface RegistrationData {
+    registrationId: number;
+    signedPreKey: SignedKeyPair;
+    noiseKey: KeyPair;
+    signedIdentityKey: KeyPair;
+    identityId: Buffer;
+    phoneId: string;
+    deviceId: string;
+    backupToken: Buffer;
+}
+export interface RegistrationOptions {
+    /** your phone number */
+    phoneNumber?: string;
+    /** the country code of your phone number */
+    phoneNumberCountryCode: string;
+    /** your phone number without country code */
+    phoneNumberNationalNumber: string;
+    /** the country code of your mobile network
+     * @see {@link https://de.wikipedia.org/wiki/Mobile_Country_Code}
+     */
+    phoneNumberMobileCountryCode: string;
+    /** the network code of your mobile network
+     * @see {@link https://de.wikipedia.org/wiki/Mobile_Network_Code}
+     */
+    phoneNumberMobileNetworkCode: string;
+    /**
+     * How to send the one time code
+     */
+    method?: 'sms' | 'voice' | 'captcha';
+    /**
+     * The captcha code if it was requested
+     */
+    captcha?: string;
+}
+export type RegistrationParams = RegistrationData & RegistrationOptions;
+export declare function registrationParams(params: RegistrationParams): {
+    cc: string;
+    in: string;
+    Rc: string;
+    lg: string;
+    lc: string;
+    mistyped: string;
+    authkey: string;
+    e_regid: string;
+    e_keytype: string;
+    e_ident: string;
+    e_skey_id: string;
+    e_skey_val: string;
+    e_skey_sig: string;
+    fdid: string;
+    network_ratio_type: string;
+    expid: string;
+    simnum: string;
+    hasinrc: string;
+    pid: string;
+    id: string;
+    backup_token: string;
+    token: string;
+    fraud_checkpoint_code: string | undefined;
 };
+/**
+ * Requests a registration code for the given phone number.
+ */
+export declare function mobileRegisterCode(params: RegistrationParams, fetchOptions?: AxiosRequestConfig): Promise<ExistsResponse>;
+export declare function mobileRegisterExists(params: RegistrationParams, fetchOptions?: AxiosRequestConfig): Promise<ExistsResponse>;
+/**
+ * Registers the phone number on whatsapp with the received OTP code.
+ */
+export declare function mobileRegister(params: RegistrationParams & {
+    code: string;
+}, fetchOptions?: AxiosRequestConfig): Promise<ExistsResponse>;
+/**
+ * Encrypts the given string as AEAD aes-256-gcm with the public whatsapp key and a random keypair.
+ */
+export declare function mobileRegisterEncrypt(data: string): string;
+export declare function mobileRegisterFetch(path: string, opts?: AxiosRequestConfig): Promise<ExistsResponse>;
+export interface ExistsResponse {
+    status: 'fail' | 'sent';
+    voice_length?: number;
+    voice_wait?: number;
+    sms_length?: number;
+    sms_wait?: number;
+    reason?: 'incorrect' | 'missing_param' | 'code_checkpoint';
+    login?: string;
+    flash_type?: number;
+    ab_hash?: string;
+    ab_key?: string;
+    exp_cfg?: string;
+    lid?: string;
+    image_blob?: string;
+    audio_blob?: string;
+}

package/lib/Socket/chats.js

@@ -1,7 +1,7 @@
 "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");
@@ -13,10 +13,12 @@ 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 MAX_SYNC_ATTEMPTS = 2;
 const makeChatsSocket = (config) => {
     const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config;
-    const sock = (0, socket_1.makeSocket)(config);
+    const sock = (0, usync_1.makeUSyncSocket)(config);
     const { ev, ws, authState, generateMessageTag, sendNode, query, onUnexpectedError, } = sock;
     let privacySettings;
     let needToFlushWithAppStateSync = false;
@@ -84,6 +86,74 @@ const makeChatsSocket = (config) => {
     const updateGroupsAddPrivacy = async (value) => {
         await privacyQuery('groupadd', value);
     };
+    /** 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({
             tag: 'iq',
@@ -139,39 +209,109 @@ const makeChatsSocket = (config) => {
         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 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)
+            };
         }
     };
     /** update the profile picture for yourself or a group */
@@ -273,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({
@@ -491,7 +586,7 @@ const makeChatsSocket = (config) => {
             await sendNode({
                 tag: 'presence',
                 attrs: {
-                    name: me.name.replace(/@/g, ''),
+                    name: me.name,
                     type
                 }
             });
@@ -867,6 +962,7 @@ const makeChatsSocket = (config) => {
         addChatLabel,
         removeChatLabel,
         addMessageLabel,
+        checkStatusWA,
         removeMessageLabel,
         star
     };