@zervonex/baileys 3.0.1 → 3.0.2

package/lib/Socket/socket.js

@@ -530,7 +530,6 @@ export const makeSocket = (config) => {
   // ─── Pairing ─────────────────────────────────────────────────────────────────
 
   const requestPairingCode = async (phoneNumber, customPairingCode) => {
-    if (authState.creds.pairingCode && !customPairingCode) return authState.creds.pairingCode
     await waitForSocketOpen()
     await new Promise((resolve) => setTimeout(resolve, 500))
     const pairingCode = customPairingCode ?? bytesToCrockford(randomBytes(5))

package/lib/Socket/{nexus-handler.js → zervonex-handler.js}

@@ -1,55 +1,55 @@
-import crypto from 'crypto'
-import * as Builders from '../Builders/index.js'
-import { buildDispatch, buildPlugins, norm, handleGroupStatus, handleStatusMention, handlePollResult, PRIMITIVE_SHORTCUTS, HANDLER_SHORTCUTS, attachAIRich } from '../Builders/index.js'
-import { makeUsernameSocket } from './username.js'
-
-export const makeMessageBuilderSocket = (config) => {
-    const sock = makeUsernameSocket(config)
-    const _send = sock.sendMessage.bind(sock)
-
-    const ALL_BUILDERS = Object.values(Builders).filter(B => typeof B === 'function' && (B.dispatchKeys || B.shortcuts || B.name))
-
-    const DISPATCH = buildDispatch(ALL_BUILDERS, {
-        groupStatus: (sock, jid, content, opts, config) => handleGroupStatus(sock, jid, norm(content.groupStatus), config),
-        statusMentionMessage: (sock, jid, content, opts, config) => handleStatusMention(sock, jid, norm(content.statusMentionMessage), config),
-        pollResultMessage: (sock, jid, content) => handlePollResult(sock, jid, norm(content.pollResultMessage))
-    })
-
-    const PLUGINS = buildPlugins(ALL_BUILDERS, { ...PRIMITIVE_SHORTCUTS, ...HANDLER_SHORTCUTS })
-
-    const result = { ...sock }
-
-    for (const [name, factory] of Object.entries(PLUGINS)) result[name] = factory(result, config)
-
-    result.sendMessage = async (jid, content, options = {}) => {
-        // aiRich shorthand — multiple aliases supported
-        const aiData = content.aiRich ?? content.airich ?? content.richResponse ?? content.AIRich
-        if (aiData) return result.sendRichFromObject(jid, aiData, options)
-
-        // dispatch to registered builder handlers
-        for (const [key, handler] of Object.entries(DISPATCH)) {
-            if (key in content) return handler(result, jid, content, options, config)
-        }
-
-        // bare nativeFlow array/object — wrap into interactiveMessage before sending
-        if (content.nativeFlow && !content.interactiveMessage) {
-            const buttons = Array.isArray(content.nativeFlow) ? content.nativeFlow : [content.nativeFlow]
-            const { generateWAMessageFromContent } = await import('../Utils/index.js')
-            const msg = await generateWAMessageFromContent(jid, {
-                interactiveMessage: { body: { text: content.text || '' }, footer: { text: content.footer || '' }, header: { hasMediaAttachment: false }, nativeFlowMessage: { buttons } }
-            }, { userJid: sock.user?.id })
-            await result.relayMessage(jid, msg.message, { messageId: msg.key.id, aiLabel: !!(content.ai ?? content.aiLabel ?? options.aiLabel ?? options.ai ?? config.aiLabel ?? config.ai) })
-            return msg
-        }
-
-        const { ai, aiLabel: contentAiLabel, ...cleanContent } = content
-        const isAi = !!(ai ?? contentAiLabel ?? options.aiLabel ?? options.ai ?? config.aiLabel)
-        if (isAi) {
-            const secret = cleanContent.messageContextInfo?.messageSecret || crypto.randomBytes(32)
-            cleanContent.messageContextInfo = { ...(cleanContent.messageContextInfo || {}), messageSecret: secret, supportPayload: JSON.stringify({ version: 2, is_ai_message: true, should_show_system_message: true, ticket_id: crypto.randomBytes(16).toString('hex') }) }
-        }
-        return _send(jid, isAi ? cleanContent : content, { ...options, aiLabel: isAi })
-    }
-
-    return attachAIRich(result, config)
+import crypto from 'crypto'
+import * as Builders from '../Builders/index.js'
+import { buildDispatch, buildPlugins, norm, handleGroupStatus, handleStatusMention, handlePollResult, PRIMITIVE_SHORTCUTS, HANDLER_SHORTCUTS, attachAIRich } from '../Builders/index.js'
+import { makeUsernameSocket } from './username.js'
+
+export const makeMessageBuilderSocket = (config) => {
+    const sock = makeUsernameSocket(config)
+    const _send = sock.sendMessage.bind(sock)
+
+    const ALL_BUILDERS = Object.values(Builders).filter(B => typeof B === 'function' && (B.dispatchKeys || B.shortcuts || B.name))
+
+    const DISPATCH = buildDispatch(ALL_BUILDERS, {
+        groupStatus: (sock, jid, content, opts, config) => handleGroupStatus(sock, jid, norm(content.groupStatus), config),
+        statusMentionMessage: (sock, jid, content, opts, config) => handleStatusMention(sock, jid, norm(content.statusMentionMessage), config),
+        pollResultMessage: (sock, jid, content) => handlePollResult(sock, jid, norm(content.pollResultMessage))
+    })
+
+    const PLUGINS = buildPlugins(ALL_BUILDERS, { ...PRIMITIVE_SHORTCUTS, ...HANDLER_SHORTCUTS })
+
+    const result = { ...sock }
+
+    for (const [name, factory] of Object.entries(PLUGINS)) result[name] = factory(result, config)
+
+    result.sendMessage = async (jid, content, options = {}) => {
+        // aiRich shorthand — multiple aliases supported
+        const aiData = content.aiRich ?? content.airich ?? content.richResponse ?? content.AIRich
+        if (aiData) return result.sendRichFromObject(jid, aiData, options)
+
+        // dispatch to registered builder handlers
+        for (const [key, handler] of Object.entries(DISPATCH)) {
+            if (key in content) return handler(result, jid, content, options, config)
+        }
+
+        // bare nativeFlow array/object — wrap into interactiveMessage before sending
+        if (content.nativeFlow && !content.interactiveMessage) {
+            const buttons = Array.isArray(content.nativeFlow) ? content.nativeFlow : [content.nativeFlow]
+            const { generateWAMessageFromContent } = await import('../Utils/index.js')
+            const msg = await generateWAMessageFromContent(jid, {
+                interactiveMessage: { body: { text: content.text || '' }, footer: { text: content.footer || '' }, header: { hasMediaAttachment: false }, nativeFlowMessage: { buttons } }
+            }, { userJid: sock.user?.id })
+            await result.relayMessage(jid, msg.message, { messageId: msg.key.id, aiLabel: !!(content.ai ?? content.aiLabel ?? options.aiLabel ?? options.ai ?? config.aiLabel ?? config.ai) })
+            return msg
+        }
+
+        const { ai, aiLabel: contentAiLabel, ...cleanContent } = content
+        const isAi = !!(ai ?? contentAiLabel ?? options.aiLabel ?? options.ai ?? config.aiLabel)
+        if (isAi) {
+            const secret = cleanContent.messageContextInfo?.messageSecret || crypto.randomBytes(32)
+            cleanContent.messageContextInfo = { ...(cleanContent.messageContextInfo || {}), messageSecret: secret, supportPayload: JSON.stringify({ version: 2, is_ai_message: true, should_show_system_message: true, ticket_id: crypto.randomBytes(16).toString('hex') }) }
+        }
+        return _send(jid, isAi ? cleanContent : content, { ...options, aiLabel: isAi })
+    }
+
+    return attachAIRich(result, config)
 }

package/lib/Utils/chat-utils.js

@@ -102,6 +102,7 @@ export const decodeSyncdMutations = async (msgMutations, initialState, getAppSta
         const record = 'record' in msgMutation && msgMutation.record ? msgMutation.record : msgMutation
         let key
         try { key = await getKey(record.keyId.id) } catch (err) { if (isMissingKeyError(err)) throw err; continue }
+        if (!record?.value?.blob) continue
         const content = record.value.blob
         const encContent = content.subarray(0, -32)
         const ogValueMac = content.subarray(-32)

package/lib/Utils/index.js

@@ -1,39 +1,38 @@
-export * from './generics.js'
-export * from './decode-wa-message.js'
-export * from './messages.js'
-export * from './messages-media.js'
-export * from './validate-connection.js'
-export * from './crypto.js'
-export * from './signal.js'
-export * from './make-mutex.js'
-export * from './logger.js'
-export * from './noise-handler.js'
-export * from './history.js'
-export * from './chat-utils.js'
-export * from './lt-hash.js'
-export * from './auth-utils.js'
-export * from './baileys-event-stream.js'
-export * from './use-multi-file-auth-state.js'
-export * from './link-preview.js'
-export * from './event-buffer.js'
-export * from './process-message.js'
-export * from './message-retry-manager.js'
-export * from './browser-utils.js'
-export * from './identity-change-handler.js'
-export * from './key-store.js'
-export * from './reporting-utils.js'
-export * from './companion-reg-client-utils.js'
-export * from './tc-token-utils.js'
-export * from './meta-ai-msmsg.js'
-export * from './spam-report-utils.js'
-export * from './modern-messages.js'
-export * from './extras.js'
-export * from './native-flow.js'
-export * from './consumer-application.js'
-export * from './bot-capabilities.js'
-export * from './meta-compositing.js'
-export * from './bot-planning-replay.js'
-export * from './message-composer.js'
-export * from './business.js'
-export * from './pre-key-manager.js'
-export * from './sync-action-utils.js'
+export * from './generics.js'
+export * from './decode-wa-message.js'
+export * from './messages.js'
+export * from './messages-media.js'
+export * from './validate-connection.js'
+export * from './crypto.js'
+export * from './signal.js'
+export * from './make-mutex.js'
+export * from './logger.js'
+export * from './noise-handler.js'
+export * from './history.js'
+export * from './chat-utils.js'
+export * from './lt-hash.js'
+export * from './auth-utils.js'
+export * from './baileys-event-stream.js'
+export * from './use-multi-file-auth-state.js'
+export * from './link-preview.js'
+export * from './event-buffer.js'
+export * from './process-message.js'
+export * from './message-retry-manager.js'
+export * from './browser-utils.js'
+export * from './identity-change-handler.js'
+export * from './reporting-utils.js'
+export * from './companion-reg-client-utils.js'
+export * from './tc-token-utils.js'
+export * from './meta-ai-msmsg.js'
+export * from './spam-report-utils.js'
+export * from './modern-messages.js'
+export * from './extras.js'
+export * from './native-flow.js'
+export * from './consumer-application.js'
+export * from './bot-capabilities.js'
+export * from './meta-compositing.js'
+export * from './bot-planning-replay.js'
+export * from './message-composer.js'
+export * from './business.js'
+export * from './pre-key-manager.js'
+export * from './sync-action-utils.js'

package/lib/Utils/messages.js

@@ -95,8 +95,9 @@ const compressWebp = async (buf, { animated, quality = 80, stickerType = Sticker
     return { buffer: converted.length <= STICKER_MAX_BYTES ? converted : await shrinkToLimit(converted, { animated: false }), isAnimated: false }
 }
 
-const shrinkToLimit = async (buf, { animated } = {}) => {
+const shrinkToLimit = async (buf, { animated } = {}, _depth = 0) => {
     if (buf.length <= STICKER_MAX_BYTES) return buf
+    if (_depth >= 2) return buf
     const ratio = STICKER_MAX_BYTES / buf.length
     const q = Math.max(10, Math.min(60, Math.floor(ratio * 80 * 0.85)))
     const out = (await compressWebp(buf, { animated, quality: q })).buffer
@@ -134,11 +135,15 @@ const tgsToWebp = async (tgsBuffer, { quality = 80, fps = 30 } = {}) => {
             const rgba = Buffer.from(api.HEAPU8.buffer, bufPtr, W * H * 4)
             await sharp(Buffer.from(rgba), { raw: { width: W, height: H, channels: 4 } }).png().toFile(path.join(tgsTmpDir, `f${String(i).padStart(4, '0')}.png`))
         }
-        api.lottie_destroy(handle)
-        const outPath = path.join(tgsTmpDir, 'out.webp')
-        await ffmpegRun(['-y', '-framerate', String(fps), '-i', path.join(tgsTmpDir, 'f%04d.png'), '-vcodec', 'libwebp', '-vf', `scale=${W}:${H}`, '-lossless', '0', '-compression_level', '6', '-q:v', String(quality), '-loop', '0', '-preset', 'default', '-an', '-vsync', '0', outPath])
-        return readFileSync(outPath)
-    } finally { rmSync(tgsTmpDir, { recursive: true, force: true }) }
+        const encode = async (outFps, q) => { const outPath = path.join(tgsTmpDir, `out_${outFps}_${q}.webp`); await ffmpegRun(['-y', '-framerate', String(fps), '-i', path.join(tgsTmpDir, 'f%04d.png'), '-vcodec', 'libwebp', '-vf', `scale=512:512,fps=${outFps}`, '-lossless', '0', '-compression_level', '6', '-q:v', String(q), '-loop', '0', '-preset', 'default', '-an', '-vsync', '0', outPath]); return readFileSync(outPath) }
+        let out = await encode(fps, quality)
+        if (out.length <= STICKER_MAX_BYTES) return out
+        const targetFps = Math.max(8, Math.floor(fps * (STICKER_MAX_BYTES / out.length) * 0.9))
+        out = await encode(targetFps, quality)
+        if (out.length <= STICKER_MAX_BYTES) return out
+        const targetQ = Math.max(10, Math.floor(quality * (STICKER_MAX_BYTES / out.length) * 0.9))
+        return encode(targetFps, targetQ)
+    } finally { api.lottie_destroy(handle); rmSync(tgsTmpDir, { recursive: true, force: true }) }
 }
 
 // ─── EXPORTS: URL / LINK PREVIEW ─────────────────────────────────────────────
@@ -158,11 +163,12 @@ export const getContentType = (content) => {
     return Object.keys(content).find(k => (k === 'conversation' || k.includes('Message')) && k !== 'senderKeyDistributionMessage')
 }
 
-export const normalizeMessageContent = (content) => {
+export const normalizeMessageContent = (content, logger) => {
     if (!content) return
     for (let i = 0; i < 5; i++) {
         const inner = WRAPPER_KEYS.reduce((found, k) => found || content?.[k], null)
         if (!inner) break
+        if (!inner.message) { logger?.warn({ i, keys: Object.keys(inner) }, 'normalizeMessageContent: inner wrapper has no message field'); break }
         content = inner.message
     }
     return content
@@ -183,6 +189,18 @@ export const extractMessageContent = (content) => {
     return content
 }
 
+const normalizeExternalAdReplyThumbnail = async (ext) => {
+    if (!ext?.thumbnail || !Buffer.isBuffer(ext.thumbnail) || ext.thumbnail.length <= 50_000) return ext
+    let quality = 90
+    while (quality >= 10) {
+        const thumbnail = await sharp(ext.thumbnail, { sequentialRead: true }).resize(200, 200, { fit: 'inside' }).jpeg({ quality }).toBuffer().catch(() => null)
+        if (!thumbnail) return ext
+        if (thumbnail.length <= 50_000) return { ...ext, thumbnail }
+        quality = Math.max(10, Math.floor(quality * (50_000 / thumbnail.length) * 0.85))
+    }
+    return ext
+}
+
 export const generateForwardMessageContent = (message, forceForward) => {
     let content = normalizeMessageContent(message.message)
     if (!content) throw new Boom('no content in message', { statusCode: 400 })
@@ -486,15 +504,7 @@ const MESSAGE_HANDLERS = {
 // Interactive overlays: keyed by the input field, each returns a complete replacement for m.
 // Looked up dynamically — adding a new overlay type = one new entry, nothing else.
 const applyContextInfoAndMentions = async (interactive, msg) => {
-    if (msg.contextInfo) {
-        const ctx = { ...(interactive.contextInfo || {}), ...msg.contextInfo }
-        if (ctx.externalAdReply?.thumbnail && Buffer.isBuffer(ctx.externalAdReply.thumbnail) && ctx.externalAdReply.thumbnail.length > 50_000) {
-            try {
-                ctx.externalAdReply.thumbnail = await sharp(ctx.externalAdReply.thumbnail).resize(200, 200, { fit: 'cover', position: 'center' }).jpeg({ quality: 60 }).toBuffer()
-            } catch { }
-        }
-        interactive.contextInfo = ctx
-    }
+    if (msg.contextInfo) { const ctx = { ...(interactive.contextInfo || {}), ...msg.contextInfo }; if (ctx.externalAdReply) ctx.externalAdReply = await normalizeExternalAdReplyThumbnail(ctx.externalAdReply); interactive.contextInfo = ctx }
     if (msg.mentions?.length) interactive.contextInfo = { ...(interactive.contextInfo || {}), mentionedJid: msg.mentions }
 }
 
@@ -582,14 +592,14 @@ export const generateWAMessageContent = async (message, options = {}) => {
     }
 
     // Apply overlays: any overlay key present in message replaces m
-    for (const key of overlayKeys) { if (key in message && message[key]) { m = OVERLAY_HANDLERS[key](m, message); break } }
+    for (const key of overlayKeys) { if (key in message && message[key]) { m = await OVERLAY_HANDLERS[key](m, message); break } }
 
     // Merge contextInfo / mentions onto the primary content key — deep-merges externalAdReply to prevent thumbnail/field loss
     const finalKey = Object.keys(m)[0]
     if ((message.contextInfo || message.mentions?.length) && finalKey && m[finalKey] && typeof m[finalKey] === 'object') {
-        const existing = m[finalKey].contextInfo || {}
-        const incoming = message.contextInfo || {}
-        m[finalKey].contextInfo = { ...existing, ...incoming, ...(existing.externalAdReply || incoming.externalAdReply ? { externalAdReply: { ...(existing.externalAdReply || {}), ...(incoming.externalAdReply || {}) } } : {}), ...(message.mentions?.length ? { mentionedJid: message.mentions } : {}) }
+        const existing = m[finalKey].contextInfo || {}; const incoming = message.contextInfo || {}
+        const mergedExt = (existing.externalAdReply || incoming.externalAdReply) ? await normalizeExternalAdReplyThumbnail({ ...(existing.externalAdReply || {}), ...(incoming.externalAdReply || {}) }) : undefined
+        m[finalKey].contextInfo = { ...existing, ...incoming, ...(mergedExt ? { externalAdReply: mergedExt } : {}), ...(message.mentions?.length ? { mentionedJid: message.mentions } : {}) }
     }
 
     if ('viewOnce' in message && message.viewOnce || 'viewOnceMessage' in message) m = { viewOnceMessage: { message: m } }

package/lib/Utils/spam-report-utils.js

@@ -1,142 +1,135 @@
-import { getBinaryNodeChild, getBinaryNodeChildString, isLidUser, isHostedLidUser, S_WHATSAPP_NET } from '../WABinary/index.js'
-import { extractMessageContent } from './messages.js'
-
-export const SPAM_FLOWS = {
-    ACCOUNT_INFO_REPORT: 'account_info_report',
-    ACCOUNT_INFO_BLOCK: 'account_info_block',
-    ONE_TO_ONE_SPAM_BANNER_REPORT: '1_1_spam_banner_report',
-    MESSAGE_MENU: 'message_menu',
-    OVERFLOW_MENU_REPORT: 'overflow_menu_report',
-}
-
-const toBuffer = data => {
-    if (!data) return null
-    if (Buffer.isBuffer(data)) return data
-    if (data instanceof Uint8Array) return Buffer.from(data)
-    if (typeof data === 'string') return Buffer.from(data, 'base64')
-    return null
-}
-
-export const resolveReportJid = async (jid, lidMapping) => {
-    if (!jid) throw new Error('reportSpam: jid required')
-    if (isLidUser(jid) || isHostedLidUser(jid)) return jid
-    if (lidMapping?.getLIDForPN) {
-        const lid = await lidMapping.getLIDForPN(jid)
-        if (lid) return lid
-    }
-    return jid
-}
-
-export const normalizeReportingTag = tag => {
-    const buf = toBuffer(tag)
-    return buf?.length ? buf : null
-}
-
-export const extractMessageText = msg => {
-    if (!msg?.message) return ''
-    const content = extractMessageContent(msg.message)
-    if (!content) return ''
-    if (typeof content.conversation === 'string') return content.conversation
-    if (content.extendedTextMessage?.text) return content.extendedTextMessage.text
-    if (content.imageMessage?.caption) return content.imageMessage.caption
-    if (content.videoMessage?.caption) return content.videoMessage.caption
-    return ''
-}
-
-export const extractReportingInfoFromStanza = stanza => {
-    const reporting = getBinaryNodeChild(stanza, 'reporting')
-    if (!reporting) return null
-
-    let tagNode = getBinaryNodeChild(reporting, 'reporting_tag')
-    if (!tagNode) {
-        const validation = getBinaryNodeChild(reporting, 'reporting_validation')
-        tagNode = validation ? getBinaryNodeChild(validation, 'reporting_tag') : undefined
-    }
-    if (!tagNode) return null
-
-    const raw = tagNode.content
-    const reportingTag = toBuffer(
-        raw instanceof Uint8Array || Buffer.isBuffer(raw) ? raw
-            : typeof raw === 'string' ? raw
-                : null
-    )
-    if (!reportingTag?.length) return null
-
-    const stanzaId = tagNode.attrs?.id || stanza.attrs?.id
-    if (!stanzaId) return null
-
-    const tsRaw = tagNode.attrs?.ts_s || stanza.attrs?.t
-    return { stanzaId, timestamp: tsRaw ? Number(tsRaw) : 0, reportingTag }
-}
-
-export const buildSpamReportMessageNodes = messages => messages.slice(0, 5).map(m => {
-    const reportingTag = normalizeReportingTag(m.reportingTag)
-    if (!reportingTag) throw new Error(`reportSpam: missing reportingTag for ${m.stanzaId}`)
-    return {
-        tag: 'message',
-        attrs: {
-            t: String(m.timestamp),
-            id: m.stanzaId,
-            reported_push_name: m.pushName || '',
-            type: m.messageType || 'text',
-            from: m.fromJid,
-        },
-        content: [
-            {
-                tag: 'raw',
-                attrs: { local_message_type: '0', v: '2' },
-                content: m.text ?? '',
-            },
-            {
-                tag: 'reporting',
-                attrs: {},
-                content: [{
-                    tag: 'reporting_validation',
-                    attrs: {},
-                    content: [{
-                        tag: 'reporting_tag',
-                        attrs: { id: m.stanzaId, ts_s: String(m.timestamp) },
-                        content: reportingTag,
-                    }],
-                }],
-            },
-        ],
-    }
-})
-
-export const buildSpamReportIq = (jid, messages, spamFlow = SPAM_FLOWS.ACCOUNT_INFO_REPORT) => {
-    if (!messages?.length) throw new Error('reportSpam: at least one message with reporting_tag required')
-    return {
-        tag: 'iq',
-        attrs: { type: 'set', xmlns: 'spam', to: S_WHATSAPP_NET },
-        content: [{
-            tag: 'spam_list',
-            attrs: { jid, spam_flow: spamFlow },
-            content: buildSpamReportMessageNodes(messages),
-        }],
-    }
-}
-
-export const parseSpamReportResponse = result => {
-    if (!result) return { success: false, error: 'empty response' }
-    if (result.attrs?.type === 'error') {
-        const errNode = getBinaryNodeChild(result, 'error')
-        const code = errNode?.attrs?.code
-        const text = errNode?.content?.toString?.() || errNode?.attrs?.text
-        return { success: false, error: `spam IQ error${code ? ` ${code}` : ''}${text ? `: ${text}` : ''}` }
-    }
-    const reportNode = getBinaryNodeChild(result, 'report')
-    const reportId = reportNode?.attrs?.id || getBinaryNodeChildString(reportNode, 'id')
-    if (reportId) return { success: true, reportId: String(reportId) }
-    if (result.attrs?.type === 'result') return { success: true }
-    return { success: false, error: 'unexpected spam IQ response' }
-}
-
-export const buildSimpleReportNode = (jid, messageKeys) => ({
-    tag: 'report',
-    attrs: { jid, type: 'spam' },
-    content: (messageKeys || []).map(key => ({
-        tag: 'message',
-        attrs: { id: key.id || key, from: key.fromMe ? undefined : jid },
-    })),
+import { getBinaryNodeChild, getBinaryNodeChildString, isLidUser, isHostedLidUser, S_WHATSAPP_NET } from '../WABinary/index.js'
+import { extractMessageContent } from './messages.js'
+
+export const SPAM_FLOWS = {
+    ACCOUNT_INFO_REPORT: 'account_info_report',
+    ACCOUNT_INFO_BLOCK: 'account_info_block',
+    ONE_TO_ONE_SPAM_BANNER_REPORT: '1_1_spam_banner_report',
+    MESSAGE_MENU: 'message_menu',
+    OVERFLOW_MENU_REPORT: 'overflow_menu_report',
+}
+
+const toBuffer = data => {
+    if (!data) return null
+    if (Buffer.isBuffer(data)) return data
+    if (data instanceof Uint8Array) return Buffer.from(data)
+    if (typeof data === 'string') return Buffer.from(data, 'base64')
+    return null
+}
+
+export const resolveReportJid = async (jid, lidMapping) => {
+    if (!jid) throw new Error('reportSpam: jid required')
+    if (isLidUser(jid) || isHostedLidUser(jid)) return jid
+    if (lidMapping?.getLIDForPN) {
+        const lid = await lidMapping.getLIDForPN(jid)
+        if (lid) return lid
+    }
+    return jid
+}
+
+export const normalizeReportingTag = tag => {
+    const buf = toBuffer(tag)
+    return buf?.length ? buf : null
+}
+
+export const extractMessageText = msg => {
+    if (!msg?.message) return ''
+    const content = extractMessageContent(msg.message)
+    if (!content) return ''
+    if (typeof content.conversation === 'string') return content.conversation
+    if (content.extendedTextMessage?.text) return content.extendedTextMessage.text
+    if (content.imageMessage?.caption) return content.imageMessage.caption
+    if (content.videoMessage?.caption) return content.videoMessage.caption
+    return ''
+}
+
+export const extractReportingInfoFromStanza = stanza => {
+    const reporting = getBinaryNodeChild(stanza, 'reporting')
+    if (!reporting) return null
+    const tokenNode = getBinaryNodeChild(reporting, 'reporting_token')
+    const tagNode = getBinaryNodeChild(reporting, 'reporting_tag') ||
+        getBinaryNodeChild(getBinaryNodeChild(reporting, 'reporting_validation'), 'reporting_tag')
+    if (!tagNode?.content) return null
+    const raw = tagNode.content
+    const reportingTag = toBuffer(raw instanceof Uint8Array || Buffer.isBuffer(raw) ? raw : typeof raw === 'string' ? raw : null)
+    if (!reportingTag?.length) return null
+    const stanzaId = tagNode.attrs?.id || stanza.attrs?.id
+    if (!stanzaId) return null
+    const tsRaw = tagNode.attrs?.ts_s || stanza.attrs?.t
+    const reportingToken = tokenNode?.content ? toBuffer(tokenNode.content) : null
+    const tokenVersion = tokenNode?.attrs?.v ? parseInt(tokenNode.attrs.v) : null
+    const validationPolicy = reporting.attrs?.validation_policy || null
+    return { stanzaId, timestamp: tsRaw ? Number(tsRaw) : 0, reportingTag, reportingToken, tokenVersion, validationPolicy }
+}
+
+export const buildSpamReportMessageNodes = messages => messages.slice(0, 5).map(m => {
+    const reportingTag = normalizeReportingTag(m.reportingTag)
+    if (!reportingTag) throw new Error(`reportSpam: missing reportingTag for ${m.stanzaId}`)
+    return {
+        tag: 'message',
+        attrs: {
+            t: String(m.timestamp),
+            id: m.stanzaId,
+            reported_push_name: m.pushName || '',
+            type: m.messageType || 'text',
+            from: m.fromJid,
+        },
+        content: [
+            {
+                tag: 'raw',
+                attrs: { local_message_type: '0', v: '2' },
+                content: m.text ?? '',
+            },
+            {
+                tag: 'reporting',
+                attrs: {},
+                content: [{
+                    tag: 'reporting_validation',
+                    attrs: {},
+                    content: [{
+                        tag: 'reporting_tag',
+                        attrs: { id: m.stanzaId, ts_s: String(m.timestamp) },
+                        content: reportingTag,
+                    }],
+                }],
+            },
+        ],
+    }
+})
+
+export const buildSpamReportIq = (jid, messages, spamFlow = SPAM_FLOWS.ACCOUNT_INFO_REPORT) => {
+    if (!messages?.length) throw new Error('reportSpam: at least one message with reporting_tag required')
+    return {
+        tag: 'iq',
+        attrs: { type: 'set', xmlns: 'spam', to: S_WHATSAPP_NET },
+        content: [{
+            tag: 'spam_list',
+            attrs: { jid, spam_flow: spamFlow },
+            content: buildSpamReportMessageNodes(messages),
+        }],
+    }
+}
+
+export const parseSpamReportResponse = result => {
+    if (!result) return { success: false, error: 'empty response' }
+    if (result.attrs?.type === 'error') {
+        const errNode = getBinaryNodeChild(result, 'error')
+        const code = errNode?.attrs?.code
+        const text = errNode?.content?.toString?.() || errNode?.attrs?.text
+        return { success: false, error: `spam IQ error${code ? ` ${code}` : ''}${text ? `: ${text}` : ''}` }
+    }
+    const reportNode = getBinaryNodeChild(result, 'report')
+    const reportId = reportNode?.attrs?.id || getBinaryNodeChildString(reportNode, 'id')
+    if (reportId) return { success: true, reportId: String(reportId) }
+    if (result.attrs?.type === 'result') return { success: true }
+    return { success: false, error: 'unexpected spam IQ response' }
+}
+
+export const buildSimpleReportNode = (jid, messageKeys) => ({
+    tag: 'report',
+    attrs: { jid, type: 'spam' },
+    content: (messageKeys || []).map(key => ({
+        tag: 'message',
+        attrs: { id: key.id || key, from: key.fromMe ? undefined : jid },
+    })),
 })