fix(twitch): cancel auth retry disconnects

steipete · steipete · commit 841cb121fb70 · 2026-05-24T03:55:49.000+01:00
diff --git a/extensions/twitch/src/twitch-client.test.ts b/extensions/twitch/src/twitch-client.test.ts
@@ -231,6 +231,17 @@ describe("TwitchClientManager", () => {
       await expect(connection).resolves.toBeTruthy();
     });
 
+    it("rejects pending auth retry connections on manual disconnect", async () => {
+      mockConnect.mockImplementationOnce(() => {});
+
+      const connection = manager.getClient(testAccount);
+      await Promise.resolve();
+      authFailureHandlers[0]?.("bad token", 1);
+      disconnectHandlers[0]?.(true);
+
+      await expect(connection).rejects.toThrow("Twitch connection cancelled");
+    });
+
     it("does not cache pending connections after disconnectAll", async () => {
       mockConnect.mockImplementationOnce(() => {});
 
diff --git a/extensions/twitch/src/twitch-client.ts b/extensions/twitch/src/twitch-client.ts
@@ -231,14 +231,21 @@ export class TwitchClientManager {
             `Twitch authentication failed for ${account.username}; waiting for retry, disconnect, or timeout: ${text}`,
           );
         }),
-        client.onDisconnect((_manual, reason) => {
-          if (authRetryPending) {
+        client.onDisconnect((manual, reason) => {
+          if (authRetryPending && !manual) {
             this.logger.debug?.(
               `Twitch disconnected during auth retry for ${account.username}: ${formatErrorMessage(reason)}`,
             );
             return;
           }
-          finish(reason ?? new Error(`Twitch disconnected before ready for ${account.username}`));
+          finish(
+            reason ??
+              new Error(
+                manual
+                  ? `Twitch connection cancelled for ${account.username}`
+                  : `Twitch disconnected before ready for ${account.username}`,
+              ),
+          );
         }),
       );
       timeout = setTimeout(
