@spectrum-ts/whatsapp-business 12.4.0 → 12.6.0

package/dist/index.js

@@ -1,16 +1,86 @@
 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, asGroup, asPollOption, asReaction, asReply, asText, asUnsend, asVoice, createLogger, createTokenRenewal, errorAttrs, tracedFetch } from "@spectrum-ts/core/authoring";
+import { UnsupportedError, cloud, definePlatform, stream } from "@spectrum-ts/core";
+import { asAttachment, asContact, asCustom, asGroup, asPollOption, asReaction, asReply, asText, asUnsend, asVoice, createLogger, createStreamGroup, createTokenRenewal, errorAttrs, tracedFetch } from "@spectrum-ts/core/authoring";
 import { extension } from "mime-types";
 import z from "zod";
+//#region src/lines.ts
+const linesLog = createLogger("spectrum.whatsapp.lines");
+const observers = /* @__PURE__ */ new WeakMap();
+const lineIds = /* @__PURE__ */ new WeakMap();
+let fallbackKeys = 0;
+/** Pairs a client with the phone number id it was built for. */
+const setLineId = (client, phoneNumberId) => {
+	lineIds.set(client, phoneNumberId);
+};
+/**
+* Stable per-client key. Falls back to a generated id for directly-configured
+* clients, which are not built from a token payload and carry no line id.
+*/
+const lineKey = (client) => {
+	const existing = lineIds.get(client);
+	if (existing) return existing;
+	fallbackKeys += 1;
+	const generated = `line-${fallbackKeys}`;
+	lineIds.set(client, generated);
+	return generated;
+};
+/**
+* Registers `observer` and returns a disposer that removes just this one, so a
+* closed message stream stops being called into. `clearLineObservers` remains
+* the whole-array teardown used when the client itself is destroyed.
+*/
+const addLineObserver = (clients, observer) => {
+	const existing = observers.get(clients);
+	if (existing) existing.add(observer);
+	else observers.set(clients, new Set([observer]));
+	return () => {
+		const current = observers.get(clients);
+		if (!current?.delete(observer)) return;
+		if (current.size === 0) observers.delete(clients);
+	};
+};
+const clearLineObservers = (clients) => {
+	observers.delete(clients);
+};
+/**
+* Synchronous by contract: the reconcile calls this immediately after pushing
+* the client, with no await in between, so an observer can never see a
+* half-applied array. A throwing observer is contained — it must not be able to
+* reject the token refresh, which would stall renewal for every line.
+*/
+const notifyLineAttached = (clients, client) => {
+	for (const observer of observers.get(clients) ?? []) try {
+		observer.attach(client);
+	} catch (error) {
+		linesLog.warn("whatsapp line observer failed to attach", errorAttrs(error), error instanceof Error ? error : void 0);
+	}
+};
+/**
+* Returns each observer's detach promise so the caller can settle them off the
+* refresh path — a wedged stream close must not stall token renewal.
+*/
+const notifyLineDetached = (clients, client) => {
+	const pending = [];
+	for (const observer of observers.get(clients) ?? []) try {
+		pending.push(Promise.resolve(observer.detach(client)));
+	} catch (error) {
+		linesLog.warn("whatsapp line observer failed to detach", errorAttrs(error), error instanceof Error ? error : void 0);
+	}
+	return pending;
+};
+//#endregion
 //#region src/auth.ts
 const streamLog$1 = createLogger("spectrum.whatsapp.stream");
+const authLog = createLogger("spectrum.whatsapp.auth");
 const RESUBSCRIBE_BACKOFF_MS = 500;
+const lineAttrs = (phoneNumberId) => ({ "spectrum.whatsapp.line": phoneNumberId });
 const ignoreCleanupError = () => void 0;
 const cloudAuthState = /* @__PURE__ */ new WeakMap();
 async function createCloudClients(projectId, projectSecret) {
 	let tokenData = await cloud.issueWhatsappBusinessTokens(projectId, projectSecret);
 	const lines = /* @__PURE__ */ new Map();
+	const clients = [];
+	const records = /* @__PURE__ */ new Map();
 	const buildRawClient = (phoneNumberId) => {
 		const accessToken = tokenData.auth[phoneNumberId];
 		if (!accessToken) throw new Error(`WhatsApp Business line ${phoneNumberId} missing from token response`);
@@ -20,6 +90,70 @@ async function createCloudClients(projectId, projectSecret) {
 			phoneNumberId
 		});
 	};
