Merge origin/master into master

background/mail-2925-session.js

@@ -15,6 +15,7 @@
       pickMail2925AccountForRun,
       getState,
       isAutoRunLockedState,
+      ensureContentScriptReadyOnTab,
       requestStop,
       reuseOrCreateTab,
       sendToContentScriptResilient,
@@ -24,11 +25,12 @@
       sleepWithStop,
       throwIfStopped,
       upsertMail2925AccountInList,
+      waitForTabUrlMatch,
     } = deps;
 
     const MAIL2925_SOURCE = 'mail-2925';
     const MAIL2925_URL = 'https://2925.com/#/mailList';
-    const MAIL2925_LOGIN_URL = 'https://2925.com/';
+    const MAIL2925_LOGIN_URL = 'https://2925.com/login/';
     const MAIL2925_INJECT = ['content/utils.js', 'content/mail-2925.js'];
     const MAIL2925_INJECT_SOURCE = 'mail-2925';
     const MAIL2925_COOKIE_DOMAINS = [
@@ -387,7 +389,8 @@
       }
 
       throwIfStopped();
-      await reuseOrCreateTab(MAIL2925_SOURCE, forceRelogin ? MAIL2925_LOGIN_URL : MAIL2925_URL, {
+      const targetUrl = forceRelogin ? MAIL2925_LOGIN_URL : MAIL2925_URL;
+      const tabId = await reuseOrCreateTab(MAIL2925_SOURCE, targetUrl, {
         inject: MAIL2925_INJECT,
         injectSource: MAIL2925_INJECT_SOURCE,
       });
@@ -497,13 +500,40 @@
 
       throwIfStopped();
       await addLog(`2925：准备打开登录页 ${MAIL2925_LOGIN_URL}（forceRelogin=${forceRelogin ? 'true' : 'false'}）`, 'info');
-      await reuseOrCreateTab(MAIL2925_SOURCE, forceRelogin ? MAIL2925_LOGIN_URL : MAIL2925_URL, {
+      const targetUrl = forceRelogin ? MAIL2925_LOGIN_URL : MAIL2925_URL;
+      const tabId = await reuseOrCreateTab(MAIL2925_SOURCE, targetUrl, {
         inject: MAIL2925_INJECT,
         injectSource: MAIL2925_INJECT_SOURCE,
       });
       const openedUrl = await getMail2925CurrentTabUrl();
       await addLog(`2925：打开页后当前标签地址：${openedUrl || 'unknown'}`, 'info');
 
+      if (forceRelogin && typeof waitForTabUrlMatch === 'function') {
+        const matchedLoginTab = await waitForTabUrlMatch(
+          tabId,
+          (url) => {
+            try {
+              const parsed = new URL(String(url || ''));
+              return (parsed.hostname === '2925.com' || parsed.hostname === 'www.2925.com')
+                && /^\/login\/?$/.test(parsed.pathname);
+            } catch {
+              return false;
+            }
+          },
+          { timeoutMs: 15000, retryDelayMs: 300 }
+        );
+        await addLog(`2925：等待最终落到登录页结果：${matchedLoginTab?.url || 'timeout'}`, matchedLoginTab ? 'info' : 'warn');
+        if (matchedLoginTab && typeof ensureContentScriptReadyOnTab === 'function') {
+          await ensureContentScriptReadyOnTab(MAIL2925_SOURCE, tabId, {
+            inject: MAIL2925_INJECT,
+            injectSource: MAIL2925_INJECT_SOURCE,
+            timeoutMs: 20000,
+            retryDelayMs: 800,
+            logMessage: '步骤 0：2925 登录页内容脚本未就绪，正在等待页面稳定后继续登录...',
+          });
+        }
+      }
+
       if (forceRelogin && typeof sleepWithStop === 'function') {
         await addLog('2925：登录页已打开，等待 3 秒后开始检查输入框并执行登录...', 'info');
         await sleepWithStop(3000);

background/steps/fetch-login-code.js

@@ -1,6 +1,8 @@
 (function attachBackgroundStep8(root, factory) {
   root.MultiPageBackgroundStep8 = factory();
 })(typeof self !== 'undefined' ? self : globalThis, function createBackgroundStep8Module() {
+  const MAIL_2925_FILTER_LOOKBACK_MS = 10 * 60 * 1000;
+
   function createStep8Executor(deps = {}) {
     const {
       addLog,
@@ -61,6 +63,9 @@
       if (mail.error) throw new Error(mail.error);
 
       const stepStartedAt = Date.now();
+      const verificationFilterAfterTimestamp = mail.provider === '2925'
+        ? Math.max(0, stepStartedAt - MAIL_2925_FILTER_LOOKBACK_MS)
+        : stepStartedAt;
       const verificationSessionKey = `8:${stepStartedAt}`;
       const authTabId = await getTabId('signup-page');
 
@@ -140,7 +145,7 @@
         ...state,
         step8VerificationTargetEmail: displayedVerificationEmail || '',
       }, mail, {
-        filterAfterTimestamp: mail.provider === '2925' ? 0 : stepStartedAt,
+        filterAfterTimestamp: verificationFilterAfterTimestamp,
         sessionKey: verificationSessionKey,
         disableTimeBudgetCap: mail.provider === '2925',
         getRemainingTimeMs: getStep8RemainingTimeResolver(state?.oauthUrl || ''),

background/steps/fetch-signup-code.js

@@ -1,6 +1,8 @@
 (function attachBackgroundStep4(root, factory) {
   root.MultiPageBackgroundStep4 = factory();
 })(typeof self !== 'undefined' ? self : globalThis, function createBackgroundStep4Module() {
+  const MAIL_2925_FILTER_LOOKBACK_MS = 10 * 60 * 1000;
+
   function createStep4Executor(deps = {}) {
     const {
       addLog,
@@ -26,6 +28,9 @@
       const mail = getMailConfig(state);
       if (mail.error) throw new Error(mail.error);
       const stepStartedAt = Date.now();
+      const verificationFilterAfterTimestamp = mail.provider === '2925'
+        ? Math.max(0, stepStartedAt - MAIL_2925_FILTER_LOOKBACK_MS)
+        : stepStartedAt;
       const verificationSessionKey = `4:${stepStartedAt}`;
       const signupTabId = await getTabId('signup-page');
       if (!signupTabId) {
@@ -101,7 +106,7 @@
       }
 
       await resolveVerificationStep(4, state, mail, {
-        filterAfterTimestamp: mail.provider === '2925' ? 0 : stepStartedAt,
+        filterAfterTimestamp: verificationFilterAfterTimestamp,
         sessionKey: verificationSessionKey,
         disableTimeBudgetCap: mail.provider === '2925',
         requestFreshCodeFirst: mail.provider === HOTMAIL_PROVIDER ? false : true,

background/verification-flow.js

@@ -239,12 +239,16 @@
       return requestedAt;
     }
 
-    function shouldPreclear2925Mailbox(step, mail) {
-      return mail?.provider === '2925' && (step === 4 || step === 8);
+    function shouldPreclear2925Mailbox(step, mail, options = {}) {
+      if (mail?.provider !== '2925' || (step !== 4 && step !== 8)) {
+        return false;
+      }
+
+      return !(Number(options.filterAfterTimestamp) > 0);
     }
 
     async function clear2925MailboxBeforePolling(step, mail, options = {}) {
-      if (!shouldPreclear2925Mailbox(step, mail)) {
+      if (!shouldPreclear2925Mailbox(step, mail, options)) {
         return;
       }