@openclaw/twitch 2026.5.22 → 2026.5.24-beta.1

package/dist/api.js

@@ -1,3 +1,3 @@
-import { t as twitchPlugin } from "./plugin-Bhtgv1oH.js";
+import { t as twitchPlugin } from "./plugin-BWX0hpqA.js";
 import { n as setTwitchRuntime } from "./runtime-B5If4b0g.js";
 export { setTwitchRuntime, twitchPlugin };

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as twitchPlugin } from "./plugin-Bhtgv1oH.js";
+import { t as twitchPlugin } from "./plugin-BWX0hpqA.js";
 export { twitchPlugin };

package/dist/{monitor-Bf1feqSo.js → monitor-ClcKuSAz.js}

@@ -1,4 +1,4 @@
-import { n as stripMarkdownForTwitch, r as getOrCreateClientManager } from "./plugin-Bhtgv1oH.js";
+import { n as stripMarkdownForTwitch, r as getOrCreateClientManager } from "./plugin-BWX0hpqA.js";
 import { t as getTwitchRuntime } from "./runtime-B5If4b0g.js";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";

package/dist/{plugin-Bhtgv1oH.js → plugin-BWX0hpqA.js}

@@ -22,7 +22,10 @@ var TwitchClientManager = class {
 	constructor(logger) {
 		this.logger = logger;
 		this.clients = /* @__PURE__ */ new Map();
+		this.pendingClients = /* @__PURE__ */ new Map();
+		this.connectionPromises = /* @__PURE__ */ new Map();
 		this.messageHandlers = /* @__PURE__ */ new Map();
+		this.messageHandlerTokens = /* @__PURE__ */ new Map();
 	}
 	/**
 	* Create an auth provider for the account.
@@ -34,16 +37,17 @@ var TwitchClientManager = class {
 				clientId: account.clientId,
 				clientSecret: account.clientSecret
 			});
-			await authProvider.addUserForToken({
-				accessToken: normalizedToken,
-				refreshToken: account.refreshToken ?? null,
-				expiresIn: account.expiresIn ?? null,
-				obtainmentTimestamp: account.obtainmentTimestamp ?? Date.now()
-			}, TWITCH_CHAT_AUTH_INTENTS).then((userId) => {
+			try {
+				const userId = await authProvider.addUserForToken({
+					accessToken: normalizedToken,
+					refreshToken: account.refreshToken ?? null,
+					expiresIn: account.expiresIn ?? null,
+					obtainmentTimestamp: account.obtainmentTimestamp ?? Date.now()
+				}, TWITCH_CHAT_AUTH_INTENTS);
 				this.logger.info(`Added user ${userId} to RefreshingAuthProvider for ${account.username}`);
-			}).catch((err) => {
-				this.logger.error(`Failed to add user to RefreshingAuthProvider: ${formatErrorMessage(err)}`);
-			});
+			} catch (err) {
+				throw new Error(`Failed to add user to RefreshingAuthProvider: ${formatErrorMessage(err)}`, { cause: err });
+			}
 			authProvider.onRefresh((userId, token) => {
 				this.logger.info(`Access token refreshed for user ${userId} (expires in ${token.expiresIn ? `${token.expiresIn}s` : "unknown"})`);
 			});
@@ -64,6 +68,17 @@ var TwitchClientManager = class {
 		const key = this.getAccountKey(account);
 		const existing = this.clients.get(key);
 		if (existing) return existing;
+		const pending = this.connectionPromises.get(key);
+		if (pending) return pending;
+		const connection = this.createConnectedClient(key, account, cfg, accountId);
+		this.connectionPromises.set(key, connection);
+		try {
+			return await connection;
+		} finally {
+			if (this.connectionPromises.get(key) === connection) this.connectionPromises.delete(key);
+		}
+	}
+	async createConnectedClient(key, account, cfg, accountId) {
 		const tokenResolution = resolveTwitchToken(cfg, { accountId });
 		if (!tokenResolution.token) {
 			this.logger.error(`Missing Twitch token for account ${account.username} (set channels.twitch.accounts.${account.username}.token or OPENCLAW_TWITCH_ACCESS_TOKEN for default)`);
@@ -107,11 +122,62 @@ var TwitchClientManager = class {
 			}
 		});
 		this.setupClientHandlers(client, account);
-		client.connect();
+		this.pendingClients.set(key, client);
+		try {
+			await this.connectClient(client, account);
+			if (this.pendingClients.get(key) !== client) {
+				client.quit();
+				throw new Error(`Twitch connection cancelled for ${account.username}`);
+			}
+			this.pendingClients.delete(key);
+		} catch (error) {
+			if (this.pendingClients.get(key) === client) this.pendingClients.delete(key);
+			throw error;
+		}
 		this.clients.set(key, client);
 		this.logger.info(`Connected to Twitch as ${account.username}`);
 		return client;
 	}
+	async connectClient(client, account) {
+		const connectTimeoutMs = 15e3;
+		await new Promise((resolve, reject) => {
+			let settled = false;
+			let authRetryPending = false;
+			const listeners = [];
+			let timeout;
+			const finish = (error) => {
+				if (settled) return;
+				settled = true;
+				if (timeout) clearTimeout(timeout);
+				for (const listener of listeners) listener.unbind();
+				if (error) {
+					try {
+						client.quit();
+					} catch {}
+					reject(error);
+					return;
+				}
+				resolve();
+			};
+			listeners.push(client.onAuthenticationSuccess(() => finish()), client.onAuthenticationFailure((text) => {
+				authRetryPending = true;
+				this.logger.warn(`Twitch authentication failed for ${account.username}; waiting for retry, disconnect, or timeout: ${text}`);
+			}), client.onDisconnect((manual, reason) => {
+				if (authRetryPending && !manual) {
+					this.logger.debug?.(`Twitch disconnected during auth retry for ${account.username}: ${formatErrorMessage(reason)}`);
+					return;
+				}
+				finish(reason ?? /* @__PURE__ */ new Error(manual ? `Twitch connection cancelled for ${account.username}` : `Twitch disconnected before ready for ${account.username}`));
+			}));
+			timeout = setTimeout(() => finish(/* @__PURE__ */ new Error(`Timed out connecting to Twitch as ${account.username}`)), connectTimeoutMs);
+			timeout.unref?.();
+			try {
+				client.connect();
+			} catch (error) {
+				finish(error instanceof Error ? error : new Error(String(error)));
+			}
+		});
+	}
 	/**
 	* Set up message and event handlers for a client
 	*/
