feat: 移除贡献模式确认弹窗，简化进入流程，更新相关测试

2026-04-20 01:18:59 +08:00
parent 0d0cf4b2af
commit 95750056ad
6 changed files with 26 additions and 233 deletions
@@ -247,17 +247,6 @@
    }

    async function enterContributionMode() {
-      const confirmed = await helpers.openConfirmModal?.({
-        title: '贡献账号',
-        message: '是否确认给作者 QLHazyCoder 提供账号以支持继续维护项目？',
-        confirmLabel: '确定',
-        confirmVariant: 'btn-primary',
-      });
-
-      if (!confirmed) {
-        return;
-      }
-
      await requestContributionMode(true);
      helpers.showToast?.('已进入贡献模式。', 'success', 1800);
    }
@@ -35,7 +35,7 @@
    <div class="header-btns">
      <div class="run-group">
        <button id="btn-contribution-mode" class="btn btn-outline btn-sm btn-contribution-mode" type="button"
-          title="打开账号贡献上传页面">贡献</button>
+          aria-pressed="false" title="进入贡献模式">贡献</button>
        <input type="number" id="input-run-count" class="run-count-input" value="1" min="1" max="50" title="运行次数" />
        <button id="btn-auto-run" class="btn btn-success" title="自动执行全部步骤">
          <svg width="14" height="14" viewBox="0 0 24 24" fill="currentColor">
@@ -52,8 +52,6 @@
          <path d="M3.51 15a9 9 0 1 0 2.13-9.36L1 10" />
        </svg>
      </button>
-      <button id="btn-contribution-mode" class="btn btn-outline btn-sm btn-contribution-mode" type="button"
-        aria-pressed="false">贡献</button>
      <button id="btn-theme" class="theme-toggle" title="切换主题">
        <svg class="icon-moon" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor"
          stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -235,7 +235,6 @@ const DEFAULT_LUCKMAIL_BASE_URL = 'https://mails.luckyous.com';
 const DEFAULT_LUCKMAIL_EMAIL_TYPE = 'ms_graph';
 const DISPLAY_TIMEZONE = 'Asia/Shanghai';
 const DEFAULT_ACCOUNT_RUN_HISTORY_HELPER_BASE_URL = 'http://127.0.0.1:17373';
