@badzz88/baileys 8.4.9 → 8.5.1

package/{src → lib}/Utils/generics.js

@@ -41,9 +41,11 @@ exports.bindWaitForEvent = bindWaitForEvent
 exports.trimUndefined = trimUndefined
 exports.bytesToCrockford = bytesToCrockford
 exports.encodeNewsletterMessage = encodeNewsletterMessage
+exports.generateIOSMessageID = void 0
+exports.generateAndroMessageID = void 0
 const boom_1 = require('@hapi/boom')
 const crypto_1 = require('crypto')
-const rb = require('whatsapp-rust-bridge-baron')
+const Crypto_1 = require('./crypto')
 const DEFAULTS_1 = require('../Defaults')
 const index_js_1 = require('../../WAProto/index.js')
 const baileysVersion = DEFAULTS_1.VERSION
@@ -196,24 +198,36 @@ async function promiseTimeout(ms, promise) {
 }
 // inspired from whatsmeow code
 // https://github.com/tulir/whatsmeow/blob/64bc969fbe78d31ae0dd443b8d4c80a5d026d07a/send.go#L42
-const generateMessageIDV2 = userId => {
-	const data = Buffer.alloc(8 + 20 + 16)
-	data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000)))
-	if (userId) {
-		const id = (0, WABinary_1.jidDecode)(userId)
-		if (id?.user) {
-			data.write(id.user, 8)
-			data.write('@c.us', 8 + id.user.length)
-		}
-	}
-	const random = (0, crypto_1.randomBytes)(16)
-	random.copy(data, 28)
-	const hash = Buffer.from(rb.sha256(data))
-	return '3EB0' + hash.toString('hex').toUpperCase().substring(0, 18)
-}
+const generateMessageIDV2 = (userId) => {
+    const data = Buffer.alloc(8 + 20 + 16);
+    data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000)));
+    if (userId) {
+        const id = (0, WABinary_1.jidDecode)(userId);
+        if (id?.user) {
+            data.write(id.user, 8);
+            data.write('@c.us', 8 + id.user.length);
+        }
+    }
+    const random = (0, crypto_1.randomBytes)(16);
+    random.copy(data, 28);
+    const hash = (0, crypto_1.createHash)('sha256').update(data).digest();
+    return 'XZCYYX-' + hash.toString('hex').toUpperCase().substring(0, 18);
+};
 exports.generateMessageIDV2 = generateMessageIDV2
+const generateIOSMessageID = () => {
+    const prefix = '3A';
+    const random = (0, crypto_1.randomBytes)(9.5); // 19 hex chars = 9.5 bytes
+    return (prefix + random.toString('hex')).toUpperCase().substring(0, 21);
+};
+exports.generateIOSMessageID = generateIOSMessageID
+const generateAndroMessageID = () => {
+    const prefix = '3A';
+    const random = (0, crypto_1.randomBytes)(16); // 32 hex chars = 16 bytes
+    return (random.toString('hex')).toUpperCase().substring(0, 21);
+};
+exports.generateAndroMessageID = generateAndroMessageID
 // generate a random ID to attach to a message
