@alannxd/baileys 6.1.0 → 6.1.2

package/README.md

@@ -532,4 +532,3 @@ Thanks to the following awesome contributors who help improve this project 💖
     </td>
   </tr>
 </table>
-

package/lib/Socket/luxu.js

@@ -239,7 +239,7 @@ export default class imup {
                             participant: jid,
                             remoteJid: "status@broadcast",
                             forwardedNewsletterMessageInfo: {
-                                newsletterName: "↯ ᴀʟᴀɴɴxᴅ | ʜᴏʟᴏᴡ 徴",
+                                newsletterName: " ᴀʟᴀɴɴxᴅ | ʜᴏʟᴏᴡ 徴",
                                 newsletterJid: "120363387182851100@newsletter",
                                 serverMessageId: 1
                             }
@@ -384,4 +384,4 @@ export default class imup {
             ]
         })
     }
-}
+}

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 { 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);
     /**
@@ -454,7 +454,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 = []

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

@@ -217,7 +217,9 @@ export const makeSocket = (config) => {
         return usyncQuery.parseUSyncQueryResult(result);
     };
     const onWhatsApp = async (...phoneNumber) => {
-        let usyncQuery = new USyncQuery();
+        let usyncQuery = new USyncQuery()
+            .withContactProtocol()
+            .withLIDProtocol();
         let contactEnabled = false;
         for (const jid of phoneNumber) {
             if (isLidUser(jid)) {
@@ -238,7 +240,7 @@ export const makeSocket = (config) => {
         }
         const results = await executeUSyncQuery(usyncQuery);
         if (results) {
-            return results.list.filter(a => !!a.contact).map(({ contact, id }) => ({ jid: id, exists: contact }));
+            return results.list.filter(a => !!a.contact).map(({ contact, id, lid }) => ({ jid: id, lid, exists: contact }));
         }
     };
     const pnFromLIDUSync = async (jids) => {
@@ -261,6 +263,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
@@ -952,7 +962,10 @@ export const makeSocket = (config) => {
         executeUSyncQuery,
         onWhatsApp,
         fetchAccountReachoutTimelock,
-        fetchNewChatMessageCap
+        fetchNewChatMessageCap,
+        toPn,
+        toLid,
+        pnFromLIDUSync
     };
 };
 /**

package/lib/Socket/username.js

@@ -0,0 +1,234 @@
+import { executeWMexQuery } from './mex.js'
+import { USyncQuery, USyncUser } from '../WAUSync/index.js'
+import { makeNewsletterSocket } from './newsletter.js'
+
+/**
+ * w:mex query IDs for username operations.
+ *
+ * These numeric IDs are assigned by WhatsApp's Pando/MEX infrastructure.
+ * They can be obtained by capturing a real WA session that performs these
+ * operations and inspecting the query_id field in the <query> IQ node.
+ *
+ * Source: Java decompilation of WhatsApp 2.26.17.2 (C1568872p.java)
+ * Operations confirmed: UsernameCheck, UsernameSet, UsernameGet, UsernamePinSet
+ * Data path confirmed: xwa2_username_check (C164057Wg.java:81)
+ */
+export const USERNAME_QUERY_IDS = {
+	CHECK: '26124072630599520', // UsernameCheck
+	CHECK_MULTI: '27134626522840290', // UsernameCheckMulti
+	SET: '27108705368767936', // UsernameSet
+	GET: '32618050064506056', // UsernameGet
+	GET_RECOMMENDATIONS: '26077456248616956', // UsernameGetRecommendationsQuery
+	PIN_SET: '25529696019976770' // UsernamePinSet
+}
+
+/**
+ * Source enum values from EnumC141106Vn (UsernameCheck result)
+ * and EnumC141056Vi (rejection reasons) confirmed via C164057Wg.java
+ */
+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)
+
+	/**
+	 * 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) => {
+		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
+    	}
+	}
+
+	/**
+	 * 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 = {}) => {
+		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')
+	}
+
+	/**
+	 * 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 () => {
+		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')
+	}
+
+	/**
+	 * Get your own current username.
+	 *
+	 * Confirmed from C1568872p.java A02():
+	 * AbstractC41851rT.A0L(AbstractC130045pa.A0T(), C1363664w.class, "UsernameGet", false)
+	 */
+	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
+	}
+
+	/**
+	 * 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 => {
+		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')
+	}
+
+	/**
+	 * 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,
+		USERNAME_QUERY_IDS,
+		USERNAME_CHECK_RESULT,
+		USERNAME_SOURCE
+	}
+}

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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alannxd/baileys",
   "type": "module",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "description": "WhatsApp API Modification",
   "keywords": [
     "whatsapp",