sync: master → develop 2026-06-08 — backfill release #521 fixes

WAProto/WAProto.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package proto;
 
-/// WhatsApp Version: 2.3000.1040967287
+/// WhatsApp Version: 2.3000.1041063798
 
 message ADVDeviceIdentity {
     optional uint32 rawId = 1;

src/Defaults/baileys-version.json

@@ -1 +1 @@
-{"version":[2,3000,1040973525]}
+{"version":[2,3000,1041103517]}

src/Socket/messages-recv.ts

@@ -626,7 +626,7 @@
 			return
 		}
 
 		let data: any
 		try {
 			// Narrow payload content type before JSON.parse:
 			// content can be string (UTF-16 internally), Uint8Array, Buffer, or
@@ -839,7 +839,7 @@
 				case 'update': {
 					const settingsNode = getBinaryNodeChild(child, 'settings')
 					if (settingsNode) {
 						const update: Record<string, any> = {}
 						const nameNode = getBinaryNodeChild(settingsNode, 'name')
 						if (nameNode?.content) update.name = nameNode.content.toString()
 
@@ -3121,6 +3121,33 @@
 						return
 					}
 
+					// `OrphanMsmsgError` from `decryptMsmsgBotMessage` (Meta AI / FBID bot
+					// reply that arrived before we cached the matching outgoing
+					// `messageContextInfo.messageSecret`). Without this guard the stub
+					// string falls through to the Signal retry/PDO path below — pointless
+					// because a missing CACHE entry can't be recovered by a Signal retry,
+					// and we'd burn the retry budget asking the bot for prekeys it has
+					// no business issuing. Send a plain ACK (no NACK) so the server
+					// considers the message delivered; the next bot reply that arrives
+					// after the outgoing-secret cache populates will decrypt cleanly
+					// (audit thread 2 / chatgpt P2 on release PR #521).
+					//
+					// Narrow match on `'no messageSecret for '` (not the broader
+					// `'decryptMsmsgBotMessage:'` prefix): `decryptMsmsgBotMessage`
+					// also raises for real decryption failures — missing
+					// `meta.target_id`, missing `encIv`/`encPayload`, AES-GCM auth-tag
+					// mismatch — which deserve the Signal retry path, NOT a silent
+					// ACK. cubic audit thread 13 (PR #521).
+					if (
+						msg?.messageStubParameters?.[0]?.startsWith(
+							'decryptMsmsgBotMessage: no messageSecret for '
+						)
+					) {
+						await sendMessageAck(node)
+						acked = true
+						return
+					}
+
 					// Audit RETRY-A2 — sender-key stale em skmsg de grupo: o counter
 					// avançou no remetente mas a chain local não acompanhou. Reenviar
 					// o mesmo skmsg via sendRetryRequest sempre falha (mesma sender-key,
@@ -3772,7 +3799,7 @@
 					tcTokenRetriedMsgIds.add(retryKey)
 					// Each entry auto-expires after 60s — naturally bounded under normal use
 					setTimeout(() => tcTokenRetriedMsgIds.delete(retryKey), 60_000)
 					;(async () => {
 						try {
 							await delay(1500)
 							const msg =

src/Socket/messages-send.ts

@@ -1575,14 +1575,27 @@ export const makeMessagesSocket = (config: SocketConfig) => {
 					}
 				}
 
-				// Send DSM for all message types including carousel
+				// Send DSM for all message types including carousel.
+				// Mirrors the same `messageContextInfo` lift done on the initial-
+				// fanout DSM build (line ~1198 — release PR #519 fix): Lottie
+				// stickers wrap their `messageContextInfo` inside
+				// `lottieStickerMessage.message`, so the retry-resend envelope
+				// needs to lift it back to the DSM top-level just like the initial
+				// send does. Without this, the sender's other devices receive the
+				// retry without `messageSecret` / reporting token and the next
+				// edit / msmsg reply can't be decrypted on those devices.
+				// (audit thread 5 / coderabbit Major on release PR #521)
+				const retryDsmContextInfo =
+					messageToSend.lottieStickerMessage?.message?.messageContextInfo ??
+					messageToSend.messageContextInfo
 				const usesDSM = isMe
 				const encodedMessageToSend = usesDSM
 					? encodeWAMessage({
 							deviceSentMessage: {
 								destinationJid,
 								message: messageToSend
-							}
+							},
+							messageContextInfo: retryDsmContextInfo
 						})
 					: encodeWAMessage(messageToSend)
 
@@ -1878,10 +1891,19 @@ export const makeMessagesSocket = (config: SocketConfig) => {
 				logger.debug({ jid }, 'adding device identity')
 			}
 
+			// Lottie stickers (`{ lottieStickerMessage: { message: outer }}`) carry
+			// their `messageContextInfo` INSIDE the wrap — read both spots so the
+			// reporting-token attachment works the same for wrapped and unwrapped
+			// stickers (audit thread 1 / chatgpt P2 on release PR #521).
+			const reportingMessageSecret =
+				reportingMessage?.lottieStickerMessage?.message?.messageContextInfo?.messageSecret ??
+				reportingMessage?.messageContextInfo?.messageSecret
+
 			if (
 				!isNewsletter &&
 				!isRetryResend &&
-				reportingMessage?.messageContextInfo?.messageSecret &&
+				reportingMessage &&
+				reportingMessageSecret &&
 				shouldIncludeReportingToken(reportingMessage)
 			) {
 				try {

src/Utils/auth-utils.ts

@@ -711,7 +711,7 @@ export const addTransactionCapability = (
 					// with the message context attached (key/sender/decryptionJid). This
 					// site has none of that context — it would just duplicate the stack
 					// without anything actionable on top.
-					logger.trace({ err: (err as any)?.message }, 'transactWith rolled back')
+					logger.trace({ err: err instanceof Error ? err.message : String(err) }, 'transactWith rolled back')
 					throw err
 				} finally {
 					activeTransactions--

src/Utils/decode-wa-message.ts

@@ -70,7 +70,7 @@ const EMPTY_UINT8_ARRAY = new Uint8Array(0)
  *
  * Returns the input unchanged when there is no `deviceSentMessage` envelope.
  */
-const unwrapDeviceSentMessage = (msg: proto.IMessage): proto.IMessage => {
+export const unwrapDeviceSentMessage = (msg: proto.IMessage): proto.IMessage => {
 	const inner = msg.deviceSentMessage?.message
 	if (!inner) return msg
 

src/Utils/error-log-utils.ts

@@ -30,7 +30,10 @@
  * raises `TypeError`, so the object-without-message branch is guarded.
  */
 export const compactError = (err: unknown): string => {
-	if (!err) return 'Unknown'
+	// Nullish-only check captures `null` AND `undefined` only — the previous
+	// `!err` also caught `0`, `''`, `false`, `NaN`, which are valid (if
+	// unusual) thrown values. cubic audit thread 9 (PR #521).
+	if (err === null || err === undefined) return 'Unknown'
 	if (err instanceof Error) {
 		const name = err.name || 'Error'
 		return `${name}: ${err.message}`

src/Utils/meta-ai-msmsg.ts

@@ -43,7 +43,7 @@ import NodeCache from '@cacheable/node-cache'
 import { proto } from '../../WAProto/index.js'
 import { DEFAULT_CACHE_MAX_KEYS, DEFAULT_CACHE_TTLS } from '../Defaults'
 import type { BinaryNode } from '../WABinary'
-import { isJidGroup, isJidMetaAI, jidDecode, jidNormalizedUser } from '../WABinary/jid-utils'
+import { isJidMetaAI, jidDecode, jidNormalizedUser } from '../WABinary/jid-utils'
 import { isNodeCacheFullError } from './cache-utils'
 import { aesDecryptGCM, hkdf } from './crypto'
 import { compactError } from './error-log-utils'
@@ -519,14 +519,3 @@ export const isMsmsgBotConversation = (chatOrAuthorJid: string | undefined): boo
 	if (!chatOrAuthorJid) return false
 	return !!isJidMetaAI(chatOrAuthorJid)
 }
-
-/** Re-export for the test suite + decoder. */
-export const __internal = {
-	BOT_MESSAGE_INFO,
-	KEY_LENGTH,
-	isMeJid,
-	deriveKeyAndDecrypt,
-	decodeDecryptedMsmsg,
-	userOnlyJid,
-	isJidGroup
-}

src/__tests__/Utils/dsm-context-info-preservation.test.ts

@@ -22,26 +22,15 @@
  *     are caught too.
  */
 import { proto } from '../../../WAProto/index.js'
+import { unwrapDeviceSentMessage } from '../../Utils/decode-wa-message'
 
-// The helper is intentionally not exported (it's a leaf utility used by
-// `decryptMessageNode`). Re-derive its behaviour here to pin the exact
-// per-field merge rules. If the rules change in `decode-wa-message.ts`,
-// these expectations break first and point at the divergence.
-const unwrapDeviceSentMessage = (msg: proto.IMessage): proto.IMessage => {
-	const inner = msg.deviceSentMessage?.message
-	if (!inner) return msg
-	const innerCtx = inner.messageContextInfo
-	const outerCtx = msg.messageContextInfo
-	const messageContextInfo: proto.IMessageContextInfo = {
-		...innerCtx,
-		messageSecret: innerCtx?.messageSecret ?? outerCtx?.messageSecret,
-		messageAssociation: innerCtx?.messageAssociation ?? outerCtx?.messageAssociation,
-		limitSharingV2: outerCtx?.limitSharingV2,
-		threadId: (innerCtx?.threadId?.length ? innerCtx.threadId : null) ?? outerCtx?.threadId ?? [],
-		botMetadata: innerCtx?.botMetadata ?? outerCtx?.botMetadata
-	}
-	return { ...inner, messageContextInfo }
-}
+// Import the REAL helper from production (not a re-derivation). Earlier
+// version of this file kept a local copy because the helper wasn't exported,
+// but that broke the contract these tests claim to enforce: a regression
+// in `decode-wa-message.ts` would not surface here. cubic audit thread 8
+// (PR #521) caught it — exported the helper as a named export and import
+// it now, so any change to the production implementation is reflected in
+// the assertions below.
 
 const OUTER_SECRET = Buffer.alloc(32, 0xaa)
 const INNER_SECRET = Buffer.alloc(32, 0xbb)

src/__tests__/Utils/error-log-utils.test.ts

@@ -43,6 +43,18 @@ describe('compactError', () => {
 		expect(compactError(true)).toBe('true')
 	})
 
+	// cubic audit thread 9 (PR #521): the original `if (!err)` short-circuit
+	// captured `0`, `''`, `false`, `NaN` as "Unknown" even though those are
+	// (unusual but valid) thrown values. The narrowed `if (err == null)`
+	// nullish check keeps `undefined`/`null` → "Unknown" but lets the falsy
+	// primitives reach the `String(err)` fallback below.
+	it('preserves falsy primitives that are NOT null/undefined', () => {
+		expect(compactError(0)).toBe('0') // not 'Unknown'
+		expect(compactError(false)).toBe('false') // not 'Unknown'
+		expect(compactError('')).toBe('') // empty string is still a string
+		expect(compactError(NaN)).toBe('NaN') // not 'Unknown'
+	})
+
 	it('falls back to JSON.stringify on a plain object without .message', () => {
 		const err = { name: 'CustomBag', code: 'X1', details: 'no message field' }
 		expect(compactError(err)).toBe('CustomBag: {"name":"CustomBag","code":"X1","details":"no message field"}')