fix: bound subscription login completion time

Author: joohw

core/internal/buildinfo/buildinfo.go

@@ -4,7 +4,7 @@ import "strings"
 
 // Set at link time via -ldflags (see .goreleaser.yaml).
 var (
-	Version = "dev0.1.91"
+	Version = "dev0.1.92"
 	Commit  = "none"
 	Date    = "unknown"
 )

core/internal/subscriptionauth/oauth.go

@@ -41,7 +41,8 @@ const (
 	codexScope        = "openid profile email offline_access"
 	codexAuthClaim    = "https://api.openai.com/auth"
 
-	loginTimeout = 10 * time.Minute
+	loginTimeout         = 10 * time.Minute
+	tokenExchangeTimeout = 45 * time.Second
 )
 
 // claudeTokenURL is a var (not const) so tests can point it at a local server.
@@ -127,7 +128,9 @@ func loginClaude(ctx context.Context, openBrowser bool) (string, error) {
 	if err != nil {
 		return authURL, err
 	}
-	creds, err := exchangeClaudeCode(ctx, cb.Code, cb.State, pkce.Verifier, redirectURI)
+	exchangeCtx, exchangeCancel := context.WithTimeout(ctx, tokenExchangeTimeout)
+	defer exchangeCancel()
+	creds, err := exchangeClaudeCode(exchangeCtx, cb.Code, cb.State, pkce.Verifier, redirectURI)
 	if err != nil {
 		return authURL, err
 	}
@@ -178,7 +181,9 @@ func loginCodex(ctx context.Context, openBrowser bool) (string, error) {
 	if err != nil {
 		return authURL, err
 	}
-	creds, err := exchangeCodexCode(ctx, cb.Code, pkce.Verifier, redirectURI)
+	exchangeCtx, exchangeCancel := context.WithTimeout(ctx, tokenExchangeTimeout)
+	defer exchangeCancel()
+	creds, err := exchangeCodexCode(exchangeCtx, cb.Code, pkce.Verifier, redirectURI)
 	if err != nil {
 		return authURL, err
 	}

electron/clovapi-desktop.js

@@ -175,6 +175,7 @@ async function authLogin(provider) {
   const result = await runClovapiLongAsync(["auth", "login", "--provider", providerId, "--json"], {
     cancelKey: providerId,
     onOutput: outputHandler,
+    timeout: AUTH_LOGIN_TIMEOUT,
   });
   if (result.cancelled) {
     return { ok: false, cancelled: true, error: "已取消登录" };

electron/clovapi-exec.js

@@ -699,12 +699,22 @@ async function runClovapiLongAsync(args, options = {}) {
     const stderrChunks = [];
     let settled = false;
     const onOutput = options.onOutput;
+    const longRunTimeout = Number(options.timeout);
+    let timeoutTimer = null;
+    if (Number.isFinite(longRunTimeout) && longRunTimeout > 0) {
+      timeoutTimer = setTimeout(() => {
+        emitLongRunOutput(onOutput, "system", `\n[timeout] after ${longRunTimeout}ms\n`);
+        killChildTree(child);
+      }, longRunTimeout);
+      timeoutTimer.unref?.();
+    }
     emitLongRunOutput(onOutput, "system", `$ ${exe} ${args.join(" ")}\n`);
 
     const finish = (result) => {
       if (settled) return;
       settled = true;
       if (cancelKey) activeLongRuns.delete(cancelKey);
+      if (timeoutTimer) clearTimeout(timeoutTimer);
       resolve(result);
     };
 

electron/package.json

@@ -1,7 +1,7 @@
 {
   "name": "clovapi-switcher",
   "private": true,
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "ClovAPI Switcher desktop app",
   "main": "main.js",
   "type": "commonjs",