feat: 更新 OAuth 流程，调整步骤 6 和步骤 7 的逻辑，添加相关测试

background/steps/fetch-login-code.js

@@ -8,7 +8,6 @@
       CLOUDFLARE_TEMP_EMAIL_PROVIDER,
       confirmCustomVerificationStepBypass,
       ensureStep8VerificationPageReady,
-      executeStep7,
       getOAuthFlowRemainingMs,
       getOAuthFlowStepTimeoutMs,
       getMailConfig,
@@ -19,17 +18,16 @@
       isVerificationMailPollingError,
       LUCKMAIL_PROVIDER,
       resolveVerificationStep,
+      rerunStep7ForStep8Recovery,
       reuseOrCreateTab,
       setState,
-      setStepStatus,
       shouldUseCustomRegistrationEmail,
-      sleepWithStop,
       STANDARD_MAIL_VERIFICATION_RESEND_INTERVAL_MS,
       STEP7_MAIL_POLLING_RECOVERY_MAX_ATTEMPTS,
       throwIfStopped,
     } = deps;
 
-    async function getStep8ReadyTimeoutMs(actionLabel) {
+    async function getStep8ReadyTimeoutMs(actionLabel, expectedOauthUrl = '') {
       if (typeof getOAuthFlowStepTimeoutMs !== 'function') {
         return 15000;
       }
@@ -37,10 +35,11 @@
       return getOAuthFlowStepTimeoutMs(15000, {
         step: 8,
         actionLabel,
+        oauthUrl: expectedOauthUrl,
       });
     }
 
-    function getStep8RemainingTimeResolver() {
+    function getStep8RemainingTimeResolver(expectedOauthUrl = '') {
       if (typeof getOAuthFlowRemainingMs !== 'function') {
         return undefined;
       }
@@ -48,6 +47,7 @@
       return async (details = {}) => getOAuthFlowRemainingMs({
         step: 8,
         actionLabel: details.actionLabel || '登录验证码流程',
+        oauthUrl: expectedOauthUrl,
       });
     }
 
@@ -73,7 +73,7 @@
 
       throwIfStopped();
       const pageState = await ensureStep8VerificationPageReady({
-        timeoutMs: await getStep8ReadyTimeoutMs('确认登录验证码页已就绪'),
+        timeoutMs: await getStep8ReadyTimeoutMs('确认登录验证码页已就绪', state?.oauthUrl || ''),
       });
       const shouldCompareVerificationEmail = mail.provider !== '2925';
       const displayedVerificationEmail = shouldCompareVerificationEmail
@@ -131,7 +131,7 @@
         step8VerificationTargetEmail: displayedVerificationEmail || '',
       }, mail, {
         filterAfterTimestamp: stepStartedAt,
-        getRemainingTimeMs: getStep8RemainingTimeResolver(),
+        getRemainingTimeMs: getStep8RemainingTimeResolver(state?.oauthUrl || ''),
         requestFreshCodeFirst: false,
         targetEmail: fixedTargetEmail,
         resendIntervalMs: (mail.provider === HOTMAIL_PROVIDER || mail.provider === '2925')
@@ -140,19 +140,6 @@
       });
     }
 
-    async function rerunStep7ForStep8Recovery(options = {}) {
-      const {
-        logMessage = '步骤 8：正在回到步骤 7，重新发起登录验证码流程...',
-        postStepDelayMs = 3000,
-      } = options;
-      const currentState = await getState();
-      await addLog(logMessage, 'warn');
-      await executeStep7(currentState);
-      if (postStepDelayMs > 0) {
-        await sleepWithStop(postStepDelayMs);
-      }
-    }
-
     function isStep8RestartStep7Error(error) {
       const message = String(error?.message || error || '');
       return /STEP8_RESTART_STEP7::/i.test(message);