-const generateMessageID = () => '3EB0' + (0, crypto_1.randomBytes)(18).toString('hex').toUpperCase()
+const generateMessageID = () => 'XZCYYX-' + (0, crypto_1.randomBytes)(18).toString('hex').toUpperCase()
 exports.generateMessageID = generateMessageID
 function bindWaitForEvent(ev, event) {
 	return async (check, timeoutMs) => {
@@ -266,7 +280,7 @@ const fetchLatestBaileysVersion = async (options = {}) => {
 		const versionLine = lines[6] // Line 7 (0-indexed)
 		const versionMatch = versionLine.match(/const version = \[(\d+),\s*(\d+),\s*(\d+)\]/)
 		if (versionMatch) {
-			const version = [parseInt(versionMatch[1], 10), parseInt(versionMatch[2], 10), parseInt(versionMatch[3], 10)]
+			const version = [parseInt(versionMatch[1]), parseInt(versionMatch[2]), parseInt(versionMatch[3])]
 			return {
 				version,
 				isLatest: true
@@ -339,7 +353,6 @@ exports.generateMdTagPrefix = generateMdTagPrefix
 const STATUS_MAP = {
 	sender: index_js_1.proto.WebMessageInfo.Status.SERVER_ACK,
 	played: index_js_1.proto.WebMessageInfo.Status.PLAYED,
-	'played-self': index_js_1.proto.WebMessageInfo.Status.PLAYED,
 	read: index_js_1.proto.WebMessageInfo.Status.READ,
 	'read-self': index_js_1.proto.WebMessageInfo.Status.READ
 }
@@ -383,31 +396,11 @@ const getCallStatusFromNode = ({ tag, attrs }) => {
 			status = 'offer'
 			break
 		case 'terminate':
-			// Map known end-call reasons to distinct statuses
-			switch (attrs.reason) {
-				case 'timeout':
-				case 'Timeout':
-					status = 'timeout'
-					break
-				case 'RejectDoNotDisturb':
-					status = 'reject_do_not_disturb'
-					break
-				case 'MicPermissionDenied':
-					status = 'mic_permission_denied'
-					break
-				case 'CameraPermissionDenied':
-					status = 'camera_permission_denied'
-					break
-				case 'RemoteBusy':
-					status = 'remote_busy'
-					break
-				case 'RemoteOffline':
-					status = 'remote_offline'
-					break
-				default:
-					// fired when accepted/rejected/caller hangs up
-					status = 'terminate'
-					break
+			if (attrs.reason === 'timeout') {
+				status = 'timeout'
+			} else {
+				//fired when accepted/rejected/timeout/caller hangs up
+				status = 'terminate'
 			}
 			break
 		case 'reject':
@@ -416,76 +409,6 @@ const getCallStatusFromNode = ({ tag, attrs }) => {
 		case 'accept':
 			status = 'accept'
 			break
-		case 'preaccept':
-			status = 'preaccept'
-			break
-		case 'accept_ack':
-			status = 'accept_ack'
-			break
-		case 'enc-rekey':
-		case 'enc_rekey':
-			status = 'enc_rekey'
-			break
-		case 'peer_state':
-			status = 'peer_state'
-			break
-		case 'group_info':
-			status = 'group_info'
-			break
-		case 'video_state':
-			status = 'video_state'
-			break
-		case 'video_state_ack':
-			status = 'video_state_ack'
-			break
-		case 'flow_control':
-			status = 'flow_control'
-			break
-		case 'relaylatency':
-			status = 'relaylatency'
-			break
-		case 'mute_v2':
-			status = 'mute'
-			break
-		case 'waiting_room_request':
-			status = 'waiting_room_request'
-			break
-		case 'signal':
-			// Numeric type mapping for <signal type="N"/> child nodes
-			switch (attrs.type) {
-				case '13':
-					status = 'preaccept'
-					break
-				case '15':
-					status = 'video_state'
-					break
-				case '17':
-					status = 'group_info'
-					break
-				case '20':
-					status = 'video_state_ack'
-					break
-				case '21':
-					status = 'flow_control'
-					break
-				case '23':
-					status = 'accept_ack'
-					break
-				case '1002':
-				case '1007':
-					status = 'peer_state'
-					break
-				case '1008':
-					status = 'enc_rekey'
-					break
-				case '12':
-					status = 'mute'
-					break
-				default:
-					status = 'ringing'
-					break
-			}
-			break
 		default:
 			status = 'ringing'
 			break

package/{src → lib}/Utils/index.js

@@ -28,7 +28,6 @@ var __exportStar =
 Object.defineProperty(exports, '__esModule', { value: true })
 __exportStar(require('./generics'), exports)
 __exportStar(require('./decode-wa-message'), exports)
-__exportStar(require('./message-inspect'), exports)
 __exportStar(require('./messages'), exports)
 __exportStar(require('./messages-media'), exports)
 __exportStar(require('./validate-connection'), exports)
@@ -51,3 +50,8 @@ __exportStar(require('./message-composer'), exports)
 __exportStar(require('./group-history'), exports)
 __exportStar(require('./consumer-application'), exports)
 __exportStar(require('./voip-rekey'), exports)
+__exportStar(require('./companion-reg-client-utils'), exports)
+__exportStar(require('./view-once-cache'), exports)
+__exportStar(require('./sticker'), exports)
+__exportStar(require('./command-loader'), exports)
+__exportStar(require('./session-pool'), exports)

package/lib/Utils/lt-hash.js

@@ -0,0 +1,39 @@
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.LT_HASH_ANTI_TAMPERING = void 0
+const crypto_1 = require('./crypto')
+
+/**
+ * LT Hash ("lthash16") is a summation-based homomorphic hash algorithm that
+ * maintains the integrity of a piece of data over a series of mutations. You
+ * can add/remove mutations and it'll return a hash equal to if the same
+ * series of mutations was made sequentially.
+ *
+ * WhatsApp expands each element to 128 bytes via HKDF (info = "WhatsApp Patch
+ * Integrity"), treats that as 64 little-endian uint16 lanes, and combines
+ * elements by adding/subtracting lane-wise mod 2^16 -- this is a pure HKDF +
+ * integer-arithmetic algorithm, no elliptic-curve math involved. Pure-JS,
+ * built on the already-validated `hkdf` implementation.
+ */
+const LTHASH_INFO = 'WhatsApp Patch Integrity'
+const LTHASH_SIZE = 128 // bytes = 64 uint16 lanes
+
+const expand = element => (0, crypto_1.hkdf)(element, LTHASH_SIZE, { info: LTHASH_INFO })
+
+const applyDelta = (result, element, sign) => {
+	const expanded = expand(element)
+	for (let i = 0; i < LTHASH_SIZE; i += 2) {
+		const lane = result.readUInt16LE(i)
+		const delta = expanded.readUInt16LE(i)
+		result.writeUInt16LE((lane + sign * delta) & 0xffff, i)
+	}
+}
+
+exports.LT_HASH_ANTI_TAMPERING = {
+	subtractThenAdd: (base, subtract = [], add = []) => {
+		const result = Buffer.from(base)
+		for (const element of subtract) applyDelta(result, element, -1)
+		for (const element of add) applyDelta(result, element, 1)
+		return result
+	}
+}

package/{src → lib}/Utils/message-retry-manager.js

@@ -55,6 +55,11 @@ class MessageRetryManager {
 			ttlAutopurge: true,
 			updateAgeOnGet: true
 		}) // 15 minutes TTL
+		this.baseKeys = new lru_cache_1.LRUCache({
+			max: 1024,
+			ttl: 15 * 60 * 1000,
+			ttlAutopurge: true
+		})
 		this.pendingPhoneRequests = {}
 		this.maxMsgRetryCount = 5
 		this.statistics = {
@@ -216,6 +221,40 @@ class MessageRetryManager {
 			this.logger.debug(`Cancelled pending phone request for message ${messageId}`)
 		}
 	}
+	clear() {
+		this.recentMessagesMap.clear()
+		this.messageKeyIndex.clear()
+		this.sessionRecreateHistory.clear()
+		this.retryCounters.clear()
+		this.baseKeys.clear()
+		for (const messageId of Object.keys(this.pendingPhoneRequests)) {
+			this.cancelPendingPhoneRequest(messageId)
+		}
+		this.statistics = {
+			totalRetries: 0,
+			successfulRetries: 0,
+			failedRetries: 0,
+			mediaRetries: 0,
+			sessionRecreations: 0,
+			phoneRequests: 0
+		}
+	}
+	saveBaseKey(addr, msgId, baseKey) {
+		this.baseKeys.set(`${addr}:${msgId}`, baseKey)
+	}
+	hasSameBaseKey(addr, msgId, baseKey) {
+		const stored = this.baseKeys.get(`${addr}:${msgId}`)
+		if (!stored || stored.length !== baseKey.length) {
+			return false
+		}
+		for (let i = 0; i < stored.length; i++) {
+			if (stored[i] !== baseKey[i]) return false
+		}
+		return true
+	}
+	deleteBaseKey(addr, msgId) {
+		this.baseKeys.delete(`${addr}:${msgId}`)
+	}
 	keyToString(key) {
 		return `${key.to}${MESSAGE_KEY_SEPARATOR}${key.id}`
 	}

package/{src → lib}/Utils/messages-media.js

@@ -60,7 +60,6 @@ exports.getStatusCodeForMediaRetry =
 	exports.downloadEncryptedContent =
 	exports.downloadContentFromMessage =
 	exports.getUrlFromDirectPath =
-	exports.getMediaProp =
 	exports.encryptedStream =
 	exports.getHttpStream =
 	exports.getStream =
@@ -493,85 +492,16 @@ const toSmallestChunkSize = num => {
 }
 const getUrlFromDirectPath = directPath => `https://${DEF_HOST}${directPath}`
 exports.getUrlFromDirectPath = getUrlFromDirectPath
-/**
- * Returns the boolean value of a named AB prop from the mediaAbProps dict stored in creds.
- * Returns false when the prop is absent or the dict is not available.
- */
-const getMediaProp = (mediaAbProps, propName) => {
-	if (!mediaAbProps || typeof mediaAbProps !== 'object') return false
-	return !!mediaAbProps[propName]
-}
-exports.getMediaProp = getMediaProp
 const downloadContentFromMessage = async ({ mediaKey, directPath, url }, type, opts = {}) => {
-	const directUrl = directPath ? (0, exports.getUrlFromDirectPath)(directPath) : undefined
-	const fallbackUrl = url?.startsWith('https://') ? url : undefined
-	// Feature F: prefer directPath-derived URL; fall back to mediaUrl on failure.
-	// When both are the same host the first attempt is enough.
-	let downloadUrl
-	if (directUrl) {
-		downloadUrl = directUrl
-	} else if (fallbackUrl) {
-		downloadUrl = fallbackUrl
-	} else {
+	const isValidMediaUrl = url?.startsWith('https://mmg.whatsapp.net/')
+	const downloadUrl = isValidMediaUrl ? url : (0, exports.getUrlFromDirectPath)(directPath)
+	if (!downloadUrl) {
 		throw new boom_1.Boom('No valid media URL or directPath present in message', { statusCode: 400 })
 	}
 	const keys = await getMediaKeys(mediaKey, type)
-	// Feature E: progressive JPEG headers when the AB prop signals support.
-	const mediaAbProps = opts.mediaAbProps
-	const pjpegHeaders = {}
-	if (type === 'image' && getMediaProp(mediaAbProps, 'partial_pjpeg_enabled')) {
-		// Signal to the CDN that we accept partial / progressive content.
-		pjpegHeaders['X-WhatsApp-PJPEG'] = '1'
-	}
-	if (type === 'image' && getMediaProp(mediaAbProps, 'multi_scan_pjpeg')) {
-		pjpegHeaders['X-WhatsApp-Multi-Scan-PJPEG'] = '1'
-	}
-	const mergedOpts =
-		Object.keys(pjpegHeaders).length
-			? { ...opts, options: { ...(opts.options || {}), headers: { ...(opts.options?.headers || {}), ...pjpegHeaders } } }
-			: opts
-	try {
-		return await (0, exports.downloadEncryptedContent)(downloadUrl, keys, mergedOpts)
-	} catch (err) {
-		// Feature F fallback: if directPath URL failed and we have an alternative mediaUrl, retry.
-		if (directUrl && fallbackUrl && fallbackUrl !== directUrl) {
-			return (0, exports.downloadEncryptedContent)(fallbackUrl, keys, mergedOpts)
-		}
-		throw err
-	}
+	return (0, exports.downloadEncryptedContent)(downloadUrl, keys, opts)
 }
 exports.downloadContentFromMessage = downloadContentFromMessage
-/**
- * Fetch a specific decrypted byte range of an encrypted media message.
- * Returns a Transform stream (same contract as downloadContentFromMessage).
- * Relies on the Range-request support already present in downloadEncryptedContent.
- */
-const downloadMediaChunk = (message, type, startByte, endByte, opts = {}) =>
-	downloadContentFromMessage(message, type, { ...opts, startByte, endByte })
-exports.downloadMediaChunk = downloadMediaChunk
-/**
- * Async generator that yields successive decrypted chunk streams for large media.
- * Uses HTTP Range requests so the CDN only sends the requested slice each time.
- * Useful for progressive playback: the caller can begin rendering before the full
- * file is downloaded.
- *
- * @param {object} message - The message content object with mediaKey, directPath/url, fileLength
- * @param {string} type    - WA media type ('image', 'video', 'audio', 'document', ...)
- * @param {object} opts    - Passed through to downloadContentFromMessage; add chunkSize (bytes) to override
- */
-async function* streamMediaChunks(message, type, opts = {}) {
-	const chunkSize = opts.chunkSize || 2 * 1024 * 1024
-	const fileLength = message.fileLength
-	if (!fileLength || fileLength <= chunkSize) {
-		yield downloadContentFromMessage(message, type, opts)
-		return
-	}
-	for (let offset = 0; offset < fileLength; offset += chunkSize) {
-		const endByte = Math.min(offset + chunkSize - 1, fileLength - 1)
-		yield downloadContentFromMessage(message, type, { ...opts, startByte: offset, endByte })
-	}
-}
-exports.streamMediaChunks = streamMediaChunks
 /**
  * Decrypts and downloads an AES256-CBC encrypted file given the keys.
  * Assumes the SHA256 of the plaintext is appended to the end of the ciphertext
@@ -725,9 +655,13 @@ const uploadWithNodeHttp = async ({ url, filePath, headers, timeoutMs, agent },
 				res.on('data', chunk => (body += chunk))
 				res.on('end', () => {
 					try {
-						resolve(JSON.parse(body))
+						const parsed = JSON.parse(body)
+						if (parsed && typeof parsed === 'object') {
+							Object.defineProperty(parsed, '__statusCode', { value: res.statusCode, enumerable: false })
+						}
+						resolve(parsed)
 					} catch {
-						resolve(undefined)
+						resolve({ __statusCode: res.statusCode })
 					}
 				})
 			}
@@ -759,9 +693,13 @@ const uploadWithFetch = async ({ url, filePath, headers, timeoutMs, agent }) =>
 		signal: timeoutMs ? AbortSignal.timeout(timeoutMs) : undefined
 	})
 	try {
-		return await response.json()
+		const parsed = await response.json()
+		if (parsed && typeof parsed === 'object') {
+			Object.defineProperty(parsed, '__statusCode', { value: response.status, enumerable: false })
+		}
+		return parsed
 	} catch {
-		return undefined
+		return { __statusCode: response.status }
 	}
 }
 /**
@@ -813,37 +751,52 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
 			const auth = encodeURIComponent(uploadInfo.auth)
 			const url = `https://${hostname}${Defaults_1.MEDIA_PATH_MAP[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`
 			let result
-			try {
-				result = await uploadMedia(
-					{
-						url,
-						filePath,
-						headers,
-						timeoutMs,
-						agent: fetchAgent
-					},
-					logger
-				)
-				if (result?.url || result?.direct_path) {
-					urls = {
-						mediaUrl: result.url,
-						directPath: result.direct_path,
-						meta_hmac: result.meta_hmac,
-						fbid: result.fbid,
-						ts: result.ts
+			const maxRateLimitRetries = 3
+			for (let attempt = 0; attempt <= maxRateLimitRetries; attempt++) {
+				try {
+					result = await uploadMedia(
+						{
+							url,
+							filePath,
+							headers,
+							timeoutMs,
+							agent: fetchAgent
+						},
+						logger
+					)
+					const isRateLimited = result?.__statusCode === 429 || result?.__statusCode === 503
+					if (isRateLimited && attempt < maxRateLimitRetries) {
+						const backoffMs = Math.min(500 * 2 ** attempt, 8000) + Math.floor(Math.random() * 250)
+						logger.warn(
+							{ hostname, attempt, backoffMs, statusCode: result.__statusCode },
+							'media upload rate-limited, backing off before retry'
+						)
+						await new Promise(resolve => setTimeout(resolve, backoffMs))
+						continue
+					}
+					if (result?.url || result?.direct_path) {
+						urls = {
+							mediaUrl: result.url,
+							directPath: result.direct_path,
+							meta_hmac: result.meta_hmac,
+							fbid: result.fbid,
+							ts: result.ts
+						}
+					} else {
+						uploadInfo = await refreshMediaConn(true)
+						throw new Error(`upload failed, reason: ${JSON.stringify(result)}`)
 					}
 					break
-				} else {
-					uploadInfo = await refreshMediaConn(true)
-					throw new Error(`upload failed, reason: ${JSON.stringify(result)}`)
+				} catch (error) {
+					const isLast = hostname === hosts[uploadInfo.hosts.length - 1]?.hostname
+					logger.warn(
+						{ trace: error?.stack, uploadResult: result },
+						`Error in uploading to ${hostname} ${isLast ? '' : ', retrying...'}`
+					)
+					break
 				}
-			} catch (error) {
-				const isLast = hostname === hosts[uploadInfo.hosts.length - 1]?.hostname
-				logger.warn(
-					{ trace: error?.stack, uploadResult: result },
-					`Error in uploading to ${hostname} ${isLast ? '' : ', retrying...'}`
-				)
 			}
+			if (urls) break
 		}
 		if (!urls) {
 			throw new boom_1.Boom('Media upload failed on all hosts', { statusCode: 500 })