@alannxd/baileys 6.1.4 → 6.1.7

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';
+import { randomBytes, createHmac } 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);
     /**
@@ -433,17 +433,22 @@ export const makeMessagesSocket = (config) => {
 	    message,
 	    {
 		    messageId: msgId,
-		    participant = false,
+        	participant,
+        	participants: retryParticipants,
+        	isSecret,
+        	protected: protectedSend,
 		    additionalAttributes,
 		    additionalNodes,
-		    useUserDevicesCache,
+	    	useUserDevicesCache,
 		    useCachedGroupMetadata,
-		    statusJidList
+		    statusJidList,
+		    cstoken = true
 	    }
 	) => {
 	    const meId = authState.creds.me.id
     	const meLid = authState.creds.me?.lid
-	    const isRetryResend = Boolean(participant?.jid)
+	    const isRetryResend = Boolean(retryParticipants?.jid && retryParticipants?.count != null)
+	    const isRecipientOnly = Boolean(participant?.jid)
 	    let shouldIncludeDeviceIdentity = isRetryResend
 	    const statusJid = 'status@broadcast'
 	    const { user, server } = jidDecode(jid)
@@ -454,7 +459,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 = []
@@ -467,6 +473,16 @@ export const makeMessagesSocket = (config) => {
 	    	messageContextInfo: message.messageContextInfo
 	    }
 	    const extraAttrs = {}
+    	if (isRetryResend) {
+    		if (!isGroup &&!isStatus) {
+    			additionalAttributes = { ...additionalAttributes, device_fanout: 'false' }
+    		}
+    		const { user: retryUser, device: retryDevice } = jidDecode(retryParticipants.jid)
+    		devices.push({ user: retryUser, device: retryDevice, jid: retryParticipants.jid })
+    	}
+    	if ((isRecipientOnly || isSecret || protectedSend) &&!isGroup &&!isStatus) {
+    		additionalAttributes = { ...additionalAttributes, device_fanout: 'false' }
+    	}
     	const regexGroupOld = /^(\d{1,15})-(\d+)@g\.us$/
 	    const messages = normalizeMessageContent(message)
 	    const buttonType = getButtonType(messages)
@@ -508,7 +524,7 @@ export const makeMessagesSocket = (config) => {
 			    		return groupData
 			    	})(),
 		    		(async () => {
-		    			if (!participant &&!isStatus) {
+		    			if (!retryParticipants &&!isStatus) {
 			    			const result = await authState.keys.get('sender-key-memory', [jid])
 				    		return result[jid] || {}
 			    		}
@@ -648,7 +664,7 @@ export const makeMessagesSocket = (config) => {
 			    for (const device of devices) {
 		    		const deviceJid = device.jid
 		    		const hasKey =!!senderKeyMap[deviceJid]
-		    		if (!hasKey ||!!participant &&!isHostedLidUser(deviceJid) &&!isHostedPnUser(deviceJid) && device.device!== 99) {
+		    		if (!hasKey ||!!retryParticipants &&!isHostedLidUser(deviceJid) &&!isHostedPnUser(deviceJid) && device.device!== 99) {
 			    		senderKeyRecipients.push(deviceJid)
 		    			senderKeyMap[deviceJid] = true
 		    		}
@@ -677,7 +693,7 @@ export const makeMessagesSocket = (config) => {
 		    		logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation')
 	    		}
 	    		const { user: ownUser } = jidDecode(ownId)
-		    	if (!participant) {
+		    	if (!isRetryResend) {
 	    			const patchedForReporting = await patchMessageBeforeSending(message, [jid])
 		    		reportingMessage = Array.isArray(patchedForReporting)
 		    			? patchedForReporting.find(item => item.recipientJid === jid) || patchedForReporting[0]
@@ -714,22 +730,25 @@ export const makeMessagesSocket = (config) => {
                         continue
                     }
                     const isMe = user === mePnUser || user === meLidUser
+                    const hasDevice = jid.includes(':')
                     let ptcp = false
-                    if (participant) {
+                    if (retryParticipants) {
                         if (!isJidGroup(jid) && !isStatus) {
                             if (!(!isMe)) ptcp = true
                         } else {
                             ptcp = false
                         }
                     }
-                    if (!ptcp) {
-                        if (isMe) {
-                            meRecipients.push(jid)
-                        } else {
-                            otherRecipients.push(jid)
-                        }
-                        allRecipients.push(jid)
+                    if (ptcp) continue
+                    if (isRecipientOnly && isMe) continue
+                    if (isSecret && !(!isMe && !hasDevice)) continue
+                    if (protectedSend && !isMe && hasDevice) continue
+                    if (isMe) {
+                        meRecipients.push(jid)
+                    } else {
+                        otherRecipients.push(jid)
                     }
+                    allRecipients.push(jid)
                 }
 	    		await assertSessions(allRecipients)
 		    	const [
@@ -746,18 +765,38 @@ export const makeMessagesSocket = (config) => {
 	    		shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2
     	}
 	  	if (isRetryResend) {
-	   		const isParticipantLid = jidDecode(participant.jid).server === 'lid'
-	    	const isMe = areJidsSameUser(participant.jid, isParticipantLid? meLid : meId)
+	   		const isParticipantLid = isLidUser(retryParticipants.jid)
+	    	const isMe = areJidsSameUser(retryParticipants.jid, isParticipantLid? meLid : meId)
+	   		let messageToSend = message
+	   		if (isGroupOrStatus) {
+	   			let groupSenderIdentity
+	   			try {
+	   				if (meLid && await signalRepository.hasSenderKey({ group: destinationJid, meId: meLid })) {
+	   					groupSenderIdentity = meLid
+	   				} else if (await signalRepository.hasSenderKey({ group: destinationJid, meId })) {
+	   					groupSenderIdentity = meId
+	   				}
+	   				if (groupSenderIdentity) {
+	   					const skdm = await signalRepository.getSenderKeyDistributionMessage({ group: destinationJid, meId: groupSenderIdentity })
+	   					messageToSend = {
+	   						...message,
+	   						senderKeyDistributionMessage: { groupId: destinationJid, axolotlSenderKeyDistributionMessage: skdm }
+	   					}
+	   				}
+	   			} catch (err) {
+	   				logger.warn({ err, jid: destinationJid }, 'failed to build SKDM for retry, sending without it')
+	   			}
+	   		}
 	   		const encodedMessageToSend = isMe
-		   		? encodeWAMessage({ deviceSentMessage: { destinationJid, message } })
-		   		: encodeWAMessage(message)
+		   		? encodeWAMessage({ deviceSentMessage: { destinationJid, message: messageToSend } })
+		   		: encodeWAMessage(messageToSend)
 	    	const { type, ciphertext: encryptedContent } = await signalRepository.encryptMessage({
 		    	data: encodedMessageToSend,
-	    		jid: participant.jid
+	    		jid: retryParticipants.jid
 		   	})
 		   	binaryNodeContent.push({
 		   		tag: 'enc',
-		   		attrs: { v: '2', type, count: (participant.count?? 0).toString() },
+		   		attrs: { v: '2', type, count: (retryParticipants.count?? 0).toString() },
 	    		content: encryptedContent
 	    	})
        	}
@@ -777,6 +816,17 @@ export const makeMessagesSocket = (config) => {
 			tag: 'message',
 			attrs: { id: msgId, to: destinationJid, type: getMessageType(message),...(additionalAttributes || {}) },
 			content: binaryNodeContent
+    	}
+		if (isRetryResend) {
+			if (isJidGroup(destinationJid)) {
+				stanza.attrs.to = destinationJid
+				stanza.attrs.participant = retryParticipants.jid
+			} else if (areJidsSameUser(retryParticipants.jid, meId)) {
+				stanza.attrs.to = retryParticipants.jid
+				stanza.attrs.recipient = destinationJid
+			} else {
+				stanza.attrs.to = retryParticipants.jid
+			}
     	}
 		if (shouldIncludeDeviceIdentity) {
 			stanza.content.push({ tag: 'device-identity', attrs: {}, content: encodeSignedDeviceIdentity(authState.creds.account, true) })
@@ -799,7 +849,7 @@ export const makeMessagesSocket = (config) => {
 		if (!isNewsletter &&!isRetryResend && reportingMessage?.messageContextInfo?.messageSecret && shouldIncludeReportingToken(reportingMessage)) {
 			try {
 				const encoded = encodeWAMessage(reportingMessage)
-				const reportingKey = { id: msgId, fromMe: true, remoteJid: destinationJid, participant: participant?.jid }
+				const reportingKey = { id: msgId, fromMe: true, remoteJid: destinationJid, participant: retryParticipants?.jid }
 				const reportingNode = await getMessageReportingToken(encoded, reportingMessage, reportingKey)
 				if (reportingNode) {
 					stanza.content.push(reportingNode)
@@ -845,6 +895,26 @@ export const makeMessagesSocket = (config) => {
 	    }
 		if (tcTokenBuffer?.length && sock.serverProps.privacyTokenOn1to1) {
 			stanza.content.push({ tag: 'tctoken', attrs: {}, content: tcTokenBuffer })
+    	}
+		if (cstoken && is1on1Send &&!tcTokenBuffer?.length) {
+			try {
+				const lidJid = await resolveTcTokenJid(destinationJid, getLIDForPN)
+				if (isLidUser(lidJid)) {
+					const saltRes = await authState.keys.get('nct-salt', ['default'])
+					const nctSalt = saltRes?.default
+					if (nctSalt?.length) {
+						const cs = createHmac('sha256', Buffer.from(nctSalt)).update(Buffer.from(lidJid, 'utf8')).digest()
+						stanza.content.push({ tag: 'cstoken', attrs: {}, content: cs })
+						logger.debug({ jid: destinationJid, lid: lidJid }, 'attached cstoken (nct fallback)')
+					} else {
+						logger.debug({ jid: destinationJid }, 'cstoken requested but no nct salt stored yet')
+					}
+				} else {
+					logger.debug({ jid: destinationJid }, 'cstoken requested but recipient has no LID')
+				}
+			} catch (err) {
+				logger.debug({ jid: destinationJid, err: err?.message }, 'cstoken attach failed')
+			}
     	}
 		if (additionalNodes && additionalNodes.length > 0 &&!didPushAdditional) {
 			stanza.content.push(...additionalNodes)
@@ -877,7 +947,7 @@ export const makeMessagesSocket = (config) => {
 				.catch(err => logger.debug({ jid: destinationJid, err: err?.message }, 'fire-and-forget tctoken issuance failed'))
 				.finally(() => inFlightTcTokenIssuance.delete(tcTokenJid))
 	    }
-		if (messageRetryManager &&!participant) {
+		if (messageRetryManager &&!retryParticipants) {
 			messageRetryManager.addRecentMessage(destinationJid, msgId, message)
     	}
 		if (isInterop &&!isRetryResend) {
@@ -934,6 +1004,9 @@ export const makeMessagesSocket = (config) => {
         else if (message.stickerMessage) {
             return 'sticker';
         }
+        else if (message.stickerPackMessage) {
+            return 'sticker';
+        }
         else if (message.listMessage) {
             return 'list';
         }
@@ -1265,7 +1338,7 @@ export const makeMessagesSocket = (config) => {
         sendMessage: async (jid, content, options = {}) => {
             const userJid = authState.creds.me.id;
             const luki = new imup(Utils_1, waUploadToServer, relayMessage)
-            const { quoted, participant = false } = options;
+            const { quoted, participant = false, isSecret, protected: protectedSend, cstoken } = options;
             const messageType = luki.detectType(content);
             if (typeof content === 'object' &&
                 'disappearingMessagesInChat' in content &&
@@ -1374,7 +1447,10 @@ export const makeMessagesSocket = (config) => {
                     additionalAttributes,
                     statusJidList: options.statusJidList,
                     additionalNodes: aiLabel ? additionalNodes : options.additionalNodes,
-                    participant
+                    participants: participant || undefined,
+                    isSecret,
+                    protected: protectedSend,
+                    ...(cstoken !== undefined ? { cstoken } : {})
                 });
                 if (config.emitOwnEvents) {
                     process.nextTick(async () => {

package/lib/Socket/mex.js

@@ -1,42 +1,54 @@
-import { Boom } from '@hapi/boom';
-import { getBinaryNodeChild, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { Boom } from '@hapi/boom'
+import { S_WHATSAPP_NET, getBinaryNodeChild } 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')
-            }
-        ]
-    });
-};
+  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')
+      }
+    ]
+  })
+}
+
 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 result = await wMexQuery(variables, queryId, query, generateMessageTag)
+  const child = getBinaryNodeChild(result, 'result')
+  if (child?.content) {
+    const str = child.content.toString('utf-8').replace(/^\x00+/, '').trim()
+    let data
+    try {
+      data = JSON.parse(str)
+    } catch {
+      data = str
     }
-    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
+    if (typeof data === 'string') {
+      return data
+    }
+    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 })
+}