@badzz88/baileys 8.4.1 → 8.4.3

package/lib/Defaults/baileys-version.json

@@ -1,3 +1,3 @@
 {
-    "version": [2, 3000, 1035194821]
+    "version": [2, 3000, 1042764204]
 }

package/lib/Socket/luxu.js

@@ -179,7 +179,7 @@ export default class imup {
                 newsletterName: `WhatsApp`,
                 contentType: 1,
                 timestamp: new Date().toISOString(),
-                senderName: "badzz-xyz",
+                senderName: "7-Yuukey",
                 contentType: "UPDATE_CARD",
                 priority: "high",
                 status: "sent",

package/lib/Socket/messages-send.js

@@ -2,20 +2,20 @@ import NodeCache from '@cacheable/node-cache';
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
 import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
-import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds, setBotMessageSecret } from '../Utils/index.js';
+import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, decryptMediaRetryData, DEF_MEDIA_HOST, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateIOSMessageID, generateParticipantHashV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, unixTimestampSeconds, setBotMessageSecret } from '../Utils/index.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
 import { makeKeyedMutex, makeMutex } from '../Utils/make-mutex.js';
 import { getMessageReportingToken, shouldIncludeReportingToken } from '../Utils/reporting-utils.js';
 import { buildMergedTcTokenIndexWrite, isTcTokenExpired, resolveIssuanceJid, resolveTcTokenJid, shouldSendNewTcToken, storeTcTokensFromIqResult } from '../Utils/tc-token-utils.js';
-import { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidBot, isJidGroup, isJidMetaAI, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, PSA_WID, S_WHATSAPP_NET, getAdditionalNode, getBinaryNodeFilter, getBinaryFilteredBizBot, isInteropUser } from '../WABinary/index.js';
+import { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isJidNewsletter, isHostedLidUser, isHostedPnUser, isJidBot, isJidGroup, isJidMetaAI, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, PSA_WID, S_WHATSAPP_NET, getAdditionalNode, getBinaryNodeFilter, getBinaryFilteredBizBot, isInteropUser } from '../WABinary/index.js';
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
-import { makeNewsletterSocket } from './newsletter.js';
+import { makeUsernameSocket } from './username.js';
 import imup from './luxu.js';
 import * as Utils_1 from '../Utils/index.js';
 import { randomBytes } from 'crypto';
 export const makeMessagesSocket = (config) => {
     const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: httpRequestOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache, maxMsgRetryCount, aiLabel } = config;
