重构修改2925获取邮箱

background/steps/fetch-login-code.js

@@ -51,9 +51,14 @@
       });
     }
 
+    function normalizeStep8VerificationTargetEmail(value) {
+      return String(value || '').trim().toLowerCase();
+    }
+
     async function runStep8Attempt(state) {
       const mail = getMailConfig(state);
       if (mail.error) throw new Error(mail.error);
+
       const stepStartedAt = Date.now();
       const authTabId = await getTabId('signup-page');
 
@@ -67,10 +72,25 @@
       }
 
       throwIfStopped();
-      await ensureStep8VerificationPageReady({
+      const pageState = await ensureStep8VerificationPageReady({
         timeoutMs: await getStep8ReadyTimeoutMs('确认登录验证码页已就绪'),
       });
+      const shouldCompareVerificationEmail = mail.provider !== '2925';
+      const displayedVerificationEmail = shouldCompareVerificationEmail
+        ? normalizeStep8VerificationTargetEmail(pageState?.displayedEmail)
+        : '';
+      const fixedTargetEmail = shouldCompareVerificationEmail
+        ? (displayedVerificationEmail || normalizeStep8VerificationTargetEmail(state?.email))
+        : '';
+
+      await setState({
+        step8VerificationTargetEmail: displayedVerificationEmail || '',
+      });
+
       await addLog('步骤 8：登录验证码页面已就绪，开始获取验证码。', 'info');
+      if (shouldCompareVerificationEmail && displayedVerificationEmail) {
+        await addLog(`步骤 8：已固定当前验证码页显示邮箱 ${displayedVerificationEmail} 作为后续匹配目标。`, 'info');
+      }
 
       if (shouldUseCustomRegistrationEmail(state)) {
         await confirmCustomVerificationStepBypass(8);
@@ -78,7 +98,11 @@
       }
 
       throwIfStopped();
-      if (mail.provider === HOTMAIL_PROVIDER || mail.provider === LUCKMAIL_PROVIDER || mail.provider === CLOUDFLARE_TEMP_EMAIL_PROVIDER) {
+      if (
+        mail.provider === HOTMAIL_PROVIDER
+        || mail.provider === LUCKMAIL_PROVIDER
+        || mail.provider === CLOUDFLARE_TEMP_EMAIL_PROVIDER
+      ) {
         await addLog(`步骤 8：正在通过 ${mail.label} 轮询验证码...`);
       } else {
         await addLog(`步骤 8：正在打开${mail.label}...`);
@@ -102,10 +126,14 @@
         }
       }
 
-      await resolveVerificationStep(8, state, mail, {
+      await resolveVerificationStep(8, {
+        ...state,
+        step8VerificationTargetEmail: displayedVerificationEmail || '',
+      }, mail, {
         filterAfterTimestamp: stepStartedAt,
         getRemainingTimeMs: getStep8RemainingTimeResolver(),
         requestFreshCodeFirst: false,
+        targetEmail: fixedTargetEmail,
         resendIntervalMs: (mail.provider === HOTMAIL_PROVIDER || mail.provider === '2925')
           ? 0
           : STANDARD_MAIL_VERIFICATION_RESEND_INTERVAL_MS,

background/verification-flow.js

@@ -113,7 +113,7 @@
       const is2925Provider = state?.mailProvider === '2925';
       if (step === 4) {
         return {
-          filterAfterTimestamp: getHotmailVerificationRequestTimestamp(4, state),
+          filterAfterTimestamp: is2925Provider ? 0 : getHotmailVerificationRequestTimestamp(4, state),
           senderFilters: ['openai', 'noreply', 'verify', 'auth', 'duckduckgo', 'forward'],
           subjectFilters: ['verify', 'verification', 'code', '验证码', 'confirm'],
           targetEmail: state.email,
@@ -124,10 +124,10 @@
       }
 
       return {
-        filterAfterTimestamp: getHotmailVerificationRequestTimestamp(8, state),
+        filterAfterTimestamp: is2925Provider ? 0 : getHotmailVerificationRequestTimestamp(8, state),
         senderFilters: ['openai', 'noreply', 'verify', 'auth', 'chatgpt', 'duckduckgo', 'forward'],
         subjectFilters: ['verify', 'verification', 'code', '验证码', 'confirm', 'login'],
-        targetEmail: state.email,
+        targetEmail: String(state?.step8VerificationTargetEmail || '').trim() || state.email,
         maxAttempts: is2925Provider ? MAIL_2925_VERIFICATION_MAX_ATTEMPTS : 5,
         intervalMs: is2925Provider ? MAIL_2925_VERIFICATION_INTERVAL_MS : 3000,
         ...overrides,
@@ -236,6 +236,33 @@
       return requestedAt;
     }
 
+    function triggerPostSuccessMailboxCleanup(step, mail) {
+      if (mail?.provider !== '2925') {
+        return;
+      }
+
+      Promise.resolve().then(async () => {
+        try {
+          await sendToMailContentScriptResilient(
+            mail,
+            {
+              type: 'DELETE_ALL_EMAILS',
+              step,
+              source: 'background',
+              payload: {},
+            },
+            {
+              timeoutMs: 10000,
+              responseTimeoutMs: 5000,
+              maxRecoveryAttempts: 1,
+            }
+          );
+        } catch (_) {
+          // Best-effort cleanup only.
+        }
+      });
+    }
+
     async function pollFreshVerificationCodeWithResendInterval(step, state, mail, pollOverrides = {}) {
       const stateKey = getVerificationCodeStateKey(step);
       const rejectedCodes = new Set();
@@ -656,6 +683,7 @@
             emailTimestamp: result.emailTimestamp,
             code: result.code,
           });
+          triggerPostSuccessMailboxCleanup(step, mail);
           return;
         }
       }