隐藏本地同步为默认开启，调整为接码开关

2026-04-25 16:24:47 +08:00
parent 672c593271
commit 809d146b74
15 changed files with 319 additions and 45 deletions
@@ -98,6 +98,7 @@ return {
  `)();

  assert.equal(api.normalizePersistentSettingValue('accountRunHistoryTextEnabled', 1), true);
+  assert.equal(api.normalizePersistentSettingValue('phoneVerificationEnabled', 1), true);
  assert.equal(api.normalizePersistentSettingValue('verificationResendCount', '7'), 7);
  assert.equal(api.normalizePersistentSettingValue('verificationResendCount', '-1'), 0);
  assert.equal(
@@ -54,7 +54,7 @@ test('account run history helper upgrades old records, keeps stopped items and s
      autoRunTotalRuns: 10,
      autoRunAttemptRun: 3,
      accountRunHistoryTextEnabled: false,
-      accountRunHistoryHelperBaseUrl: '',
+      accountRunHistoryHelperBaseUrl: 'http://127.0.0.1:17373',
    }),
    normalizeAccountRunHistoryHelperBaseUrl: (value) => String(value || '').trim(),
  });
@@ -97,8 +97,8 @@ test('account run history helper upgrades old records, keeps stopped items and s
  assert.equal(storedHistory.some((item) => item.email === 'stop@example.com' && item.finalStatus === 'stopped'), true);
  assert.equal(storedHistory.some((item) => item.email === 'latest@example.com' && item.retryCount === 2), true);
  assert.equal(storedHistory.some((item) => item.email === 'old@example.com'), true);
-  assert.equal(fetchCalled, false);
-  assert.equal(helpers.shouldAppendAccountRunTextFile({ accountRunHistoryTextEnabled: false, accountRunHistoryHelperBaseUrl: 'http://127.0.0.1:17373' }), false);
+  assert.equal(fetchCalled, true);
+  assert.equal(helpers.shouldAppendAccountRunTextFile({ accountRunHistoryTextEnabled: false, accountRunHistoryHelperBaseUrl: 'http://127.0.0.1:17373' }), true);
  assert.equal(helpers.shouldAppendAccountRunTextFile({ accountRunHistoryTextEnabled: true, accountRunHistoryHelperBaseUrl: 'http://127.0.0.1:17373' }), true);
  const stoppedRecord = helpers.buildAccountRunHistoryRecord(
    { email: 'a@b.com', password: 'x' },
@@ -39,4 +39,9 @@ test('logging/status add-phone detection ignores step 2 phone-entry switch failu
    loggingStatus.isAddPhoneAuthFailure('Step 8: verification submitted but the auth flow entered the phone number page. URL: https://auth.openai.com/add-phone'),
    true
  );
+  assert.equal(
+    loggingStatus.isAddPhoneAuthFailure('Step 9: auth page entered phone verification page. URL: https://auth.openai.com/phone-verification'),
+    true
+  );
+  assert.equal(loggingStatus.getLoginAuthStateLabel('phone_verification_page'), '手机验证码页');
 });
@@ -142,6 +142,7 @@ const selectMailProvider = { value: '163' };
 const selectEmailGenerator = { value: 'duck' };
 const checkboxAutoDeleteIcloud = { checked: true };
 const selectIcloudHostPreference = { value: 'auto' };
+const inputPhoneVerificationEnabled = { checked: true };
 const inputAccountRunHistoryTextEnabled = { checked: true };
 const inputAccountRunHistoryHelperBaseUrl = { value: 'http://127.0.0.1:17373' };
 const inputInbucketHost = { value: 'inbucket.local' };
@@ -193,6 +194,7 @@ return {
  assert.equal('customPassword' in contributionPayload, false);
  assert.equal('accountRunHistoryTextEnabled' in contributionPayload, false);
  assert.equal('accountRunHistoryHelperBaseUrl' in contributionPayload, false);
+  assert.equal(contributionPayload.phoneVerificationEnabled, true);
  assert.equal(contributionPayload.cloudflareTempEmailUseRandomSubdomain, true);

  api.setLatestState({ contributionMode: false });
@@ -200,6 +202,7 @@ return {
  assert.equal(normalPayload.customPassword, 'Secret123!');
  assert.equal(normalPayload.accountRunHistoryTextEnabled, true);
  assert.equal(normalPayload.accountRunHistoryHelperBaseUrl, 'http://127.0.0.1:17373');
+  assert.equal(normalPayload.phoneVerificationEnabled, true);
  assert.equal(normalPayload.codex2apiUrl, 'http://localhost:8080/admin/accounts');
  assert.equal(normalPayload.codex2apiAdminKey, 'codex-admin-secret');
  assert.equal(normalPayload.cloudflareTempEmailUseRandomSubdomain, true);
@@ -173,6 +173,7 @@ const selectMailProvider = { value: '2925' };
 const selectEmailGenerator = { value: 'duck' };
 const checkboxAutoDeleteIcloud = { checked: false };
 const selectIcloudHostPreference = { value: 'auto' };
+const inputPhoneVerificationEnabled = { checked: false };
 const inputAccountRunHistoryTextEnabled = { checked: false };
 const inputAccountRunHistoryHelperBaseUrl = { value: '' };
 const inputMail2925UseAccountPool = { checked: true };
@@ -227,4 +228,5 @@ return { collectSettingsPayload };

  assert.equal(payload.currentMail2925AccountId, 'acc-2');
  assert.equal(payload.mail2925UseAccountPool, true);
+  assert.equal(payload.phoneVerificationEnabled, false);
 });
@@ -0,0 +1,181 @@
+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 exposes phone verification toggle and dedicated HeroSMS rows', () => {
+  const html = fs.readFileSync('sidepanel/sidepanel.html', 'utf8');
+
+  assert.match(html, /id="row-phone-verification-enabled"/);
+  assert.match(html, /id="input-phone-verification-enabled"/);
+  assert.match(html, /id="row-hero-sms-platform"/);
+  assert.match(html, /id="row-hero-sms-country"/);
+  assert.match(html, /id="row-hero-sms-api-key"/);
+  assert.doesNotMatch(html, /id="input-account-run-history-text-enabled"/);
+});
+
+test('updatePhoneVerificationSettingsUI toggles HeroSMS rows from the sms switch', () => {
+  const api = new Function(`
+const inputPhoneVerificationEnabled = { checked: false };
+const rowHeroSmsPlatform = { style: { display: 'none' } };
+const rowHeroSmsCountry = { style: { display: 'none' } };
+const rowHeroSmsApiKey = { style: { display: 'none' } };
+
+${extractFunction('updatePhoneVerificationSettingsUI')}
+
+return {
+  inputPhoneVerificationEnabled,
+  rowHeroSmsPlatform,
+  rowHeroSmsCountry,
+  rowHeroSmsApiKey,
+  updatePhoneVerificationSettingsUI,
+};
+`)();
+
+  api.updatePhoneVerificationSettingsUI();
+  assert.equal(api.rowHeroSmsPlatform.style.display, 'none');
+  assert.equal(api.rowHeroSmsCountry.style.display, 'none');
+  assert.equal(api.rowHeroSmsApiKey.style.display, 'none');
+
+  api.inputPhoneVerificationEnabled.checked = true;
+  api.updatePhoneVerificationSettingsUI();
+  assert.equal(api.rowHeroSmsPlatform.style.display, '');
+  assert.equal(api.rowHeroSmsCountry.style.display, '');
+  assert.equal(api.rowHeroSmsApiKey.style.display, '');
+});
+
+test('collectSettingsPayload keeps local helper sync enabled while persisting sms toggle state', () => {
+  const api = new Function(`
+let latestState = {
+  contributionMode: false,
+  mail2925UseAccountPool: false,
+  currentMail2925AccountId: '',
+};
+let cloudflareDomainEditMode = false;
+let cloudflareTempEmailDomainEditMode = false;
+const selectCfDomain = { value: '' };
+const selectTempEmailDomain = { value: '' };
+const selectPanelMode = { value: 'cpa' };
+const inputVpsUrl = { value: '' };
+const inputVpsPassword = { value: '' };
+const inputSub2ApiUrl = { value: '' };
+const inputSub2ApiEmail = { value: '' };
+const inputSub2ApiPassword = { value: '' };
+const inputSub2ApiGroup = { value: '' };
+const inputSub2ApiDefaultProxy = { value: '' };
+const inputCodex2ApiUrl = { value: '' };
+const inputCodex2ApiAdminKey = { value: '' };
+const inputPassword = { value: '' };
+const selectMailProvider = { value: '163' };
+const selectEmailGenerator = { value: 'duck' };
+const checkboxAutoDeleteIcloud = { checked: false };
+const selectIcloudHostPreference = { value: 'auto' };
+const inputMail2925UseAccountPool = { checked: false };
+const inputInbucketHost = { value: '' };
+const inputInbucketMailbox = { value: '' };
+const inputHotmailRemoteBaseUrl = { value: '' };
+const inputHotmailLocalBaseUrl = { value: '' };
+const inputLuckmailApiKey = { value: '' };
+const inputLuckmailBaseUrl = { value: '' };
+const selectLuckmailEmailType = { value: 'ms_graph' };
+const inputLuckmailDomain = { value: '' };
+const inputTempEmailBaseUrl = { value: '' };
+const inputTempEmailAdminAuth = { value: '' };
+const inputTempEmailCustomAuth = { value: '' };
+const inputTempEmailReceiveMailbox = { value: '' };
+const inputTempEmailUseRandomSubdomain = { checked: false };
+const inputAutoSkipFailures = { checked: false };
+const inputAutoSkipFailuresThreadIntervalMinutes = { value: '0' };
+const inputAutoDelayEnabled = { checked: false };
+const inputAutoDelayMinutes = { value: '30' };
+const inputAutoStepDelaySeconds = { value: '' };
+const inputPhoneVerificationEnabled = { checked: true };
+const inputVerificationResendCount = { value: '4' };
+const inputHeroSmsApiKey = { value: 'demo-key' };
+const inputAccountRunHistoryHelperBaseUrl = { value: 'http://127.0.0.1:17373' };
+const DEFAULT_VERIFICATION_RESEND_COUNT = 4;
+const DEFAULT_HERO_SMS_COUNTRY_ID = 52;
+const DEFAULT_HERO_SMS_COUNTRY_LABEL = 'Thailand';
+const selectHeroSmsCountry = {
+  value: '52',
+  selectedIndex: 0,
+  options: [{ textContent: 'Thailand' }],
+};
+function getCloudflareDomainsFromState() { return { domains: [], activeDomain: '' }; }
+function normalizeCloudflareDomainValue(value) { return String(value || '').trim(); }
+function getCloudflareTempEmailDomainsFromState() { return { domains: [], activeDomain: '' }; }
+function normalizeCloudflareTempEmailDomainValue(value) { return String(value || '').trim(); }
+function getSelectedLocalCpaStep9Mode() { return 'submit'; }
+function getSelectedMail2925Mode() { return 'provide'; }
+function getSelectedHotmailServiceMode() { return 'local'; }
+function buildManagedAliasBaseEmailPayload() { return { gmailBaseEmail: '', mail2925BaseEmail: '', emailPrefix: '' }; }
+function normalizeLuckmailBaseUrl(value) { return String(value || '').trim(); }
+function normalizeLuckmailEmailType(value) { return String(value || '').trim() || 'ms_graph'; }
+function normalizeCloudflareTempEmailBaseUrlValue(value) { return String(value || '').trim(); }
+function normalizeCloudflareTempEmailReceiveMailboxValue(value) { return String(value || '').trim(); }
+function normalizeAccountRunHistoryHelperBaseUrlValue(value) { return String(value || '').trim(); }
+function normalizeAutoRunThreadIntervalMinutes(value) { return Number(value) || 0; }
+function normalizeAutoDelayMinutes(value) { return Number(value) || 30; }
+function normalizeAutoStepDelaySeconds(value) { return value === '' ? null : Number(value); }
+function normalizeVerificationResendCount(value, fallback) { return Number(value) || fallback; }
+${extractFunction('normalizeHeroSmsCountryId')}
+${extractFunction('normalizeHeroSmsCountryLabel')}
+${extractFunction('getSelectedHeroSmsCountryOption')}
+${extractFunction('collectSettingsPayload')}
+return { collectSettingsPayload };
+`)();
+
+  const payload = api.collectSettingsPayload();
+
+  assert.equal(payload.phoneVerificationEnabled, true);
+  assert.equal(payload.accountRunHistoryTextEnabled, true);
+  assert.equal(payload.accountRunHistoryHelperBaseUrl, 'http://127.0.0.1:17373');
+  assert.equal(payload.heroSmsApiKey, 'demo-key');
+  assert.equal(payload.heroSmsCountryId, 52);
+  assert.equal(payload.heroSmsCountryLabel, 'Thailand');
+});
@@ -140,6 +140,9 @@ const phoneVerificationCalls = [];
 function throwIfStopped() {}
 async function sleepWithStop() {}
 async function ensureStep8SignupPageReady() {}
+async function getState() {
+  return { phoneVerificationEnabled: true };
+}
 const phoneVerificationHelpers = {
  async completePhoneVerificationFlow(tabId, pageState) {
    phoneVerificationCalls.push({ tabId, pageState });
@@ -200,3 +203,52 @@ return {
    consentReady: true,
  });
 });
+
+test('step 8 ready check blocks phone verification flow when sms toggle is disabled', async () => {
+  const api = new Function(`
+const phoneVerificationCalls = [];
+
+function throwIfStopped() {}
+async function sleepWithStop() {}
+async function ensureStep8SignupPageReady() {}
+async function getState() {
+  return { phoneVerificationEnabled: false };
+}
+const phoneVerificationHelpers = {
+  async completePhoneVerificationFlow(tabId, pageState) {
+    phoneVerificationCalls.push({ tabId, pageState });
+    return {
+      success: true,
+      consentReady: true,
+      url: 'https://auth.openai.com/authorize',
+    };
+  },
+};
+async function getStep8PageState() {
+  return {
+    url: 'https://auth.openai.com/add-phone',
+    addPhonePage: true,
+    phoneVerificationPage: false,
+    consentReady: false,
+  };
+}
+
+${extractFunction('waitForStep8Ready')}
+
+return {
+  async run() {
+    try {
+      await waitForStep8Ready(88, 1000);
+      return { error: null, phoneVerificationCalls };
+    } catch (error) {
+      return { error, phoneVerificationCalls };
+    }
+  },
+};
+`)();
+
+  const { error, phoneVerificationCalls } = await api.run();
+
+  assert.match(String(error?.message || ''), /未开启接码功能/);
+  assert.deepStrictEqual(phoneVerificationCalls, []);
+});