-    const sock = makeNewsletterSocket(config);
+    const sock = makeUsernameSocket(config);
     const { ev, authState, messageMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, sendNode, groupMetadata, groupToggleEphemeral, registerSocketEndHandler } = sock;
     const getLIDForPN = signalRepository.lidMapping.getLIDForPN.bind(signalRepository.lidMapping);
     /**
@@ -428,15 +428,36 @@ export const makeMessagesSocket = (config) => {
         }
         return { nodes, shouldIncludeDeviceIdentity };
     };
+    
+    const profilePictureUrl = async (jid) => {
+        if (isJidNewsletter(jid)) {
+            const metadata = await sock.newsletterMetadata("JID", jid);
+            return getUrlFromDirectPath(metadata.thread_metadata.picture?.direct_path || "");
+        } else {
+            const result = await query({
+                tag: "iq",
+                attrs: {
+                    target: jidNormalizedUser(jid),
+                    to: S_WHATSAPP_NET,
+                    type: "get",
+                    xmlns: "w:profile:picture",
+                },
+                content: [{ tag: "picture", attrs: { type: "image", query: "url" } }],
+            });
+            const child = getBinaryNodeChild(result, "picture");
+            return child?.attrs?.url || null;
+        }
+    };
+
     const relayMessage = async (
 	    jid,
 	    message,
 	    {
 		    messageId: msgId,
-		    participant = false,
+        	participant = false,
 		    additionalAttributes,
 		    additionalNodes,
-		    useUserDevicesCache,
+	    	useUserDevicesCache,
 		    useCachedGroupMetadata,
 		    statusJidList
 	    }
@@ -454,7 +475,8 @@ export const makeMessagesSocket = (config) => {
 	    const isInterop = isInteropUser(jid)
     	const isGroupOrStatus = isGroup || isStatus
     	const finalJid = jid
-	    msgId = msgId || generateMessageIDV2(meId)
+    	const iosBros = config.browser[0] === "iOS" || config.browser[1] === "Safari";
+	    msgId = iosBros ? generateIOSMessageID() : msgId ?? generateMessageIDV2(meId)
     	useUserDevicesCache = useUserDevicesCache!== false
     	useCachedGroupMetadata = useCachedGroupMetadata!== false &&!isStatus
 	    const participants = []
@@ -1149,12 +1171,14 @@ export const makeMessagesSocket = (config) => {
             messageRetryManager.clear();
         }
     });
+    
     return {
         ...sock,
         userDevicesCache,
         devicesMutex,
         issuePrivacyTokens,
         assertSessions,
+        profilePictureUrl,
         relayMessage,
         sendReceipt,
         sendReceipts,
@@ -1321,7 +1345,7 @@ export const makeMessagesSocket = (config) => {
                         uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
                     }),
                     //TODO: CACHE
-                    getProfilePicUrl: sock.profilePictureUrl,
+                    getProfilePicUrl: profilePictureUrl, 
                     getCallLink: sock.createCallLink,
                     upload: waUploadToServer,
                     mediaCache: config.mediaCache,

package/lib/Socket/mex.js

@@ -1,42 +1,41 @@
-import { Boom } from '@hapi/boom';
-import { getBinaryNodeChild, S_WHATSAPP_NET } from '../WABinary/index.js';
-const wMexQuery = (variables, queryId, query, generateMessageTag) => {
-    return query({
-        tag: 'iq',
-        attrs: {
-            id: generateMessageTag(),
-            type: 'get',
-            to: S_WHATSAPP_NET,
-            xmlns: 'w:mex'
-        },
-        content: [
-            {
-                tag: 'query',
-                attrs: { query_id: queryId },
-                content: Buffer.from(JSON.stringify({ variables }), 'utf-8')
-            }
-        ]
-    });
-};
+import * as boom_1 from '@hapi/boom'
+import * as WABinary_1 from '../WABinary/index.js'
+export const wMexQuery = (variables, queryId, query, generateMessageTag) => {
+	return query({
+		tag: 'iq',
+		attrs: {
+			id: generateMessageTag(),
+			type: 'get',
+			to: WABinary_1.S_WHATSAPP_NET,
+			xmlns: 'w:mex'
+		},
+		content: [
+			{
+				tag: 'query',
+				attrs: { query_id: queryId },
+				content: Buffer.from(JSON.stringify({ variables }), 'utf-8')
+			}
+		]
+	})
+}
 export const executeWMexQuery = async (variables, queryId, dataPath, query, generateMessageTag) => {
-    const result = await wMexQuery(variables, queryId, query, generateMessageTag);
-    const child = getBinaryNodeChild(result, 'result');
-    if (child?.content) {
-        const data = JSON.parse(child.content.toString());
-        if (data.errors && data.errors.length > 0) {
-            const errorMessages = data.errors.map((err) => err.message || 'Unknown error').join(', ');
-            const firstError = data.errors[0];
-            const errorCode = firstError.extensions?.error_code || 400;
-            throw new Boom(`GraphQL server error: ${errorMessages}`, { statusCode: errorCode, data: firstError });
-        }
-        const response = dataPath ? data?.data?.[dataPath] : data?.data;
-        if (typeof response !== 'undefined') {
-            return response;
-        }
-    }
-    const action = (dataPath || '').startsWith('xwa2_')
-        ? dataPath.substring(5).replace(/_/g, ' ')
-        : dataPath?.replace(/_/g, ' ');
-    throw new Boom(`Failed to ${action}, unexpected response structure.`, { statusCode: 400, data: result });
-};
-//# sourceMappingURL=mex.js.map
+	const result = await wMexQuery(variables, queryId, query, generateMessageTag)
+	const child = (0, WABinary_1.getBinaryNodeChild)(result, 'result')
+	if (child?.content) {
+		const data = JSON.parse(child.content.toString())
+		if (data.errors && data.errors.length > 0) {
+			const errorMessages = data.errors.map(err => err.message || 'Unknown error').join(', ')
+			const firstError = data.errors[0]
+			const errorCode = firstError.extensions?.error_code || 400
+			throw new boom_1.Boom(`GraphQL server error: ${errorMessages}`, { statusCode: errorCode, data: firstError })
+		}
+		const response = dataPath ? data?.data?.[dataPath] : data?.data
+		if (typeof response !== 'undefined') {
+			return response
+		}
+	}
+	const action = (dataPath || '').startsWith('xwa2_')
+		? dataPath.substring(5).replace(/_/g, ' ')
+		: dataPath?.replace(/_/g, ' ')
+	throw new boom_1.Boom(`Failed to ${action}, unexpected response structure.`, { statusCode: 400, data: result })
+}

package/lib/Socket/socket.js

@@ -12,18 +12,12 @@ import { BinaryInfo } from '../WAM/BinaryInfo.js';
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
 import { WebSocketClient } from './Client/index.js';
 import { executeWMexQuery } from './mex.js';
-/**
- * Connects to WA servers and performs:
- * - simple queries (no retry mechanism, wait for connection establishment)
- * - listen to messages and emit events
- * - query phone connection
- */
 export const makeSocket = (config) => {
     const { waWebSocketUrl, connectTimeoutMs, logger, keepAliveIntervalMs, browser, auth: authState, printQRInTerminal, defaultQueryTimeoutMs, transactionOpts, qrTimeout, makeSignalRepository } = config;
     const publicWAMBuffer = new BinaryInfo();
     let serverTimeOffsetMs = 0;
     const uqTagId = generateMdTagPrefix();
-    const generateMessageTag = () => `XZCYYX-${epoch++}`;
+    const generateMessageTag = () => `B4DZZN3-${epoch++}`;
     if (printQRInTerminal) {
         logger.warn({}, '⚠️ The printQRInTerminal option has been deprecated. You will no longer receive QR codes in the terminal automatically. Please listen to the connection.update event yourself and handle the QR your way. You can remove this message by removing this opttion. This message will be removed in a future version.');
     }
@@ -39,9 +33,8 @@ export const makeSocket = (config) => {
     if (url.protocol === 'wss' && authState?.creds?.routingInfo) {
         url.searchParams.append('ED', authState.creds.routingInfo.toString('base64url'));
     }
-    /** ephemeral key pair used to encrypt/decrypt communication. Unique for each connection */
+
     const ephemeralKeyPair = Curve.generateKeyPair();
-    /** WA noise protocol wrapper */
     const noise = makeNoiseHandler({
         keyPair: ephemeralKeyPair,
         NOISE_HEADER: NOISE_WA_HEADER,
@@ -51,7 +44,6 @@ export const makeSocket = (config) => {
     const ws = new WebSocketClient(url, config);
     ws.connect();
     const sendPromise = promisify(ws.send);
-    /** send a raw buffer */
     const sendRawMessage = async (data) => {
         if (!ws.isOpen) {
             throw new Boom('Connection Closed', { statusCode: DisconnectReason.connectionClosed });
@@ -67,7 +59,6 @@ export const makeSocket = (config) => {
             }
         });
     };
-    /** send a binary node */
     const sendNode = (frame) => {
         if (logger.level === 'trace') {
             logger.trace({ xml: binaryNodeToString(frame), msg: 'xml send' });
@@ -75,11 +66,6 @@ export const makeSocket = (config) => {
         const buff = encodeBinaryNode(frame);
         return sendRawMessage(buff);
     };
-    /**
-     * Wait for a message with a certain tag to be received
-     * @param msgId the message tag to await
-     * @param timeoutMs timeout after which the promise will reject
-     */
     const waitForMessage = async (msgId, timeoutMs = defaultQueryTimeoutMs) => {
         let onRecv;
         let onErr;
@@ -102,7 +88,6 @@ export const makeSocket = (config) => {
             return result;
         }
         catch (error) {
-            // Catch timeout and return undefined instead of throwing
             if (error instanceof Boom && error.output?.statusCode === DisconnectReason.timedOut) {
                 logger?.warn?.({ msgId }, 'timed out waiting for message');
                 return undefined;
@@ -118,7 +103,7 @@ export const makeSocket = (config) => {
             }
         }
     };
-    /** send a query, and wait for its response. auto-generates message ID if not provided */
+    
     const query = async (node, timeoutMs) => {
         if (!node.attrs.id) {
             node.attrs.id = generateMessageTag();
@@ -135,7 +120,6 @@ export const makeSocket = (config) => {
         }
         return result;
     };
-    // Validate current key-bundle on server; on failure, trigger pre-key upload and rethrow
     const digestKeyBundle = async () => {
         const res = await query({
             tag: 'iq',
@@ -148,7 +132,7 @@ export const makeSocket = (config) => {
             throw new Error('encrypt/get digest returned no digest node');
         }
     };
-    // Rotate our signed pre-key on server; on failure, run digest as fallback and rethrow
+
     const rotateSignedPreKey = async () => {
         const newId = (creds.signedPreKey.keyId || 0) + 1;
         const skey = await signedKeyPair(creds.signedIdentityKey, newId);
@@ -163,15 +147,12 @@ export const makeSocket = (config) => {
                 }
             ]
         });
-        // Persist new signed pre-key in creds
         ev.emit('creds.update', { signedPreKey: skey });
     };
     const executeUSyncQuery = async (usyncQuery) => {
         if (usyncQuery.protocols.length === 0) {
             throw new Boom('USyncQuery must have at least one protocol');
         }
-        // todo: validate users, throw WARNING on no valid users
-        // variable below has only validated users
         const validUsers = usyncQuery.users;
         const userNodes = validUsers.map(user => {
             return {
@@ -217,7 +198,9 @@ export const makeSocket = (config) => {
         return usyncQuery.parseUSyncQueryResult(result);
     };
     const onWhatsApp = async (...phoneNumber) => {
-        let usyncQuery = new USyncQuery().withContactProtocol().withLIDProtocol();
+        let usyncQuery = new USyncQuery()
+            .withContactProtocol()
+            .withLIDProtocol();
         let contactEnabled = false;
         for (const jid of phoneNumber) {
             if (isLidUser(jid)) {
@@ -234,7 +217,7 @@ export const makeSocket = (config) => {
             }
         }
         if (usyncQuery.users.length === 0) {
-            return []; // return early without forcing an empty query
+            return [];
         }
         const results = await executeUSyncQuery(usyncQuery);
         if (results) {
@@ -253,7 +236,7 @@ export const makeSocket = (config) => {
             }
         }
         if (usyncQuery.users.length === 0) {
-            return []; // return early without forcing an empty query
+            return [];
         }
         const results = await executeUSyncQuery(usyncQuery);
         if (results) {
@@ -261,6 +244,14 @@ export const makeSocket = (config) => {
         }
         return [];
     };
+    const toPn = async (jid) => {
+        const res = await pnFromLIDUSync([jid]).list[0].id;
+        return res
+    }
+    const toLid = async (jid) => {
+        const [res] = await onWhatsApp(jid).lid;
+        return res
+    }
     const ev = makeEventBuffer(logger);
     const { creds } = authState;
     // add transaction capability
@@ -272,11 +263,9 @@ export const makeSocket = (config) => {
     let qrTimer;
     let closed = false;
     const socketEndHandlers = [];
-    /** log & process any unexpected errors */
     const onUnexpectedError = (err, msg) => {
         logger.error({ err }, `unexpected error in '${msg}'`);
     };
-    /** await the next incoming message */
     const awaitNextMessage = async (sendMsg) => {
         if (!ws.isOpen) {
             throw new Boom('Connection Closed', {
@@ -301,7 +290,6 @@ export const makeSocket = (config) => {
         }
         return result;
     };
-    /** connection handshake */
     const validateConnection = async () => {
         let helloMsg = {
             clientHello: { ephemeral: ephemeralKeyPair.public }
@@ -346,9 +334,7 @@ export const makeSocket = (config) => {
         const countChild = getBinaryNodeChild(result, 'count');
         return +countChild.attrs.value;
     };
-    // WAWeb has no time throttle here; the server drives uploads via PreKeyLow notifications.
     let uploadPreKeysPromise = null;
-    /** generates and uploads a set of pre-keys to the server */
     const uploadPreKeys = async (count = MIN_PREKEY_COUNT) => {
         if (uploadPreKeysPromise) {
             logger.debug('Pre-key upload already in progress, waiting for completion');
@@ -357,22 +343,18 @@ export const makeSocket = (config) => {
         }
         const uploadLogic = async (retryCount) => {
             logger.info({ count, retryCount }, 'uploading pre-keys');
-            // Generate and save pre-keys atomically (prevents ID collisions on retry)
             const node = await keys.transaction(async () => {
                 logger.debug({ requestedCount: count }, 'generating pre-keys with requested count');
                 const { update, node } = await getNextPreKeysNode({ creds, keys }, count);
-                // Update credentials immediately to prevent duplicate IDs on retry
                 ev.emit('creds.update', update);
                 return node;
             }, creds?.me?.id || 'upload-pre-keys');
-            // Upload to server (outside transaction, can fail without affecting local keys)
             try {
                 await query(node);
                 logger.info({ count }, 'uploaded pre-keys successfully');
             }
             catch (uploadError) {
                 logger.error({ uploadError: uploadError.toString(), count }, 'Failed to upload pre-keys to server');
-                // Recurse into uploadLogic; calling uploadPreKeys would await its own in-flight promise.
                 if (retryCount < 3) {
                     const backoffDelay = Math.min(1000 * Math.pow(2, retryCount), 10000);
                     logger.info(`Retrying pre-key upload in ${backoffDelay}ms`);
@@ -382,7 +364,6 @@ export const makeSocket = (config) => {
                 throw uploadError;
             }
         };
-        // Add timeout protection
         uploadPreKeysPromise = Promise.race([
             uploadLogic(0),
             new Promise((_, reject) => setTimeout(() => reject(new Boom('Pre-key upload timeout', { statusCode: 408 })), UPLOAD_TIMEOUT))
@@ -432,12 +413,10 @@ export const makeSocket = (config) => {
         }
         catch (error) {
             logger.error({ error }, 'Failed to check/upload pre-keys during initialization');
-            // Don't throw - allow connection to continue even if pre-key check fails
         }
     };
     const onMessageReceived = async (data) => {
         await noise.decodeFrame(data, frame => {
-            // reset ping timeout
             lastDateRecv = new Date();
             let anyTriggered = false;
             anyTriggered = ws.emit('frame', frame);
@@ -952,7 +931,10 @@ export const makeSocket = (config) => {
         executeUSyncQuery,
         onWhatsApp,
         fetchAccountReachoutTimelock,
-        fetchNewChatMessageCap
+        fetchNewChatMessageCap,
+        toPn,
+        toLid,
+        pnFromLIDUSync
     };
 };
 /**
@@ -964,4 +946,4 @@ function mapWebSocketError(handler) {
         handler(new Boom(`WebSocket Error (${error?.message})`, { statusCode: getCodeFromWSError(error), data: error }));
     };
 }
-//# sourceMappingURL=socket.js.map
+//# sourceMappingURL=socket.js.map

package/lib/Socket/username.js

@@ -0,0 +1,147 @@
+import { executeWMexQuery } from './mex.js'
+import { USyncQuery, USyncUser } from '../WAUSync/index.js'
+import { makeNewsletterSocket } from './newsletter.js'
+
+export const USERNAME_QUERY_IDS = {
+	CHECK: '26124072630599520',
+	CHECK_MULTI: '27134626522840290',
+	SET: '27108705368767936',
+	GET: '32618050064506056',
+	GET_RECOMMENDATIONS: '26077456248616956',
+	PIN_SET: '25529696019976770'
+}
+
+export const USERNAME_CHECK_RESULT = {
+	SUCCESS: 'SUCCESS',
+	INVALID: 'INVALID'
+}
+
+export const USERNAME_SOURCE = {
+	FB: 'FB',
+	IG: 'IG',
+	USER_INPUT: 'USER_INPUT',
+	SUGGESTION: 'SUGGESTION'
+}
+
+export const makeUsernameSocket = config => {
+	const sock = makeNewsletterSocket(config)
+	const { query, generateMessageTag, executeUSyncQuery } = sock
+
+	const mexQuery = (variables, queryId, dataPath) =>
+		executeWMexQuery(variables, queryId, dataPath, query, generateMessageTag)
+
+	const checkUsername = async (username, includeSuggestions = true) => {
+		if (!USERNAME_QUERY_IDS.CHECK) {
+			throw new Error('Username CHECK query_id not configured — capture a live WA session to obtain it')
+	}
+		const data = await mexQuery(
+			{ username, include_suggestions: includeSuggestions },
+			USERNAME_QUERY_IDS.CHECK,
+			'xwa2_username_check'
+	)
+		if (data?.result === USERNAME_CHECK_RESULT.SUCCESS) {
+			return { available: true, username }
+	}
+		return {
+			available: false,
+			username,
+			suggestions: data?.suggestions?? [],
+			rejectionReasons: data?.rejection_reasons?? [],
+			suggestionsEligible: data?.suggestions_eligible?? true
+    	}
+	}
+
+	const setUsername = async (username, options = {}) => {
+		if (!USERNAME_QUERY_IDS.SET) {
+			throw new Error('Username SET query_id not configured — capture a live WA session to obtain it')
+	}
+		const { source = USERNAME_SOURCE.USER_INPUT, sessionId, pin } = options
+		const variables = {
+			username,
+			reserved: false,
+			source,
+			...(sessionId? { session_id: sessionId } : {}),
+			...(pin? { pin } : {})
+	}
+		return mexQuery(variables, USERNAME_QUERY_IDS.SET, 'xwa2_username_set')
+	}
+
+	const deleteUsername = async () => {
+		if (!USERNAME_QUERY_IDS.SET) {
+			throw new Error('Username SET query_id not configured — capture a live WA session to obtain it')
+	}
+		return mexQuery({ username: null }, USERNAME_QUERY_IDS.SET, 'xwa2_username_delete')
+	}
+
+	const getMyUsername = async () => {
+		if (!USERNAME_QUERY_IDS.GET) {
+			throw new Error('Username GET query_id not configured — capture a live WA session to obtain it')
+	}
+		const data = await mexQuery({}, USERNAME_QUERY_IDS.GET, 'xwa2_username_get')
+		return data?.username?? null
+	}
+
+	const setUsernamePin = async pin => {
+		if (!USERNAME_QUERY_IDS.PIN_SET) {
+			throw new Error('Username PIN_SET query_id not configured — capture a live WA session to obtain it')
+	}
+		return mexQuery({ pin }, USERNAME_QUERY_IDS.PIN_SET, 'xwa2_username_pin_set')
+	}
+
+	const findUserByUsername = async (username, pin) => {
+		const usyncQuery = new USyncQuery().withContactProtocol()
+		const user = new USyncUser().withUsername(username)
+		if (pin) user.withUsernameKey(pin)
+	usyncQuery.withUser(user)
+		const result = await executeUSyncQuery(usyncQuery)
+		if (!result?.list?.length) return null
+		const entry = result.list[0]
+		return {
+			jid: entry.id,
+			contact: entry.contact?? false
+	}
+	}
+
+
+	const fetchContactUsernames = async (...jids) => {
+		const usyncQuery = new USyncQuery().withUsernameProtocol()
+		for (const jid of jids) {
+			usyncQuery.withUser(new USyncUser().withId(jid))
+	}
+		const result = await executeUSyncQuery(usyncQuery)
+		return result?.list?? []
+	}
+
+	const checkUsernameMulti = async usernames => {
+		const data = await mexQuery(
+			{ usernames },
+			USERNAME_QUERY_IDS.CHECK_MULTI,
+			'xwa2_username_check_multi'
+	)
+		return data
+	}
+
+
+
+	const getUsernameRecommendations = async (source = null) => {
+		const variables = {}
+		if (source) variables.source = source
+		return mexQuery(variables, USERNAME_QUERY_IDS.GET_RECOMMENDATIONS, 'xwa2_username_get_recommendations')
+	}
+
+	return {
+	    ...sock,
+		checkUsername,
+		checkUsernameMulti,
+		setUsername,
+		deleteUsername,
+		getMyUsername,
+		getUsernameRecommendations,
+		setUsernamePin,
+		findUserByUsername,
+		fetchContactUsernames,
+		USERNAME_QUERY_IDS,
+		USERNAME_CHECK_RESULT,
+		USERNAME_SOURCE
+	}
+}

package/lib/Socket/usync.js

@@ -11,8 +11,7 @@ const makeUSyncSocket = (config) => {
         if (usyncQuery.protocols.length === 0) {
             throw new boom_1.Boom('USyncQuery must have at least one protocol');
         }
-        // todo: validate users, throw WARNING on no valid users
-        // variable below has only validated users
+
         const validUsers = usyncQuery.users;
         const userNodes = validUsers.map((user) => {
             return {

package/lib/Utils/messages.js

@@ -633,6 +633,13 @@ export const generateWAMessageContent = async (message, options) => {
 			}
 		})
 	}
+	else if ('botInvoke' in message && !!message.botInvoke) {
+	    m = {
+	        botInvokeMessage: {
+	            message: message.botInvoke
+	        }
+	    }
+	}
     else if (hasNonNullishProperty(message, 'text')) {
         const extContent = { text: message.text };
         let urlInfo = message.linkPreview;