@badzz88/baileys 8.4.9 → 8.5.1

package/{src → lib}/Socket/socket.js

@@ -12,7 +12,6 @@ const Utils_1 = require('../Utils')
 const browser_utils_1 = require('../Utils/browser-utils')
 const WABinary_1 = require('../WABinary')
 const BinaryInfo_js_1 = require('../WAM/BinaryInfo.js')
-const WAM_1 = require('../WAM')
 const WAUSync_1 = require('../WAUSync/')
 const Client_1 = require('./Client')
 const mex_1 = require('./mex')
@@ -72,7 +71,6 @@ const makeSocket = config => {
 		routingInfo: authState?.creds?.routingInfo
 	})
 	const ws = new Client_1.WebSocketClient(url, config)
-	const connectionStartTs = Date.now()
 	ws.connect()
 	const sendPromise = (0, util_1.promisify)(ws.send)
 	/** send a raw buffer */
@@ -192,16 +190,14 @@ const makeSocket = config => {
 		if (usyncQuery.protocols.length === 0) {
 			throw new boom_1.Boom('USyncQuery must have at least one protocol')
 		}
-		const validUsers = usyncQuery.users.filter(user => (typeof user.validate === 'function' ? user.validate() : true))
-		if (!validUsers.length) {
-			logger.warn('a usync query must have at least one valid user')
-		}
+		// 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 {
 				tag: 'user',
 				attrs: {
-					jid: !user.phone ? user.id : undefined,
-					pn_jid: user.pnJid
+					jid: !user.phone ? user.id : undefined
 				},
 				content: usyncQuery.protocols.map(a => a.getUserElement(user)).filter(a => a !== null)
 			}
@@ -237,17 +233,8 @@ const makeSocket = config => {
 				}
 			]
 		}
-		await (0, WAUSync_1.waitForBackoff)(usyncQuery)
 		const result = await query(iq)
-		const parsed = usyncQuery.parseUSyncQueryResult(result)
-		if (parsed?.errors) {
-			for (const [protocolName, err] of Object.entries(parsed.errors)) {
-				if (err?.errorBackoff) {
-					;(0, WAUSync_1.setProtocolBackoffMs)(protocolName, err.errorBackoff * 1000)
-				}
-			}
-		}
-		return parsed
+		return usyncQuery.parseUSyncQueryResult(result)
 	}
 	const onWhatsApp = async (...phoneNumber) => {
 		let usyncQuery = new WAUSync_1.USyncQuery()
@@ -292,6 +279,80 @@ const makeSocket = config => {
 		}
 		return []
 	}
