@vanzxy/baileys 1.6.2 → 1.6.4

package/NOTICE.md

@@ -29,11 +29,61 @@ inline `Vanz@` comments for specifics): lazy-loading of optional
 and neutral fallback text (previously referenced the original author's
 name in a small number of user-facing fallback strings).
 
+---
+
+## lib/Utils/message-kind.js — button/list "addon kind" resolution
+
+`resolveButtonAddonKind()` is adapted from **zapo-js**
+(`resolveButtonAddonKind` / `resolveNativeFlowAddonKind` in
+`src/message/encode/content.ts`), created by **vinikjkkj**
+<contact@vinicius.email>. <https://github.com/vinikjkkj/zapo>
+
+- License: MIT, Copyright (c) 2026 vinikjkkj
+- Ported into `@vanzxy/baileys` 1.6.4, adapted from zapo's internal
+  `Proto.IMessage` shape to this fork's message-content shape.
+  `parseInteractiveReply()` in the same file is original code written
+  for this fork (not from zapo), covering `buttonsResponseMessage` /
+  `listResponseMessage` / `interactiveResponseMessage` /
+  `templateButtonReplyMessage`.
+
 Additional performance/authenticity reference drawn from `arslan-baileys`
 (1.1.0), which shares the same underlying builder API.
 
 ---
 
+## lib/Utils/button-sender.js + lib/Utils/button-helper-utils.js — interactive/native-flow button send layer
+
+Ported from `@queenanya/baileys` (fork by **QueenAnya** / OLDUSER 06,
+package `@queenanya/baileys`), files `src/addons/button-sender.ts` and
+`src/addons/message-utils.ts`. That fork's own header credits the base
+implementation as "Ported from `@ryuu-reinzz/button-helper` v2.2.5".
+
+- License: MIT (per `@queenanya/baileys` `package.json`)
+- Ported into `@vanzxy/baileys` 1.6.5, converted TS → JS ESM. Adjustments:
+  `console.log`/`console.warn` calls replaced with `sock.logger` (pino)
+  calls to match this fork's logging convention; default dummy-file
+  name/branding strings genericized; import paths rewired to this fork's
+  `Utils`/`WABinary`/`Types` layout (`generateWAMessage`,
+  `generateWAMessageFromContent`, `normalizeMessageContent`,
+  `getUrlFromDirectPath`, `unixTimestampSeconds`, `isJidGroup`,
+  `isJidNewsletter`, `QueryIds`, `XWAPaths`, etc. — all already present
+  in `@vanzxy/baileys` and reused as-is, no duplication).
+- Adds `sendButtons()`, `sendInteractiveMessage()`,
+  `sendInteractiveMessageV2()`, plus supporting validators
+  (`validateSendButtonsPayload`, `validateSendInteractiveMessagePayload`,
+  `validateInteractiveMessageContent`, `validateAuthoringButtons`),
+  `buildInteractiveButtons()`, `convertToInteractiveMessage()`, the
+  `InteractiveValidationError` class, and message-introspection helpers
+  (`getButtonType`, `getButtonArgs`, `getMediaType`, `getMessageType`,
+  `prepareAlbumMessageContent`, `makeMessageExtrasAddon`, etc.). These
+  send buttons via `relayMessage` directly (bypassing `sendMessage`'s
+  validation path, which doesn't recognise `interactiveMessage`
+  payloads) with the correct `biz`/`interactive`/`native_flow` binary
+  nodes so buttons render on WhatsApp Messenger + Business, Android +
+  iOS. Complements the existing `Button`/`ButtonV2`/`ButtonV3` builder
+  classes in `MessageBuilder.js`, which build message *content* — this
+  addon handles the *send* layer.
+
 ## rich-message-utils.js — AIRICH inline-image bug fix
 
 Original implementation is this project's own; fixed 2026-08-15 (bad

package/lib/Utils/A2UI.js