@@ -148,21 +214,37 @@ var TwitchClientManager = class {
 	*/
 	onMessage(account, handler) {
 		const key = this.getAccountKey(account);
+		const token = Symbol(key);
 		this.messageHandlers.set(key, handler);
+		this.messageHandlerTokens.set(key, token);
 		return () => {
-			this.messageHandlers.delete(key);
+			if (this.messageHandlerTokens.get(key) === token) {
+				this.messageHandlers.delete(key);
+				this.messageHandlerTokens.delete(key);
+			}
 		};
 	}
+	clearMessageHandler(key) {
+		this.messageHandlers.delete(key);
+		this.messageHandlerTokens.delete(key);
+	}
 	/**
 	* Disconnect a client
 	*/
 	async disconnect(account) {
 		const key = this.getAccountKey(account);
 		const client = this.clients.get(key);
+		const pendingClient = this.pendingClients.get(key);
+		if (pendingClient) {
+			pendingClient.quit();
+			this.pendingClients.delete(key);
+			this.connectionPromises.delete(key);
+			this.clearMessageHandler(key);
+		}
 		if (client) {
 			client.quit();
 			this.clients.delete(key);
-			this.messageHandlers.delete(key);
+			this.clearMessageHandler(key);
 			this.logger.info(`Disconnected ${key}`);
 		}
 	}
@@ -170,9 +252,13 @@ var TwitchClientManager = class {
 	* Disconnect all clients
 	*/
 	async disconnectAll() {
+		this.pendingClients.forEach((client) => client.quit());
 		this.clients.forEach((client) => client.quit());
+		this.pendingClients.clear();
+		this.connectionPromises.clear();
 		this.clients.clear();
 		this.messageHandlers.clear();
+		this.messageHandlerTokens.clear();
 		this.logger.info(" Disconnected all clients");
 	}
 	/**
@@ -206,6 +292,8 @@ var TwitchClientManager = class {
 	*/
 	clearForTest() {
 		this.clients.clear();
+		this.pendingClients.clear();
+		this.connectionPromises.clear();
 		this.messageHandlers.clear();
 	}
 };
@@ -260,9 +348,12 @@ function getClientManager(accountId) {
 async function removeClientManager(accountId) {
 	const entry = registry.get(accountId);
 	if (!entry) return;
-	await entry.manager.disconnectAll();
-	registry.delete(accountId);
-	entry.logger.info(`Unregistered client manager for account: ${accountId}`);
+	try {
+		await entry.manager.disconnectAll();
+	} finally {
+		registry.delete(accountId);
+		entry.logger.info(`Unregistered client manager for account: ${accountId}`);
+	}
 }
 //#endregion
 //#region extensions/twitch/src/utils/markdown.ts
@@ -1257,7 +1348,7 @@ const twitchPlugin = createChatChannelPlugin({
 				await runStoppablePassiveMonitor({
 					abortSignal: ctx.abortSignal,
 					start: async () => {
-						const { monitorTwitchProvider } = await import("./monitor-Bf1feqSo.js");
+						const { monitorTwitchProvider } = await import("./monitor-ClcKuSAz.js");
 						return monitorTwitchProvider({
 							account,
 							accountId,

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/twitch",
-  "version": "2026.5.22",
+  "version": "2026.5.24-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/twitch",
-      "version": "2026.5.22",
+      "version": "2026.5.24-beta.1",
       "dependencies": {
         "@twurple/api": "8.1.4",
         "@twurple/auth": "8.1.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/twitch",
-  "version": "2026.5.22",
+  "version": "2026.5.24-beta.1",
   "description": "OpenClaw Twitch channel plugin",
   "repository": {
     "type": "git",
@@ -24,10 +24,10 @@
       "minHostVersion": ">=2026.4.10"
     },
     "compat": {
-      "pluginApi": ">=2026.5.22"
+      "pluginApi": ">=2026.5.24-beta.1"
     },
     "build": {
-      "openclawVersion": "2026.5.22"
+      "openclawVersion": "2026.5.24-beta.1"
     },
     "channel": {
       "id": "twitch",
@@ -55,7 +55,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.5.22"
+    "openclaw": ">=2026.5.24-beta.1"
   },
   "peerDependenciesMeta": {
     "openclaw": {