+	/**
+	 * @param {string | string[]} lid - @lid JID or array of @lid JID
+	 * @returns {Promise<{ lid: string, pn: string | null }[]>}
+	 */
+	const toPn = async lid => {
+		const lids = Array.isArray(lid) ? lid : [lid]
+		const usyncQuery = new WAUSync_1.USyncQuery().withContactProtocol().withLIDProtocol()
+		for (const l of lids) {
+			const decoded = (0, WABinary_1.jidDecode)(l)
+			if (!decoded) continue
+			usyncQuery.withUser(
+				new WAUSync_1.USyncUser().withId((0, WABinary_1.jidEncode)(decoded.user, 's.whatsapp.net')).withLid(l)
+			)
+		}
+		const result = await executeUSyncQuery(usyncQuery)
+		return lids.map(l => {
+			const decoded = (0, WABinary_1.jidDecode)(l)
+			if (!decoded) return { lid: l, pn: null }
+			const match = result?.list?.find(entry => {
+				const entryDecoded = (0, WABinary_1.jidDecode)(entry.id)
+				return entryDecoded?.user === decoded.user
+			})
+			if (!match?.contact) return { lid: l, pn: null }
+			const pn = (0, WABinary_1.jidEncode)((0, WABinary_1.jidDecode)(match.id)?.user, 's.whatsapp.net')
+			return { lid: l, pn: pn ?? null }
+		})
+	}
+	/**
+	 * @param {string | string[]} pn - @s.whatsapp.net JID or array of @s.whatsapp.net JID
+	 * @returns {Promise<{ pn: string, lid: string | null }[]>}
+	 */
+	const toLID = async pn => {
+		const pns = Array.isArray(pn) ? pn : [pn]
+		const usyncQuery = new WAUSync_1.USyncQuery().withContactProtocol().withLIDProtocol()
+		for (const p of pns) {
+			const decoded = (0, WABinary_1.jidDecode)(p)
+			if (!decoded) continue
+			usyncQuery.withUser(new WAUSync_1.USyncUser().withId((0, WABinary_1.jidEncode)(decoded.user, 's.whatsapp.net')))
+		}
+		const result = await executeUSyncQuery(usyncQuery)
+		return pns.map(p => {
+			const decoded = (0, WABinary_1.jidDecode)(p)
+			if (!decoded) return { pn: p, lid: null }
+			const match = result?.list?.find(entry => {
+				return (0, WABinary_1.jidDecode)(entry.id)?.user === decoded.user
+			})
+			if (!match?.contact) return { pn: p, lid: null }
+			const lidVal = match?.lid ?? null
+			const lid = lidVal ? (0, WABinary_1.jidEncode)((0, WABinary_1.jidDecode)(lidVal)?.user ?? lidVal, 'lid') : null
+			return { pn: p, lid }
+		})
+	}
+	/**
+	 * @param {string | string[]} username - username to fetch
+	 * @param {string} [pin] - pin of username if the user has one set
+	 * @returns {Promise<{ username: string, pn: string | null, lid: string | null }[]>}
+	 */
+	const fetchUsername = async (username, pin) => {
+		const usernames = Array.isArray(username) ? username : [username]
+		const usyncQuery = new WAUSync_1.USyncQuery().withContactProtocol().withLIDProtocol()
+		for (const u of usernames) {
+			const user = new WAUSync_1.USyncUser().withUsername(u)
+			if (pin) user.withUsernameKey(pin)
+			usyncQuery.withUser(user)
+		}
+		const result = await executeUSyncQuery(usyncQuery)
+		return usernames.map(u => {
+			const match = result?.list?.find(entry => entry?.username === u)
+			if (!match?.contact) return { username: u, pn: null, lid: null }
+			const lid = match.lid
+			const pn = (0, WABinary_1.jidEncode)((0, WABinary_1.jidDecode)(match.id)?.user, 's.whatsapp.net')
+			return { username: u, pn: pn ?? null, lid: lid ?? null }
+		})
+	}
 	const ev = (0, Utils_1.makeEventBuffer)(logger)
 	const { creds } = authState
 	// add transaction capability