+	const attachLine = (phoneNumberId) => {
+		const state = {
+			current: buildRawClient(phoneNumberId),
+			subscriptions: /* @__PURE__ */ new Set()
+		};
+		lines.set(phoneNumberId, state);
+		const proxy = buildClientProxy(state, renewal.refreshIfNeeded);
+		setLineId(proxy, phoneNumberId);
+		records.set(phoneNumberId, proxy);
+		clients.push(proxy);
+		notifyLineAttached(clients, proxy);
+	};
+	const retire = async (proxy) => {
+		await Promise.allSettled(notifyLineDetached(clients, proxy));
+		await proxy.close();
+	};
+	const removeMissing = (auth) => {
+		let removed = 0;
+		for (const [phoneNumberId, proxy] of records) {
+			if (auth[phoneNumberId]) continue;
+			records.delete(phoneNumberId);
+			lines.delete(phoneNumberId);
+			const index = clients.indexOf(proxy);
+			if (index >= 0) clients.splice(index, 1);
+			removed += 1;
+			retire(proxy).catch((error) => {
+				authLog.warn("failed to retire whatsapp line", {
+					...lineAttrs(phoneNumberId),
+					...errorAttrs(error)
+				}, error instanceof Error ? error : void 0);
+			});
+		}
+		return removed;
+	};
+	/**
+	* Brings the client set in line with the token payload, which is the only
+	* line inventory the cloud exposes: keys present but untracked are newly
+	* provisioned, tracked keys that vanished were deprovisioned.
+	*
+	* An empty payload means the project has no lines, not that the response is
+	* suspect — keeping entries the payload no longer covers would leave the
+	* client routing through lines whose tokens have stopped being refreshed. A
+	* genuinely malformed payload (no `auth` at all) throws instead, which the
+	* caller contains before any line is removed.
+	*/
+	const reconcile = (auth) => {
+		const next = Object.keys(auth);
+		const removed = removeMissing(auth);
+		let added = 0;
+		for (const phoneNumberId of next) {
+			const existing = records.get(phoneNumberId);
+			if (existing) {
+				notifyLineAttached(clients, existing);
+				continue;
+			}
+			attachLine(phoneNumberId);
+			added += 1;
+		}
+		if (added > 0 || removed > 0) authLog.info("whatsapp lines reconciled", {
+			"spectrum.whatsapp.lines.added": added,
+			"spectrum.whatsapp.lines.removed": removed,
+			"spectrum.whatsapp.lines.total": clients.length
+		});
+	};
 	const refreshTokens = async () => {
 		tokenData = await cloud.issueWhatsappBusinessTokens(projectId, projectSecret);
 		for (const [phoneNumberId, state] of lines) {
@@ -29,20 +163,18 @@ async function createCloudClients(projectId, projectSecret) {
 			for (const sub of state.subscriptions) sub.swap();
 			await old.close().catch(() => void 0);
 		}
+		try {
+			reconcile(tokenData.auth);
+		} catch (error) {
+			authLog.error("whatsapp line reconcile failed", errorAttrs(error), error instanceof Error ? error : void 0);
+		}
 	};
 	const renewal = createTokenRenewal({
 		expiresInSeconds: () => tokenData.expiresIn,
 		name: "whatsapp",
 		refresh: refreshTokens
 	});
-	const clients = Object.keys(tokenData.auth).map((phoneNumberId) => {
-		const state = {
-			current: buildRawClient(phoneNumberId),
-			subscriptions: /* @__PURE__ */ new Set()
-		};
-		lines.set(phoneNumberId, state);
-		return buildClientProxy(state, renewal.refreshIfNeeded);
-	});
+	reconcile(tokenData.auth);
 	cloudAuthState.set(clients, { dispose: async () => {
 		renewal.dispose();
 		for (const state of lines.values()) for (const sub of state.subscriptions) sub.close();
@@ -52,6 +184,7 @@ async function createCloudClients(projectId, projectSecret) {
 	return clients;
 }
 async function disposeCloudAuth(clients) {
+	clearLineObservers(clients);
 	const auth = cloudAuthState.get(clients);
 	if (!auth) return;
 	await auth.dispose();
@@ -634,7 +767,21 @@ const clientStream = (client) => {
 		};
 	});
 };
-const messages = (clients) => mergeStreams(clients.map(clientStream));
+const messages = (clients) => {
+	const group = createStreamGroup({ label: "whatsapp.messages" });
+	for (const client of clients) group.add(lineKey(client), () => clientStream(client));
+	const disposeObserver = addLineObserver(clients, {
+		attach: (client) => {
+			group.add(lineKey(client), () => clientStream(client));
+		},
+		detach: (client) => group.remove(lineKey(client)).then(() => void 0)
+	});
+	const closeGroup = group.close.bind(group);
+	return Object.assign(group, { close: async () => {
+		disposeObserver();
+		await closeGroup();
+	} });
+};
 const MAX_CAPTION_LENGTH = 1024;
 const captionablePair = (group) => {
 	if (group.items.length !== 2) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-ts/whatsapp-business",
-  "version": "12.4.0",
+  "version": "12.6.0",
   "description": "WhatsApp Business provider for spectrum-ts.",
   "repository": {
     "type": "git",