feat: 增强2925邮箱登录流程，添加登录失败处理和超时机制，更新相关文档和测试用例

2026-04-20 23:10:01 +08:00
parent 20146ce3e9
commit 6c17ffc7f4
7 changed files with 392 additions and 27 deletions
@@ -159,3 +159,69 @@ test('handleMail2925LimitReachedError requests stop when no next mail2925 accoun
  assert.equal(events.stopCalls.length, 1);
  assert.match(events.stopCalls[0].logMessage, /没有可切换的下一个账号/);
 });
+
+test('ensureMail2925MailboxSession requests stop when auto run is active and login does not reach mailbox', async () => {
+  const source = fs.readFileSync('background/mail-2925-session.js', 'utf8');
+  const globalScope = {};
+  const api = new Function('self', `${source}; return self.MultiPageBackgroundMail2925Session;`)(globalScope);
+
+  let currentState = {
+    autoRunning: true,
+    autoRunPhase: 'running',
+    mail2925Accounts: mail2925Utils.normalizeMail2925Accounts([
+      { id: 'acc-1', email: 'acc1@2925.com', password: 'p1', enabled: true, lastUsedAt: 10 },
+    ]),
+    currentMail2925AccountId: 'acc-1',
+  };
+  const events = {
+    stopCalls: [],
+  };
+
+  const manager = api.createMail2925SessionManager({
+    addLog: async () => {},
+    broadcastDataUpdate: () => {},
+    chrome: {
+      cookies: {
+        getAll: async () => [],
+        remove: async () => ({ ok: true }),
+      },
+      browsingData: {
+        removeCookies: async () => {},
+      },
+    },
+    findMail2925Account: mail2925Utils.findMail2925Account,
+    getMail2925AccountStatus: mail2925Utils.getMail2925AccountStatus,
+    getState: async () => currentState,
+    isAutoRunLockedState: (state) => Boolean(state?.autoRunning) && state?.autoRunPhase === 'running',
+    isMail2925AccountAvailable: mail2925Utils.isMail2925AccountAvailable,
+    MAIL2925_LIMIT_COOLDOWN_MS: mail2925Utils.MAIL2925_LIMIT_COOLDOWN_MS,
+    normalizeMail2925Account: mail2925Utils.normalizeMail2925Account,
+    normalizeMail2925Accounts: mail2925Utils.normalizeMail2925Accounts,
+    pickMail2925AccountForRun: mail2925Utils.pickMail2925AccountForRun,
+    requestStop: async (options = {}) => {
+      events.stopCalls.push(options);
+    },
+    reuseOrCreateTab: async () => 1,
+    sendToMailContentScriptResilient: async () => ({ loggedIn: false }),
+    setPersistentSettings: async (payload) => {
+      currentState = { ...currentState, ...payload };
+    },
+    setState: async (updates) => {
+      currentState = { ...currentState, ...updates };
+    },
+    throwIfStopped: () => {},
+    upsertMail2925AccountInList: mail2925Utils.upsertMail2925AccountInList,
+  });
+
+  await assert.rejects(
+    () => manager.ensureMail2925MailboxSession({
+      accountId: 'acc-1',
+      forceRelogin: true,
+      actionLabel: '步骤 4：确认 2925 邮箱登录态',
+    }),
+    /流程已被用户停止。/
+  );
+
+  assert.equal(events.stopCalls.length, 1);
+  assert.match(events.stopCalls[0].logMessage, /20 秒内未进入收件箱/);
+});
@@ -4,6 +4,10 @@ const fs = require('node:fs');

 const source = fs.readFileSync('content/mail-2925.js', 'utf8');

+test('ensureMail2925Session waits at most 20 seconds for mailbox after clicking login', () => {
+  assert.match(source, /waitForMail2925View\('mailbox',\s*20000\)/);
+});
+
 function extractFunction(name) {
  const markers = [`async function ${name}(`, `function ${name}(`];
  const start = markers
@@ -488,3 +492,187 @@ return {
  assert.equal(result, true);
  assert.deepEqual(api.getCalls(), ['inbox', 'select-all', 'delete']);
 });
