From e774ab43fce88e2b88f66ebc58ce61693e660f0c Mon Sep 17 00:00:00 2001
From: QLHazyCoder <2825305047@qq.com>
Date: Thu, 9 Apr 2026 23:57:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=BC=BA=20OAuth=20=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=E5=92=8C=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E6=9C=BA=E5=88=B6=EF=BC=885=E6=AC=A1=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 background.js        | 26 ++++++++++++++++++++++++--
 content/vps-panel.js |  7 +++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/background.js b/background.js
index 3fa7cc7..74cc538 100644
--- a/background.js
+++ b/background.js
@@ -648,6 +648,11 @@ function isRestartCurrentAttemptError(error) {
   return /当前邮箱已存在，需要重新开始新一轮/.test(message);
 }
 
+function isStep9OAuthTimeoutError(error) {
+  const message = String(typeof error === 'string' ? error : error?.message || '');
+  return /STEP9_OAUTH_TIMEOUT::|认证失败:\s*Timeout waiting for OAuth callback/i.test(message);
+}
+
 function isStepDoneStatus(status) {
   return status === 'completed' || status === 'manual_completed' || status === 'skipped';
 }
@@ -1289,6 +1294,8 @@ async function ensureAutoEmailReady(targetRun, totalRuns, attemptRuns) {
 
 async function runAutoSequenceFromStep(startStep, context = {}) {
   const { targetRun, totalRuns, attemptRuns, continued = false } = context;
+  const maxStep9RestartAttempts = 5;
+  let step9RestartAttempts = 0;
 
   if (continued) {
     await addLog(`=== 目标 ${targetRun}/${totalRuns} 轮：继续当前进度，从步骤 ${startStep} 开始（第 ${attemptRuns} 次尝试）===`, 'info');
@@ -1321,8 +1328,23 @@ async function runAutoSequenceFromStep(startStep, context = {}) {
     await chrome.tabs.update(signupTabId, { active: true });
   }
 
-  for (let step = Math.max(startStep, 4); step <= 9; step++) {
-    await executeStepAndWait(step, AUTO_STEP_DELAYS[step]);
+  let step = Math.max(startStep, 4);
+  while (step <= 9) {
+    try {
+      await executeStepAndWait(step, AUTO_STEP_DELAYS[step]);
+      step += 1;
+    } catch (err) {
+      if (step === 9 && isStep9OAuthTimeoutError(err) && step9RestartAttempts < maxStep9RestartAttempts) {
+        step9RestartAttempts += 1;
+        await addLog(
+          `步骤 9：检测到 OAuth callback 超时，正在回到步骤 6 重新开始授权流程（${step9RestartAttempts}/${maxStep9RestartAttempts}）...`,
+          'warn'
+        );
+        step = 6;
+        continue;
+      }
+      throw err;
+    }
   }
 }
 
diff --git a/content/vps-panel.js b/content/vps-panel.js
index 928c271..1c7b47c 100644
--- a/content/vps-panel.js
+++ b/content/vps-panel.js
@@ -98,6 +98,10 @@ function getStatusBadgeText() {
   return statusEl ? (statusEl.textContent || '').replace(/\s+/g, ' ').trim() : '';
 }
 
+function isOAuthCallbackTimeoutFailure(statusText) {
+  return /认证失败:\s*Timeout waiting for OAuth callback/i.test(statusText || '');
+}
+
 async function waitForExactSuccessBadge(timeout = 30000) {
   const start = Date.now();
 
@@ -111,6 +115,9 @@ async function waitForExactSuccessBadge(timeout = 30000) {
   }
 
   const finalText = getStatusBadgeText();
+  if (isOAuthCallbackTimeoutFailure(finalText)) {
+    throw new Error(`STEP9_OAUTH_TIMEOUT::${finalText}`);
+  }
   throw new Error(finalText
     ? `CPA 面板状态不是“认证成功！”，当前为“${finalText}”。`
     : 'CPA 面板长时间未出现“认证成功！”状态徽标。');