@vanzxy/baileys 1.5.3 → 1.5.4

package/lib/Utils/MessageBuilder.js

@@ -47,6 +47,7 @@
 const MESSAGE_BUILDER_VERSION = '4.9';
 
 import { generateWAMessageFromContent, prepareWAMessageMedia } from './messages.js';
+import { generateMessageIDV2 } from './generics.js';
 import { botMetadataSignature, botMetadataCertificate } from './rich-message-utils.js';
 import crypto from 'crypto';
 import { PassThrough, Readable } from 'stream';
@@ -293,15 +294,19 @@ class Toolkit {
 		return await waitAllPromises(input);
 	}
 
-	/** Fetch `url` into a Buffer. @param {boolean} [silent] Return an empty Buffer instead of throwing on failure. */
-	static async fetchBuffer(url, options = {}, { silent = true } = {}) {
+	/** Fetch `url` into a Buffer. @param {boolean} [silent] Return an empty Buffer instead of throwing on failure. @param {number} [timeout] Abort after this many ms (default 15s) instead of hanging indefinitely on a dead/slow host. */
+	static async fetchBuffer(url, options = {}, { silent = true, timeout = 15000 } = {}) {
+		const controller = new AbortController();
+		const timer = setTimeout(() => controller.abort(), timeout);
 		try {
-			let response = await fetch(url, options);
+			let response = await fetch(url, { ...options, signal: options.signal ?? controller.signal });
 			if (!response.ok) throw Error(`HTTP ${response.status}`);
 			return Buffer.from(await response.arrayBuffer());
 		} catch (error) {
 			if (silent) return Buffer.alloc(0);
 			throw error;
+		} finally {
+			clearTimeout(timer);
 		}
 	}
 
@@ -1599,6 +1604,10 @@ class AIRich extends BaseBuilder {
 		this._responseId = null;
 		this._botResponseId = null;
 
+		// Vanz@Add --- set by send()/sendEdit() after every relay so a follow-up sendEdit(), called
+		// with no args, knows which jid/message id to patch in place (matches temen's v4.7 API).
+		this._lastMessageKey = null;
+
 		// 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.
@@ -2741,7 +2750,7 @@ class AIRich extends BaseBuilder {
 	// the two calls expect different option shapes, so the fallback now only forwards `quoted`
 	// (the one option that clearly applies to both) instead of blindly spreading everything.
 	/** Build and send this AI-rich message. @param {string} jid Destination chat/group jid. @param {boolean} [skipImageFallback] Skip auto-resending inline images as a plain imageMessage. */
-	async send(jid, { forwarded, notification, includesUnifiedResponse, includesSubmessages, skipImageFallback = false, quoted, ...options } = {}) {
+	async send(jid, { forwarded, notification, includesUnifiedResponse, includesSubmessages, skipImageFallback = false, quoted, messageId, ...options } = {}) {
 		const msg = await this.build({ forwarded, notification, includesUnifiedResponse, includesSubmessages, quoted, ...options });
 
 		if (!skipImageFallback && this._inlineImages.length) {
@@ -2755,7 +2764,82 @@ class AIRich extends BaseBuilder {
 			}
 		}
 
-		return await this.#client.relayMessage(jid, msg, { ...options });
+		// Vanz@Add --- pin our own messageId (instead of letting relayMessage mint one internally)
+		// so we know exactly which id was sent, and stash it as _lastMessageKey. That's what lets
+		// sendEdit() be called with no args afterwards and still know which message to patch.
+		messageId = messageId || generateMessageIDV2();
+
+		await this.#client.relayMessage(jid, msg, { messageId, ...options });
+
+		this._lastMessageKey = { remoteJid: jid, fromMe: true, id: messageId };
+
+		return { key: this._lastMessageKey, message: msg };
+	}
+
+	/**
+	 * Build a `protocolMessage` (type EDIT) that patches an already-sent AIRich message in place.
+	 * @param {string} targetJid Chat the original message lives in.
+	 * @param {string} targetId `key.id` of the original message (the id `send()`/`sendEdit()` returned).
+	 * @param {object} [opts] Pass `{ msg }` to reuse an already-built content object instead of rebuilding via build().
+	 */
+	async buildEdit(targetJid, targetId, { msg, messageId, ...options } = {}) {
+		const editedMessage = msg || (await this.build({ ...options }));
+
+		if (!editedMessage) {
+			throw new Error('buildEdit: no message content to edit (build() returned nothing)');
+		}
+
+		return generateWAMessageFromContent(
+			targetJid,
+			{
+				protocolMessage: {
+					key: {
+						remoteJid: targetJid,
+						fromMe: true,
+						id: targetId,
+					},
+					type: 14, // MESSAGE_EDIT
+					editedMessage,
+				},
+			},
+			{ messageId: messageId || generateMessageIDV2(), ...options }
+		);
+	}
+
+	/**
+	 * Rebuild this AIRich message's current content and patch it into an already-sent message in place
+	 * (WA edits the bubble instead of showing a new one). With no args, edits the message from the last
+	 * send()/sendEdit() call — that's the flow `.addX(...); await rich.sendEdit();` relies on.
+	 * @param {string} [jid] Defaults to the jid from the last send()/sendEdit().
+	 * @param {string} [id] Defaults to the message id from the last send()/sendEdit().
+	 */
+	async sendEdit(jid, id, { msg, messageId, additionalNodes = [], ...options } = {}) {
+		jid = jid ?? this._lastMessageKey?.remoteJid;
+		id = id ?? this._lastMessageKey?.id;
+
+		if (!jid) {
+			throw new Error('sendEdit: no jid — pass one explicitly, or call send() first');
+		}
+
+		if (!id) {
+			throw new Error('sendEdit: no message id — pass one explicitly, or call send() first');
+		}
+
+		const msgEdit = await this.buildEdit(jid, id, {
+			msg,
+			messageId: messageId || generateMessageIDV2(),
+			...options,
+		});
+
+		await this.#client.relayMessage(jid, msgEdit.message, {
+			messageId: msgEdit.key.id,
+			additionalNodes,
+		});
+
+		// Vanz@Note --- deliberately NOT overwriting _lastMessageKey with msgEdit.key here: the
+		// protocolMessage envelope has its own id, but the message the user actually sees (and the
+		// one future sendEdit() calls need to keep patching) is still `id`/`jid` above.
+		return msgEdit;
 	}
 
 	/** Tokenize `code` into `{ type, value }` spans for syntax highlighting. Covers JS/TS/Python/Java and more; unsupported languages fall back to a single plain-text token. */

package/package.json

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