@spectrum-ts/slack 12.0.0 → 12.1.0

package/dist/index.d.ts

@@ -15,7 +15,7 @@ type SlackMessage = SchemaMessage<typeof userSchema, typeof spaceSchema> & {
 };
 //#endregion
 //#region src/index.d.ts
-declare const slack: import("@spectrum-ts/core").Platform<import("@spectrum-ts/core").PlatformDef<"Slack", import("zod").ZodUnion<readonly [import("zod").ZodObject<{
+declare const slack: import("@spectrum-ts/core").Platform<import("@spectrum-ts/core").PlatformDef<"slack", import("zod").ZodUnion<readonly [import("zod").ZodObject<{
   endpoint: import("zod").ZodOptional<import("zod").ZodString>;
   teams: import("zod").ZodOptional<import("zod").ZodRecord<import("zod").ZodString, import("zod").ZodObject<{
     appId: import("zod").ZodString;

package/dist/index.js

@@ -1,12 +1,8 @@
 import { createClient, staticTokens } from "@photon-ai/slack";
 import { UnsupportedError, cloud, definePlatform, mergeStreams, stream } from "@spectrum-ts/core";
-import { asAttachment, asCustom, asReaction, asText, createLogger, errorAttrs } from "@spectrum-ts/core/authoring";
+import { asAttachment, asCustom, asReaction, asText, createTokenRenewal } from "@spectrum-ts/core/authoring";
 import z from "zod";
 //#region src/auth.ts
-const log = createLogger("spectrum.slack.auth");
-const RENEWAL_RATIO = .8;
-const EXPIRY_BUFFER_MS = 3e4;
-const RETRY_DELAY_MS = 3e4;
 const cloudAuthState = /* @__PURE__ */ new WeakMap();
 const toTeamMetadata = (meta) => ({
 	appId: meta.appId,
@@ -26,96 +22,34 @@ const toTeamMetadata = (meta) => ({
 */
 async function createCloudClients(projectId, projectSecret, endpoint) {
 	let tokenData = await cloud.issueSlackTokens(projectId, projectSecret);
-	let tokenExpiresAt = Date.now() + tokenData.expiresIn * 1e3;
-	let disposed = false;
-	let renewalTimer;
-	let refreshFailures = 0;
-	const clearRenewalTimer = () => {
-		if (renewalTimer !== void 0) {
-			clearTimeout(renewalTimer);
-			renewalTimer = void 0;
+	const renewal = createTokenRenewal({
+		expiresInSeconds: () => tokenData.expiresIn,
+		name: "slack",
+		refresh: async () => {
+			tokenData = await cloud.issueSlackTokens(projectId, projectSecret);
 		}
-	};
-	const refreshTokens = async () => {
-		tokenData = await cloud.issueSlackTokens(projectId, projectSecret);
-		tokenExpiresAt = Date.now() + tokenData.expiresIn * 1e3;
-	};
-	const onRefreshSuccess = () => {
-		if (refreshFailures > 0) {
-			log.info("slack token refresh recovered", { "spectrum.slack.auth.attempt": refreshFailures });
-			refreshFailures = 0;
-		}
-	};
-	const onRefreshFailure = (error) => {
-		refreshFailures += 1;
-		log.warn("slack token refresh failed; retrying", {
-			"spectrum.slack.auth.attempt": refreshFailures,
-			"spectrum.slack.auth.retry_in_ms": RETRY_DELAY_MS,
-			...errorAttrs(error)
-		}, error);
-	};
-	const scheduleRetry = () => {
-		if (disposed) return;
-		clearRenewalTimer();
-		renewalTimer = setTimeout(async () => {
-			if (disposed) return;
-			try {
-				await refreshTokens();
-				onRefreshSuccess();
-				scheduleRenewal();
-			} catch (retryErr) {
-				onRefreshFailure(retryErr);
-				scheduleRetry();
-			}
-		}, RETRY_DELAY_MS);
-		renewalTimer?.unref?.();
-	};
-	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) {
-				onRefreshFailure(err);
-				scheduleRetry();
-			}
-		}, renewInMs);
-		renewalTimer?.unref?.();
-	};
-	const refreshIfNeeded = async () => {
-		if (Date.now() < tokenExpiresAt - EXPIRY_BUFFER_MS) return;
-		await refreshTokens();
-		onRefreshSuccess();
-		scheduleRenewal();
-	};
-	scheduleRenewal();
+	});
 	const client = createClient({
 		spectrumSlackEndpoint: endpoint,
 		tokenProvider: {
 			async getAccessToken(teamId) {
-				await refreshIfNeeded();
+				await renewal.refreshIfNeeded();
 				const token = tokenData.auth[teamId];
 				if (!token) throw new Error(`Slack team ${teamId} has no active installation in this project`);
 				return token;
 			},
 			invalidate(_teamId) {
-				tokenExpiresAt = 0;
+				renewal.invalidate();
 			},
 			async listTeams() {
-				await refreshIfNeeded();
+				await renewal.refreshIfNeeded();
 				const entries = Object.entries(tokenData.teams).map(([teamId, meta]) => [teamId, toTeamMetadata(meta)]);
 				return new Map(entries);
 			}
 		}
 	});
 	cloudAuthState.set(client, { dispose: async () => {
-		disposed = true;
-		clearRenewalTimer();
+		renewal.dispose();
 	} });
 	return client;
 }
@@ -404,7 +338,8 @@ const messageSchema = z.object({
 });
 //#endregion
 //#region src/index.ts
-const slack = definePlatform("Slack", {
+const PLATFORM_ID = "slack";
+const slack = definePlatform(PLATFORM_ID, {
 	config: configSchema,
 	lifecycle: {
 		createClient: async ({ config, projectId, projectSecret }) => {
@@ -433,7 +368,7 @@ const slack = definePlatform("Slack", {
 		create: async ({ input }) => {
 			const teamId = input.params?.teamId;
 			if (!teamId) throw new Error("Slack space creation requires a teamId param. Pass it via space.create(user, { teamId }).");
-			if (input.users.length > 1) throw UnsupportedError.action("space.create", "Slack", "group DMs require an explicit channel id (Slack's conversations.open is not exposed); use space.get(channelId, { teamId })");
+			if (input.users.length > 1) throw UnsupportedError.action("space.create", PLATFORM_ID, "group DMs require an explicit channel id (Slack's conversations.open is not exposed); use space.get(channelId, { teamId })");
 			const user = input.users[0];
 			if (!user) throw new Error("Slack space creation requires a user");
 			return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spectrum-ts/slack",
-  "version": "12.0.0",
+  "version": "12.1.0",
   "description": "Slack provider for spectrum-ts.",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
   "spectrum": {
     "key": "slack",
     "import": "slack",
-    "label": "Slack"
+    "label": "slack"
   },
   "dependencies": {
     "@photon-ai/slack": "^0.2.0",