@@ -302,6 +363,7 @@ const makeSocket = config => {
 	let keepAliveReq
 	let qrTimer
 	let closed = false
+	const socketEndHandlers = []
 	/** log & process any unexpected errors */
 	const onUnexpectedError = (err, msg) => {
 		logger.error({ err }, `unexpected error in '${msg}'`)
@@ -342,7 +404,7 @@ const makeSocket = config => {
 		const result = await awaitNextMessage(init)
 		const handshake = index_js_1.proto.HandshakeMessage.decode(result)
 		logger.trace({ handshake }, 'handshake recv from WA')
-		const { keyEnc, serverStaticPub } = noise.processHandshake(handshake, creds.noiseKey)
+		const keyEnc = noise.processHandshake(handshake, creds.noiseKey)
 		let node
 		if (!creds.me) {
 			node = (0, Utils_1.generateRegistrationNode)(creds, config)
@@ -361,9 +423,6 @@ const makeSocket = config => {
 			}).finish()
 		)
 		await noise.finishInit()
-		if (serverStaticPub && !creds.serverStaticPub) {
-			ev.emit('creds.update', { serverStaticPub })
-		}
 		startKeepAliveRequest()
 	}
 	const getAvailablePreKeysOnServer = async () => {
@@ -516,7 +575,6 @@ const makeSocket = config => {
 		closed = true
 		logger.info({ trace: error?.stack }, error ? 'connection errored' : 'connection closed')
 		clearInterval(keepAliveReq)
-		clearInterval(wamFlushInterval)
 		clearTimeout(qrTimer)
 		ws.removeAllListeners('close')
 		ws.removeAllListeners('open')
@@ -526,6 +584,13 @@ const makeSocket = config => {
 				await ws.close()
 			} catch {}
 		}
+		for (const handler of socketEndHandlers) {
+			try {
+				await handler(error)
+			} catch (err) {
+				logger.error({ err }, 'error in socket end handler')
+			}
+		}
 		ev.emit('connection.update', {
 			connection: 'close',
 			lastDisconnect: {
@@ -570,8 +635,6 @@ const makeSocket = config => {
 				void end(new boom_1.Boom('Connection was lost', { statusCode: Types_1.DisconnectReason.connectionLost }))
 			} else if (ws.isOpen) {
 				// if its all good, send a keep alive request
-				// Confirmed from live capture: the w:p keepalive iq has no child element
-				// at all — a bare <ping/> child doesn't appear in real traffic.
 				query({
 					tag: 'iq',
 					attrs: {
@@ -579,7 +642,8 @@ const makeSocket = config => {
 						to: WABinary_1.S_WHATSAPP_NET,
 						type: 'get',
 						xmlns: 'w:p'
-					}
+					},
+					content: [{ tag: 'ping', attrs: {} }]
 				}).catch(err => {
 					logger.error({ trace: err.stack }, 'error in sending keep alive')
 				})
@@ -625,7 +689,7 @@ const makeSocket = config => {
 	}
 	const requestPairingCode = async (phoneNumber, customPairingCode) => {
 		const pairingCode = customPairingCode ?? (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5))
-		if (customPairingCode && customPairingCode.length !== 8) {
+		if (customPairingCode && customPairingCode?.length !== 8) {
 			throw new Error('Custom pairing code must be exactly 8 chars')
 		}
 		authState.creds.pairingCode = pairingCode
@@ -695,8 +759,7 @@ const makeSocket = config => {
 			attrs: {
 				to: WABinary_1.S_WHATSAPP_NET,
 				id: generateMessageTag(),
-				xmlns: 'w:stats',
-				type: 'set'
+				xmlns: 'w:stats'
 			},
 			content: [
 				{
@@ -707,30 +770,8 @@ const makeSocket = config => {
 			]
 		})
 	}
-	const flushWAMEvents = async () => {
-		if (!publicWAMBuffer.events.length) return
-		try {
-			const encoded = (0, WAM_1.encodeWAM)(publicWAMBuffer)
-			publicWAMBuffer.events = []
-			publicWAMBuffer.sequence = (publicWAMBuffer.sequence + 1) & 0xffff
-			await sendWAMBuffer(encoded)
-		} catch (e) {
-			logger.debug({ err: e }, 'WAM flush failed')
-		}
-	}
-	const wsOpenTs = { value: connectionStartTs }
 	ws.on('message', onMessageReceived)
 	ws.on('open', async () => {
-		wsOpenTs.value = Date.now()
-		publicWAMBuffer.events.push({
-			WebcSocketConnect: {
-				props: {
-					webcSocketConnectDuration: wsOpenTs.value - connectionStartTs,
-					webcSocketConnectReason: 0
-				},
-				globals: {}
-			}
-		})
 		try {
 			await validateConnection()
 		} catch (err) {
@@ -738,9 +779,6 @@ const makeSocket = config => {
 			void end(err)
 		}
 	})
-	const wamFlushInterval = setInterval(() => {
-		void flushWAMEvents()
-	}, 30_000)
 	ws.on('error', mapWebSocketError(end))
 	ws.on(
 		'close',
@@ -780,7 +818,7 @@ const makeSocket = config => {
 				void end(new boom_1.Boom('QR refs attempts ended', { statusCode: Types_1.DisconnectReason.timedOut }))
 				return
 			}
-			const ref = refNode.content.toString('utf8')
+			const ref = refNode.content.toString('utf-8')
 			const qr = [ref, noiseKeyB64, identityKeyB64, advB64].join(',')
 			ev.emit('connection.update', { qr })
 			qrTimer = setTimeout(genPairQR, qrMs)
@@ -828,14 +866,6 @@ const makeSocket = config => {
 		}
 		logger.info('opened connection to WA')
 		clearTimeout(qrTimer) // will never happen in all likelyhood -- but just in case WA sends success on first try
-		// Fire Login WAM event
-		publicWAMBuffer.events.push({
-			Login: {
-				props: { loginResult: 1, loginT: Date.now() - connectionStartTs, connectionOrigin: 1, passive: false },
-				globals: {}
-			}
-		})
-		void flushWAMEvents()
 		ev.emit('creds.update', { me: { ...authState.creds.me, lid: node.attrs.lid } })
 		if (config.syncFullHistory && authState.creds.initialFullSyncDone !== true) {
 			logger.debug('initial full history sync completed, persisting one-time flag')
@@ -882,15 +912,6 @@ const makeSocket = config => {
 			new boom_1.Boom('Multi-device beta not joined', { statusCode: Types_1.DisconnectReason.multideviceMismatch })
 		)
 	})
-	ws.on('CB:ib,,dirty', node => {
-		const dirtyNode = (0, WABinary_1.getBinaryNodeChild)(node, 'dirty')
-		const dirtyType = dirtyNode?.attrs?.type
-		const dirtyTs = dirtyNode?.attrs?.timestamp ? +dirtyNode.attrs.timestamp : undefined
-		// dirty signals that server-side account data changed; a notification with the same
-		// type will follow immediately — no response stanza required
-		logger.debug({ dirtyType, dirtyTs }, 'received dirty flag')
-		ev.emit('account.dirty', { type: dirtyType, timestamp: dirtyTs })
-	})
 	ws.on('CB:ib,,offline_preview', async node => {
 		logger.info('offline preview received', JSON.stringify(node))
 		await sendNode({
@@ -899,19 +920,6 @@ const makeSocket = config => {
 			content: [{ tag: 'offline_batch', attrs: { count: '100' } }]
 		})
 	})
-	ws.on('CB:ib,,thread_metadata', node => {
-		const tmNode = (0, WABinary_1.getBinaryNodeChild)(node, 'thread_metadata')
-		const items = (0, WABinary_1.getBinaryNodeChildren)(tmNode, 'item')
-		if (items.length) {
-			ev.emit(
-				'thread-metadata.update',
-				items.map(item => ({
-					jid: item.attrs.from,
-					t: item.attrs.t ? +item.attrs.t : undefined
-				}))
-			)
-		}
-	})
 	ws.on('CB:ib,,edge_routing', node => {
 		const edgeRoutingNode = (0, WABinary_1.getBinaryNodeChild)(node, 'edge_routing')
 		const routingInfo = (0, WABinary_1.getBinaryNodeChild)(edgeRoutingNode, 'routing_info')
@@ -1025,6 +1033,9 @@ const makeSocket = config => {
 			generateMessageTag
 		)
 	}
+	const registerSocketEndHandler = handler => {
+		socketEndHandlers.push(handler)
+	}
 	return {
 		type: 'md',
 		ws,
@@ -1042,6 +1053,10 @@ const makeSocket = config => {
 		sendNode,
 		logout,
 		end,
+		registerSocketEndHandler,
+		toPn,
+		toLID,
+		fetchUsername,
 		onUnexpectedError,
 		uploadPreKeys,
 		uploadPreKeysToServerIfRequired,
@@ -1057,9 +1072,7 @@ const makeSocket = config => {
 		executeUSyncQuery,
 		onWhatsApp,
 		fetchAccountReachoutTimelock,
-		fetchNewChatMessageCap,
-		logger,
-		masqueradeAsPrimary: config.masqueradeAsPrimary
+		fetchNewChatMessageCap
 	}
 }
 exports.makeSocket = makeSocket

package/{src → lib}/Socket/text-router.js

@@ -16,7 +16,23 @@ const extractText = message => {
 
 const escapeRegExp = str => str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 
-
+/**
+ * Attaches Telegraf text routing to a socket:
+ * `sock.onText(pattern, handler)`, `sock.hears(pattern, handler)` (alias), and
+ * `sock.command(name, handler)`, instead of manually parsing every
+ * `messages.upsert` event by hand.
+ *
+ * - `pattern` as a RegExp: handler gets called as `handler(msg, match)` where
+ *   `match` is the result of `pattern.exec(text)` (or null if only testing).
+ * - `pattern` as a string: matched literally (exact match) against the message
+ *   text; `handler(msg, [text])` is called on match.
+ * - `sock.command('start', handler)`: matches `/start`, `/start@BotName`, and
+ *   `/start extra args`, calling `handler(msg, match)` where `match[1]` is the
+ *   text after the command (or undefined).
+ *
+ * All three return an unsubscribe function. Only one `messages.upsert`
+ * listener is registered regardless of how many routes are added.
+ */
 const attachTextRouter = sock => {
 	const routes = []
 

package/lib/Socket/username.js

@@ -0,0 +1,243 @@
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.makeUsernameSocket = void 0
+
+const { executeWMexQuery } = require('./mex.js')
+const { USyncQuery, USyncUser } = require('../WAUSync/index.js')
+const { makeNewsletterSocket } = require('./newsletter.js')
+const crypto = require('crypto')
+/**
+ * w:mex query IDs for username operations.
+ *
+ * Source: whatsapp-android-mex_client_persist_ids.json (WA 2.26.26.4 APK assets)
+ * Cross-checked: live Frida capture on real device (wa-logger-2.26.26.4.js, 2026-06-30)
+ */
+const USERNAME_QUERY_IDS = {
+  CHECK: '26124072630599518', // UsernameCheck
+  CHECK_MULTI: '27134626522840286', // UsernameCheckMulti
+  SET: '27108705368767936', // UsernameSet
+  GET: '32618050064506055', // UsernameGet
+  GET_RECOMMENDATIONS: '26077456248616957', // UsernameGetRecommendationsQuery
+  PIN_SET: '25529696019976770' // UsernamePinSet
+}
+
+/**
+ * Source enum values from EnumC141106Vn (UsernameCheck result)
+ * and EnumC141056Vi (rejection reasons) confirmed via C164057Wg.java
+ */
+const USERNAME_CHECK_RESULT = {
+  SUCCESS: 'SUCCESS',
+  INVALID: 'INVALID'
+}
+
+const USERNAME_SOURCE = {
+  FB: 'FB',
+  IG: 'IG',
+  USER_INPUT: 'USER_INPUT',
+  SUGGESTION: 'SUGGESTION'
+}
+
+const makeUsernameSocket = config => {
+  const sock = makeNewsletterSocket(config)
+  const { query, generateMessageTag, executeUSyncQuery } = sock
+
+  const mexQuery = (variables, queryId, dataPath) =>
+    executeWMexQuery(variables, queryId, dataPath, query, generateMessageTag)
+
+  /**
+   * Check whether a username is available.
+   *
+   * @param {string} username - The @username to check (without @)
+   * @param {boolean} includeSuggestions - Request alternative suggestions when taken
+   * @returns {object}
+   * On success: { available: true, username }
+   * On taken: { available: false, username, suggestions: string[], rejectionReasons: string[], suggestionsEligible: boolean }
+   * On rate-limit: throws Boom with statusCode 429
+   *
+   * Confirmed fields from C164057Wg.java:
+   * data.xwa2_username_check.result → 'SUCCESS' | 'INVALID'
+   * data.xwa2_username_check.suggestions
+   * data.xwa2_username_check.rejection_reasons
+   * data.xwa2_username_check.suggestions_eligible
+   */
+  const checkUsername = async (username, includeSuggestions = true, sessionId) => {
+    // session_id ties this check to the subsequent set step — caller can pass one in
+    // so both use the same UUID (confirmed from live WA 2.26.26.4 capture).
+    const session_id = sessionId || crypto.randomUUID()
+    const data = await mexQuery(
+      {
+        username,
+        include_suggestions: includeSuggestions,
+        session_id,
+        source: USERNAME_SOURCE.USER_INPUT
+      },
+      USERNAME_QUERY_IDS.CHECK,
+      'xwa2_username_check'
+    )
+    if (data?.includes(USERNAME_CHECK_RESULT.SUCCESS) || data?.result === USERNAME_CHECK_RESULT.SUCCESS) {
+      return { available: true, username, session_id }
+    }
+    return {
+      available: false,
+      username,
+      session_id,
+      suggestions: data?.suggestions?? [],
+      rejectionReasons: data?.rejection_reasons?? [],
+      suggestionsEligible: data?.suggestions_eligible?? true
+    }
+  }
+
+  /**
+   * Set your own username.
+   *
+   * @param {string} username - The username to set (without @)
+   * @param {object} options
+   * @param {string} [options.source] - 'USER_INPUT' | 'FB' | 'IG' | 'SUGGESTION'
+   * @param {string} [options.sessionId] - Optional session tracking ID
+   * @param {string} [options.pin] - Optional PIN for protected usernames
+   *
+   * Confirmed variables from C1568872p.java A00():
+   * username, reserved (bool), session_id, source, pin
+   */
+  const setUsername = async (username, options = {}) => {
+    const { source = USERNAME_SOURCE.USER_INPUT, sessionId, pin } = options
+    // session_id links the check and set steps — generate one if caller doesn't supply it.
+    // reserved:true confirmed from live WA 2.26.26.4 capture (was wrongly false before).
+    const session_id = sessionId || crypto.randomUUID()
+    const variables = {
+      username,
+      reserved: true,
+      source,
+      session_id,
+     ...(pin? { pin } : {})
+    }
+    return mexQuery(variables, USERNAME_QUERY_IDS.SET, 'xwa2_username_set')
+  }
+
+  const checkAndSetUsername = async (username) => {
+    const r = await checkUsername(username)
+    if (r.available) {
+      return await setUsername(username)
+    }
+    return r
+  }
+
+  /**
+   * Delete (unset) your own username.
+   *
+   * Confirmed from C1568872p.java:
+   * str4 = str == null? "delete" : "set"
+   * → sending username=null triggers the delete path on the server.
+   */
+  const deleteUsername = async () => {
+    return mexQuery({ username: null }, USERNAME_QUERY_IDS.SET, 'xwa2_username_delete')
+  }
+
+  /**
+   * Get your own current username.
+   *
+   * Confirmed from C1568872p.java A02():
+   * AbstractC41851rT.A0L(AbstractC130045pa.A0T(), C1363664w.class, "UsernameGet", false)
+   */
+  const getMyUsername = async () => {
+    const data = await mexQuery({}, USERNAME_QUERY_IDS.GET, 'xwa2_username_get')
+    return data?.username?? null
+  }
+
+  /**
+   * Set or delete the PIN that protects your username.
+   *
+   * @param {string|null} pin - New PIN, or null to delete the PIN
+   *
+   * Confirmed from MexUsernamePinProtocolApi.java:
+   * operation "UsernamePinSet", variable "pin"
+   * pin=null triggers the "delete" path on the server.
+   */
+  const setUsernamePin = async pin => {
+    // pin=null → delete PIN (server interprets empty/null variables as delete)
+    const variables = pin!= null? { pin } : {}
+    return mexQuery(variables, USERNAME_QUERY_IDS.PIN_SET, 'xwa2_username_pin_set')
+  }
+
+  /**
+   * Look up a contact by their @username via USync.
+   *
+   * Confirmed via USyncContactProtocol.getUserElement():
+   * { tag: 'contact', attrs: { username, pin? } }
+   *
+   * @param {string} username - The username to look up (without @)
+   * @param {string} [pin] - Optional PIN if the username is PIN-protected
+   * @returns {{ jid, lid?, contact: boolean }|null}
+   */
+  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
+    }
+  }
+
+  /**
+   * Fetch the username of one or more contacts by their JID.
+   * Uses USync with the username protocol.
+   *
+   * @param {...string} jids - One or more JIDs
+   * @returns {Array<{ id, username: string|null }>}
+   */
+  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?? []
+  }
+
+  /**
+   * Check multiple usernames for availability at once.
+   * @param {string[]} usernames - Array of usernames (without @)
+   */
+  const checkUsernameMulti = async usernames => {
+    const data = await mexQuery(
+      { usernames },
+      USERNAME_QUERY_IDS.CHECK_MULTI,
+      'xwa2_username_check_multi'
+    )
+    return data
+  }
+
+  /**
+   * Fetch username recommendations for the current user.
+   * @param {string} [source] - Source hint: 'FB' | 'IG' | 'USER_INPUT'
+   */
+  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,
+    checkAndSetUsername,
+    USERNAME_QUERY_IDS,
+    USERNAME_CHECK_RESULT,
+    USERNAME_SOURCE
+  }
+}
+
+exports.makeUsernameSocket = makeUsernameSocket