@@ -0,0 +1,217 @@
+/**
+ * lib/Utils/A2UI.js — A2UI (Bloks) widget builder + sender
+ *
+ * Part of @vanzxy/baileys. Builds the flat `components` array A2UI/Bloks
+ * expects (id-referencing tree: Column/Row hold `children`, Card/Button hold
+ * `child`, Modal holds `trigger`/`content`) and sends it as an
+ * `interactiveMessage.bloksWidget` via the same `getBizBinaryNode()` path
+ * Button/ButtonV2 use, so the wire-level <biz>/<native_flow> node always
+ * matches the actual button names sent — no more hand-rolled duplicate of
+ * that logic living outside the library.
+ *
+ * See MessageBuilder.js's `Button.setBloksWidget()` for the declarative
+ * (nested-tree) alternative to this imperative (id-returning-factory) API;
+ * both produce the same wire format and can be mixed freely.
+ */
+"use strict";
+
+import crypto from "crypto";
+import { generateWAMessageFromContent } from "./messages.js";
+import { getBizBinaryNode } from "../WABinary/index.js";
+
+class A2UI {
+	constructor({ catalogId = "https://a2ui.org/specification/v0_9/catalogs/basic/catalog.json", version = "v0.9" } = {}) {
+		this._version = version;
+		this._catalogId = catalogId;
+		this._components = new Map();
+		this._counter = 0;
+		this._rootChildren = [];
+	}
+	#nextId(prefix) {
+		return `${prefix}_${(this._counter++).toString(36)}`;
+	}
+	#reg(id, component, extra = {}) {
+		id ??= this.#nextId(component.toLowerCase());
+		if (id === "root") throw new Error(`Component id "root" is reserved for the implicit root wrapper`);
+		if (this._components.has(id)) throw new Error(`Component id "${id}" already used`);
+		this._components.set(id, { id, component, ...extra });
+		return id;
+	}
+	text(text, { id, variant = "body" } = {}) {
+		return this.#reg(id, "Text", { text, variant });
+	}
+	image(url, { id, variant, fit = "cover" } = {}) {
+		return this.#reg(id, "Image", { url, ...(variant ? { variant } : {}), fit });
+	}
+	video(url, { id } = {}) {
+		return this.#reg(id, "Video", { url });
+	}
+	checkbox(label, { id, value = false } = {}) {
+		return this.#reg(id, "CheckBox", { label, value });
+	}
+	textField(label, { id, variant = "text" } = {}) {
+		return this.#reg(id, "TextField", { label, variant });
+	}
+	button(childId, { id, variant = "primary", action } = {}) {
+		if (!childId) throw new TypeError("button(childId) requires the id of a child component (e.g. from .text())");
+		return this.#reg(id, "Button", { child: childId, variant, ...(action ? { action } : {}) });
+	}
+	card(childId, { id } = {}) {
+		return this.#reg(id, "Card", { child: childId });
+	}
+	// trigger: id of the component that opens the modal (e.g. a Button); content: id of the
+	// component shown inside it. Both are ids of already-registered SIBLING components, not
+	// nested children — that's how the wire format expects Modal to reference them.
+	modal(triggerId, contentId, { id } = {}) {
+		if (!triggerId) throw new TypeError("modal(triggerId, contentId) requires the id of the trigger component");
+		if (!contentId) throw new TypeError("modal(triggerId, contentId) requires the id of the content component");
+		return this.#reg(id, "Modal", { trigger: triggerId, content: contentId });
+	}
+	// Escape hatch for any catalog component without a dedicated method yet (Divider, Slider,
+	// Switch, List, etc). props is merged as-is into the registered node.
+	raw(component, props = {}, { id } = {}) {
+		if (typeof component !== "string" || !component) throw new TypeError("raw(component, props) requires a non-empty component type string");
+		return this.#reg(id, component, props);
+	}
+	column(children = [], { id } = {}) {
+		if (!children.length) throw new TypeError("column(children) requires at least one child id");
+		return this.#reg(id, "Column", { children });
+	}
+	row(children = [], { id } = {}) {
+		if (!children.length) throw new TypeError("row(children) requires at least one child id");
+		return this.#reg(id, "Row", { children });
+	}
+	divider({ id } = {}) {
+		return this.#reg(id, "Divider", {});
+	}
+	choicePicker(label, options, { id, variant = "mutuallyExclusive", value, displayStyle = "checkbox", filterable = false } = {}) {
+		if (!Array.isArray(options) || !options.length) {
+			throw new TypeError("choicePicker(label, options) requires a non-empty options array of {label, value}");
+		}
+		return this.#reg(id, "ChoicePicker", {
+			label,
+			variant,
+			...(value !== undefined ? { value } : {}),
+			options,
+			displayStyle,
+			filterable
+		});
+	}
+	root(children) {
+		if (!Array.isArray(children) || !children.length) {
+			throw new TypeError("root(children) requires a non-empty array of top-level component ids");
+		}
+		this._rootChildren = children;
+		return this;
+	}
+	// Vanz@Add 29-08-26 --- Product/list carousel card. This is a DIFFERENT wire
+	// payload shape from the Column/Row component-tree the rest of this class
+	// builds (type: 'list_card', flat items array) — not a catalog component, so
+	// it doesn't go through #reg()/root(). Call this instead of root()+build();
+	// build() returns the list_card payload directly when this was set.
+	listCard({ title, items, fallbackText, uuid = crypto.randomUUID() } = {}) {
+		if (!title) throw new TypeError("listCard requires a title");
+		if (!Array.isArray(items) || !items.length) {
+			throw new TypeError("listCard requires a non-empty items array");
+		}
+		this._listCardPayload = {
+			uuid,
+			data: JSON.stringify({
+				type: "list_card",
+				title,
+				fallback_text: fallbackText ?? "",
+				items: items.map((it) => ({
+					asset_id: it.assetId ?? crypto.randomUUID().replace(/-/g, "").slice(0, 17),
+					asset_type: it.assetType ?? "PRODUCT_ITEM",
+					title: it.title,
+					trailing_label: it.price ?? it.trailingLabel ?? "",
+					trailing_emphasis: it.emphasis ?? "strong"
+				}))
+			}),
+			type: "im_a2ui",
+			fallback: fallbackText ?? ""
+		};
+		return this;
+	}
+	build({ uuid = crypto.randomUUID(), surfaceId, type = "im_a2ui", wrapped = true } = {}) {
+		if (this._listCardPayload) return this._listCardPayload;
+		if (!this._rootChildren.length) throw new Error("Call root([...ids]) before build()");
+		const root = { id: "root", component: "Column", children: this._rootChildren };
+		const components = [root, ...this._components.values()];
+		const data = wrapped
+			? {
+					version: this._version,
+					createSurface: {
+						surfaceId: surfaceId ?? `starcore-widget=${uuid}`,
+						catalogId: this._catalogId,
+						components
+					}
+				}
+			: { components };
+		return {
+			uuid,
+			data: JSON.stringify(data),
+			type
+		};
+	}
+}
+
+/**
+ * Build + send an A2UI/Bloks widget as an interactiveMessage.
+ * @param {import('../../WAProto/index.js').WASocket} client Active Baileys socket.
+ * @param {string} jid Destination chat/group jid.
+ */
+async function sendA2UIWidget(client, jid, {
+	a2ui,
+	bodyText = "",
+	footer = "",
+	buttons = [],
+	contextInfo = {},
+	expiration,
+	quoted,
+	type = "im_a2ui",
+	wrapped = true,
+	singleScreen = false
+} = {}) {
+	if (!client) throw new Error("Socket is required");
+	if (!(a2ui instanceof A2UI)) throw new TypeError("a2ui must be an A2UI instance");
+
+	const nativeFlowMessage = buttons && buttons.length
+		? {
+				buttons: buttons.map((b) => ({
+					name: b.name ?? "cta_url",
+					buttonParamsJson: typeof b.params === "string" ? b.params : JSON.stringify(b.params ?? {}),
+				})),
+				messageParamsJson: "{}",
+				messageVersion: 1
+			}
+		: { messageParamsJson: "" };
+
+	const interactiveMessage = singleScreen
+		? {
+				nativeFlowMessage,
+				bloksWidget: a2ui.build({ type, wrapped }),
+				...(expiration || Object.keys(contextInfo).length ? { contextInfo: { ...(expiration ? { expiration } : {}), ...contextInfo } } : {})
+			}
+		: {
+				header: { hasMediaAttachment: false },
+				body: { text: bodyText },
+				...(footer ? { footer: { text: footer } } : {}),
+				nativeFlowMessage,
+				bloksWidget: a2ui.build({ type, wrapped }),
+				...(expiration || Object.keys(contextInfo).length ? { contextInfo: { ...(expiration ? { expiration } : {}), ...contextInfo } } : {})
+			};
+
+	const msg = generateWAMessageFromContent(jid, {
+		messageContextInfo: { messageSecret: crypto.randomBytes(32) },
+		interactiveMessage
+	}, { quoted });
+
+	await client.relayMessage(msg.key.remoteJid, msg.message, {
+		messageId: msg.key.id,
+		additionalNodes: [getBizBinaryNode(msg.message)]
+	});
+	return msg;
+}
+
+export { A2UI, sendA2UIWidget };