+
+test('findAgreementCheckbox skips 30-day login checkbox and picks agreement checkbox', async () => {
+  const bundle = [
+    extractFunction('normalizeNodeText'),
+    extractFunction('isVisibleNode'),
+    extractFunction('resolveActionTarget'),
+    extractFunction('findAgreementContainer'),
+    extractFunction('isAgreementText'),
+    extractFunction('getCheckboxContextText'),
+    extractFunction('findAgreementCheckbox'),
+  ].join('\n');
+
+  const api = new Function(`
+const MAIL2925_REMEMBER_LOGIN_PATTERNS = [
+  /30天内免登录/,
+  /免登录/,
+  /记住登录/,
+  /保持登录/,
+];
+const MAIL2925_AGREEMENT_PATTERNS = [
+  /我已阅读并同意/,
+  /服务协议/,
+  /隐私政策/,
+];
+
+const rememberCheckbox = {
+  kind: 'remember-checkbox',
+  disabled: false,
+  readOnly: false,
+  hidden: false,
+  classList: { contains() { return false; } },
+  getBoundingClientRect() { return { width: 14, height: 14 }; },
+  closest(selector) {
+    if (selector === 'button, [role="button"], a, label, .el-checkbox, .el-checkbox__input') return this;
+    if (selector === 'label') return rememberLabel;
+    if (selector === 'label, div, span, p, li, form') return rememberLabel;
+    return null;
+  },
+};
+const agreementCheckbox = {
+  kind: 'agreement-checkbox',
+  disabled: false,
+  readOnly: false,
+  hidden: false,
+  classList: { contains() { return false; } },
+  getBoundingClientRect() { return { width: 14, height: 14 }; },
+  closest(selector) {
+    if (selector === 'button, [role="button"], a, label, .el-checkbox, .el-checkbox__input') return this;
+    if (selector === 'label') return agreementLabel;
+    if (selector === 'label, div, span, p, li, form') return agreementLabel;
+    return null;
+  },
+};
+const rememberLabel = {
+  innerText: '30天内免登录',
+  textContent: '30天内免登录',
+  hidden: false,
+  getBoundingClientRect() { return { width: 100, height: 20 }; },
+  parentElement: null,
+};
+const agreementLabel = {
+  innerText: '我已阅读并同意 《服务协议》 和 《隐私政策》',
+  textContent: '我已阅读并同意 《服务协议》 和 《隐私政策》',
+  hidden: false,
+  getBoundingClientRect() { return { width: 220, height: 24 }; },
+  parentElement: null,
+  querySelector(selector) {
+    return selector.includes('checkbox') ? agreementCheckbox : null;
+  },
+};
+rememberCheckbox.parentElement = rememberLabel;
+agreementCheckbox.parentElement = agreementLabel;
+
+const document = {
+  querySelectorAll(selector) {
+    if (selector === 'label, div, span, p, form') {
+      return [rememberLabel, agreementLabel];
+    }
+    if (selector === 'input[type="checkbox"], [role="checkbox"], .ivu-checkbox, .el-checkbox') {
+      return [rememberCheckbox, agreementCheckbox];
+    }
+    return [];
+  },
+};
+
+const window = {
+  getComputedStyle() {
+    return { display: 'block', visibility: 'visible' };
+  },
+};
+
+${bundle}
+
+return {
+  findAgreementCheckbox,
+  rememberCheckbox,
+  agreementCheckbox,
+};
+`)();
+
+  assert.equal(api.findAgreementCheckbox(), api.agreementCheckbox);
+});
+
+test('ensureAgreementChecked clicks all visible login checkboxes', async () => {
+  const bundle = [
+    extractFunction('isVisibleNode'),
+    extractFunction('resolveActionTarget'),
+    extractFunction('isCheckboxChecked'),
+    extractFunction('ensureAgreementChecked'),
+  ].join('\n');
+
+  const api = new Function(`
+const rememberCheckbox = {
+  disabled: false,
+  readOnly: false,
+  hidden: false,
+  checked: false,
+  classList: { contains() { return false; } },
+  getBoundingClientRect() { return { width: 14, height: 14 }; },
+  click() { this.checked = true; },
+  closest(selector) {
+    if (selector === 'button, [role="button"], a, label, .el-checkbox, .el-checkbox__input') return this;
+    return null;
+  },
+  querySelector() { return null; },
+  getAttribute(name) {
+    if (name === 'aria-checked') return this.checked ? 'true' : 'false';
+    return '';
+  },
+};
+const agreementCheckbox = {
+  disabled: false,
+  readOnly: false,
+  hidden: false,
+  checked: false,
+  classList: { contains() { return false; } },
+  getBoundingClientRect() { return { width: 14, height: 14 }; },
+  click() { this.checked = true; },
+  closest(selector) {
+    if (selector === 'button, [role="button"], a, label, .el-checkbox, .el-checkbox__input') return this;
+    return null;
+  },
+  querySelector() { return null; },
+  getAttribute(name) {
+    if (name === 'aria-checked') return this.checked ? 'true' : 'false';
+    return '';
+  },
+};
+
+const document = {
+  querySelectorAll(selector) {
+    if (selector === 'input[type="checkbox"], [role="checkbox"], .ivu-checkbox, .el-checkbox') {
+      return [rememberCheckbox, agreementCheckbox];
+    }
+    return [];
+  },
+};
+
+const window = {
+  getComputedStyle() {
+    return { display: 'block', visibility: 'visible' };
+  },
+};
+
+async function sleep() {}
+function simulateClick(node) {
+  node.click();
+}
+
+${bundle}
+
+return {
+  rememberCheckbox,
+  agreementCheckbox,
+  ensureAgreementChecked,
+};
+`)();
+
+  const result = await api.ensureAgreementChecked();
+
+  assert.equal(result, true);
+  assert.equal(api.rememberCheckbox.checked, true);
+  assert.equal(api.agreementCheckbox.checked, true);
+});