@vanzxy/baileys 1.4.6 → 1.4.8

package/cjs/lib/Utils/MessageBuilder.js

@@ -61,7 +61,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _a, _Button_client, _Button_validateAgainstSchema, _ButtonV2_client, _Carousel_client, _Poll_client, _AIRich_client;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Toolkit = exports.VanzxyRich = exports.VanzxyAI = exports.LeafRich = exports.AIVanzxy = exports.AIRich = exports.Poll = exports.Carousel = exports.ButtonV2 = exports.Button = exports.MESSAGE_BUILDER_VERSION = void 0;
-const MESSAGE_BUILDER_VERSION = '4.8';
+const MESSAGE_BUILDER_VERSION = '4.9';
 exports.MESSAGE_BUILDER_VERSION = MESSAGE_BUILDER_VERSION;
 const messages_js_1 = require("./messages.js");
 const rich_message_utils_js_1 = require("./rich-message-utils.js");
@@ -1378,7 +1378,7 @@ class AIRich extends BaseBuilder {
         }))));
         return this;
     }
-    addImage(imageUrl, { resolveUrl = false } = {}) {
+    addImage(imageUrl, { resolveUrl = false, instant = false } = {}) {
         if (!(typeof imageUrl === 'string' || Buffer.isBuffer(imageUrl) || (Array.isArray(imageUrl) && imageUrl.every((v) => typeof v === 'string' || Buffer.isBuffer(v))))) {
             throw new TypeError('imageUrl must be string | buffer | array of string/buffer');
         }
@@ -1420,6 +1420,9 @@ class AIRich extends BaseBuilder {
                 status: { status: 'READY' },
                 __typename: 'GenAIImaginePrimitive',
             }));
+            if (instant) {
+                this._inlineImages.push({ url: imagePreviewUrl, caption: undefined });
+            }
         });
         return this;
     }

package/lib/Utils/MessageBuilder.js

@@ -44,7 +44,7 @@
 
 'use strict';
 
-const MESSAGE_BUILDER_VERSION = '4.8';
+const MESSAGE_BUILDER_VERSION = '4.9';
 
 import { generateWAMessageFromContent, prepareWAMessageMedia } from './messages.js';
 import { botMetadataSignature, botMetadataCertificate } from './rich-message-utils.js';
