@spectrum-ts/whatsapp-business 8.2.1 → 8.2.2

package/dist/index.js

@@ -10,6 +10,7 @@ const RENEWAL_RATIO = .8;
 const EXPIRY_BUFFER_MS = 3e4;
 const RETRY_DELAY_MS = 3e4;
 const RESUBSCRIBE_BACKOFF_MS = 500;
+const ignoreCleanupError = () => void 0;
 const cloudAuthState = /* @__PURE__ */ new WeakMap();
 async function createCloudClients(projectId, projectSecret) {
 	let tokenData = await cloud.issueWhatsappBusinessTokens(projectId, projectSecret);
@@ -17,6 +18,7 @@ async function createCloudClients(projectId, projectSecret) {
 	let disposed = false;
 	let renewalTimer;
 	let refreshFailures = 0;
+	let refreshInFlight;
 	const lines = /* @__PURE__ */ new Map();
 	const buildRawClient = (phoneNumberId) => {
 		const accessToken = tokenData.auth[phoneNumberId];
@@ -58,30 +60,36 @@ async function createCloudClients(projectId, projectSecret) {
 			renewalTimer = void 0;
 		}
 	};
+	const refreshNow = async () => {
+		await refreshTokens();
+		onRefreshSuccess();
+		scheduleRenewal();
+	};
+	const coalescedRefresh = () => {
+		if (!refreshInFlight) refreshInFlight = refreshNow().finally(() => {
+			refreshInFlight = void 0;
+		});
+		return refreshInFlight;
+	};
 	const scheduleRenewal = () => {
 		if (disposed) return;
 		clearRenewalTimer();
 		const ttlMs = tokenData.expiresIn * 1e3;
 		const renewInMs = Math.max(ttlMs * RENEWAL_RATIO, 5e3);
-		renewalTimer = setTimeout(async () => {
-			try {
-				await refreshTokens();
-				onRefreshSuccess();
-				scheduleRenewal();
-			} catch (err) {
+		const runScheduledRefresh = () => {
+			coalescedRefresh().catch((err) => {
 				onRefreshFailure(err);
-				clearRenewalTimer();
-				renewalTimer = setTimeout(() => scheduleRenewal(), RETRY_DELAY_MS);
+				if (disposed) return;
+				renewalTimer = setTimeout(runScheduledRefresh, RETRY_DELAY_MS);
 				renewalTimer?.unref?.();
-			}
-		}, renewInMs);
+			});
+		};
+		renewalTimer = setTimeout(runScheduledRefresh, renewInMs);
 		renewalTimer?.unref?.();
 	};
 	const refreshIfNeeded = async () => {
 		if (Date.now() < tokenExpiresAt - EXPIRY_BUFFER_MS) return;
-		await refreshTokens();
-		onRefreshSuccess();
-		scheduleRenewal();
+		await coalescedRefresh();
 	};
 	scheduleRenewal();
 	const clients = Object.keys(tokenData.auth).map((phoneNumberId) => {
@@ -133,18 +141,45 @@ const buildClientProxy = (state, refresh) => {
 		}
 	};
 };
+const settleNext = (next) => next.then((result) => ({
+	type: "next",
+	result
+}), (error) => ({
+	type: "error",
+	error
+}));
+const closeStream = (stream) => {
+	stream.close().catch(ignoreCleanupError);
+};
+const returnIterator = (iterator) => {
+	iterator.return?.(void 0).catch(ignoreCleanupError);
+};
 const pumpOnce = async (ctx) => {
 	const sub = ctx.getCurrent().events.subscribe(ctx.options);
+	const iterator = sub[Symbol.asyncIterator]();
+	const swapVersion = ctx.swapVersion();
 	ctx.setActive(sub);
 	try {
-		for await (const event of sub) await ctx.emit(event);
-		return true;
+		while (!ctx.isClosed()) {
+			const result = await Promise.race([settleNext(iterator.next()), ctx.waitForSwap(swapVersion).then(() => ({ type: "swap" }))]);
+			if (result.type === "swap") {
+				closeStream(sub);
+				returnIterator(iterator);
+				return ctx.isClosed() ? "closed" : "swap";
+			}
+			if (result.type === "error") throw result.error;
+			if (result.result.done) return ctx.isClosed() ? "closed" : "ended";
+			await ctx.emit(result.result.value);
+		}
+		return "closed";
 	} catch (error) {
+		closeStream(sub);
+		returnIterator(iterator);
 		streamLog$1.warn("whatsapp event stream interrupted; resubscribing", {
 			"spectrum.whatsapp.resubscribe_in_ms": RESUBSCRIBE_BACKOFF_MS,
 			...errorAttrs(error)
 		}, error);
-		return false;
+		return ctx.isClosed() ? "closed" : "error";
 	} finally {
 		ctx.setActive(void 0);
 	}
@@ -152,25 +187,45 @@ const pumpOnce = async (ctx) => {
 const resubscribableStream = (state, options) => {
 	let closed = false;
 	let active;
+	let swapVersion = 0;
+	let wakeSwap;
+	const wake = () => {
+		wakeSwap?.();
+		wakeSwap = void 0;
+	};
+	const requestResubscribe = () => {
+		swapVersion += 1;
+		wake();
+		active?.close().catch(ignoreCleanupError);
+	};
 	const source = stream((emit, end) => {
 		const ctx = {
 			emit,
 			getCurrent: () => state.current,
+			isClosed: () => closed,
 			options,
 			setActive: (s) => {
 				active = s;
+			},
+			swapVersion: () => swapVersion,
+			waitForSwap: (version) => {
+				if (closed || swapVersion !== version) return Promise.resolve();
+				return new Promise((resolve) => {
+					wakeSwap = resolve;
+				});
 			}
 		};
 		const pump = (async () => {
 			while (!closed) {
-				await pumpOnce(ctx);
-				if (!closed) await new Promise((r) => setTimeout(r, RESUBSCRIBE_BACKOFF_MS));
+				const result = await pumpOnce(ctx);
+				if (!closed && result !== "swap") await new Promise((r) => setTimeout(r, RESUBSCRIBE_BACKOFF_MS));
 			}
 			end();
 		})();
 		return async () => {
 			closed = true;
-			active?.close().catch(() => void 0);
+			wake();
+			active?.close().catch(ignoreCleanupError);
 			active = void 0;
 			state.subscriptions.delete(subscription);
 			await pump;
@@ -179,16 +234,18 @@ const resubscribableStream = (state, options) => {
 	const subscription = {
 		close: () => {
 			closed = true;
-			active?.close().catch(() => void 0);
+			wake();
+			active?.close().catch(ignoreCleanupError);
 		},
 		swap: () => {
-			active?.close().catch(() => void 0);
+			requestResubscribe();
 		}
 	};
 	state.subscriptions.add(subscription);
 	return new TypedEventStream(source, async () => {
 		closed = true;
-		active?.close().catch(() => void 0);
+		wake();
+		active?.close().catch(ignoreCleanupError);
 		state.subscriptions.delete(subscription);
 		await source.close();
 	});

package/package.json

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