@spectrum-ts/whatsapp-business 12.0.0 → 12.2.0

package/dist/index.d.ts

@@ -16,7 +16,7 @@ type WhatsAppMessage = SchemaMessage<typeof userSchema, typeof spaceSchema>;
  * WhatsApp-only template message content. Lives entirely under the WhatsApp
  * Business provider — never enters the universal `Content` discriminated
  * union. The framework recognizes it via the generic content-level platform
- * contract: `__platform: "WhatsApp Business"` lets
+ * contract: `__platform: "whatsapp_business"` lets
  * `findUnsupportedPlatformContent` warn-and-skip when a different platform
  * receives it.
  *
@@ -29,7 +29,7 @@ type WhatsAppMessage = SchemaMessage<typeof userSchema, typeof spaceSchema>;
  */
 declare const whatsappTemplateSchema: z.ZodObject<{
   type: z.ZodLiteral<"whatsapp-template">;
-  __platform: z.ZodLiteral<"WhatsApp Business">;
+  __platform: z.ZodLiteral<"whatsapp_business">;
   name: z.ZodString;
   languageCode: z.ZodString;
   bodyParams: z.ZodOptional<z.ZodArray<z.ZodString>>;
@@ -53,7 +53,7 @@ declare class WhatsAppPartialSendError extends Error {
 }
 //#endregion
 //#region src/index.d.ts
-declare const whatsappBusiness: import("@spectrum-ts/core").Platform<import("@spectrum-ts/core").PlatformDef<"WhatsApp Business", import("zod").ZodUnion<readonly [import("zod").ZodObject<{
+declare const whatsappBusiness: import("@spectrum-ts/core").Platform<import("@spectrum-ts/core").PlatformDef<"whatsapp_business", import("zod").ZodUnion<readonly [import("zod").ZodObject<{
   accessToken: import("zod").ZodString;
   appSecret: import("zod").ZodOptional<import("zod").ZodString>;
   phoneNumberId: import("zod").ZodString;

package/dist/index.js

@@ -1,24 +1,15 @@
 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, errorAttrs, tracedFetch } from "@spectrum-ts/core/authoring";
+import { asAttachment, asContact, asCustom, asGroup, asPollOption, asReaction, asReply, asText, asUnsend, asVoice, createLogger, createTokenRenewal, errorAttrs, tracedFetch } from "@spectrum-ts/core/authoring";
 import { extension } from "mime-types";
 import z from "zod";
 //#region src/auth.ts
-const log = createLogger("spectrum.whatsapp.auth");
 const streamLog$1 = createLogger("spectrum.whatsapp.stream");
-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);
-	let tokenExpiresAt = Date.now() + tokenData.expiresIn * 1e3;
-	let disposed = false;
-	let renewalTimer;
-	let refreshFailures = 0;
-	let refreshInFlight;
 	const lines = /* @__PURE__ */ new Map();
 	const buildRawClient = (phoneNumberId) => {
 		const accessToken = tokenData.auth[phoneNumberId];
@@ -31,7 +22,6 @@ async function createCloudClients(projectId, projectSecret) {
 	};
 	const refreshTokens = async () => {
 		tokenData = await cloud.issueWhatsappBusinessTokens(projectId, projectSecret);
-		tokenExpiresAt = Date.now() + tokenData.expiresIn * 1e3;
 		for (const [phoneNumberId, state] of lines) {
 			if (!tokenData.auth[phoneNumberId]) continue;
 			const old = state.current;
@@ -40,69 +30,21 @@ async function createCloudClients(projectId, projectSecret) {
 			await old.close().catch(() => void 0);
 		}
 	};
-	const onRefreshSuccess = () => {
-		if (refreshFailures > 0) {
-			log.info("whatsapp token refresh recovered", { "spectrum.whatsapp.auth.attempt": refreshFailures });
-			refreshFailures = 0;
-		}
-	};
-	const onRefreshFailure = (error) => {
-		refreshFailures += 1;
-		log.warn("whatsapp token refresh failed; retrying", {
-			"spectrum.whatsapp.auth.attempt": refreshFailures,
-			"spectrum.whatsapp.auth.retry_in_ms": RETRY_DELAY_MS,
-			...errorAttrs(error)
-		}, error);
-	};
-	const clearRenewalTimer = () => {
-		if (renewalTimer !== void 0) {
-			clearTimeout(renewalTimer);
-			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);
-		const runScheduledRefresh = () => {
-			coalescedRefresh().catch((err) => {
-				onRefreshFailure(err);
-				if (disposed) return;
-				renewalTimer = setTimeout(runScheduledRefresh, RETRY_DELAY_MS);
-				renewalTimer?.unref?.();
-			});
-		};
-		renewalTimer = setTimeout(runScheduledRefresh, renewInMs);
-		renewalTimer?.unref?.();
-	};
-	const refreshIfNeeded = async () => {
-		if (Date.now() < tokenExpiresAt - EXPIRY_BUFFER_MS) return;
-		await coalescedRefresh();
-	};
-	scheduleRenewal();
+	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, refreshIfNeeded);
+		return buildClientProxy(state, renewal.refreshIfNeeded);
 	});
 	cloudAuthState.set(clients, { dispose: async () => {
-		disposed = true;
-		clearRenewalTimer();
+		renewal.dispose();
 		for (const state of lines.values()) for (const sub of state.subscriptions) sub.close();
 		await Promise.allSettled(Array.from(lines.values()).map((s) => s.current.close()));
 		lines.clear();
@@ -256,7 +198,7 @@ const resubscribableStream = (state, options) => {
 * WhatsApp-only template message content. Lives entirely under the WhatsApp
 * Business provider — never enters the universal `Content` discriminated
 * union. The framework recognizes it via the generic content-level platform
-* contract: `__platform: "WhatsApp Business"` lets
+* contract: `__platform: "whatsapp_business"` lets
 * `findUnsupportedPlatformContent` warn-and-skip when a different platform
 * receives it.
 *
@@ -269,7 +211,7 @@ const resubscribableStream = (state, options) => {
 */
 const whatsappTemplateSchema = z.object({
 	type: z.literal("whatsapp-template"),
-	__platform: z.literal("WhatsApp Business"),
+	__platform: z.literal("whatsapp_business"),
 	name: z.string().min(1),
 	languageCode: z.string().min(1),
 	bodyParams: z.array(z.string()).optional()
@@ -277,7 +219,7 @@ const whatsappTemplateSchema = z.object({
 const isWhatsAppTemplate = (value) => whatsappTemplateSchema.safeParse(value).success;
 const asWhatsAppTemplate = (input) => whatsappTemplateSchema.parse({
 	type: "whatsapp-template",
-	__platform: "WhatsApp Business",
+	__platform: "whatsapp_business",
 	...input
 });
 function whatsappTemplate(input) {
@@ -948,9 +890,11 @@ const cloudConfig = z.object({}).strict();
 const configSchema = z.union([directConfig, cloudConfig]);
 const isCloudConfig = (config) => !("accessToken" in config);
 z.object({});
+const spaceSchema = z.object({ id: z.string() });
 //#endregion
 //#region src/index.ts
-const whatsappBusiness = definePlatform("WhatsApp Business", {
+const PLATFORM_ID = "whatsapp_business";
+const whatsappBusiness = definePlatform(PLATFORM_ID, {
 	config: configSchema,
 	lifecycle: {
 		createClient: async ({ config, projectId, projectSecret }) => {
@@ -969,10 +913,10 @@ const whatsappBusiness = definePlatform("WhatsApp Business", {
 	},
 	user: { resolve: async ({ input }) => ({ id: input.userID }) },
 	space: {
-		schema: z.object({ id: z.string() }),
+		schema: spaceSchema,
 		create: async ({ input }) => {
 			if (input.users.length === 0) throw new Error("WhatsApp space creation requires at least one user");
-			if (input.users.length > 1) throw UnsupportedError.action("space.create", "WhatsApp Business", "only 1:1 conversations are supported");
+			if (input.users.length > 1) throw UnsupportedError.action("space.create", PLATFORM_ID, "only 1:1 conversations are supported");
 			const user = input.users[0];
 			if (!user) throw new Error("WhatsApp space creation requires a user");
 			return { id: user.id };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-ts/whatsapp-business",
-  "version": "12.0.0",
+  "version": "12.2.0",
   "description": "WhatsApp Business provider for spectrum-ts.",
   "repository": {
     "type": "git",
@@ -26,9 +26,9 @@
     "access": "public"
   },
   "spectrum": {
-    "key": "whatsapp-business",
+    "key": "whatsapp_business",
     "import": "whatsappBusiness",
-    "label": "WhatsApp Business"
+    "label": "whatsapp_business"
   },
   "dependencies": {
     "@photon-ai/whatsapp-business": "^0.2.0",