@@ -1587,6 +1587,79 @@ class AIRich extends BaseBuilder {
 		// mediaKey still doesn't render, so it's a trust-chain gate, not a domain/encoding issue).
 		// Track every addInlineImage() call here so send() can fall back to a normal imageMessage.
 		this._inlineImages = [];
+
+		// Vanz@Add (v4.9.1) --- { id, insertAt } support for every add*()/set*() call, without
+		// touching each method's own body/signature. Every add*() call ends up pushing 0-N items
+		// onto _submessages and 0-N onto _sections (some push to both, some to just one — e.g.
+		// addSuggest only touches _submessages, addSection only touches _sections). A Proxy wraps
+		// every add*/set* call: it snapshots array lengths before calling the real method, lets the
+		// method push onto the tail as it always has, then — if the caller passed { insertAt } —
+		// peels those freshly-pushed items back off the tail and re-splices them right after the
+		// last item that belongs to the block named by insertAt. Blocks are tracked by *object
+		// reference*, not saved numeric index, so earlier insertions shifting the array around never
+		// invalidates a later insertAt lookup (indexOf on the reference always finds the live position).
+		this._blocks = new Map(); // id -> { subItems: object[], secItems: object[] }
+		return new Proxy(this, {
+			get(target, prop, receiver) {
+				const orig = Reflect.get(target, prop, receiver);
+				if (typeof orig !== 'function' || !/^(add|set)/.test(String(prop))) return orig;
+
+				return (...args) => {
+					const opts = args.find((a) => a && typeof a === 'object' && !Array.isArray(a) && !Buffer.isBuffer(a) && ('id' in a || 'insertAt' in a));
+					const id = opts?.id;
+					const insertAt = opts?.insertAt;
+
+					const subBefore = target._submessages.length;
+					const secBefore = target._sections.length;
+
+					// Vanz@Fix 23-08-26 --- was orig.apply(receiver, args): calling the real method bound to
+					// the Proxy itself (`receiver`) makes any `this.#client` access inside throw
+					// "Cannot read private member #client from an object whose class did not declare it",
+					// because a Proxy is never the branded instance a private field was declared on —
+					// this hit every add*() that touches #client via Toolkit.resolveMedia(this.#client, ...)
+					// (addProduct/addPost/addReels/addSource, and would eventually hit addImage/addVideo
+					// too once JIT/engine specifics changed). Binding to `target` (the real instance) instead
+					// fixes it for good; `target._submessages`/`target._sections` below are unaffected since
+					// they're plain properties, and `result === target ? receiver : result` still converts a
+					// `this`-return back to the Proxy so chaining (`.addX().addY()`) keeps working.
+					const result = orig.apply(target, args);
+
+
+					const subItems = target._submessages.splice(subBefore);
+					const secItems = target._sections.splice(secBefore);
+
+					if (insertAt) {
+						const anchor = target._blocks.get(insertAt);
+						if (!anchor) throw new Error(`insertAt: no block registered with id "${insertAt}" (register it by passing { id: "${insertAt}" } on an earlier add*() call)`);
+
+						const lastSub = anchor.subItems[anchor.subItems.length - 1];
+						const subIdx = lastSub ? target._submessages.indexOf(lastSub) + 1 : target._submessages.length;
+						target._submessages.splice(subIdx, 0, ...subItems);
+
+						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 {
+						target._submessages.push(...subItems);
+						target._sections.push(...secItems);
+					}
+
+					if (id) target._blocks.set(id, { subItems, secItems });
+
+					return result === target ? receiver : result;
+				};
+			},
+		});
+	}
+
+	/** Flatten every primitive pushed into `_sections` so far into one array — lets you build a
+	 * card set in one AIRich instance and re-embed it into another via addSection(AIRich.newLayout(...)). */
+	get items() {
+		return this._sections.flatMap((s) => {
+			const vm = s?.view_model;
+			if (!vm) return [];
+			return vm.primitives ?? (vm.primitive !== undefined ? [vm.primitive] : []);
+		});
 	}
 
 	/** Push a raw pre-built submessage block (escape hatch for shapes not covered by the add*() helpers). */
@@ -1703,7 +1776,7 @@ class AIRich extends BaseBuilder {
 	}
 
 	/** Add a "Sources" strip. @param {string[]|string[][]} sources Flat list of urls, or `[title, url]` pairs. */
-	addSource(sources = []) {
+	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');
 		}
@@ -1718,7 +1791,7 @@ class AIRich extends BaseBuilder {
 			source_subtitle: 'AI',
 			source_url: url ?? '',
 			favicon: {
-				url: Toolkit.resolveMedia(this.#client, icon ?? '', 'image'),
+				url: Toolkit.resolveMedia(this.#client, icon ?? '', 'image', { resolveUrl }),
 				mime_type: 'image/jpeg',
 				width: 16,
 				height: 16,
@@ -1736,7 +1809,7 @@ class AIRich extends BaseBuilder {
 	}
 
 	/** Add a horizontally-scrollable reel of image/video items. */
-	addReels(reelsItems = []) {
+	addReels(reelsItems = [], { resolveUrl = false } = {}) {
 		if (
 			!(
 				(reelsItems && typeof reelsItems === 'object' && !Array.isArray(reelsItems)) ||
@@ -1752,8 +1825,8 @@ class AIRich extends BaseBuilder {
 
 		const reels = reelsItems.map((item) => ({
 			...item,
-			_avatar: Toolkit.resolveMedia(this.#client, item.profileIconUrl ?? item.profile_url ?? item.profile ?? '', 'image'),
-			_thumbnail: Toolkit.resolveMedia(this.#client, item.thumbnailUrl ?? item.thumbnail ?? '', 'image'),
+			_avatar: Toolkit.resolveMedia(this.#client, item.profileIconUrl ?? item.profile_url ?? item.profile ?? '', 'image', { resolveUrl }),
+			_thumbnail: Toolkit.resolveMedia(this.#client, item.thumbnailUrl ?? item.thumbnail ?? '', 'image', { resolveUrl }),
 		}));
 
 		this._submessages.push({
@@ -1806,10 +1879,24 @@ class AIRich extends BaseBuilder {
 	}
 
 	/** Add a full-width image (or grid of images if `imageUrl` is an array). */
-	addImage(imageUrl, { resolveUrl = false } = {}) {
+	/**
+	 * @param {{ resolveUrl?: boolean, instant?: boolean|'only' }} [options]
+	 * `instant: true` — sends BOTH: the GRID_IMAGE card (still shows WA's "can't verify"
+	 *   forwarded-download prompt, unavoidable per-design of botForwardedMessage) AND a plain
+	 *   (non-forwarded) imageMessage via send()'s inline-image fallback queue (`_inlineImages`,
+	 *   shared with addInlineImage()) that renders instantly with no prompt. Two images, by design.
+	 * `instant: 'only'` — Vanz@Add (v4.9.2): skips building the GRID_IMAGE card entirely (no
+	 *   submessage, no GenAIImaginePrimitive section) and queues ONLY the plain imageMessage.
+	 *   One image, no prompt, nothing to download — use this when you don't need the rich card,
+	 *   just the picture to show up immediately.
+	 */
+	addImage(imageUrl, { resolveUrl = false, instant = false } = {}) {
 		if (!(typeof imageUrl === 'string' || Buffer.isBuffer(imageUrl) || (Array.isArray(imageUrl) && imageUrl.every((v) => typeof v === 'string' || Buffer.isBuffer(v))))) {
 			throw new TypeError('imageUrl must be string | buffer | array of string/buffer');
 		}
+		if (instant !== false && instant !== true && instant !== 'only') {
+			throw new TypeError(`instant must be false, true, or 'only' — got ${JSON.stringify(instant)}`);
+		}
 
 		const list = Array.isArray(imageUrl)
 			? imageUrl.map((v) => {
@@ -1831,28 +1918,38 @@ class AIRich extends BaseBuilder {
 					];
 				})();
 
-		this._submessages.push({
-			messageType: 1,
-			gridImageMetadata: {
-				gridImageUrl: {
-					imagePreviewUrl: list[0]?.imagePreviewUrl,
+		const buildCard = instant !== 'only';
+
+		if (buildCard) {
+			this._submessages.push({
+				messageType: 1,
+				gridImageMetadata: {
+					gridImageUrl: {
+						imagePreviewUrl: list[0]?.imagePreviewUrl,
+					},
+					imageUrls: list,
 				},
-				imageUrls: list,
-			},
-		});
+			});
+		}
 
 		list.forEach(({ imagePreviewUrl }) => {
-			this._sections.push(
-				AIRich.newLayout('Single', {
-					media: {
-						url: imagePreviewUrl,
-						mime_type: 'image/png',
-					},
-					imagine_type: 'IMAGE',
-					status: { status: 'READY' },
-					__typename: 'GenAIImaginePrimitive',
-				})
-			);
+			if (buildCard) {
+				this._sections.push(
+					AIRich.newLayout('Single', {
+						media: {
+							url: imagePreviewUrl,
+							mime_type: 'image/png',
+						},
+						imagine_type: 'IMAGE',
+						status: { status: 'READY' },
+						__typename: 'GenAIImaginePrimitive',
+					})
+				);
+			}
+
+			if (instant) {
+				this._inlineImages.push({ url: imagePreviewUrl, caption: undefined });
+			}
 		});
 
 		return this;
@@ -1923,8 +2020,12 @@ class AIRich extends BaseBuilder {
 	// fetch-full-video + ffmpeg-frame-extraction + duration-parse round trip per video, which
 	// was the main source of blurose's slower response time. Pass { autoFill: true } to opt
 	// back into the complete/slow path (real thumbnail + duration + file_length).
+	// Vanz@Fix 23-08-26 --- addVideo() had no resolveUrl option at all (unlike addImage()), so the
+	// video url always stayed a raw external link, which stock WA clients show a "download" state
+	// for before rendering. Mirrors addImage()'s { resolveUrl } — when true, the url is uploaded to
+	// WA's own media server first via Toolkit.toUrl() so it renders instantly like WA-native media.
 	/** Add a video block. */
-	addVideo(videoUrl, { autoFill = false } = {}) {
+	addVideo(videoUrl, { autoFill = false, resolveUrl = false } = {}) {
 		const isObjectVideo = (v) => v && typeof v === 'object' && v.url;
 
 		const isValidPrimitive =
@@ -1947,7 +2048,9 @@ class AIRich extends BaseBuilder {
 		items.forEach((item) => {
 			const isObject = isObjectVideo(item);
 
-			const url = isObject ? Toolkit.resolveMedia(this.#client, item.url ?? '', 'video') : Toolkit.resolveMedia(this.#client, item, 'video');
+			const url = isObject
+				? Toolkit.resolveMedia(this.#client, item.url ?? '', 'video', { resolveUrl })
+				: Toolkit.resolveMedia(this.#client, item, 'video', { resolveUrl });
 
 			const bufferPromise = autoFill ? Promise.resolve(url).then((u) => Toolkit.fetchBuffer(u)) : null;
 
@@ -2005,7 +2108,7 @@ class AIRich extends BaseBuilder {
 	}
 
 	/** Add an inline product card (or array of cards). Each item needs at least a `title`. */
-	addProduct(data = {}) {
+	addProduct(data = {}, { resolveUrl = false } = {}) {
 		if (!((data && typeof data === 'object' && !Array.isArray(data)) || (Array.isArray(data) && data.every((item) => item && typeof item === 'object' && !Array.isArray(item))))) {
 			throw new TypeError('Product items must be an object or an array of objects');
 		}
@@ -2030,11 +2133,11 @@ class AIRich extends BaseBuilder {
 			sale_price: item.sale_price,
 			product_url: item.product_url ?? item.url,
 			image: {
-				url: Toolkit.resolveMedia(this.#client, item.image_url ?? item.image, 'image'),
+				url: Toolkit.resolveMedia(this.#client, item.image_url ?? item.image, 'image', { resolveUrl }),
 			},
 			additional_images: [
 				{
-					url: Toolkit.resolveMedia(this.#client, item.icon_url ?? item.icon, 'image'),
+					url: Toolkit.resolveMedia(this.#client, item.icon_url ?? item.icon, 'image', { resolveUrl }),
 				},
 			],
 			__typename: 'GenAIProductItemCardPrimitive',
@@ -2046,7 +2149,7 @@ class AIRich extends BaseBuilder {
 	}
 
 	/** Add an inline social-post style card (or array of cards). */
-	addPost(data = {}) {
+	addPost(data = {}, { resolveUrl = false } = {}) {
 		if (!((data && typeof data === 'object' && !Array.isArray(data)) || (Array.isArray(data) && data.every((item) => item && typeof item === 'object' && !Array.isArray(item))))) {
 			throw new TypeError('Post items must be an object or an array of objects');
 		}
@@ -2062,9 +2165,9 @@ class AIRich extends BaseBuilder {
 			title: p.title ?? '',
 			subtitle: p.subtitle ?? '',
 			username: p.username ?? '',
-			profile_picture_url: Toolkit.resolveMedia(this.#client, p.profile_picture_url ?? p.profile_url ?? p.profile ?? '', 'image'),
+			profile_picture_url: Toolkit.resolveMedia(this.#client, p.profile_picture_url ?? p.profile_url ?? p.profile ?? '', 'image', { resolveUrl }),
 			is_verified: !!(p.is_verified || p.verified),
-			thumbnail_url: Toolkit.resolveMedia(this.#client, p.thumbnail_url ?? p.thumbnail ?? '', 'image'),
+			thumbnail_url: Toolkit.resolveMedia(this.#client, p.thumbnail_url ?? p.thumbnail ?? '', 'image', { resolveUrl }),
 			post_caption: p.post_caption ?? p.caption ?? '',
 			likes_count: p.likes_count ?? p.like ?? 0,
 			comments_count: p.comments_count ?? p.comment ?? 0,
@@ -2073,7 +2176,7 @@ class AIRich extends BaseBuilder {
 			post_deeplink: p.post_deeplink ?? p.deeplink ?? '',
 			source_app: p.source_app || p.source || 'INSTAGRAM',
 			footer_label: p.footer_label ?? p.footer ?? '',
-			footer_icon: Toolkit.resolveMedia(this.#client, p.footer_icon ?? p.icon ?? '', 'image'),
+			footer_icon: Toolkit.resolveMedia(this.#client, p.footer_icon ?? p.icon ?? '', 'image', { resolveUrl }),
 			is_carousel: posts.length > 1,
 			orientation: p.orientation ?? 'LANDSCAPE',
 			post_type: p.post_type ?? 'VIDEO',

package/lib/Utils/{MessageBuilder.d.ts → MessageBuilder_d.ts}

@@ -147,13 +147,13 @@ export class AIRich extends BaseBuilder {
 	addText(text: string, options?: AddTextOptions): this;
 	addCode(language: string, code: string): this;
 	addTable(table: string[][], options?: AddTextOptions): this;
-	addSource(sources?: Record<string, any>[]): this;
-	addReels(reelsItems?: Record<string, any>[]): this;
+	addSource(sources?: Record<string, any>[], options?: { resolveUrl?: boolean }): this;
+	addReels(reelsItems?: Record<string, any>[], options?: { resolveUrl?: boolean }): this;
 	addImage(imageUrl: string, options?: { resolveUrl?: boolean }): this;
 	addInlineImage(imageUrl: string, options?: AddInlineImageOptions): this;
-	addVideo(videoUrl: string, options?: { autoFill?: boolean }): this;
-	addProduct(data?: Record<string, any>): this;
-	addPost(data?: Record<string, any>): this;
+	addVideo(videoUrl: string, options?: { autoFill?: boolean; resolveUrl?: boolean }): this;
+	addProduct(data?: Record<string, any>, options?: { resolveUrl?: boolean }): this;
+	addPost(data?: Record<string, any>, options?: { resolveUrl?: boolean }): this;
 	addTip(text: string): this;
 	/** FOATextPrimitive — large heading text, distinct from addText()'s paragraph text. */
 	addHeading(text: string): this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanzxy/baileys",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "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",
   "main": "./cjs/lib/index.js",