-const CONTRIBUTION_UPLOAD_URL = 'https://apikey.qzz.io/';

 function getManagedAliasUtils() {
  return window.MultiPageManagedAliasUtils || null;
@@ -1900,15 +1899,6 @@ function openReleaseListPage() {
  openExternalUrl(getReleaseListUrl());
 }

-async function openContributionUploadPage() {
-  if (isContributionButtonLocked()) {
-    throw new Error('当前流程运行中，请先停止后再打开贡献页面。');
-  }
-
-  openExternalUrl(CONTRIBUTION_UPLOAD_URL);
-  return true;
-}
-
 function createUpdateNoteList(notes = []) {
  if (!Array.isArray(notes) || notes.length === 0) {
    const empty = document.createElement('p');
@@ -3410,14 +3400,6 @@ btnConfigMenu?.addEventListener('click', (event) => {
  toggleConfigMenu();
 });

-btnContributionMode?.addEventListener('click', async () => {
-  try {
-    await openContributionUploadPage();
-  } catch (err) {
-    showToast(err.message, 'error');
-  }
-});
-
 btnRepoHome?.addEventListener('click', () => {
  openRepositoryHomePage();
 });
@@ -2,194 +2,17 @@ const test = require('node:test');
 const assert = require('node:assert/strict');
 const fs = require('node:fs');

-const sidepanelSource = fs.readFileSync('sidepanel/sidepanel.js', 'utf8');
-
-function extractFunction(name) {
-  const markers = [`async function ${name}(`, `function ${name}(`];
-  const start = markers
-    .map((marker) => sidepanelSource.indexOf(marker))
-    .find((index) => index >= 0);
-  if (start < 0) {
-    throw new Error(`missing function ${name}`);
-  }
-
-  let parenDepth = 0;
-  let signatureEnded = false;
-  let braceStart = -1;
-  for (let i = start; i < sidepanelSource.length; i += 1) {
-    const ch = sidepanelSource[i];
-    if (ch === '(') {
-      parenDepth += 1;
-    } else if (ch === ')') {
-      parenDepth -= 1;
-      if (parenDepth === 0) {
-        signatureEnded = true;
-      }
-    } else if (ch === '{' && signatureEnded) {
-      braceStart = i;
-      break;
-    }
-  }
-
-  let depth = 0;
-  let end = braceStart;
-  for (; end < sidepanelSource.length; end += 1) {
-    const ch = sidepanelSource[end];
-    if (ch === '{') depth += 1;
-    if (ch === '}') {
-      depth -= 1;
-      if (depth === 0) {
-        end += 1;
-        break;
-      }
-    }
-  }
-
-  return sidepanelSource.slice(start, end);
-}
-
-test('sidepanel html contains contribution button in header', () => {
+test('sidepanel html keeps a single contribution mode button in header', () => {
  const html = fs.readFileSync('sidepanel/sidepanel.html', 'utf8');
-  assert.match(html, /id="btn-contribution-mode"/);
-  assert.match(html, />\u8d21\u732e</);
+  const matches = html.match(/id="btn-contribution-mode"/g) || [];
+
+  assert.equal(matches.length, 1);
+  assert.match(html, /id="btn-contribution-mode"[^>]*title="进入贡献模式"/);
 });

-test('openContributionUploadPage opens upload page in a new tab directly', async () => {
-  const bundle = [
-    extractFunction('openContributionUploadPage'),
-  ].join('\n');
+test('sidepanel source no longer keeps the legacy upload-page handler on the header contribution button', () => {
+  const source = fs.readFileSync('sidepanel/sidepanel.js', 'utf8');

-  const api = new Function(`
-const calls = [];
-const CONTRIBUTION_UPLOAD_URL = 'https://apikey.qzz.io/';
-function isContributionButtonLocked() {
-  return false;
-}
-function openExternalUrl(url) {
-  calls.push({ type: 'open', url });
-}
-${bundle}
-return {
-  openContributionUploadPage,
-  getCalls() {
-    return calls;
-  },
-};
-`)();
-
-  const result = await api.openContributionUploadPage();
-  assert.equal(result, true);
-  assert.deepStrictEqual(api.getCalls(), [
-    {
-      type: 'open',
-      url: 'https://apikey.qzz.io/',
-    },
-  ]);
-});
-
-test('isContributionButtonLocked keeps contribution button available during auto-run', () => {
-  const bundle = [
-    extractFunction('isContributionButtonLocked'),
-  ].join('\n');
-
-  const api = new Function(`
-const currentAutoRun = { autoRunning: true, phase: 'running' };
-function getStepStatuses() {
-  return { 1: 'running', 2: 'pending' };
-}
-function isAutoRunLockedPhase() {
-  return true;
-}
-function isAutoRunPausedPhase() {
-  return false;
-}
-function isAutoRunScheduledPhase() {
-  return false;
-}
-${bundle}
-return { isContributionButtonLocked };
-`)();
-
-  assert.equal(api.isContributionButtonLocked(), false);
-});
-
-test('openContributionUploadPage remains available during auto-run', async () => {
-  const bundle = [
-    extractFunction('isContributionButtonLocked'),
-    extractFunction('openContributionUploadPage'),
-  ].join('\n');
-
-  const api = new Function(`
-const calls = [];
-const CONTRIBUTION_UPLOAD_URL = 'https://apikey.qzz.io/';
-const currentAutoRun = { autoRunning: true, phase: 'running' };
-function getStepStatuses() {
-  return { 1: 'running', 2: 'pending' };
-}
-function isAutoRunLockedPhase() {
-  return true;
-}
-function isAutoRunPausedPhase() {
-  return false;
-}
-function isAutoRunScheduledPhase() {
-  return false;
-}
-function openExternalUrl(url) {
-  calls.push({ type: 'open', url });
-}
-${bundle}
-return {
-  openContributionUploadPage,
-  getCalls() {
-    return calls;
-  },
-};
-`)();
-
-  const result = await api.openContributionUploadPage();
-  assert.equal(result, true);
-  assert.deepStrictEqual(api.getCalls(), [
-    {
-      type: 'open',
-      url: 'https://apikey.qzz.io/',
-    },
-  ]);
-});
-
-test('openContributionUploadPage blocks while manual flow is running', async () => {
-  const bundle = [
-    extractFunction('isContributionButtonLocked'),
-    extractFunction('openContributionUploadPage'),
-  ].join('\n');
-
-  const api = new Function(`
-const CONTRIBUTION_UPLOAD_URL = 'https://apikey.qzz.io/';
-const currentAutoRun = { autoRunning: false, phase: 'idle' };
-function getStepStatuses() {
-  return { 1: 'running', 2: 'pending' };
-}
-function isAutoRunLockedPhase() {
-  return false;
-}
-function isAutoRunPausedPhase() {
-  return false;
-}
-function isAutoRunScheduledPhase() {
-  return false;
-}
-function openExternalUrl() {
-  throw new Error('should not open url');
-}
-${bundle}
-return { openContributionUploadPage };
-`)();
-
-  await assert.rejects(
-    () => api.openContributionUploadPage(),
-    (error) => {
-      assert.match(error.message, /\u5f53\u524d\u6d41\u7a0b\u8fd0\u884c\u4e2d/);
-      return true;
-    }
-  );
+  assert.doesNotMatch(source, /openContributionUploadPage/);
+  assert.doesNotMatch(source, /await openContributionUploadPage\(\)/);
 });
@@ -287,7 +287,9 @@ test('contribution mode manager enters mode, starts main auto flow, polls contri
      isModeSwitchBlocked() {
        return blocked;
      },
-      openConfirmModal: async () => true,
+      openConfirmModal: async () => {
+        throw new Error('should not ask for confirmation before entering contribution mode');
+      },
      openExternalUrl(url) {
        openedUrls.push(url);
      },
@@ -181,19 +181,18 @@
 贡献模式的目标不是新增一个 provider，而是在 sidepanel 内开启一套“贡献账号”专用 UI，并把公开贡献服务并进原有 10 步主链：

 1. 用户点击顶部 `贡献`
-2. sidepanel 复用现有 `openConfirmModal(...)` 打开确认弹窗
-3. 用户确认后，后台通过 `SET_CONTRIBUTION_MODE` 切换运行态
-4. 进入贡献模式后会强制 `panelMode = cpa`，并临时清空运行态 `customPassword`、禁用运行态账号记录快照同步
-5. sidepanel 隐藏 CPA 管理地址、管理密钥、SUB2API 配置、自定义密码、本地同步等普通模式配置，并禁用来源选择、配置菜单和记录入口
-6. 用户点击 `开始贡献` 后，不再单独走一条旁路 OAuth 流程，而是直接复用顶部 `自动` 的同一套主自动流
-7. 步骤 1~6 仍按原来的注册自动化执行
-8. 当主流程进入步骤 7 时，后台改为调用公开接口 `POST https://apikey.qzz.io/oauth/api/start` 申请贡献登录地址，而不是去 CPA / SUB2API 面板刷新 OAuth
-9. 步骤 7 拿到 `session_id / auth_url / state` 后，继续沿用原有登录链路进入授权页
-10. 步骤 9 仍负责捕获 localhost callback；贡献模式下后台也会持续监听导航变化，必要时提前兼容处理 callback
-11. 步骤 10 在贡献模式下不再打开 CPA 管理页，而是围绕公开贡献会话做 callback 提交兼容和最终状态确认；当状态进入 `auto_approved / auto_rejected / manual_review_required / expired / error` 时结束
-12. 当前服务端如果返回“无需手动提交 callback”，扩展会把它视为兼容成功态，而不是报错
-13. `已有认证文件？前往上传` 继续打开 `https://apikey.qzz.io/`
-14. `退出贡献模式` 会清理贡献会话相关运行态，`重置` 只重置主流程状态，不会自动退出贡献模式
+2. sidepanel 直接通过 `SET_CONTRIBUTION_MODE` 切换运行态，不再弹确认窗口
+3. 进入贡献模式后会强制 `panelMode = cpa`，并临时清空运行态 `customPassword`、禁用运行态账号记录快照同步
+4. sidepanel 隐藏 CPA 管理地址、管理密钥、SUB2API 配置、自定义密码、本地同步等普通模式配置，并禁用来源选择、配置菜单和记录入口
+5. 用户点击 `开始贡献` 后，不再单独走一条旁路 OAuth 流程，而是直接复用顶部 `自动` 的同一套主自动流
+6. 步骤 1~6 仍按原来的注册自动化执行
+7. 当主流程进入步骤 7 时，后台改为调用公开接口 `POST https://apikey.qzz.io/oauth/api/start` 申请贡献登录地址，而不是去 CPA / SUB2API 面板刷新 OAuth
+8. 步骤 7 拿到 `session_id / auth_url / state` 后，继续沿用原有登录链路进入授权页
+9. 步骤 9 仍负责捕获 localhost callback；贡献模式下后台也会持续监听导航变化，必要时提前兼容处理 callback
+10. 步骤 10 在贡献模式下不再打开 CPA 管理页，而是围绕公开贡献会话做 callback 提交兼容和最终状态确认；当状态进入 `auto_approved / auto_rejected / manual_review_required / expired / error` 时结束
+11. 当前服务端如果返回“无需手动提交 callback”，扩展会把它视为兼容成功态，而不是报错
+12. `已有认证文件？前往上传` 继续打开 `https://apikey.qzz.io/`
+13. `退出贡献模式` 会清理贡献会话相关运行态，`重置` 只重置主流程状态，不会自动退出贡献模式

 这条链路的关键边界是：

@@ -353,7 +352,7 @@

 1. 通过 CPA / SUB2API 刷新 OAuth 地址
 2. 打开最新 OAuth 链接
-3. 登录
+3. 登录；如果进入密码页且当前有密码，则填写并提交密码；如果当前没有密码但检测到一次性验证码入口，则直接切换到一次性验证码登录
 4. 确保真正进入验证码页
 5. 如果未进入验证码页，则按可恢复逻辑最多重试 3 次；但一旦当前失败已经明确进入 `https://auth.openai.com/add-phone`，则立即退出步骤 7 内部重试，不再继续第 2 / 3 次尝试
 6. 自动运行一旦进入步骤 7 之后的链路，若后续步骤报错且认证页未进入 `https://auth.openai.com/add-phone`，则统一回到步骤 7 重新开始授权流程