@zervonex/baileys 3.0.2 → 3.0.4

package/lib/Builders/AIRich.js

@@ -341,7 +341,7 @@ export class AIRich {
     if (this.#suggestedPrompts) botMeta.suggestedPromptMetadata = this.#suggestedPrompts
     if (this.#pttTranscript) botMeta.pttPromptMetadata = { transcript: this.#pttTranscript }
     botMeta.capabilities = { richResponseUnifiedResponse: true, richResponseEmbeddedScreens: true, richResponseInlineLinksEnabled: true, richResponseUrBloksEnabled: true, richResponseUrImagine: true, richResponseUrReasoning: true }
-    return generateWAMessageFromContent(jid, message, { userJid: this.#client.user?.id, messageId })
+    return await await generateWAMessageFromContent(jid, message, { userJid: this.#client.user?.id, messageId })
   }
 
   async send(jid, opts = {}) {
@@ -363,7 +363,7 @@ export class AIRich {
     if (!targetId) throw new Error('targetId is required for sendEdit')
     const msg = await this.build(jid, opts)
     const editMsg = { protocolMessage: { key: { remoteJid: jid, fromMe: true, id: targetId }, type: 14, editedMessage: msg.message } }
-    const waMsg = await generateWAMessageFromContent(jid, editMsg, { userJid: this.#client.user?.id })
+    const waMsg = await await generateWAMessageFromContent(jid, editMsg, { userJid: this.#client.user?.id })
     await this.#client.relayMessage(jid, waMsg.message, { messageId: waMsg.key.id })
     return waMsg
   }
@@ -471,7 +471,7 @@ export function attachAIRich(result, config) {
     if (shouldEdit) {
       try {
         const editContent = proto.Message.fromObject({ botForwardedMessage: { message: { protocolMessage: { key: { remoteJid: jid, fromMe: true, id: fullMsg.key.id }, type: proto.Message.ProtocolMessage.Type.MESSAGE_EDIT, editedMessage: fullMsg.message } } } })
-        const editMsg = generateWAMessageFromContent(jid, editContent, { userJid: sock.user?.id, messageId: generateMessageIDV2(sock.user?.id || jid) })
+        const editMsg = await await generateWAMessageFromContent(jid, editContent, { userJid: sock.user?.id, messageId: generateMessageIDV2(sock.user?.id || jid) })
         await sock.relayMessage(jid, editMsg.message, { ...relayOpts, messageId: editMsg.key.id })
       } catch { /* card already arrived, just behind download prompt */ }
     }
@@ -503,10 +503,10 @@ export function attachAIRich(result, config) {
   result.sendLink = (jid, text, links, quoted, opts = {}) => result.sendMessage(jid, { aiRich: { title: opts.headerText, text, sources: links.map(url => ({ url, title: url, subtitle: new URL(url).hostname })) } }, q(quoted))
   result.sendLinkV2 = (jid, text, links, quoted, opts = {}) => result.sendMessage(jid, { aiRich: { title: opts.headerText, text, sources: links } }, q(quoted))
   result.sendLatex = (jid, expressions, quoted, opts = {}) => result.sendMessage(jid, { aiRich: { text: opts.text, title: opts.headerText, latex: expressions } }, q(quoted))
-  result.sendRichTable = async (jid, title, headers, rows, quoted, opts = {}) => { const { message, messageId } = generateTableContent(title, headers, rows, quoted, opts); return relayRichMessage(jid, generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts) }
-  result.sendRichList = async (jid, title, items, quoted, opts = {}) => { const { message, messageId } = generateListContent(title, items, quoted, opts); return relayRichMessage(jid, generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts) }
-  result.sendRichCode = async (jid, code, quoted, opts = {}) => { const { message, messageId } = generateCodeBlockContent(code, quoted, opts); return relayRichMessage(jid, generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts) }
-  result.sendRichLatex = async (jid, quoted, opts = {}) => { const { message, messageId } = generateLatexContent(quoted, { expressions: [], ...opts }); return relayRichMessage(jid, generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts) }
+  result.sendRichTable = async (jid, title, headers, rows, quoted, opts = {}) => { const { message, messageId } = generateTableContent(title, headers, rows, quoted, opts); return relayRichMessage(jid, await generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts) }
+  result.sendRichList = async (jid, title, items, quoted, opts = {}) => { const { message, messageId } = generateListContent(title, items, quoted, opts); return relayRichMessage(jid, await generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts) }
+  result.sendRichCode = async (jid, code, quoted, opts = {}) => { const { message, messageId } = generateCodeBlockContent(code, quoted, opts); return relayRichMessage(jid, await generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts) }
+  result.sendRichLatex = async (jid, quoted, opts = {}) => { const { message, messageId } = generateLatexContent(quoted, { expressions: [], ...opts }); return relayRichMessage(jid, await generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts) }
   result.sendRichLabel = (jid, text, options = {}) => { const r = new AIRich(result); r.addLabel(text, options.variant, options); return r.send(jid, options) }
   result.sendInlineLinks = (jid, links, options = {}) => { const r = new AIRich(result); r.addInlineLinks(links); return r.send(jid, options) }
   result.sendVerticalAlbum = (jid, items, options = {}) => { const r = new AIRich(result); r.addVerticalAlbum(items); return r.send(jid, options) }
@@ -514,19 +514,19 @@ export function attachAIRich(result, config) {
     const { text, expressions = [], headerText, footer } = opts
     const rendered = expressions.map(expr => { const latex = expr.latexExpression || expr.expression || expr; const url = `https://latex.codecogs.com/png.latex?${encodeURIComponent(latex).replace(/'/g, '%27')}`; return { latexExpression: latex, url, width: expr.width || 400, height: expr.height || 100 } })
     const { message, messageId } = generateLatexContent(null, { text, expressions: rendered, headerText, footer })
-    return relayRichMessage(jid, generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts)
+    return relayRichMessage(jid, await generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts)
   }
   result.captureAndResendRichResponse = async (jid, metaAiMsg, quoted, opts = {}) => {
     const captured = captureUnifiedResponse(metaAiMsg)
     if (!captured) throw new Error('captureAndResendRichResponse: no unifiedResponse data in message')
     const { message, messageId } = generateUnifiedResponseContent(quoted, captured)
-    return relayRichMessage(jid, generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts)
+    return relayRichMessage(jid, await generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || messageId }), opts)
   }
   result.sendBotPlanning = async (jid, content = {}, opts = {}) => {
     const { text = 'Execution plan', steps = [], queryPlan = true, botJid = META_AI_BOT_JID } = content
     const submessages = [{ messageType: proto.AIRichResponseSubMessageType.AI_RICH_RESPONSE_TEXT, messageText: text }, ...steps.map(s => ({ messageType: proto.AIRichResponseSubMessageType.AI_RICH_RESPONSE_TEXT, messageText: typeof s === 'string' ? s : `${s.title || s.name || 'Step'}${s.body ? `: ${s.body}` : ''}` }))]
     const wrapped = buildBotRichResponse({ botJid, submessages, capabilities: [BotCapabilityType.AGENTIC_PLANNING, ...(queryPlan ? [BotCapabilityType.QUERY_PLAN] : [])] })
-    const full = await generateWAMessageFromContent(jid, wrapped, { userJid: sock.user?.id, messageId: opts.messageId || generateMessageIDV2(sock.user?.id) })
+    const full = await await generateWAMessageFromContent(jid, wrapped, { userJid: sock.user?.id, messageId: opts.messageId || generateMessageIDV2(sock.user?.id) })
     return relayRichMessage(jid, full, opts)
   }
   result.sendBotPlan = async (jid, content = {}, opts = {}) => {
@@ -535,7 +535,7 @@ export function attachAIRich(result, config) {
     const statusEnum = proto.BotProgressIndicatorMetadata.BotPlanningStepMetadata.PlanningStepStatus
     const normalizedSteps = steps.map((s, i) => ({ statusTitle: String(s.title || s.name || `Step ${i + 1}`), statusBody: String(s.body || s.description || ''), status: s.status === 'executing' ? statusEnum.EXECUTING : (s.status === 'finished' || s.status === 'completed') ? statusEnum.FINISHED : statusEnum.PLANNED, isReasoning: s.isReasoning === true, isEnhancedSearch: s.isEnhancedSearch === true }))
     const wrapped = { messageContextInfo: { botMetadata: { capabilityMetadata: { capabilities: [proto.BotCapabilityMetadata.BotCapabilityType.AGENTIC_PLANNING, proto.BotCapabilityMetadata.BotCapabilityType.QUERY_PLAN] }, progressIndicatorMetadata: { progressDescription: title, stepsMetadata: normalizedSteps, ...(estimatedCompletionTime ? { estimatedCompletionTime } : {}) } } }, botForwardedMessage: { message: { richResponseMessage: { messageType: 1, submessages: [{ messageType: 2, messageText: text }], contextInfo: { isForwarded: true, forwardingScore: 1, forwardedAiBotMessageInfo: { botJid }, forwardOrigin: 4 } } } } }
-    const full = await generateWAMessageFromContent(jid, wrapped, { userJid: sock.user?.id, messageId: opts.messageId || generateMessageIDV2(sock.user?.id) })
+    const full = await await generateWAMessageFromContent(jid, wrapped, { userJid: sock.user?.id, messageId: opts.messageId || generateMessageIDV2(sock.user?.id) })
     await sock.relayMessage(jid, full.message, { messageId: full.key.id })
     return full
   }
@@ -591,7 +591,7 @@ export function attachAIRich(result, config) {
   result.sendAsMimic = async (jid, content, mimicJid, options = {}) => {
     if (!options.admin && !options.mimicPermission) throw new Error('sendAsMimic requires admin: true')
     const msgId = generateMessageIDV2(sock.user?.id)
-    const full = await generateWAMessageFromContent(jid, content, { userJid: sock.user?.id, ...options })
+    const full = await await generateWAMessageFromContent(jid, content, { userJid: sock.user?.id, ...options })
     full.key = { remoteJid: jid, fromMe: false, id: msgId, participant: mimicJid }
     await sock.relayMessage(jid, full.message, { messageId: msgId, ...(options.additionalAttributes ? { additionalAttributes: options.additionalAttributes } : {}) })
     return full
@@ -604,7 +604,7 @@ export function attachAIRich(result, config) {
   result.sendBotToolResult = async (jid, content = {}, opts = {}) => {
     const { text = 'Tool result', toolCallId = `tool-${Date.now()}`, resolutionData, resolutionDataSerialized, botJid = META_AI_BOT_JID } = content
     const wrapped = buildBotRichResponse({ text, botJid, capabilities: [BotCapabilityType.AGENTIC_PLANNING, BotCapabilityType.QUERY_PLAN], botMetadata: { resolvedToolCallMetadata: { toolCallId, resolutionDataSerialized: resolutionDataSerialized ?? JSON.stringify(resolutionData ?? {}) } } })
-    const full = await generateWAMessageFromContent(jid, wrapped, { userJid: sock.user?.id, messageId: opts.messageId || generateMessageIDV2(sock.user?.id) })
+    const full = await await generateWAMessageFromContent(jid, wrapped, { userJid: sock.user?.id, messageId: opts.messageId || generateMessageIDV2(sock.user?.id) })
     return relayRichMessage(jid, full, opts)
   }
   result.sendWhatsAppFlow = async (jid, flow, options = {}) => {
@@ -619,7 +619,7 @@ export function attachAIRich(result, config) {
   result.sendBotSources = (jid, content = {}, options = {}) => { const { text, sources = [] } = content; const r = new AIRich(result); if (text) r.addText(text); r.addSources(sources); return r.send(jid, options) }
   result.sendBotPttTranscript = (jid, content = {}, options = {}) => { const { text, transcript } = content; const r = new AIRich(result); if (text) r.addText(text); r.addPttTranscript(transcript); return r.send(jid, options) }
   result.sendInstagramProfile = (jid, data, options = {}) => { const r = new AIRich(result); r.addInstagramProfile(data); return r.send(jid, options) }
-  result.sendRichGeneration = async (jid, opts = {}) => { const { message, responseId, itemId } = prepareRichGenerationMessage(opts); const full = await generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || generateMessageIDV2(sock.user?.id) }); await sock.relayMessage(jid, full.message, { messageId: full.key.id }); return { msg: full, responseId, itemId } }
+  result.sendRichGeneration = async (jid, opts = {}) => { const { message, responseId, itemId } = prepareRichGenerationMessage(opts); const full = await await generateWAMessageFromContent(jid, message, { userJid: sock.user?.id, messageId: opts.messageId || generateMessageIDV2(sock.user?.id) }); await sock.relayMessage(jid, full.message, { messageId: full.key.id }); return { msg: full, responseId, itemId } }
   result.sendUnifiedResponse = (jid, sections, submessages = [], options = {}) => { const r = new AIRich(result); r.addRawSections(sections, submessages); return r.send(jid, options) }
   result.sendRichButtonGrid = async (jid, grid, options = {}) => {
     const { text, footer, cards = [] } = grid || {}

package/lib/Builders/base.js

@@ -25,7 +25,7 @@ export class BaseBuilder {
 }
 
 export const buildDispatch = (builders, handlers = {}) => ({
-    ...Object.fromEntries(builders.flatMap(B => (B.dispatchKeys ?? []).map(key => [key, (sock, jid, content, opts) => new B(sock).from(content[key], opts).send(jid, opts)]))),
+    ...Object.fromEntries(builders.flatMap(B => (B.dispatchKeys ?? []).map(key => [key, (sock, jid, content, opts) => { const b = new B(sock); return (typeof b.from === 'function' ? b.from(content[key], opts) : b).send(jid, opts) }]))),
     ...handlers
 })
 
@@ -87,7 +87,7 @@ export async function handleStatusMention(sock, jid, d, config) {
         statusJidList: [d.mentions, userJid].filter(Boolean),
         additionalNodes: [{ tag: 'meta', attrs: {}, content: [{ tag: 'mentioned_users', attrs: {}, content: [{ tag: 'to', attrs: { jid: d.mentions }, content: undefined }] }] }]
     })
-    const mentionMsg = await generateWAMessageFromContent(jid, {
+    const mentionMsg = await await generateWAMessageFromContent(jid, {
         statusMentionMessage: proto.Message.StatusMentionMessage.create({
             message: { protocolMessage: proto.Message.ProtocolMessage.create({ messageId: statusMsg?.key?.id ?? d.mentions, type: proto.Message.ProtocolMessage.Type.STATUS_MENTION_MESSAGE }) }
         })
@@ -96,7 +96,7 @@ export async function handleStatusMention(sock, jid, d, config) {
 }
 
 export async function handlePollResult(sock, jid, p) {
-    const msg = await generateWAMessageFromContent(jid, {
+    const msg = await await generateWAMessageFromContent(jid, {
         pollResultSnapshotMessage: proto.Message.PollResultSnapshotMessage.create({
             name: p.name,
             pollVotes: (p.pollVotes ?? []).map(v => proto.Message.PollResultSnapshotMessage.PollVote.create({ optionName: v.optionName, optionVoteCount: String(v.optionVoteCount ?? 0) })),