@vanzxy/baileys 1.6.1 → 1.6.3

package/lib/Utils/MessageBuilder.js

@@ -704,19 +704,44 @@ class Button extends BaseBuilder {
 	// 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') {
+	//
+	// Vanz@Fix 26-08-26 (v2) --- Modal is a different shape: `trigger`/`content` point to a
+	// SIBLING node by id (e.g. the Button that opens it), not a fresh child — captured traffic
+	// confirmed `{ trigger: "<id of an existing Button node>", content: "<id of its body>" }`.
+	// Nesting it as a plain `child`/`children` would duplicate the trigger node. So:
+	//   - any prop whose value is `{ component: ..., ... }` is now auto-flattened as a nested
+	//     node too (not just `child`/`children`) — covers Modal.content directly.
+	//   - a node can carry a builder-only `ref: 'name'` tag; another prop can then point back
+	//     at it with `{ $ref: 'name' }`, resolved to that node's real id after the whole tree
+	//     is walked (order-independent). `ref` itself is stripped and never reaches the wire.
+	#flattenBloks(tree, out, ctx = { n: 0, refs: new Map(), pending: [] }, id = 'root') {
 		if (!tree || typeof tree !== 'object') throw new TypeError('setBloksWidget: every node needs a "component" type');
-		const { component, children, child, ...props } = tree;
+		const { component, children, child, ref, ...rest } = tree;
 		if (typeof component !== 'string' || !component) throw new TypeError('setBloksWidget: every node needs a "component" type');
 
-		const node = { id, component, ...props };
+		const isTreeNode = (v) => v && typeof v === 'object' && !Array.isArray(v) && typeof v.component === 'string';
+		const isRefMarker = (v) => v && typeof v === 'object' && !Array.isArray(v) && typeof v.$ref === 'string' && Object.keys(v).length === 1;
+
+		const node = { id, component };
+		for (const [k, v] of Object.entries(rest)) {
+			if (isRefMarker(v)) {
+				node[k] = null; // resolved once the full tree (and its `ref` tags) has been walked
+				ctx.pending.push({ node, key: k, refName: v.$ref });
+			} else if (isTreeNode(v)) {
+				node[k] = this.#flattenBloks(v, out, ctx, `n${ctx.n++}`);
+			} else {
+				node[k] = v;
+			}
+		}
 
 		if (Array.isArray(children)) {
-			node.children = children.map((c) => this.#flattenBloks(c, out, counter, `n${counter.n++}`));
+			node.children = children.map((c) => this.#flattenBloks(c, out, ctx, `n${ctx.n++}`));
 		} else if (child) {
-			node.child = this.#flattenBloks(child, out, counter, `n${counter.n++}`);
+			node.child = this.#flattenBloks(child, out, ctx, `n${ctx.n++}`);
 		}
 
+		if (ref) ctx.refs.set(ref, id);
+
 		out.push(node);
 		return id;
 	}
@@ -725,12 +750,23 @@ class Button extends BaseBuilder {
 	 * 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.
+	 *
+	 * For components that reference a SIBLING node instead of nesting one — currently just
+	 * `Modal.trigger` — tag the source node with `ref: 'someName'` and point at it with
+	 * `{ $ref: 'someName' }`. Everything else (including `Modal.content`) can just be nested
+	 * directly, no special key needed.
 	 * @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);
+		const ctx = { n: 0, refs: new Map(), pending: [] };
+		this.#flattenBloks(tree, components, ctx);
+		for (const { node, key, refName } of ctx.pending) {
+			const resolved = ctx.refs.get(refName);
+			if (!resolved) throw new Error(`setBloksWidget: ref "${refName}" (used on "${key}") was never declared with ref: "${refName}" on any node`);
+			node[key] = resolved;
+		}
 
 		this._bloksWidget = {
 			uuid,

package/lib/Utils/process-message.js

@@ -1,5 +1,6 @@
 import { Boom } from '@hapi/boom';
-import { Reader } from 'protobufjs/minimal.js';
+import $protobuf from 'protobufjs/minimal.js';
+const { Reader } = $protobuf;
 import { proto } from '../../WAProto/index.js';
 import { WAMessageStubType } from '../Types/index.js';
 import { getContentType, normalizeMessageContent } from '../Utils/messages.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanzxy/baileys",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "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",