@vanzxy/baileys 1.5.9 → 1.6.1

package/lib/Utils/MessageBuilder.js

@@ -696,6 +696,58 @@ class Button extends BaseBuilder {
 		return this;
 	}
 
+	// Vanz@Add 26-08-26 --- setBloksWidget(): Meta's Bloks/A2UI format, a sibling field to
+	// nativeFlowMessage on interactiveMessage (NOT part of the AIRich rich-response system —
+	// this is a real native interactive UI: checkboxes/text fields/buttons actually work).
+	// Captured traffic gives the A2UI payload as a flat `components` array where every node has
+	// an `id` and children/child reference OTHER nodes by id string. Authoring that by hand is
+	// error-prone (dangling ids, ordering), so this accepts a plain nested tree instead —
+	// { component, ...props, children: [...] } / { component, ...props, child: {...} } — and
+	// flattens it into that array itself, auto-assigning ids.
+	#flattenBloks(tree, out, counter = { n: 0 }, id = 'root') {
+		if (!tree || typeof tree !== 'object') throw new TypeError('setBloksWidget: every node needs a "component" type');
+		const { component, children, child, ...props } = tree;
+		if (typeof component !== 'string' || !component) throw new TypeError('setBloksWidget: every node needs a "component" type');
+
+		const node = { id, component, ...props };
+
+		if (Array.isArray(children)) {
+			node.children = children.map((c) => this.#flattenBloks(c, out, counter, `n${counter.n++}`));
+		} else if (child) {
+			node.child = this.#flattenBloks(child, out, counter, `n${counter.n++}`);
+		}
+
+		out.push(node);
+		return id;
+	}
+
+	/**
+	 * Set a Bloks/A2UI native widget (`bloksWidget`, `type: "im_a2ui"`) — a real interactive
+	 * screen (images, video, checkboxes, text fields, buttons that fire an `action`), not a
+	 * static card. Pass a nested tree; ids are assigned automatically.
+	 * @param {Record<string, any>} tree Root node, e.g. `{ component: 'Column', children: [...] }`.
+	 * @param {{uuid?: string, catalogId?: string, surfaceId?: string, version?: string}} [options]
+	 */
+	setBloksWidget(tree, { uuid = crypto.randomUUID(), catalogId = 'https://a2ui.org/specification/v0_9/catalogs/basic/catalog.json', surfaceId, version = 'v0.9' } = {}) {
+		const components = [];
+		this.#flattenBloks(tree, components);
+
+		this._bloksWidget = {
+			uuid,
+			data: JSON.stringify({
+				version,
+				createSurface: {
+					surfaceId: surfaceId ?? `starcore-widget=${uuid}`,
+					catalogId,
+					components,
+				},
+			}),
+			type: 'im_a2ui',
+		};
+
+		return this;
+	}
+
 	/**
 	 * Low-level escape hatch: push a raw native-flow button by name. Prefer the
 	 * dedicated `add*()` helpers below when one exists — they validate the
@@ -1290,22 +1342,26 @@ class Button extends BaseBuilder {
 
 	/** @returns {Record<string, any>} The final content object, without generating/wrapping a WAMessage. Useful when composing this interactive card into something else (e.g. Carousel). */
 	async build(jid, { ...options } = {}) {
-		if (this._buttons.length === 0) {
-			throw new Error('Button requires at least one button (use addReply/addUrl/addCall/addSelection/addButton/...)');
+		if (this._buttons.length === 0 && !this._bloksWidget) {
+			throw new Error('Button requires at least one button (use addReply/addUrl/addCall/addSelection/addButton/...) or a Bloks widget (setBloksWidget())');
 		}
 
-		if (this.#isLoneSingleSelect()) {
+		if (this._buttons.length > 0 && this.#isLoneSingleSelect()) {
 			return generateWAMessageFromContent(jid, { ...this._extraPayload, ...this.#toListMessage() }, { ...options });
 		}
 
-		const message = await this.toCard();
+		const message = this._buttons.length > 0 ? await this.toCard() : {};
 
 		return generateWAMessageFromContent(
 			jid,
 			{
+				...(this._bloksWidget && {
+					messageContextInfo: { messageSecret: crypto.randomBytes(32) },
+				}),
 				...this._extraPayload,
 				interactiveMessage: {
 					...message,
+					...(this._bloksWidget && { bloksWidget: this._bloksWidget }),
 					contextInfo: this._contextInfo,
 				},
 			},
@@ -1328,12 +1384,25 @@ class Button extends BaseBuilder {
 		const bizContent = this.#isLoneSingleSelect()
 			? [{ tag: 'list', attrs: { v: '2', type: 'product_list' } }]
 			: [
-					{
-						tag: 'interactive',
-						attrs: { type: 'native_flow', v: '1' },
-						content: [this.#buildNativeFlowNode()],
-					},
-				];
+					...(this._buttons.length > 0
+						? [
+								{
+									tag: 'interactive',
+									attrs: { type: 'native_flow', v: '1' },
+									content: [this.#buildNativeFlowNode()],
+								},
+						  ]
+						: []),
+					...(this._bloksWidget
+						? [
+								{
+									tag: 'quality_control',
+									attrs: { decision_id: crypto.randomUUID().replace(/-/g, ''), source_type: 'third_party' },
+									content: [{ tag: 'decision_source', attrs: { value: 'df' } }],
+								},
+						  ]
+						: []),
+			  ];
 
 		await this.#client.relayMessage(msg.key.remoteJid, msg.message, {
 			messageId: msg.key.id,
@@ -1776,9 +1845,10 @@ class AIRich extends BaseBuilder {
 				}
 
 				return (...args) => {
-					const opts = args.find((a) => a && typeof a === 'object' && !Array.isArray(a) && !Buffer.isBuffer(a) && ('id' in a || 'insertAt' in a));
+					const opts = args.find((a) => a && typeof a === 'object' && !Array.isArray(a) && !Buffer.isBuffer(a) && ('id' in a || 'insertAt' in a || 'replace' in a));
 					const id = opts?.id;
 					const insertAt = opts?.insertAt;
+					const replace = opts?.replace;
 
 					const subBefore = target._submessages.length;
 					const secBefore = target._sections.length;
@@ -1810,6 +1880,31 @@ class AIRich extends BaseBuilder {
 						const lastSec = anchor.secItems[anchor.secItems.length - 1];
 						const secIdx = lastSec ? target._sections.indexOf(lastSec) + 1 : target._sections.length;
 						target._sections.splice(secIdx, 0, ...secItems);
+					} else if (replace) {
+						// replace: delete the old block's items at their current positions,
+						// then insert new items at the same positions
+						const old = target._blocks.get(replace);
+						if (!old) throw new Error(`replace: no block registered with id "${replace}" (register it first with { id: "${replace}" })`);
+
+						let subIdx = old.subItems.length > 0 ? target._submessages.indexOf(old.subItems[0]) : target._submessages.length;
+						if (subIdx === -1) subIdx = target._submessages.length;
+						for (const item of old.subItems) {
+							const i = target._submessages.indexOf(item);
+							if (i !== -1) target._submessages.splice(i, 1);
+						}
+						target._submessages.splice(subIdx, 0, ...subItems);
+
+						let secIdx = old.secItems.length > 0 ? target._sections.indexOf(old.secItems[0]) : target._sections.length;
+						if (secIdx === -1) secIdx = target._sections.length;
+						for (const item of old.secItems) {
+							const i = target._sections.indexOf(item);
+							if (i !== -1) target._sections.splice(i, 1);
+						}
+						target._sections.splice(secIdx, 0, ...secItems);
+
+						target._blocks.delete(replace);
+						if (id) target._blocks.set(id, { subItems, secItems });
+						else target._blocks.set(replace, { subItems, secItems });
 					} else {
 						target._submessages.push(...subItems);
 						target._sections.push(...secItems);
@@ -2014,21 +2109,38 @@ class AIRich extends BaseBuilder {
 	}
 
 	addSource(sources = [], { resolveUrl = false } = {}) {
-		if (!(Array.isArray(sources) && (sources.every((item) => typeof item === 'string') || sources.every((item) => Array.isArray(item) && item.every((v) => typeof v === 'string'))))) {
-			throw new TypeError('Sources must be a string array or an array of string arrays');
-		}
-
-		if (sources.every((item) => typeof item === 'string')) {
-			sources = [sources];
-		}
-
-		const source = sources.map(([icon, url, text]) => ({
+		// Accept 3 formats:
+		// 1. Array of objects: [{ icon, url, title, subtitle }] — from v4.7 example
+		// 2. Array of string arrays: [['iconUrl', 'url', 'text']]
+		// 3. Single string array (shorthand for format 2): ['iconUrl', 'url', 'text']
+		const isObjArray = Array.isArray(sources) && sources.every((item) => item && typeof item === 'object' && !Array.isArray(item));
+		const isStrArrayArray = Array.isArray(sources) && sources.every((item) => Array.isArray(item) && item.every((v) => typeof v === 'string'));
+		const isFlatStrArray = Array.isArray(sources) && sources.every((item) => typeof item === 'string');
+
+		if (!isObjArray && !isStrArrayArray && !isFlatStrArray) {
+			throw new TypeError('addSource(): pass an array of objects { icon, url, title, subtitle } or string arrays [iconUrl, url, text]');
+		}
+
+		let normalized;
+		if (isObjArray) {
+			normalized = sources.map((item) => ({
+				icon: item.icon ?? item.iconUrl ?? item.favicon ?? '',
+				url: item.url ?? '',
+				text: item.title ?? item.displayName ?? item.text ?? '',
+				subtitle: item.subtitle ?? 'AI',
+			}));
+		} else {
+			const arr = isFlatStrArray ? [sources] : sources;
+			normalized = arr.map(([icon = '', url = '', text = '']) => ({ icon, url, text, subtitle: 'AI' }));
+		}
+
+		const source = normalized.map(({ icon, url, text, subtitle }) => ({
 			source_type: 'THIRD_PARTY',
-			source_display_name: text ?? '',
-			source_subtitle: 'AI',
-			source_url: url ?? '',
+			source_display_name: text,
+			source_subtitle: subtitle,
+			source_url: url,
 			favicon: {
-				url: Toolkit.resolveMedia(this.#client, icon ?? '', 'image', { resolveUrl }),
+				url: Toolkit.resolveMedia(this.#client, icon, 'image', { resolveUrl }),
 				mime_type: 'image/jpeg',
 				width: 16,
 				height: 16,
@@ -2456,6 +2568,49 @@ class AIRich extends BaseBuilder {
 		return this;
 	}
 
+	// Vanz@Add 25-08-26 --- ported from temen's MessageBuilderV4.7 (hasId/getIds/peek/delete).
+	// That fork tracked every block in a unified `_nodes` array so query/delete-by-id was free;
+	// this fork instead tracks blocks in the `_blocks` Map (id -> {subItems, secItems}, populated
+	// by the constructor's Proxy on every add*/set* call that passes {id}) but never exposed a way
+	// to query or undo one after the fact — you could insertAt an id but never inspect, check, or
+	// remove it. These 4 read/delete that same Map, so no changes to the Proxy itself were needed.
+
+	/** Check whether a block id was registered by an earlier `add*()`/`set*()` call passing `{id}`. */
+	hasId(id) {
+		return typeof id === 'string' && this._blocks.has(id);
+	}
+
+	/** List every block id registered so far, in no particular order. */
+	getIds() {
+		return [...this._blocks.keys()];
+	}
+
+	/** Inspect a registered block without modifying it. Returns `null` if `id` isn't registered. */
+	peek(id) {
+		const block = this._blocks.get(id);
+		if (!block) return null;
+
+		return { id, sections: [...block.secItems], submessages: [...block.subItems] };
+	}
+
+	/** Remove a previously-added block (by the `id` passed to its `add*()`/`set*()` call) from the message. Throws if `id` isn't registered. */
+	delete(id) {
+		const block = this._blocks.get(id);
+		if (!block) throw new Error(`delete(id): no block registered with id "${id}"`);
+
+		for (const item of block.subItems) {
+			const idx = this._submessages.indexOf(item);
+			if (idx !== -1) this._submessages.splice(idx, 1);
+		}
+		for (const item of block.secItems) {
+			const idx = this._sections.indexOf(item);
+			if (idx !== -1) this._sections.splice(idx, 1);
+		}
+
+		this._blocks.delete(id);
+		return this;
+	}
+
 	/** Add a small metadata-style text line (`GenAIMetadataTextPrimitive`) — same visual style as the auto-appended footer/`addTip()`'s callout, but insertable anywhere and without `addTip()`'s icon prefix. */
 	addMetadata(text) {
 		if (typeof text !== 'string' || !text) throw new TypeError('addMetadata(text) requires a non-empty string');
@@ -2496,11 +2651,14 @@ class AIRich extends BaseBuilder {
 		return this;
 	}
 
-	// Vanz@Add 22-08-26 (v4.7) --- addHeading/addImageCard/addWidget/addFooterAction: 4 primitives
+	// Vanz@Add 22-08-26 (v4.7) --- addHeading/addWidget/addFooterAction: 3 primitives
 	// reverse-engineered from captured Meta-AI-in-WhatsApp traffic that this project's own crm/snip
 	// tooling (see rich-message-utils.js) dumps for study. Not in any public Baileys schema, so
 	// unknown enum values (kind/state on addWidget's ctas) are passed through as observed rather
 	// than guessed at, and documented as experimental below.
+	// Vanz@Fix 25-08-26 --- removed addImageCard(): its GenAIImagePrimitive/preview_image+full_image
+	// shape was mis-reverse-engineered (not a real WA schema) and crashed the client renderer on
+	// arrival. addImage() already covers static image cards correctly — use that instead.
 
 	/** Add a large heading-style text block (`FOATextPrimitive`) — visually distinct from `addText()`'s regular paragraph text. */
 	addHeading(text) {
@@ -2523,39 +2681,6 @@ class AIRich extends BaseBuilder {
 		return this;
 	}
 
-	/**
-	 * Add a "ready" static image card (`GenAIImagePrimitive`: preview + full-res, no generating/status
-	 * state) — distinct from `addImage()`'s AI-generation-style `GenAIImaginePrimitive`.
-	 * @param {string|Buffer} previewUrl Preview/thumbnail image.
-	 * @param {string|Buffer} [fullUrl] Full-resolution image; defaults to `previewUrl`.
-	 */
-	addImageCard(previewUrl, fullUrl = previewUrl, { resolveUrl = false } = {}) {
-		if (!(typeof previewUrl === 'string' || Buffer.isBuffer(previewUrl))) {
-			throw new TypeError('addImageCard(previewUrl) requires a string url or buffer');
-		}
-
-		const preview = Toolkit.resolveMedia(this.#client, previewUrl, 'image', { resolveUrl });
-		const full = fullUrl === previewUrl ? preview : Toolkit.resolveMedia(this.#client, fullUrl, 'image', { resolveUrl });
-
-		this._submessages.push({
-			messageType: 1,
-			gridImageMetadata: {
-				gridImageUrl: { imagePreviewUrl: preview },
-				imageUrls: [{ imagePreviewUrl: preview, imageHighResUrl: full, sourceUrl: full }],
-			},
-		});
-
-		this._sections.push(
-			AIRich.newLayout('Single', {
-				preview_image: { url: preview, mime_type: 'image/jpeg', __typename: 'GenAIMediaItem' },
-				full_image: { url: full, mime_type: 'image/jpeg', __typename: 'GenAIMediaItem' },
-				__typename: 'GenAIImagePrimitive',
-			})
-		);
-
-		return this;
-	}
-
 	/**
 	 * Add a "3P extension" widget card (`GenAI3PExtWidgetPrimitive`) — a small panel with a title and
 	 * a row of tappable CTA chips. Per captured traffic these CTAs call back into a tool (`tool_call_id`)
@@ -2574,8 +2699,10 @@ class AIRich extends BaseBuilder {
 		const items = Array.isArray(data) ? data : [data];
 
 		items.forEach((item, i) => {
-			if (!item?.title) {
-				throw new TypeError(`addWidget() item[${i}] is missing a required "title"`);
+			// header.title or top-level title required
+			const hasTitle = item?.title || item?.header?.title;
+			if (!hasTitle) {
+				throw new TypeError(`addWidget() item[${i}] is missing a required "title" (or "header.title")`);
 			}
 			const ctas = item.ctas ?? item.actions;
 			if (!Array.isArray(ctas) || !ctas.length) {
@@ -2585,22 +2712,29 @@ class AIRich extends BaseBuilder {
 
 		this._submessages.push({
 			messageType: 2,
-			messageText: items.map((item) => item.title).join(', '),
+			messageText: items.map((item) => item.header?.title ?? item.title).join(', '),
 		});
 
 		const widgets = items.map((item) => {
 			const ctas = item.ctas ?? item.actions;
+			// header accepts either a string title (legacy) or an object { title, subtitle }
+			const headerTitle = item.header?.title ?? item.title;
+			const headerSubtitle = item.header?.subtitle ?? item.subtitle ?? undefined;
 			return {
-				header: { title: item.title, __typename: 'GenAI3PExtWidgetStandardHeader' },
+				header: {
+					title: headerTitle,
+					...(headerSubtitle !== undefined && { subtitle: headerSubtitle }),
+					__typename: 'GenAI3PExtWidgetStandardHeader',
+				},
 				body: {
 					sections: item.sections ?? [],
 					ctas: ctas.map((cta, idx) => ({
 						label: cta.label ?? '',
 						state: cta.state ?? 'PENDING',
 						kind: cta.kind ?? 'OTHER',
-						tool_call_id: cta.tool_call_id ?? String(idx).padStart(2, '0'),
+						tool_call_id: cta.tool_call_id ?? cta.id ?? String(idx).padStart(2, '0'),
 						...(cta.toast !== false && {
-							toast: { label: typeof cta.toast === 'string' ? cta.toast : item.title, __typename: 'GenAI3PExtWidgetToast' },
+							toast: { label: typeof cta.toast === 'string' ? cta.toast : headerTitle, __typename: 'GenAI3PExtWidgetToast' },
 						}),
 						__typename: 'GenAI3PExtWidgetCTA',
 					})),

package/lib/Utils/MessageBuilder_d.ts

@@ -45,6 +45,7 @@ export class Button extends BaseBuilder {
 	setMedia(obj: Record<string, any>): this;
 	clearButtons(): this;
 	setParams(obj: Record<string, any>): this;
+	setBloksWidget(tree: Record<string, any>, options?: { uuid?: string; catalogId?: string; surfaceId?: string; version?: string }): this;
 	addButton(name: string, params: string | Record<string, any>): this;
 	makeRow(header?: string, title?: string, description?: string, id?: string): this;
 	makeSection(title?: string, highlight_label?: string): this;
@@ -178,10 +179,12 @@ export class AIRich extends BaseBuilder {
 	refreshResponseId(): this;
 	setBotResponseId(id: string): this;
 	refreshBotResponseId(): this;
+	hasId(id: string): boolean;
+	getIds(): string[];
+	peek(id: string): { id: string; sections: any[]; submessages: any[] } | null;
+	delete(id: string): this;
 	/** FOATextPrimitive — large heading text, distinct from addText()'s paragraph text. */
 	addHeading(text: string): this;
-	/** GenAIImagePrimitive — "ready" static image (preview + full-res), distinct from addImage()'s generation-style card. */
-	addImageCard(previewUrl: string | Buffer, fullUrl?: string | Buffer, options?: { resolveUrl?: boolean }): this;
 	/** GenAI3PExtWidgetPrimitive — experimental, reverse-engineered; see JSDoc in the .js file for caveats. */
 	addWidget(data: Record<string, any> | Record<string, any>[], options?: { layout?: 'Single' | 'HScroll' | 'ActionRow' | string }): this;
 	/** GenAIFooterActionPrimitive — footer action link chips (e.g. "Join our Group"). */

package/lib/Utils/process-message.js

@@ -1,4 +1,5 @@
 import { Boom } from '@hapi/boom';
+import { Reader } from 'protobufjs/minimal.js';
 import { proto } from '../../WAProto/index.js';
 import { WAMessageStubType } from '../Types/index.js';
 import { getContentType, normalizeMessageContent } from '../Utils/messages.js';
@@ -14,6 +15,51 @@ const REAL_MSG_STUB_TYPES = new Set([
     WAMessageStubType.CALL_MISSED_VOICE
 ]);
 const REAL_MSG_REQ_ME_STUB_TYPES = new Set([WAMessageStubType.GROUP_PARTICIPANT_ADD]);
+// Vanz@Fix 26-08-26 --- the 26-08-26 WAProto refresh dropped `LIDMigrationMappingSyncPayload`
+// / `LIDMigrationMapping` from the published schema; only the opaque envelope
+// `LIDMigrationMappingSyncMessage { encodedMappingPayload: bytes }` is generated now.
+// Nothing suggests the *inner* wire layout actually changed (WA's extractor just stopped
+// walking this nested message), so we decode it by hand instead of guessing a new shape.
+// TODO: verify against live traffic on the next audit pass — if Meta did change the inner
+// layout this will start throwing and LID/PN pairs will silently stop syncing.
+function decodeLidMigrationMappingSyncPayload(buf) {
+    const r = Reader.create(buf);
+    const out = { pnToLidMappings: [], chatDbMigrationTimestamp: undefined };
+    while (r.pos < r.len) {
+        const tag = r.uint32();
+        switch (tag >>> 3) {
+            case 1: {
+                const len = r.uint32();
+                const end = r.pos + len;
+                const entry = { pn: undefined, assignedLid: undefined, latestLid: undefined };
+                while (r.pos < end) {
+                    const t2 = r.uint32();
+                    switch (t2 >>> 3) {
+                        case 1:
+                            entry.pn = r.uint64();
+                            break;
+                        case 2:
+                            entry.assignedLid = r.uint64();
+                            break;
+                        case 3:
+                            entry.latestLid = r.uint64();
+                            break;
+                        default:
+                            r.skipType(t2 & 7);
+                    }
+                }
+                out.pnToLidMappings.push(entry);
+                break;
+            }
+            case 2:
+                out.chatDbMigrationTimestamp = r.uint64();
+                break;
+            default:
+                r.skipType(tag & 7);
+        }
+    }
+    return out;
+}
 async function storeTcTokensFromHistorySync(chats, signalRepository, keyStore, logger) {
     const getLIDForPN = signalRepository.lidMapping.getLIDForPN.bind(signalRepository.lidMapping);
     const candidates = [];
@@ -462,7 +508,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                 break;
             case proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC:
                 const encodedPayload = protocolMsg.lidMigrationMappingSyncMessage?.encodedMappingPayload;
-                const { pnToLidMappings, chatDbMigrationTimestamp } = proto.LIDMigrationMappingSyncPayload.decode(encodedPayload);
+                const { pnToLidMappings, chatDbMigrationTimestamp } = decodeLidMigrationMappingSyncPayload(encodedPayload);
                 logger?.debug({ pnToLidMappings, chatDbMigrationTimestamp }, 'got lid mappings and chat db migration timestamp');
                 const pairs = [];
                 for (const { pn, latestLid, assignedLid } of pnToLidMappings) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanzxy/baileys",
-  "version": "1.5.9",
+  "version": "1.6.1",
   "description": "Enhanced Baileys fork by Vanzxy — based on @itsliaaa/baileys + @whiskeysockets/baileys with fixes for audio group status and clean media without newsletter button.",
   "type": "module",
   "module": "./lib/index.js",