@spectrum-ts/whatsapp-business 10.0.0 → 11.1.0

package/dist/index.js

@@ -1,6 +1,6 @@
 import { TypedEventStream, button, buttons, createClient, list } from "@photon-ai/whatsapp-business";
 import { UnsupportedError, cloud, definePlatform, mergeStreams, stream } from "@spectrum-ts/core";
-import { asAttachment, asContact, asCustom, asPollOption, asReaction, asText, createLogger, errorAttrs, tracedFetch } from "@spectrum-ts/core/authoring";
+import { asAttachment, asContact, asCustom, asGroup, asPollOption, asReaction, asText, asUnsend, createLogger, errorAttrs, tracedFetch } from "@spectrum-ts/core/authoring";
 import { extension } from "mime-types";
 import z from "zod";
 //#region src/auth.ts
@@ -296,6 +296,31 @@ const cachePoll = (client, messageId, poll) => {
 		if (first !== void 0) cache.delete(first);
 	}
 };
+const MAX_REACTION_CACHE_SIZE = 1e3;
+const reactionCaches = /* @__PURE__ */ new WeakMap();
+const reactionCacheKey = (reactedId, from) => `${reactedId}:${from}`;
+const cacheReaction = (client, reactedId, from, entry) => {
+	let cache = reactionCaches.get(client);
+	if (!cache) {
+		cache = /* @__PURE__ */ new Map();
+		reactionCaches.set(client, cache);
+	}
+	const key = reactionCacheKey(reactedId, from);
+	cache.delete(key);
+	cache.set(key, entry);
+	if (cache.size > MAX_REACTION_CACHE_SIZE) {
+		const first = cache.keys().next().value;
+		if (first !== void 0) cache.delete(first);
+	}
+};
+const getCachedReaction = (client, reactedId, from) => reactionCaches.get(client)?.get(reactionCacheKey(reactedId, from));
+const reactionTargetStub = (reactedId) => ({
+	id: reactedId,
+	content: asCustom({
+		whatsapp_type: "reaction-target",
+		stub: true
+	})
+});
 const optionIndexFromId = (id) => {
 	if (!id.startsWith(OPTION_ID_PREFIX)) return;
 	const index = Number(id.slice(4));
@@ -367,6 +392,14 @@ const waContactToSpectrum = (card) => {
 	if (card.birthday) input.birthday = card.birthday;
 	return asContact(input);
 };
+const groupItem = (msg, index, content) => ({
+	id: `${msg.id}:${index}`,
+	content,
+	sender: { id: msg.from },
+	space: { id: msg.from },
+	timestamp: msg.timestamp
+});
+const parentWamid = (id) => id.split(":")[0] ?? id;
 const toMessages = (client, msg) => {
 	const base = {
 		sender: { id: msg.from },
@@ -387,6 +420,34 @@ const toMessages = (client, msg) => {
 		content: mapContent(client, msg)
 	}];
 };
+const mapReactionContent = (client, msg, reaction) => {
+	const reactedId = reaction.messageId;
+	if (!reaction.emoji) {
+		const cached = getCachedReaction(client, reactedId, msg.from);
+		return asUnsend({ target: cached ? {
+			id: cached.id,
+			content: asReaction({
+				emoji: cached.emoji,
+				target: reactionTargetStub(reactedId)
+			})
+		} : {
+			id: `${reactedId}:reaction:${msg.from}`,
+			content: asCustom({
+				whatsapp_type: "reaction-removed",
+				messageId: reactedId,
+				stub: true
+			})
+		} });
+	}
+	cacheReaction(client, reactedId, msg.from, {
+		id: msg.id,
+		emoji: reaction.emoji
+	});
+	return asReaction({
+		emoji: reaction.emoji,
+		target: reactionTargetStub(reactedId)
+	});
+};
 const mapContent = (client, msg) => {
 	const { content } = msg;
 	switch (content.type) {
@@ -394,7 +455,12 @@ const mapContent = (client, msg) => {
 		case "image":
 		case "video":
 		case "audio":
-		case "document": return lazyMedia(client, content.media);
+		case "document": {
+			const media = lazyMedia(client, content.media);
+			const caption = content.media.caption?.trim();
+			if (!caption) return media;
+			return asGroup({ items: [groupItem(msg, 0, media), groupItem(msg, 1, asText(caption))] });
+		}
 		case "sticker": return asCustom({
 			whatsapp_type: "sticker",
 			...content.sticker
@@ -403,19 +469,7 @@ const mapContent = (client, msg) => {
 			whatsapp_type: "location",
 			...content.location
 		});
-		case "reaction": {
-			const stubTarget = {
-				id: content.reaction.messageId,
-				content: asCustom({
-					whatsapp_type: "reaction-target",
-					stub: true
-				})
-			};
-			return asReaction({
-				emoji: content.reaction.emoji,
-				target: stubTarget
-			});
-		}
+		case "reaction": return mapReactionContent(client, msg, content.reaction);
 		case "interactive": {
 			const inter = content.interactive;
 			if (inter.type === "button_reply" || inter.type === "list_reply") {
@@ -547,7 +601,19 @@ const clientStream = (client) => {
 	return stream((emit, end) => {
 		const pump = (async () => {
 			try {
-				for await (const event of eventStream) for (const m of toMessages(client, event.message)) await emit(m);
+				for await (const event of eventStream) {
+					let mapped;
+					try {
+						mapped = toMessages(client, event.message);
+					} catch (error) {
+						streamLog.warn("skipping unmappable whatsapp message event", {
+							"spectrum.whatsapp.message_id": event.message.id,
+							...errorAttrs(error)
+						}, error instanceof Error ? error : void 0);
+						continue;
+					}
+					for (const m of mapped) await emit(m);
+				}
 				end();
 			} catch (e) {
 				end(e);
@@ -561,11 +627,23 @@ const clientStream = (client) => {
 };
 const messages = (clients) => mergeStreams(clients.map(clientStream));
 const send = async (clients, spaceId, content) => {
-	if (content.type === "reply") return await replyToMessage(clients, spaceId, content.target.id, content.content);
+	if (content.type === "reply") return await replyToMessage(clients, spaceId, parentWamid(content.target.id), content.content);
 	if (content.type === "reaction") return await reactToMessage(clients, spaceId, content);
 	if (content.type === "typing") return;
 	if (content.type === "read") {
-		await primary(clients).messages.markRead(content.target.id);
+		await primary(clients).messages.markRead(parentWamid(content.target.id));
+		return;
+	}
+	if (content.type === "unsend") {
+		const unsent = content.target.content;
+		if (unsent.type !== "reaction") throw UnsupportedError.content(content.type);
+		await primary(clients).messages.send({
+			to: spaceId,
+			reaction: {
+				messageId: parentWamid(unsent.target.id),
+				emoji: ""
+			}
+		});
 		return;
 	}
 	const client = primary(clients);
@@ -624,7 +702,7 @@ const reactToMessage = async (clients, spaceId, content) => {
 	return toRecord(await primary(clients).messages.send({
 		to: spaceId,
 		reaction: {
-			messageId: content.target.id,
+			messageId: parentWamid(content.target.id),
 			emoji: content.emoji
 		}
 	}), spaceId, content);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-ts/whatsapp-business",
-  "version": "10.0.0",
+  "version": "11.1.0",
   "description": "WhatsApp Business provider for spectrum-ts.",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "zod": "^4.2.1"
   },
   "peerDependencies": {
-    "@spectrum-ts/core": "^10.0.0",
+    "@spectrum-ts/core": "^11.0.0",
     "typescript": "^5 || ^6.0.0"
   },
   "license": "MIT"