邮箱服务
diff --git a/sidepanel/sidepanel.js b/sidepanel/sidepanel.js
index 9a73739..9c36e1f 100644
--- a/sidepanel/sidepanel.js
+++ b/sidepanel/sidepanel.js
@@ -99,6 +99,12 @@ const inputCodex2ApiUrl = document.getElementById('input-codex2api-url');
const rowCodex2ApiAdminKey = document.getElementById('row-codex2api-admin-key');
const inputCodex2ApiAdminKey = document.getElementById('input-codex2api-admin-key');
const rowCustomPassword = document.getElementById('row-custom-password');
+const rowPlusMode = document.getElementById('row-plus-mode');
+const inputPlusModeEnabled = document.getElementById('input-plus-mode-enabled');
+const rowPaypalEmail = document.getElementById('row-paypal-email');
+const inputPaypalEmail = document.getElementById('input-paypal-email');
+const rowPaypalPassword = document.getElementById('row-paypal-password');
+const inputPaypalPassword = document.getElementById('input-paypal-password');
const selectMailProvider = document.getElementById('select-mail-provider');
const btnMailLogin = document.getElementById('btn-mail-login');
const rowCustomMailProviderPool = document.getElementById('row-custom-mail-provider-pool');
@@ -244,11 +250,12 @@ const btnAutoStartCancel = document.getElementById('btn-auto-start-cancel');
const btnAutoStartRestart = document.getElementById('btn-auto-start-restart');
const btnAutoStartContinue = document.getElementById('btn-auto-start-continue');
const autoHintText = document.querySelector('.auto-hint');
-const stepDefinitions = (window.MultiPageStepDefinitions?.getSteps?.() || []).sort((left, right) => left.order - right.order);
-const STEP_IDS = stepDefinitions.map((step) => Number(step.id)).filter(Number.isFinite);
-const STEP_DEFAULT_STATUSES = Object.fromEntries(STEP_IDS.map((stepId) => [stepId, 'pending']));
-const SKIPPABLE_STEPS = new Set(STEP_IDS);
const stepsList = document.querySelector('.steps-list');
+let currentPlusModeEnabled = false;
+let stepDefinitions = getStepDefinitionsForMode(false);
+let STEP_IDS = stepDefinitions.map((step) => Number(step.id)).filter(Number.isFinite);
+let STEP_DEFAULT_STATUSES = Object.fromEntries(STEP_IDS.map((stepId) => [stepId, 'pending']));
+let SKIPPABLE_STEPS = new Set(STEP_IDS);
const AUTO_DELAY_MIN_MINUTES = 1;
const AUTO_DELAY_MAX_MINUTES = 1440;
const AUTO_DELAY_DEFAULT_MINUTES = 30;
@@ -269,8 +276,28 @@ const DEFAULT_MAIL_2925_MODE = MAIL_2925_MODE_PROVIDE;
const NEW_USER_GUIDE_PROMPT_DISMISSED_STORAGE_KEY = 'multipage-new-user-guide-prompt-dismissed';
const AUTO_SKIP_FAILURES_PROMPT_DISMISSED_STORAGE_KEY = 'multipage-auto-skip-failures-prompt-dismissed';
const AUTO_RUN_FALLBACK_RISK_PROMPT_DISMISSED_STORAGE_KEY = 'multipage-auto-run-fallback-risk-prompt-dismissed';
+const AUTO_RUN_PLUS_RISK_PROMPT_DISMISSED_STORAGE_KEY = 'multipage-auto-run-plus-risk-prompt-dismissed';
+
+function getStepDefinitionsForMode(plusModeEnabled = false) {
+ return (window.MultiPageStepDefinitions?.getSteps?.({ plusModeEnabled }) || [])
+ .sort((left, right) => {
+ const leftOrder = Number.isFinite(left.order) ? left.order : left.id;
+ const rightOrder = Number.isFinite(right.order) ? right.order : right.id;
+ if (leftOrder !== rightOrder) return leftOrder - rightOrder;
+ return left.id - right.id;
+ });
+}
+
+function rebuildStepDefinitionState(plusModeEnabled = false) {
+ currentPlusModeEnabled = Boolean(plusModeEnabled);
+ stepDefinitions = getStepDefinitionsForMode(currentPlusModeEnabled);
+ STEP_IDS = stepDefinitions.map((step) => Number(step.id)).filter(Number.isFinite);
+ STEP_DEFAULT_STATUSES = Object.fromEntries(STEP_IDS.map((stepId) => [stepId, 'pending']));
+ SKIPPABLE_STEPS = new Set(STEP_IDS);
+}
const CONTRIBUTION_CONTENT_PROMPT_DISMISSED_VERSION_STORAGE_KEY = 'multipage-contribution-content-prompt-dismissed-version';
const AUTO_RUN_FALLBACK_RISK_WARNING_MIN_RUNS = 3;
+const AUTO_RUN_PLUS_RISK_WARNING_MAX_SAFE_RUNS = 3;
const HOTMAIL_SERVICE_MODE_REMOTE = 'remote';
const HOTMAIL_SERVICE_MODE_LOCAL = 'local';
const ICLOUD_PROVIDER = 'icloud';
@@ -995,10 +1022,23 @@ function setAutoRunFallbackRiskPromptDismissed(dismissed) {
setPromptDismissed(AUTO_RUN_FALLBACK_RISK_PROMPT_DISMISSED_STORAGE_KEY, dismissed);
}
+function isAutoRunPlusRiskPromptDismissed() {
+ return isPromptDismissed(AUTO_RUN_PLUS_RISK_PROMPT_DISMISSED_STORAGE_KEY);
+}
+
+function setAutoRunPlusRiskPromptDismissed(dismissed) {
+ setPromptDismissed(AUTO_RUN_PLUS_RISK_PROMPT_DISMISSED_STORAGE_KEY, dismissed);
+}
+
function shouldWarnAutoRunFallbackRisk(totalRuns, autoRunSkipFailures) {
return totalRuns >= AUTO_RUN_FALLBACK_RISK_WARNING_MIN_RUNS;
}
+function shouldWarnPlusAutoRunRisk(totalRuns, plusModeEnabled) {
+ return Boolean(plusModeEnabled)
+ && Math.floor(Number(totalRuns) || 0) > AUTO_RUN_PLUS_RISK_WARNING_MAX_SAFE_RUNS;
+}
+
async function openAutoSkipFailuresConfirmModal() {
const result = await openConfirmModalWithOption({
title: '自动重试说明',
@@ -1025,6 +1065,19 @@ async function openAutoRunFallbackRiskConfirmModal(totalRuns) {
};
}
+async function openPlusAutoRunRiskConfirmModal(totalRuns) {
+ const result = await openConfirmModalWithOption({
+ title: 'Plus 自动轮数提醒',
+ message: `Plus 模式下当前设置为 ${totalRuns} 轮。轮数过多可能造成 PayPal 或账号快速封号。建议够用就好：我注册了几个使用，没多注册，完全足够使用，并且没有封号。这个模式下只要可以注册成功就能使用，所以不要贪杯哦。`,
+ confirmLabel: '我知道了，继续',
+ });
+
+ return {
+ confirmed: result.confirmed,
+ dismissPrompt: result.optionChecked,
+ };
+}
+
function updateConfigMenuControls() {
const disabled = configActionInFlight || settingsSaveInFlight;
const contributionModeEnabled = Boolean(latestState?.contributionMode);
@@ -1100,7 +1153,8 @@ function isDoneStatus(status) {
}
function getStepStatuses(state = latestState) {
- return { ...STEP_DEFAULT_STATUSES, ...(state?.stepStatuses || {}) };
+ const merged = { ...STEP_DEFAULT_STATUSES, ...(state?.stepStatuses || {}) };
+ return Object.fromEntries(STEP_IDS.map((stepId) => [stepId, merged[stepId] || 'pending']));
}
function getFirstUnfinishedStep(state = latestState) {
@@ -1690,6 +1744,15 @@ function collectSettingsPayload() {
sub2apiDefaultProxyName: inputSub2ApiDefaultProxy.value.trim(),
codex2apiUrl: inputCodex2ApiUrl.value.trim(),
codex2apiAdminKey: inputCodex2ApiAdminKey.value.trim(),
+ plusModeEnabled: typeof inputPlusModeEnabled !== 'undefined' && inputPlusModeEnabled
+ ? Boolean(inputPlusModeEnabled.checked)
+ : Boolean(latestState?.plusModeEnabled),
+ paypalEmail: typeof inputPaypalEmail !== 'undefined' && inputPaypalEmail
+ ? inputPaypalEmail.value.trim()
+ : String(latestState?.paypalEmail || ''),
+ paypalPassword: typeof inputPaypalPassword !== 'undefined' && inputPaypalPassword
+ ? inputPaypalPassword.value
+ : String(latestState?.paypalPassword || ''),
...(contributionModeEnabled ? {} : {
customPassword: inputPassword.value,
}),
@@ -1924,6 +1987,21 @@ function updatePhoneVerificationSettingsUI() {
});
}
+function updatePlusModeUI() {
+ const enabled = typeof inputPlusModeEnabled !== 'undefined' && inputPlusModeEnabled
+ ? Boolean(inputPlusModeEnabled.checked)
+ : false;
+ [
+ typeof rowPaypalEmail !== 'undefined' ? rowPaypalEmail : null,
+ typeof rowPaypalPassword !== 'undefined' ? rowPaypalPassword : null,
+ ].forEach((row) => {
+ if (!row) {
+ return;
+ }
+ row.style.display = enabled ? '' : 'none';
+ });
+}
+
function setSettingsCardLocked(locked) {
if (!settingsCard) {
return;
@@ -2104,6 +2182,9 @@ function applyAutoRunStatus(payload = currentAutoRun) {
function initializeManualStepActions() {
document.querySelectorAll('.step-row').forEach((row) => {
+ if (row.querySelector('.step-actions')) {
+ return;
+ }
const step = Number(row.dataset.step);
const statusEl = row.querySelector('.step-status');
if (!statusEl) return;
@@ -2147,6 +2228,21 @@ function renderStepsList() {
if (stepsProgress) {
stepsProgress.textContent = `0 / ${STEP_IDS.length}`;
}
+
+ initializeManualStepActions();
+ updateProgressCounter();
+ updateButtonStates();
+}
+
+function syncStepDefinitionsForMode(plusModeEnabled = false, options = {}) {
+ const nextPlusModeEnabled = Boolean(plusModeEnabled);
+ const shouldRender = Boolean(options.render) || nextPlusModeEnabled !== currentPlusModeEnabled;
+ if (!shouldRender) {
+ return;
+ }
+
+ rebuildStepDefinitionState(nextPlusModeEnabled);
+ renderStepsList();
}
// ============================================================
@@ -2154,11 +2250,23 @@ function renderStepsList() {
// ============================================================
function applySettingsState(state) {
+ if (typeof syncStepDefinitionsForMode === 'function') {
+ syncStepDefinitionsForMode(Boolean(state?.plusModeEnabled), { render: true });
+ }
syncLatestState(state);
syncAutoRunState(state);
inputEmail.value = state?.email || '';
syncPasswordField(state || {});
+ if (typeof inputPlusModeEnabled !== 'undefined' && inputPlusModeEnabled) {
+ inputPlusModeEnabled.checked = Boolean(state?.plusModeEnabled);
+ }
+ if (typeof inputPaypalEmail !== 'undefined' && inputPaypalEmail) {
+ inputPaypalEmail.value = state?.paypalEmail || '';
+ }
+ if (typeof inputPaypalPassword !== 'undefined' && inputPaypalPassword) {
+ inputPaypalPassword.value = state?.paypalPassword || '';
+ }
inputVpsUrl.value = state?.vpsUrl || '';
inputVpsPassword.value = state?.vpsPassword || '';
setLocalCpaStep9Mode(state?.localCpaStep9Mode);
@@ -2277,6 +2385,9 @@ function applySettingsState(state) {
updateFallbackThreadIntervalInputState();
updateAccountRunHistorySettingsUI();
updatePhoneVerificationSettingsUI();
+ if (typeof updatePlusModeUI === 'function') {
+ updatePlusModeUI();
+ }
updatePanelModeUI();
updateMailProviderUI();
if (isLuckmailProvider(state?.mailProvider)) {
@@ -2882,6 +2993,7 @@ function getCustomMailProviderUiCopy() {
function getCustomVerificationPromptCopy(step) {
const verificationLabel = step === 4 ? '注册验证码' : '登录验证码';
+ const isLoginVerificationStep = step === 8 || step === 11;
return {
title: `手动处理${verificationLabel}`,
message: `当前邮箱服务为“自定义邮箱”。请先在页面中手动输入${verificationLabel}，并确认已经进入下一页面后，再点击确认。`,
@@ -2889,7 +3001,7 @@ function getCustomVerificationPromptCopy(step) {
text: `点击确认后会跳过步骤 ${step}。`,
tone: 'danger',
},
- ...(step === 8 ? {
+ ...(isLoginVerificationStep ? {
phoneActionLabel: '出现手机号验证',
phoneActionAlert: {
text: '如果当前页面已经进入手机号验证，可直接标记为失败并继续下一个邮箱。',
@@ -2901,7 +3013,7 @@ function getCustomVerificationPromptCopy(step) {
async function openCustomVerificationConfirmDialog(step) {
const promptCopy = getCustomVerificationPromptCopy(step);
- if (step === 8) {
+ if (step === 8 || step === 11) {
return openActionModal({
title: promptCopy.title,
message: promptCopy.message,
@@ -4435,6 +4547,20 @@ async function startAutoRunFromCurrentSettings() {
}
}
+ const plusModeEnabled = typeof inputPlusModeEnabled !== 'undefined' && inputPlusModeEnabled
+ ? Boolean(inputPlusModeEnabled.checked)
+ : Boolean(currentPlusModeEnabled || latestState?.plusModeEnabled);
+ if (shouldWarnPlusAutoRunRisk(totalRuns, plusModeEnabled)
+ && !isAutoRunPlusRiskPromptDismissed()) {
+ const result = await openPlusAutoRunRiskConfirmModal(totalRuns);
+ if (!result.confirmed) {
+ return false;
+ }
+ if (result.dismissPrompt) {
+ setAutoRunPlusRiskPromptDismissed(true);
+ }
+ }
+
btnAutoRun.disabled = true;
inputRunCount.disabled = true;
const delayEnabled = inputAutoDelayEnabled.checked;
@@ -4651,6 +4777,23 @@ inputPassword.addEventListener('blur', () => {
saveSettings({ silent: true }).catch(() => { });
});
+inputPlusModeEnabled?.addEventListener('change', () => {
+ updatePlusModeUI();
+ syncStepDefinitionsForMode(Boolean(inputPlusModeEnabled.checked), { render: true });
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+});
+
+[inputPaypalEmail, inputPaypalPassword].forEach((input) => {
+ input?.addEventListener('input', () => {
+ markSettingsDirty(true);
+ scheduleSettingsAutoSave();
+ });
+ input?.addEventListener('blur', () => {
+ saveSettings({ silent: true }).catch(() => { });
+ });
+});
+
selectMailProvider.addEventListener('change', async () => {
const previousProvider = latestState?.mailProvider || '';
const previousMail2925Mode = latestState?.mail2925Mode;
diff --git a/tests/address-sources.test.js b/tests/address-sources.test.js
new file mode 100644
index 0000000..98dd917
--- /dev/null
+++ b/tests/address-sources.test.js
@@ -0,0 +1,23 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+
+test('address sources normalize supported countries and return local seeds', () => {
+ const source = fs.readFileSync('data/address-sources.js', 'utf8');
+ const globalScope = {};
+ const api = new Function('self', `${source}; return self.MultiPageAddressSources;`)(globalScope);
+
+ assert.equal(api.normalizeCountryCode('Deutschland'), 'DE');
+ assert.equal(api.normalizeCountryCode('澳大利亚'), 'AU');
+ assert.equal(api.normalizeCountryCode('unknown'), '');
+
+ const deSeed = api.getAddressSeedForCountry('DE');
+ assert.equal(deSeed.countryCode, 'DE');
+ assert.equal(deSeed.suggestionIndex, 1);
+ assert.equal(Boolean(deSeed.query), true);
+ assert.equal(Boolean(deSeed.fallback.city), true);
+
+ const fallbackSeed = api.getAddressSeedForCountry('unknown', { fallbackCountry: 'AU' });
+ assert.equal(fallbackSeed.countryCode, 'AU');
+ assert.equal(fallbackSeed.fallback.region, 'New South Wales');
+});
diff --git a/tests/background-auth-chain-guard.test.js b/tests/background-auth-chain-guard.test.js
index b781570..c0a6356 100644
--- a/tests/background-auth-chain-guard.test.js
+++ b/tests/background-auth-chain-guard.test.js
@@ -118,6 +118,9 @@ function isRetryableContentScriptTransportError() {
return false;
}
const stepRegistry = {
+ getStepDefinition(step) {
+ return { id: step, key: 'test-step' };
+ },
async executeStep(step) {
events.registryCalls.push(step);
if (step === 8) {
@@ -127,6 +130,12 @@ const stepRegistry = {
}
},
};
+function getStepRegistryForState() {
+ return stepRegistry;
+}
+function getStepDefinitionForState(step) {
+ return { id: step, key: 'test-step' };
+}
${extractFunction('isStopError')}
${extractFunction('throwIfStopped')}
@@ -212,10 +221,19 @@ function isRetryableContentScriptTransportError() {
return false;
}
const stepRegistry = {
+ getStepDefinition(step) {
+ return { id: step, key: 'test-step' };
+ },
async executeStep() {
throw new Error('BROWSER_SWITCH_REQUIRED::请更换浏览器进行注册登录。');
},
};
+function getStepRegistryForState() {
+ return stepRegistry;
+}
+function getStepDefinitionForState(step) {
+ return { id: step, key: 'test-step' };
+}
${extractFunction('isStopError')}
${extractFunction('throwIfStopped')}
diff --git a/tests/background-logging-status-module.test.js b/tests/background-logging-status-module.test.js
index b5f94f6..5e66201 100644
--- a/tests/background-logging-status-module.test.js
+++ b/tests/background-logging-status-module.test.js
@@ -44,4 +44,5 @@ test('logging/status add-phone detection ignores step 2 phone-entry switch failu
true
);
assert.equal(loggingStatus.getLoginAuthStateLabel('phone_verification_page'), '手机验证码页');
+ assert.equal(loggingStatus.getLoginAuthStateLabel('oauth_consent_page'), 'OAuth 授权页');
});
diff --git a/tests/background-message-router-step2-skip.test.js b/tests/background-message-router-step2-skip.test.js
index a90bf63..9ca45f6 100644
--- a/tests/background-message-router-step2-skip.test.js
+++ b/tests/background-message-router-step2-skip.test.js
@@ -59,6 +59,8 @@ function createRouter(overrides = {}) {
getPendingAutoRunTimerPlan: () => null,
getSourceLabel: () => '',
getState: async () => overrides.state || { stepStatuses: { 3: 'pending' } },
+ getStepDefinitionForState: overrides.getStepDefinitionForState,
+ getStepIdsForState: overrides.getStepIdsForState,
getTabId: overrides.getTabId || (async () => null),
getStopRequested: () => false,
handleAutoRunLoopUnhandledError: async () => {},
@@ -184,6 +186,49 @@ test('message router skips step 5 when step 4 reports already logged-in transiti
assert.equal(events.logs[0]?.message, '步骤 4：检测到账号已直接进入已登录态，已自动跳过步骤 5。');
});
+test('message router skips login-code step when oauth login lands on consent page', async () => {
+ const stepKeys = {
+ 7: 'oauth-login',
+ 8: 'fetch-login-code',
+ 9: 'confirm-oauth',
+ };
+ const { router, events } = createRouter({
+ state: { stepStatuses: { 7: 'completed', 8: 'pending', 9: 'pending' } },
+ getStepDefinitionForState: (step) => ({ id: step, key: stepKeys[step] || '' }),
+ getStepIdsForState: () => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+ });
+
+ await router.handleStepData(7, {
+ skipLoginVerificationStep: true,
+ directOAuthConsentPage: true,
+ });
+
+ assert.deepStrictEqual(events.stepStatuses, [{ step: 8, status: 'skipped' }]);
+ assert.equal(events.logs.some(({ message }) => /OAuth 授权页.*步骤 8/.test(message)), true);
+});
+
+test('message router skips Plus login-code step when oauth login lands on consent page', async () => {
+ const stepKeys = {
+ 10: 'oauth-login',
+ 11: 'fetch-login-code',
+ 12: 'confirm-oauth',
+ 13: 'platform-verify',
+ };
+ const { router, events } = createRouter({
+ state: { plusModeEnabled: true, stepStatuses: { 10: 'completed', 11: 'pending', 12: 'pending', 13: 'pending' } },
+ getStepDefinitionForState: (step) => ({ id: step, key: stepKeys[step] || '' }),
+ getStepIdsForState: () => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13],
+ });
+
+ await router.handleStepData(10, {
+ skipLoginVerificationStep: true,
+ directOAuthConsentPage: true,
+ });
+
+ assert.deepStrictEqual(events.stepStatuses, [{ step: 11, status: 'skipped' }]);
+ assert.equal(events.logs.some(({ message }) => /OAuth 授权页.*步骤 11/.test(message)), true);
+});
+
test('message router finalizes step 3 before marking it completed', async () => {
const { router, events } = createRouter();
diff --git a/tests/background-step-registry.test.js b/tests/background-step-registry.test.js
index 13972f3..d4afc3e 100644
--- a/tests/background-step-registry.test.js
+++ b/tests/background-step-registry.test.js
@@ -7,5 +7,10 @@ test('background imports step registry and shared step definitions', () => {
assert.match(source, /background\/steps\/registry\.js/);
assert.match(source, /data\/step-definitions\.js/);
assert.match(source, /MultiPageStepDefinitions\?\.getSteps/);
- assert.match(source, /stepRegistry\.executeStep\(step,\s*state\)/);
+ assert.match(source, /getStepRegistryForState\(state\)/);
+ assert.match(source, /activeStepRegistry\.executeStep\(step,\s*\{/);
+ assert.match(source, /background\/steps\/create-plus-checkout\.js/);
+ assert.match(source, /background\/steps\/fill-plus-checkout\.js/);
+ assert.match(source, /background\/steps\/paypal-approve\.js/);
+ assert.match(source, /background\/steps\/plus-return-confirm\.js/);
});
diff --git a/tests/background-step6-retry-limit.test.js b/tests/background-step6-retry-limit.test.js
index 091a579..39c0ca9 100644
--- a/tests/background-step6-retry-limit.test.js
+++ b/tests/background-step6-retry-limit.test.js
@@ -178,6 +178,55 @@ test('step 7 starts a new oauth timeout window for each refreshed oauth url', as
]);
});
+test('step 7 forwards direct OAuth consent skip metadata when completing', async () => {
+ const source = fs.readFileSync('background/steps/oauth-login.js', 'utf8');
+ const globalScope = {};
+ const api = new Function('self', `${source}; return self.MultiPageBackgroundStep7;`)(globalScope);
+
+ const events = {
+ completions: [],
+ };
+
+ const executor = api.createStep7Executor({
+ addLog: async () => {},
+ completeStepFromBackground: async (step, payload) => {
+ events.completions.push({ step, payload });
+ },
+ getErrorMessage: (error) => error?.message || String(error || ''),
+ getLoginAuthStateLabel: (state) => state || 'unknown',
+ getState: async () => ({ email: 'user@example.com', password: 'secret' }),
+ isStep6RecoverableResult: (result) => result?.step6Outcome === 'recoverable',
+ isStep6SuccessResult: (result) => result?.step6Outcome === 'success',
+ refreshOAuthUrlBeforeStep6: async () => 'https://oauth.example/latest',
+ reuseOrCreateTab: async () => {},
+ sendToContentScriptResilient: async () => ({
+ step6Outcome: 'success',
+ state: 'oauth_consent_page',
+ skipLoginVerificationStep: true,
+ directOAuthConsentPage: true,
+ }),
+ STEP6_MAX_ATTEMPTS: 3,
+ throwIfStopped: () => {},
+ });
+
+ await executor.executeStep7({
+ email: 'user@example.com',
+ password: 'secret',
+ visibleStep: 10,
+ });
+
+ assert.deepStrictEqual(events.completions, [
+ {
+ step: 10,
+ payload: {
+ loginVerificationRequestedAt: null,
+ skipLoginVerificationStep: true,
+ directOAuthConsentPage: true,
+ },
+ },
+ ]);
+});
+
test('step 7 stops immediately when management secret is missing', async () => {
const source = fs.readFileSync('background/steps/oauth-login.js', 'utf8');
const globalScope = {};
diff --git a/tests/background-step7-recovery.test.js b/tests/background-step7-recovery.test.js
index d1a2613..6b28446 100644
--- a/tests/background-step7-recovery.test.js
+++ b/tests/background-step7-recovery.test.js
@@ -85,8 +85,78 @@ test('step 8 submits login verification directly without replaying step 7', asyn
{ step8VerificationTargetEmail: 'display.user@example.com' },
]);
assert.deepStrictEqual(calls.ensureReadyOptions, [
- { timeoutMs: 5000 },
+ { visibleStep: 8, authLoginStep: 7, timeoutMs: 5000 },
]);
+ assert.equal(calls.resolveOptions.completionStep, 8);
+});
+
+test('Plus login-code step reuses step 8 verification logic but completes visible step 11', async () => {
+ let resolvedStep = null;
+ let resolvedOptions = null;
+ let readyOptions = null;
+ const remainingStepCalls = [];
+
+ const executor = api.createStep8Executor({
+ addLog: async () => {},
+ chrome: {
+ tabs: {
+ update: async () => {},
+ },
+ },
+ CLOUDFLARE_TEMP_EMAIL_PROVIDER: 'cloudflare-temp-email',
+ confirmCustomVerificationStepBypass: async () => {},
+ ensureStep8VerificationPageReady: async (options) => {
+ readyOptions = options;
+ return { state: 'verification_page', displayedEmail: 'plus.user@example.com' };
+ },
+ rerunStep7ForStep8Recovery: async () => {},
+ getOAuthFlowRemainingMs: async (details) => {
+ remainingStepCalls.push(details.step);
+ return 9000;
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs, details) => {
+ remainingStepCalls.push(details.step);
+ return Math.min(defaultTimeoutMs, 9000);
+ },
+ getMailConfig: () => ({
+ provider: 'qq',
+ label: 'QQ 邮箱',
+ source: 'mail-qq',
+ url: 'https://mail.qq.com',
+ navigateOnReuse: false,
+ }),
+ getState: async () => ({ email: 'user@example.com', password: 'secret', plusModeEnabled: true }),
+ getTabId: async (sourceName) => (sourceName === 'signup-page' ? 1 : 2),
+ HOTMAIL_PROVIDER: 'hotmail-api',
+ isTabAlive: async () => true,
+ isVerificationMailPollingError: () => false,
+ LUCKMAIL_PROVIDER: 'luckmail-api',
+ resolveVerificationStep: async (step, _state, _mail, options) => {
+ resolvedStep = step;
+ resolvedOptions = options;
+ await options.getRemainingTimeMs({ actionLabel: '登录验证码流程' });
+ },
+ reuseOrCreateTab: async () => {},
+ setState: async () => {},
+ shouldUseCustomRegistrationEmail: () => false,
+ STANDARD_MAIL_VERIFICATION_RESEND_INTERVAL_MS: 25000,
+ STEP7_MAIL_POLLING_RECOVERY_MAX_ATTEMPTS: 8,
+ throwIfStopped: () => {},
+ });
+
+ await executor.executeStep8({
+ visibleStep: 11,
+ plusModeEnabled: true,
+ email: 'user@example.com',
+ password: 'secret',
+ oauthUrl: 'https://oauth.example/latest',
+ });
+
+ assert.equal(resolvedStep, 8);
+ assert.equal(resolvedOptions.completionStep, 11);
+ assert.equal(resolvedOptions.targetEmail, 'plus.user@example.com');
+ assert.deepStrictEqual(readyOptions, { visibleStep: 11, authLoginStep: 10, timeoutMs: 9000 });
+ assert.deepStrictEqual(remainingStepCalls, [11, 11]);
});
test('step 8 uses a fixed 10-minute lookback window and disables resend interval for 2925 mailbox polling', async () => {
diff --git a/tests/content-utils.test.js b/tests/content-utils.test.js
index e3a11d0..01380a5 100644
--- a/tests/content-utils.test.js
+++ b/tests/content-utils.test.js
@@ -80,3 +80,15 @@ return { detectScriptSource };
'mail-163'
);
});
+
+test('shouldReportReadyForFrame suppresses noisy plus checkout child frame ready logs', () => {
+ const bundle = [extractFunction('shouldReportReadyForFrame')].join('\n');
+ const api = new Function(`
+${bundle}
+return { shouldReportReadyForFrame };
+`)();
+
+ assert.equal(api.shouldReportReadyForFrame('plus-checkout', true), false);
+ assert.equal(api.shouldReportReadyForFrame('plus-checkout', false), true);
+ assert.equal(api.shouldReportReadyForFrame('paypal-flow', true), true);
+});
diff --git a/tests/paypal-approve-detection.test.js b/tests/paypal-approve-detection.test.js
new file mode 100644
index 0000000..14644e5
--- /dev/null
+++ b/tests/paypal-approve-detection.test.js
@@ -0,0 +1,191 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+
+const source = fs.readFileSync('background/steps/paypal-approve.js', 'utf8');
+
+function loadModule() {
+ const self = {};
+ return new Function('self', `${source}; return self.MultiPageBackgroundPayPalApprove;`)(self);
+}
+
+function createExecutor({
+ pageStates,
+ submitResults,
+ tabUrls = [],
+ getTabId = async (source) => (source === 'paypal-flow' ? 1 : null),
+ isTabAlive = async () => true,
+ queryTabs = [],
+}) {
+ const api = loadModule();
+ const events = {
+ completed: [],
+ logs: [],
+ messages: [],
+ submittedPayloads: [],
+ updatedTabs: [],
+ };
+ const stateQueue = [...pageStates];
+ const submitQueue = [...submitResults];
+ const urlQueue = [...tabUrls];
+ let lastUrl = urlQueue.shift() || 'https://www.paypal.com/signin';
+
+ const executor = api.createPayPalApproveExecutor({
+ addLog: async (message, level = 'info') => {
+ events.logs.push({ message, level });
+ },
+ chrome: {
+ tabs: {
+ get: async (tabId = 1) => {
+ if (urlQueue.length) {
+ lastUrl = urlQueue.shift();
+ }
+ return {
+ id: tabId,
+ status: 'complete',
+ url: lastUrl,
+ };
+ },
+ query: async () => queryTabs,
+ update: async (tabId, updateInfo) => {
+ events.updatedTabs.push({ tabId, updateInfo });
+ return {};
+ },
+ },
+ },
+ completeStepFromBackground: async (step, payload) => {
+ events.completed.push({ step, payload });
+ },
+ ensureContentScriptReadyOnTabUntilStopped: async () => {},
+ getTabId,
+ isTabAlive,
+ sendTabMessageUntilStopped: async (_tabId, _source, message) => {
+ events.messages.push(message.type);
+ if (message.type === 'PAYPAL_GET_STATE') {
+ return stateQueue.shift() || pageStates[pageStates.length - 1] || {};
+ }
+ if (message.type === 'PAYPAL_SUBMIT_LOGIN') {
+ events.submittedPayloads.push(message.payload);
+ return submitQueue.shift() || { submitted: true, phase: 'password_submitted' };
+ }
+ if (message.type === 'PAYPAL_DISMISS_PROMPTS') {
+ return { clicked: 0 };
+ }
+ if (message.type === 'PAYPAL_CLICK_APPROVE') {
+ return { clicked: true };
+ }
+ return {};
+ },
+ setState: async () => {},
+ sleepWithStop: async () => {},
+ waitForTabCompleteUntilStopped: async () => {},
+ waitForTabUrlMatchUntilStopped: async () => {},
+ });
+
+ return { executor, events };
+}
+
+test('PayPal approve keeps original combined email and password login path', async () => {
+ const { executor, events } = createExecutor({
+ pageStates: [
+ { needsLogin: true, hasEmailInput: true, hasPasswordInput: true, loginPhase: 'login_combined' },
+ { needsLogin: false, approveReady: true },
+ { needsLogin: false, approveReady: true },
+ ],
+ submitResults: [
+ { submitted: true, phase: 'password_submitted', awaiting: 'redirect_or_approval' },
+ ],
+ });
+
+ await executor.executePayPalApprove({
+ paypalEmail: 'user@example.com',
+ paypalPassword: 'secret',
+ });
+
+ assert.equal(events.submittedPayloads.length, 1);
+ assert.deepEqual(events.completed.map((item) => item.step), [8]);
+ assert.equal(events.messages.includes('PAYPAL_CLICK_APPROVE'), true);
+});
+
+test('PayPal approve discovers an already open unregistered PayPal tab', async () => {
+ const { executor, events } = createExecutor({
+ pageStates: [
+ { needsLogin: false, approveReady: true },
+ ],
+ submitResults: [],
+ getTabId: async () => null,
+ isTabAlive: async () => false,
+ queryTabs: [
+ {
+ id: 7,
+ active: true,
+ currentWindow: true,
+ url: 'https://www.paypal.com/pay/?token=BA-demo',
+ },
+ ],
+ tabUrls: [
+ 'https://www.paypal.com/pay/?token=BA-demo',
+ ],
+ });
+
+ await executor.executePayPalApprove({
+ paypalEmail: 'user@example.com',
+ paypalPassword: 'secret',
+ });
+
+ assert.deepEqual(events.updatedTabs, [{ tabId: 7, updateInfo: { active: true } }]);
+ assert.equal(events.logs.some(({ message }) => /发现 PayPal 页面/.test(message)), true);
+ assert.deepEqual(events.completed.map((item) => item.step), [8]);
+ assert.equal(events.messages.includes('PAYPAL_CLICK_APPROVE'), true);
+});
+
+test('PayPal approve auto-detects split email then password pages', async () => {
+ const { executor, events } = createExecutor({
+ pageStates: [
+ { needsLogin: true, hasEmailInput: true, hasPasswordInput: false, loginPhase: 'email' },
+ { needsLogin: true, hasEmailInput: false, hasPasswordInput: true, loginPhase: 'password' },
+ { needsLogin: true, hasEmailInput: false, hasPasswordInput: true, loginPhase: 'password' },
+ { needsLogin: false, approveReady: true },
+ { needsLogin: false, approveReady: true },
+ ],
+ submitResults: [
+ { submitted: false, phase: 'email_submitted', awaiting: 'password_page' },
+ { submitted: true, phase: 'password_submitted', awaiting: 'redirect_or_approval' },
+ ],
+ });
+
+ await executor.executePayPalApprove({
+ paypalEmail: 'user@example.com',
+ paypalPassword: 'secret',
+ });
+
+ assert.equal(events.submittedPayloads.length, 2);
+ assert.deepEqual(events.completed.map((item) => item.step), [8]);
+ assert.equal(events.logs.some(({ message }) => /识别到密码页/.test(message)), true);
+ assert.equal(events.messages.includes('PAYPAL_CLICK_APPROVE'), true);
+});
+
+test('PayPal approve finishes when login redirects away from PayPal', async () => {
+ const { executor, events } = createExecutor({
+ pageStates: [
+ { needsLogin: true, hasEmailInput: false, hasPasswordInput: true, loginPhase: 'password' },
+ ],
+ submitResults: [
+ { submitted: true, phase: 'password_submitted', awaiting: 'redirect_or_approval' },
+ ],
+ tabUrls: [
+ 'https://www.paypal.com/signin',
+ 'https://www.paypal.com/signin',
+ 'https://checkout.openai.com/return',
+ ],
+ });
+
+ await executor.executePayPalApprove({
+ paypalEmail: 'user@example.com',
+ paypalPassword: 'secret',
+ });
+
+ assert.equal(events.submittedPayloads.length, 1);
+ assert.deepEqual(events.completed.map((item) => item.step), [8]);
+ assert.equal(events.messages.includes('PAYPAL_CLICK_APPROVE'), false);
+});
diff --git a/tests/paypal-flow-content.test.js b/tests/paypal-flow-content.test.js
new file mode 100644
index 0000000..d2f0ffd
--- /dev/null
+++ b/tests/paypal-flow-content.test.js
@@ -0,0 +1,205 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+
+const source = fs.readFileSync('content/paypal-flow.js', 'utf8');
+
+function extractFunction(name) {
+ const markers = [`async function ${name}(`, `function ${name}(`];
+ const start = markers
+ .map((marker) => source.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 index = start; index < source.length; index += 1) {
+ const char = source[index];
+ if (char === '(') {
+ parenDepth += 1;
+ } else if (char === ')') {
+ parenDepth -= 1;
+ if (parenDepth === 0) {
+ signatureEnded = true;
+ }
+ } else if (char === '{' && signatureEnded) {
+ braceStart = index;
+ break;
+ }
+ }
+ if (braceStart < 0) {
+ throw new Error(`missing body for function ${name}`);
+ }
+
+ let depth = 0;
+ let end = braceStart;
+ for (; end < source.length; end += 1) {
+ const char = source[end];
+ if (char === '{') depth += 1;
+ if (char === '}') {
+ depth -= 1;
+ if (depth === 0) {
+ end += 1;
+ break;
+ }
+ }
+ }
+
+ return source.slice(start, end);
+}
+
+function createElement({
+ tag = 'div',
+ type = '',
+ id = '',
+ name = '',
+ text = '',
+ value = '',
+ placeholder = '',
+ attrs = {},
+ style = {},
+ rect = { width: 160, height: 40 },
+ parentElement = null,
+} = {}) {
+ return {
+ nodeType: 1,
+ tag,
+ type,
+ id,
+ name,
+ textContent: text,
+ value,
+ placeholder,
+ disabled: false,
+ hidden: Boolean(attrs.hidden),
+ style: {
+ display: 'block',
+ visibility: 'visible',
+ opacity: '1',
+ ...style,
+ },
+ parentElement,
+ getAttribute(key) {
+ if (key === 'type') return type;
+ if (key === 'id') return id;
+ if (key === 'name') return name;
+ if (key === 'placeholder') return placeholder;
+ if (key === 'value') return value;
+ return Object.prototype.hasOwnProperty.call(attrs, key) ? attrs[key] : null;
+ },
+ getBoundingClientRect() {
+ return rect;
+ },
+ };
+}
+
+function loadApi(elements) {
+ const document = {
+ documentElement: {},
+ querySelectorAll(selector) {
+ if (selector === 'input') {
+ return elements.filter((el) => el.tag === 'input');
+ }
+ if (selector === 'input[type="email"]') {
+ return elements.filter((el) => el.tag === 'input' && el.type === 'email');
+ }
+ if (selector === 'input[type="password"]') {
+ return elements.filter((el) => el.tag === 'input' && el.type === 'password');
+ }
+ if (selector.includes('button') || selector.includes('[role="button"]')) {
+ return elements.filter((el) => el.tag === 'button' || el.attrs?.role === 'button');
+ }
+ return [];
+ },
+ };
+ const window = {
+ getComputedStyle(el) {
+ return el?.style || { display: 'block', visibility: 'visible', opacity: '1' };
+ },
+ };
+
+ return new Function('document', 'window', `
+${extractFunction('isVisibleElement')}
+${extractFunction('normalizeText')}
+${extractFunction('getActionText')}
+${extractFunction('getVisibleControls')}
+${extractFunction('isEnabledControl')}
+${extractFunction('findClickableByText')}
+${extractFunction('findInputByPatterns')}
+${extractFunction('findEmailInput')}
+${extractFunction('findPasswordInput')}
+${extractFunction('findLoginNextButton')}
+${extractFunction('findEmailNextButton')}
+${extractFunction('findPasswordLoginButton')}
+${extractFunction('getPayPalLoginPhase')}
+return {
+ findEmailInput,
+ findPasswordInput,
+ findEmailNextButton,
+ findPasswordLoginButton,
+ getPayPalLoginPhase,
+};
+`)(document, window);
+}
+
+test('PayPal email page ignores hidden pre-rendered password input', () => {
+ const hiddenPanel = createElement({ attrs: { 'aria-hidden': 'true' } });
+ const emailInput = createElement({
+ tag: 'input',
+ type: 'text',
+ id: 'login_email',
+ name: 'login_email',
+ value: 'user@example.com',
+ placeholder: 'Email',
+ });
+ const hiddenPasswordInput = createElement({
+ tag: 'input',
+ type: 'password',
+ id: 'login_password',
+ name: 'login_password',
+ parentElement: hiddenPanel,
+ });
+ const nextButton = createElement({
+ tag: 'button',
+ id: 'btnNext',
+ text: 'Next',
+ });
+
+ const api = loadApi([emailInput, hiddenPasswordInput, nextButton]);
+
+ assert.equal(api.findEmailInput(), emailInput);
+ assert.equal(api.findPasswordInput(), null);
+ assert.equal(api.findEmailNextButton(), nextButton);
+ assert.equal(api.findPasswordLoginButton(), null);
+ assert.equal(api.getPayPalLoginPhase(emailInput, api.findPasswordInput()), 'email');
+});
+
+test('PayPal combined login page still sees visible password input', () => {
+ const emailInput = createElement({
+ tag: 'input',
+ type: 'text',
+ id: 'login_email',
+ name: 'login_email',
+ });
+ const passwordInput = createElement({
+ tag: 'input',
+ type: 'password',
+ id: 'login_password',
+ name: 'login_password',
+ });
+ const loginButton = createElement({
+ tag: 'button',
+ id: 'btnLogin',
+ text: 'Log In',
+ });
+
+ const api = loadApi([emailInput, passwordInput, loginButton]);
+
+ assert.equal(api.findEmailInput(), emailInput);
+ assert.equal(api.findPasswordInput(), passwordInput);
+ assert.equal(api.findPasswordLoginButton(), loginButton);
+ assert.equal(api.getPayPalLoginPhase(emailInput, passwordInput), 'login_combined');
+});
diff --git a/tests/plus-checkout-address-input.test.js b/tests/plus-checkout-address-input.test.js
new file mode 100644
index 0000000..fd95e91
--- /dev/null
+++ b/tests/plus-checkout-address-input.test.js
@@ -0,0 +1,255 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+
+const source = fs.readFileSync('content/plus-checkout.js', 'utf8');
+
+function extractFunction(name) {
+ const plainStart = source.indexOf(`function ${name}(`);
+ const asyncStart = source.indexOf(`async function ${name}(`);
+ const start = asyncStart >= 0
+ ? asyncStart
+ : plainStart;
+ if (start < 0) {
+ throw new Error(`missing function ${name}`);
+ }
+
+ let parenDepth = 0;
+ let signatureEnded = false;
+ let braceStart = -1;
+ for (let index = start; index < source.length; index += 1) {
+ const ch = source[index];
+ if (ch === '(') {
+ parenDepth += 1;
+ } else if (ch === ')') {
+ parenDepth -= 1;
+ if (parenDepth === 0) {
+ signatureEnded = true;
+ }
+ } else if (ch === '{' && signatureEnded) {
+ braceStart = index;
+ break;
+ }
+ }
+
+ if (braceStart < 0) {
+ throw new Error(`missing body for function ${name}`);
+ }
+
+ let depth = 0;
+ let end = braceStart;
+ for (; end < source.length; end += 1) {
+ const ch = source[end];
+ if (ch === '{') depth += 1;
+ if (ch === '}') {
+ depth -= 1;
+ if (depth === 0) {
+ end += 1;
+ break;
+ }
+ }
+ }
+
+ return source.slice(start, end);
+}
+
+function createInput({ id = '', name = '', placeholder = '', containerText = '' }) {
+ const attrs = {
+ id,
+ name,
+ placeholder,
+ type: 'text',
+ };
+ const container = {
+ textContent: containerText,
+ };
+ return {
+ id,
+ name,
+ type: 'text',
+ value: '',
+ textContent: '',
+ getAttribute: (key) => attrs[key] || '',
+ closest: (selector) => {
+ if (selector === 'label') return null;
+ if (String(selector || '').includes('[data-testid]')) return container;
+ return null;
+ },
+ getBoundingClientRect: () => ({ width: 240, height: 40 }),
+ };
+}
+
+function createElement({ tagName = 'BUTTON', text = '', attrs = {}, className = '' }) {
+ return {
+ tagName,
+ textContent: text,
+ value: '',
+ className,
+ dataset: {},
+ id: attrs.id || '',
+ checked: false,
+ getAttribute: (key) => attrs[key] || '',
+ closest: () => null,
+ getBoundingClientRect: () => ({ width: 180, height: 64 }),
+ };
+}
+
+test('findAddressSearchInput skips the name field when its container says billing address', async () => {
+ const bundle = [
+ 'function throwIfStopped() {}',
+ 'function sleep() { return Promise.resolve(); }',
+ extractFunction('waitUntil'),
+ extractFunction('isVisibleElement'),
+ extractFunction('normalizeText'),
+ extractFunction('getActionText'),
+ extractFunction('getFieldText'),
+ extractFunction('getVisibleControls'),
+ extractFunction('getVisibleTextInputs'),
+ extractFunction('findInputByFieldText'),
+ extractFunction('getDirectFieldHintText'),
+ extractFunction('isNonAddressSearchInput'),
+ extractFunction('isLikelyAddressSearchInput'),
+ extractFunction('findAddressSearchInput'),
+ ].join('\n');
+
+ const nameInput = createInput({
+ name: 'name',
+ placeholder: 'Name',
+ containerText: 'Billing address',
+ });
+ const addressInput = createInput({
+ name: 'addressLine1',
+ placeholder: 'Address',
+ containerText: 'Billing address',
+ });
+ const inputs = [nameInput, addressInput];
+ const documentMock = {
+ readyState: 'complete',
+ querySelectorAll: (selector) => {
+ if (selector === 'input, textarea') return inputs;
+ return [];
+ },
+ };
+ const windowMock = {
+ getComputedStyle: () => ({ display: 'block', visibility: 'visible' }),
+ };
+ const cssMock = {
+ escape: (value) => String(value),
+ };
+
+ const api = new Function('window', 'document', 'CSS', `
+${bundle}
+return { findAddressSearchInput, isNonAddressSearchInput };
+`)(windowMock, documentMock, cssMock);
+
+ assert.equal(api.isNonAddressSearchInput(nameInput), true);
+ assert.equal(await api.findAddressSearchInput(), addressInput);
+});
+
+test('isPayPalPaymentMethodActive requires a selected PayPal control', () => {
+ const bundle = [
+ extractFunction('isVisibleElement'),
+ extractFunction('normalizeText'),
+ extractFunction('getActionText'),
+ extractFunction('getSearchText'),
+ extractFunction('getFieldText'),
+ extractFunction('getCombinedSearchText'),
+ extractFunction('getVisibleControls'),
+ extractFunction('getVisibleTextInputs'),
+ extractFunction('isDocumentLevelContainer'),
+ extractFunction('getPayPalSearchCandidates'),
+ extractFunction('hasCreditCardFields'),
+ extractFunction('hasSelectedPayPalControl'),
+ extractFunction('isPayPalPaymentMethodActive'),
+ ].join('\n');
+
+ const paypalButton = createElement({
+ text: 'PayPal',
+ attrs: {
+ id: 'paypal-tab',
+ role: 'tab',
+ 'aria-selected': '',
+ },
+ });
+ const elements = [paypalButton];
+ const documentMock = {
+ documentElement: {},
+ body: {},
+ querySelectorAll: (selector) => {
+ if (selector === 'input, textarea') return [];
+ if (String(selector || '').includes('label[for=')) return [];
+ return elements;
+ },
+ };
+ const windowMock = {
+ innerWidth: 1200,
+ innerHeight: 900,
+ getComputedStyle: () => ({ display: 'block', visibility: 'visible' }),
+ };
+ const cssMock = {
+ escape: (value) => String(value),
+ };
+
+ const api = new Function('window', 'document', 'CSS', `
+${bundle}
+return { isPayPalPaymentMethodActive };
+`)(windowMock, documentMock, cssMock);
+
+ assert.equal(api.isPayPalPaymentMethodActive(), false);
+ paypalButton.getAttribute = (key) => (key === 'aria-selected' ? 'true' : (paypalButton.id && key === 'id' ? paypalButton.id : ''));
+ assert.equal(api.isPayPalPaymentMethodActive(), true);
+});
+
+test('selectRegionDropdown opens the state dropdown and clicks the matching option', async () => {
+ const bundle = [
+ 'function throwIfStopped() {}',
+ 'function sleep() { return Promise.resolve(); }',
+ extractFunction('isVisibleElement'),
+ extractFunction('normalizeText'),
+ extractFunction('getActionText'),
+ extractFunction('getRegionCandidates'),
+ extractFunction('matchesRegionOption'),
+ extractFunction('getRegionDropdownValue'),
+ extractFunction('getVisibleRegionOptions'),
+ extractFunction('selectRegionDropdown'),
+ ].join('\n');
+
+ const state = { opened: false };
+ const clicks = [];
+ const stateDropdown = createElement({
+ tagName: 'DIV',
+ text: 'State New South Wales',
+ attrs: {
+ role: 'combobox',
+ 'aria-haspopup': 'listbox',
+ },
+ });
+ const options = [
+ createElement({ tagName: 'DIV', text: 'New South Wales', attrs: { role: 'option' } }),
+ createElement({ tagName: 'DIV', text: 'Western Australia', attrs: { role: 'option' } }),
+ ];
+ const documentMock = {
+ querySelectorAll: (selector) => {
+ if (!state.opened) return [];
+ if (selector === '[role="listbox"] [role="option"]' || selector === '[role="option"]') return options;
+ if (selector === 'li') return [];
+ return [];
+ },
+ };
+ const windowMock = {
+ getComputedStyle: () => ({ display: 'block', visibility: 'visible' }),
+ };
+
+ const api = new Function('window', 'document', 'Event', 'clicks', 'stateDropdown', 'state', `
+function simulateClick(el) {
+ clicks.push(el);
+ if (el === stateDropdown) state.opened = true;
+}
+${bundle}
+return { selectRegionDropdown };
+`)(windowMock, documentMock, Event, clicks, stateDropdown, state);
+
+ await api.selectRegionDropdown(stateDropdown, 'Western Australia');
+
+ assert.deepEqual(clicks, [stateDropdown, options[1]]);
+});
diff --git a/tests/plus-checkout-billing-tab-resolution.test.js b/tests/plus-checkout-billing-tab-resolution.test.js
new file mode 100644
index 0000000..350d6f5
--- /dev/null
+++ b/tests/plus-checkout-billing-tab-resolution.test.js
@@ -0,0 +1,375 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+
+function loadPlusCheckoutBillingModule() {
+ const source = fs.readFileSync('background/steps/fill-plus-checkout.js', 'utf8');
+ const globalScope = {};
+ return new Function('self', `${source}; return self.MultiPageBackgroundPlusCheckoutBilling;`)(globalScope);
+}
+
+function createAddressSeed() {
+ return {
+ countryCode: 'DE',
+ query: 'Berlin Mitte',
+ suggestionIndex: 1,
+ fallback: {
+ address1: 'Unter den Linden',
+ city: 'Berlin',
+ region: 'Berlin',
+ postalCode: '10117',
+ },
+ };
+}
+
+function createAuAddressSeed() {
+ return {
+ countryCode: 'AU',
+ query: 'Sydney NSW',
+ suggestionIndex: 1,
+ fallback: {
+ address1: 'George Street',
+ city: 'Sydney',
+ region: 'New South Wales',
+ postalCode: '2000',
+ },
+ };
+}
+
+function createSuccessfulBillingResult() {
+ return {
+ countryText: 'Germany',
+ structuredAddress: {
+ address1: 'Unter den Linden',
+ city: 'Berlin',
+ postalCode: '10117',
+ },
+ };
+}
+
+function createExecutorHarness({
+ frames,
+ stateByFrame,
+ readyByFrame = {},
+ fetchImpl = null,
+ getAddressSeedForCountry = () => createAddressSeed(),
+}) {
+ const api = loadPlusCheckoutBillingModule();
+ const events = {
+ completed: [],
+ ensuredTabs: [],
+ injectedAllFrames: false,
+ logs: [],
+ messages: [],
+ states: [],
+ waitedUrls: [],
+ };
+ const checkoutTab = {
+ id: 42,
+ url: 'https://chatgpt.com/checkout/openai_ie/cs_test',
+ status: 'complete',
+ };
+
+ const executor = api.createPlusCheckoutBillingExecutor({
+ addLog: async (message, level = 'info') => events.logs.push({ message, level }),
+ chrome: {
+ tabs: {
+ get: async (tabId) => (tabId === checkoutTab.id ? checkoutTab : null),
+ query: async (queryInfo) => {
+ if (queryInfo.active && queryInfo.currentWindow) {
+ return [checkoutTab];
+ }
+ if (queryInfo.url === 'https://chatgpt.com/checkout/*') {
+ return [checkoutTab];
+ }
+ return [];
+ },
+ sendMessage: async (tabId, message, options = {}) => {
+ const frameId = Number.isInteger(options.frameId) ? options.frameId : 0;
+ events.messages.push({ tabId, message, frameId });
+ const hasConfiguredState = Object.prototype.hasOwnProperty.call(stateByFrame, frameId);
+ if (message.type === 'PING') {
+ if (readyByFrame[frameId] === false) {
+ throw new Error('No receiving end');
+ }
+ return { ok: true, source: 'plus-checkout' };
+ }
+ if (readyByFrame[frameId] === false && !hasConfiguredState) {
+ throw new Error('No receiving end');
+ }
+ if (message.type === 'PLUS_CHECKOUT_GET_STATE') {
+ return stateByFrame[frameId] || { hasPayPal: false, paypalCandidates: [] };
+ }
+ return createSuccessfulBillingResult();
+ },
+ },
+ scripting: {
+ executeScript: async (details) => {
+ if (details.target?.allFrames) {
+ events.injectedAllFrames = true;
+ }
+ },
+ },
+ webNavigation: {
+ getAllFrames: async () => frames,
+ },
+ },
+ completeStepFromBackground: async (step, payload) => events.completed.push({ step, payload }),
+ ensureContentScriptReadyOnTabUntilStopped: async (source, tabId) => events.ensuredTabs.push({ source, tabId }),
+ fetch: fetchImpl,
+ generateRandomName: () => ({ firstName: 'Ada', lastName: 'Lovelace' }),
+ getAddressSeedForCountry,
+ getTabId: async () => null,
+ isTabAlive: async () => false,
+ setState: async (updates) => events.states.push(updates),
+ sleepWithStop: async () => {},
+ waitForTabCompleteUntilStopped: async () => checkoutTab,
+ waitForTabUrlMatchUntilStopped: async (tabId, matcher) => {
+ events.waitedUrls.push({ tabId });
+ assert.equal(matcher('https://www.paypal.com/checkoutnow'), true);
+ return { id: tabId, url: 'https://www.paypal.com/checkoutnow' };
+ },
+ });
+
+ return { checkoutTab, events, executor };
+}
+
+test('Plus checkout billing uses the current checkout tab when step 6 did not register one', async () => {
+ const { checkoutTab, events, executor } = createExecutorHarness({
+ frames: [{ frameId: 0, url: 'https://chatgpt.com/checkout/openai_ie/cs_test' }],
+ stateByFrame: {
+ 0: {
+ hasPayPal: true,
+ paypalCandidates: [{ tag: 'button', text: 'PayPal' }],
+ billingFieldsVisible: true,
+ hasSubscribeButton: true,
+ },
+ },
+ });
+
+ await executor.executePlusCheckoutBilling({});
+
+ assert.deepEqual(events.ensuredTabs[0], { source: 'plus-checkout', tabId: checkoutTab.id });
+ assert.equal(events.messages.some((entry) => entry.message.type === 'PLUS_CHECKOUT_SELECT_PAYPAL' && entry.frameId === 0), true);
+ assert.equal(events.messages.some((entry) => entry.message.type === 'PLUS_CHECKOUT_FILL_BILLING_ADDRESS' && entry.frameId === 0), true);
+ assert.equal(events.messages.some((entry) => entry.message.type === 'PLUS_CHECKOUT_CLICK_SUBSCRIBE' && entry.frameId === 0), true);
+ assert.equal(events.completed[0].step, 7);
+ assert.equal(events.states.some((updates) => updates.plusCheckoutTabId === checkoutTab.id), true);
+ assert.equal(events.logs.some((entry) => /当前已在 Plus Checkout 页面/.test(entry.message)), true);
+});
+
+test('Plus checkout billing sends the billing command to the iframe that contains PayPal', async () => {
+ const { events, executor } = createExecutorHarness({
+ frames: [
+ { frameId: 0, url: 'https://chatgpt.com/checkout/openai_ie/cs_test' },
+ { frameId: 7, url: 'https://js.stripe.com/v3/elements-inner-payment.html' },
+ { frameId: 8, url: 'https://js.stripe.com/v3/elements-inner-address.html' },
+ ],
+ stateByFrame: {
+ 0: { hasPayPal: false, paypalCandidates: [], hasSubscribeButton: true },
+ 7: { hasPayPal: true, paypalCandidates: [{ tag: 'button', text: 'PayPal' }] },
+ 8: { hasPayPal: false, paypalCandidates: [], billingFieldsVisible: true },
+ },
+ });
+
+ await executor.executePlusCheckoutBilling({});
+
+ const selectMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_SELECT_PAYPAL');
+ const fillMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_FILL_BILLING_ADDRESS');
+ const subscribeMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_CLICK_SUBSCRIBE');
+ assert.equal(selectMessage.frameId, 7);
+ assert.equal(fillMessage.frameId, 8);
+ assert.equal(subscribeMessage.frameId, 0);
+ assert.equal(events.logs.some((entry) => /checkout iframe/.test(entry.message)), true);
+ assert.equal(events.completed[0].step, 7);
+});
+
+test('Plus checkout billing still inspects a frame when ping readiness is stale', async () => {
+ const { events, executor } = createExecutorHarness({
+ frames: [
+ { frameId: 0, url: 'https://chatgpt.com/checkout/openai_ie/cs_test' },
+ { frameId: 7, url: 'https://js.stripe.com/v3/elements-inner-payment.html' },
+ { frameId: 8, url: 'https://js.stripe.com/v3/elements-inner-address.html' },
+ ],
+ stateByFrame: {
+ 0: {
+ hasPayPal: true,
+ paypalCandidates: [{ tag: 'button', text: 'PayPal' }],
+ hasSubscribeButton: true,
+ },
+ 7: { hasPayPal: false, paypalCandidates: [] },
+ 8: { hasPayPal: false, paypalCandidates: [], billingFieldsVisible: true },
+ },
+ readyByFrame: {
+ 0: false,
+ },
+ });
+
+ await executor.executePlusCheckoutBilling({});
+
+ const selectMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_SELECT_PAYPAL');
+ assert.equal(selectMessage.frameId, 0);
+ assert.equal(events.completed[0].step, 7);
+});
+
+test('Plus checkout billing uses the autocomplete iframe for address suggestions when Stripe splits it out', async () => {
+ const { events, executor } = createExecutorHarness({
+ frames: [
+ { frameId: 0, url: 'https://chatgpt.com/checkout/openai_ie/cs_test' },
+ { frameId: 7, url: 'https://js.stripe.com/v3/elements-inner-payment.html' },
+ { frameId: 8, url: 'https://js.stripe.com/v3/elements-inner-address.html' },
+ { frameId: 9, url: 'https://js.stripe.com/v3/elements-inner-autocompl.html' },
+ ],
+ stateByFrame: {
+ 0: { hasPayPal: false, paypalCandidates: [], hasSubscribeButton: true },
+ 7: { hasPayPal: true, paypalCandidates: [{ tag: 'button', text: 'PayPal' }] },
+ 8: { hasPayPal: false, paypalCandidates: [], billingFieldsVisible: true },
+ 9: { hasPayPal: false, paypalCandidates: [] },
+ },
+ });
+
+ await executor.executePlusCheckoutBilling({});
+
+ const fillQueryMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_FILL_ADDRESS_QUERY');
+ const suggestionMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_SELECT_ADDRESS_SUGGESTION');
+ const ensureAddressMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_ENSURE_BILLING_ADDRESS');
+ const combinedFillMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_FILL_BILLING_ADDRESS');
+ assert.equal(fillQueryMessage.frameId, 8);
+ assert.equal(suggestionMessage.frameId, 9);
+ assert.equal(ensureAddressMessage.frameId, 8);
+ assert.equal(combinedFillMessage, undefined);
+ assert.equal(events.logs.some((entry) => /Google 地址推荐/.test(entry.message)), true);
+ assert.equal(events.completed[0].step, 7);
+});
+
+test('Plus checkout billing skips Google autocomplete when meiguodizhi returns a complete address', async () => {
+ const fetchRequests = [];
+ const { events, executor } = createExecutorHarness({
+ frames: [
+ { frameId: 0, url: 'https://chatgpt.com/checkout/openai_ie/cs_test' },
+ { frameId: 7, url: 'https://js.stripe.com/v3/elements-inner-payment.html' },
+ { frameId: 8, url: 'https://js.stripe.com/v3/elements-inner-address.html' },
+ { frameId: 9, url: 'https://js.stripe.com/v3/elements-inner-autocompl.html' },
+ ],
+ stateByFrame: {
+ 0: { hasPayPal: false, paypalCandidates: [], hasSubscribeButton: true },
+ 7: { hasPayPal: true, paypalCandidates: [{ tag: 'button', text: 'PayPal' }] },
+ 8: { hasPayPal: false, paypalCandidates: [], billingFieldsVisible: true },
+ 9: { hasPayPal: false, paypalCandidates: [] },
+ },
+ fetchImpl: async (url, init) => {
+ fetchRequests.push({ url, init });
+ return {
+ ok: true,
+ status: 200,
+ json: async () => ({
+ status: 'ok',
+ address: {
+ Address: 'Rosa-Luxemburg-Strasse 40',
+ City: 'Berlin',
+ State: 'Berlin',
+ Zip_Code: '69081',
+ },
+ }),
+ };
+ },
+ });
+
+ await executor.executePlusCheckoutBilling({});
+
+ const fillQueryMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_FILL_ADDRESS_QUERY');
+ const suggestionMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_SELECT_ADDRESS_SUGGESTION');
+ const ensureAddressMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_ENSURE_BILLING_ADDRESS');
+ const combinedFillMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_FILL_BILLING_ADDRESS');
+ assert.equal(fillQueryMessage, undefined);
+ assert.equal(suggestionMessage, undefined);
+ assert.equal(ensureAddressMessage, undefined);
+ assert.equal(combinedFillMessage.frameId, 8);
+ assert.equal(combinedFillMessage.message.payload.addressSeed.skipAutocomplete, true);
+ assert.equal(combinedFillMessage.message.payload.addressSeed.source, 'meiguodizhi');
+ assert.equal(combinedFillMessage.message.payload.addressSeed.fallback.address1, 'Rosa-Luxemburg-Strasse 40');
+ assert.equal(combinedFillMessage.message.payload.addressSeed.fallback.city, 'Berlin');
+ assert.equal(combinedFillMessage.message.payload.addressSeed.fallback.postalCode, '69081');
+ assert.equal(fetchRequests.length, 1);
+ assert.equal(fetchRequests[0].url, 'https://www.meiguodizhi.com/api/v1/dz');
+ assert.deepEqual(JSON.parse(fetchRequests[0].init.body), {
+ city: 'Berlin',
+ path: '/de-address',
+ method: 'refresh',
+ });
+ assert.equal(events.completed[0].step, 7);
+});
+
+test('Plus checkout billing uses the detected checkout country before choosing an address seed', async () => {
+ const requestedCountries = [];
+ const fetchRequests = [];
+ const { events, executor } = createExecutorHarness({
+ frames: [
+ { frameId: 0, url: 'https://chatgpt.com/checkout/openai_ie/cs_test' },
+ { frameId: 7, url: 'https://js.stripe.com/v3/elements-inner-payment.html' },
+ { frameId: 8, url: 'https://js.stripe.com/v3/elements-inner-address.html' },
+ ],
+ stateByFrame: {
+ 0: { hasPayPal: false, paypalCandidates: [], hasSubscribeButton: true },
+ 7: { hasPayPal: true, paypalCandidates: [{ tag: 'button', text: 'PayPal' }] },
+ 8: {
+ hasPayPal: false,
+ paypalCandidates: [],
+ billingFieldsVisible: true,
+ countryText: 'Australia',
+ },
+ },
+ getAddressSeedForCountry: (countryValue) => {
+ requestedCountries.push(countryValue);
+ return /australia|au/i.test(String(countryValue || '')) ? createAuAddressSeed() : createAddressSeed();
+ },
+ fetchImpl: async (url, init) => {
+ fetchRequests.push({ url, init });
+ return {
+ ok: true,
+ status: 200,
+ json: async () => ({
+ status: 'ok',
+ address: {
+ Address: '98 Ocean Street',
+ City: 'Sydney South',
+ State: 'New South Wales',
+ Zip_Code: '2000',
+ },
+ }),
+ };
+ },
+ });
+
+ await executor.executePlusCheckoutBilling({ plusCheckoutCountry: 'DE' });
+
+ const combinedFillMessage = events.messages.find((entry) => entry.message.type === 'PLUS_CHECKOUT_FILL_BILLING_ADDRESS');
+ assert.equal(requestedCountries[0], 'Australia');
+ assert.equal(combinedFillMessage.message.payload.addressSeed.countryCode, 'AU');
+ assert.equal(combinedFillMessage.message.payload.addressSeed.fallback.region, 'New South Wales');
+ assert.deepEqual(JSON.parse(fetchRequests[0].init.body), {
+ city: 'Sydney',
+ path: '/au-address',
+ method: 'refresh',
+ });
+});
+
+test('Plus checkout billing reports when the payment iframe exists but cannot receive the content script', async () => {
+ const { executor } = createExecutorHarness({
+ frames: [
+ { frameId: 0, url: 'https://chatgpt.com/checkout/openai_ie/cs_test' },
+ { frameId: 7, url: 'https://js.stripe.com/v3/elements-inner-payment.html' },
+ ],
+ stateByFrame: {
+ 0: { hasPayPal: false, paypalCandidates: [], hasSubscribeButton: true },
+ },
+ readyByFrame: {
+ 7: false,
+ },
+ });
+
+ await assert.rejects(
+ executor.executePlusCheckoutBilling({}),
+ /已定位到 PayPal 所在 iframe（frameId=7），但账单脚本无法注入该 iframe/
+ );
+});
diff --git a/tests/plus-checkout-create-wait.test.js b/tests/plus-checkout-create-wait.test.js
new file mode 100644
index 0000000..8253d6c
--- /dev/null
+++ b/tests/plus-checkout-create-wait.test.js
@@ -0,0 +1,55 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+
+const source = fs.readFileSync('background/steps/create-plus-checkout.js', 'utf8');
+const globalScope = {};
+const api = new Function('self', `${source}; return self.MultiPageBackgroundPlusCheckoutCreate;`)(globalScope);
+
+test('Plus checkout create waits 20 seconds before completing step 6', async () => {
+ const events = [];
+ const executor = api.createPlusCheckoutCreateExecutor({
+ addLog: async (message, level = 'info') => {
+ events.push({ type: 'log', message, level });
+ },
+ chrome: {
+ tabs: {
+ update: async (tabId, payload) => {
+ events.push({ type: 'tab-update', tabId, payload });
+ },
+ },
+ },
+ completeStepFromBackground: async (step, payload) => {
+ events.push({ type: 'complete', step, payload });
+ },
+ ensureContentScriptReadyOnTabUntilStopped: async () => {
+ events.push({ type: 'ready' });
+ },
+ reuseOrCreateTab: async () => 42,
+ sendTabMessageUntilStopped: async () => ({
+ checkoutUrl: 'https://checkout.stripe.com/c/pay/session',
+ country: 'US',
+ currency: 'USD',
+ }),
+ setState: async (payload) => {
+ events.push({ type: 'set-state', payload });
+ },
+ sleepWithStop: async (ms) => {
+ events.push({ type: 'sleep', ms });
+ },
+ waitForTabCompleteUntilStopped: async () => {
+ events.push({ type: 'tab-complete' });
+ },
+ });
+
+ await executor.executePlusCheckoutCreate();
+
+ const sleepEvents = events.filter((event) => event.type === 'sleep');
+ assert.deepStrictEqual(sleepEvents.map((event) => event.ms), [1000, 1000, 20000]);
+
+ const fixedWaitIndex = events.findIndex((event) => event.type === 'sleep' && event.ms === 20000);
+ const completeIndex = events.findIndex((event) => event.type === 'complete');
+ assert.ok(fixedWaitIndex > -1);
+ assert.ok(completeIndex > fixedWaitIndex);
+ assert.equal(events.some((event) => event.type === 'log' && /固定等待 20 秒/.test(event.message)), true);
+});
diff --git a/tests/sidepanel-auto-run-content-refresh.test.js b/tests/sidepanel-auto-run-content-refresh.test.js
index c91cb51..dc6ed2f 100644
--- a/tests/sidepanel-auto-run-content-refresh.test.js
+++ b/tests/sidepanel-auto-run-content-refresh.test.js
@@ -48,12 +48,23 @@ function extractFunction(name) {
return sidepanelSource.slice(start, end);
}
-function createApi({ refreshImpl, confirmImpl, dismissImpl } = {}) {
+function createApi({
+ refreshImpl,
+ confirmImpl,
+ dismissImpl,
+ runCount = 3,
+ plusModeEnabled = false,
+ plusRiskEnabled = false,
+ plusRiskConfirmed = true,
+ plusRiskDismissPrompt = false,
+} = {}) {
const bundle = extractFunction('startAutoRunFromCurrentSettings');
return new Function(`
const events = [];
const latestState = { contributionMode: false };
+const currentPlusModeEnabled = ${JSON.stringify(Boolean(plusModeEnabled))};
+const inputPlusModeEnabled = { checked: ${JSON.stringify(Boolean(plusModeEnabled))} };
const inputAutoSkipFailures = { checked: false };
const inputContributionNickname = { value: 'tester' };
const inputContributionQq = { value: '123456' };
@@ -75,7 +86,7 @@ const console = {
events.push({ type: 'warn', args });
},
};
-function getRunCountValue() { return 3; }
+function getRunCountValue() { return ${Math.max(1, Number(runCount) || 1)}; }
function normalizeAutoRunThreadIntervalMinutes(value) { return Number(value) || 0; }
function shouldOfferAutoModeChoice() { return false; }
async function openAutoStartChoiceDialog() { throw new Error('should not be called'); }
@@ -85,6 +96,20 @@ function shouldWarnAutoRunFallbackRisk() { return false; }
function isAutoRunFallbackRiskPromptDismissed() { return false; }
async function openAutoRunFallbackRiskConfirmModal() { throw new Error('should not be called'); }
function setAutoRunFallbackRiskPromptDismissed() {}
+function shouldWarnPlusAutoRunRisk(totalRuns, plusModeEnabled) {
+ return ${JSON.stringify(Boolean(plusRiskEnabled))} && Boolean(plusModeEnabled) && Number(totalRuns) > 3;
+}
+function isAutoRunPlusRiskPromptDismissed() { return false; }
+async function openPlusAutoRunRiskConfirmModal(totalRuns) {
+ events.push({ type: 'plus-risk-modal', totalRuns });
+ return {
+ confirmed: ${JSON.stringify(Boolean(plusRiskConfirmed))},
+ dismissPrompt: ${JSON.stringify(Boolean(plusRiskDismissPrompt))},
+ };
+}
+function setAutoRunPlusRiskPromptDismissed(dismissed) {
+ events.push({ type: 'plus-risk-dismiss', dismissed });
+}
function normalizeAutoDelayMinutes(value) { return Number(value) || 30; }
async function refreshContributionContentHint() {
events.push({ type: 'refresh' });
@@ -155,3 +180,39 @@ test('startAutoRunFromCurrentSettings aborts when contribution update confirmati
['refresh', 'confirm-check']
);
});
+
+test('startAutoRunFromCurrentSettings shows Plus risk warning before starting more than 3 runs', async () => {
+ const api = createApi({
+ runCount: 4,
+ plusModeEnabled: true,
+ plusRiskEnabled: true,
+ });
+
+ const result = await api.startAutoRunFromCurrentSettings();
+ const events = api.getEvents();
+
+ assert.equal(result, true);
+ assert.deepEqual(
+ events.map((entry) => entry.type),
+ ['refresh', 'confirm-check', 'plus-risk-modal', 'send']
+ );
+ assert.equal(events[2].totalRuns, 4);
+ assert.equal(events[3].message.payload.totalRuns, 4);
+});
+
+test('startAutoRunFromCurrentSettings aborts when Plus risk warning is declined', async () => {
+ const api = createApi({
+ runCount: 4,
+ plusModeEnabled: true,
+ plusRiskEnabled: true,
+ plusRiskConfirmed: false,
+ });
+
+ const result = await api.startAutoRunFromCurrentSettings();
+
+ assert.equal(result, false);
+ assert.deepEqual(
+ api.getEvents().map((entry) => entry.type),
+ ['refresh', 'confirm-check', 'plus-risk-modal']
+ );
+});
diff --git a/tests/sidepanel-auto-run-risk-warning.test.js b/tests/sidepanel-auto-run-risk-warning.test.js
index 5a7ba4a..aa059d3 100644
--- a/tests/sidepanel-auto-run-risk-warning.test.js
+++ b/tests/sidepanel-auto-run-risk-warning.test.js
@@ -65,6 +65,48 @@ return { shouldWarnAutoRunFallbackRisk };
assert.equal(api.shouldWarnAutoRunFallbackRisk(10, true), true);
});
+test('Plus auto-run risk warning only starts above 3 runs in Plus mode', () => {
+ const bundle = extractFunction('shouldWarnPlusAutoRunRisk');
+
+ const api = new Function(`
+const AUTO_RUN_PLUS_RISK_WARNING_MAX_SAFE_RUNS = 3;
+${bundle}
+return { shouldWarnPlusAutoRunRisk };
+`)();
+
+ assert.equal(api.shouldWarnPlusAutoRunRisk(3, true), false);
+ assert.equal(api.shouldWarnPlusAutoRunRisk(4, true), true);
+ assert.equal(api.shouldWarnPlusAutoRunRisk(10, false), false);
+});
+
+test('Plus auto-run risk modal uses PayPal account warning copy', async () => {
+ const bundle = extractFunction('openPlusAutoRunRiskConfirmModal');
+
+ const api = new Function(`
+let capturedOptions = null;
+async function openConfirmModalWithOption(options) {
+ capturedOptions = options;
+ return { confirmed: true, optionChecked: true };
+}
+${bundle}
+return {
+ openPlusAutoRunRiskConfirmModal,
+ getCapturedOptions() {
+ return capturedOptions;
+ },
+};
+`)();
+
+ const result = await api.openPlusAutoRunRiskConfirmModal(4);
+ const options = api.getCapturedOptions();
+
+ assert.deepStrictEqual(result, { confirmed: true, dismissPrompt: true });
+ assert.equal(options.title, 'Plus 自动轮数提醒');
+ assert.match(options.message, /轮数过多可能造成 PayPal 或账号快速封号/);
+ assert.match(options.message, /不要贪杯哦/);
+ assert.equal(options.confirmLabel, '我知道了，继续');
+});
+
test('auto-run fallback risk modal uses the single-node warning copy', async () => {
const bundle = extractFunction('openAutoRunFallbackRiskConfirmModal');
diff --git a/tests/sidepanel-custom-email-pool.test.js b/tests/sidepanel-custom-email-pool.test.js
index a8e7b6e..75e5c89 100644
--- a/tests/sidepanel-custom-email-pool.test.js
+++ b/tests/sidepanel-custom-email-pool.test.js
@@ -216,3 +216,43 @@ return {
assert.equal(modalPayload.actions[1].id, 'add_phone');
assert.equal(modalPayload.actions[1].label, '出现手机号验证');
});
+
+test('sidepanel custom verification dialog exposes add-phone action for Plus login code step', async () => {
+ const bundle = [
+ extractFunction('getCustomVerificationPromptCopy'),
+ extractFunction('openCustomVerificationConfirmDialog'),
+ ].join('\n');
+
+ const api = new Function(`
+let openActionModalPayload = null;
+
+async function openActionModal(options) {
+ openActionModalPayload = options;
+ return options.buildResult('add_phone');
+}
+
+async function openConfirmModal() {
+ throw new Error('Plus login code step should use action modal');
+}
+
+${bundle}
+
+return {
+ getCustomVerificationPromptCopy,
+ openCustomVerificationConfirmDialog,
+ getOpenActionModalPayload: () => openActionModalPayload,
+};
+`)();
+
+ const prompt = api.getCustomVerificationPromptCopy(11);
+ assert.equal(prompt.phoneActionLabel, '出现手机号验证');
+
+ const result = await api.openCustomVerificationConfirmDialog(11);
+ assert.deepEqual(result, {
+ confirmed: false,
+ addPhoneDetected: true,
+ });
+
+ const modalPayload = api.getOpenActionModalPayload();
+ assert.equal(modalPayload.actions[1].id, 'add_phone');
+});
diff --git a/tests/step-definitions-module.test.js b/tests/step-definitions-module.test.js
index 859bffb..ea6390b 100644
--- a/tests/step-definitions-module.test.js
+++ b/tests/step-definitions-module.test.js
@@ -2,15 +2,16 @@ const test = require('node:test');
const assert = require('node:assert/strict');
const fs = require('node:fs');
-test('step definitions module exposes ordered shared step metadata', () => {
+test('step definitions module exposes ordered normal and Plus step metadata', () => {
const source = fs.readFileSync('data/step-definitions.js', 'utf8');
const globalScope = {};
const api = new Function('self', `${source}; return self.MultiPageStepDefinitions;`)(globalScope);
const steps = api.getSteps();
+ const plusSteps = api.getSteps({ plusModeEnabled: true });
assert.equal(Array.isArray(steps), true);
- assert.equal(steps.length >= 10, true);
+ assert.equal(steps.length, 10);
assert.deepStrictEqual(
steps.map((step) => step.order),
steps.map((step) => step.order).slice().sort((left, right) => left - right)
@@ -30,6 +31,28 @@ test('step definitions module exposes ordered shared step metadata', () => {
'platform-verify',
]
);
+ assert.deepStrictEqual(
+ plusSteps.map((step) => step.key),
+ [
+ 'open-chatgpt',
+ 'submit-signup-email',
+ 'fill-password',
+ 'fetch-signup-code',
+ 'fill-profile',
+ 'plus-checkout-create',
+ 'plus-checkout-billing',
+ 'paypal-approve',
+ 'plus-checkout-return',
+ 'oauth-login',
+ 'fetch-login-code',
+ 'confirm-oauth',
+ 'platform-verify',
+ ]
+ );
+ assert.equal(plusSteps.some((step) => step.key === 'clear-login-cookies'), false);
+ assert.equal(plusSteps.some((step) => step.key === 'fetch-login-code'), true);
+ assert.deepStrictEqual(api.getStepIds({ plusModeEnabled: true }), [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
+ assert.equal(api.getLastStepId({ plusModeEnabled: true }), 13);
});
test('sidepanel html loads shared step definitions before sidepanel bootstrap', () => {
@@ -41,3 +64,10 @@ test('sidepanel html loads shared step definitions before sidepanel bootstrap',
assert.notEqual(sidepanelIndex, -1);
assert.ok(definitionsIndex < sidepanelIndex);
});
+
+test('sidepanel html exposes Plus mode and PayPal settings', () => {
+ const html = fs.readFileSync('sidepanel/sidepanel.html', 'utf8');
+ assert.match(html, /id="input-plus-mode-enabled"/);
+ assert.match(html, /id="input-paypal-email"/);
+ assert.match(html, /id="input-paypal-password"/);
+});
diff --git a/tests/step6-login-state.test.js b/tests/step6-login-state.test.js
index c274f60..f9f2f95 100644
--- a/tests/step6-login-state.test.js
+++ b/tests/step6-login-state.test.js
@@ -215,17 +215,20 @@ return {
consentReady: true,
});
+ const inspected = api.inspectLoginAuthState();
+ assert.strictEqual(inspected.state, 'oauth_consent_page');
+
const snapshot = api.normalizeStep6Snapshot({
state: 'oauth_consent_page',
url: 'https://auth.openai.com/authorize',
});
- assert.strictEqual(snapshot.state, 'unknown', '第六步应忽略 oauth_consent_page 状态');
+ assert.strictEqual(snapshot.state, 'oauth_consent_page', '第六步应保留 oauth_consent_page 状态');
}
assert.ok(
- !extractFunction('inspectLoginAuthState').includes("state: 'oauth_consent_page'"),
- 'inspectLoginAuthState 不应再产出 oauth_consent_page 状态'
+ extractFunction('inspectLoginAuthState').includes("state: 'oauth_consent_page'"),
+ 'inspectLoginAuthState 应产出 oauth_consent_page 状态'
);
console.log('step6 login state tests passed');
diff --git a/tests/step6-oauth-consent-skip.test.js b/tests/step6-oauth-consent-skip.test.js
new file mode 100644
index 0000000..d8ad6bb
--- /dev/null
+++ b/tests/step6-oauth-consent-skip.test.js
@@ -0,0 +1,134 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+
+const source = fs.readFileSync('content/signup-page.js', 'utf8');
+
+function extractFunction(name) {
+ const markers = [`async function ${name}(`, `function ${name}(`];
+ const start = markers
+ .map((marker) => source.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 index = start; index < source.length; index += 1) {
+ const char = source[index];
+ if (char === '(') {
+ parenDepth += 1;
+ } else if (char === ')') {
+ parenDepth -= 1;
+ if (parenDepth === 0) {
+ signatureEnded = true;
+ }
+ } else if (char === '{' && signatureEnded) {
+ braceStart = index;
+ break;
+ }
+ }
+ if (braceStart < 0) {
+ throw new Error(`missing body for function ${name}`);
+ }
+
+ let depth = 0;
+ let end = braceStart;
+ for (; end < source.length; end += 1) {
+ const char = source[end];
+ if (char === '{') depth += 1;
+ if (char === '}') {
+ depth -= 1;
+ if (depth === 0) {
+ end += 1;
+ break;
+ }
+ }
+ }
+
+ return source.slice(start, end);
+}
+
+test('password submit treats direct OAuth consent as a login-code skip', async () => {
+ const api = new Function(`
+const location = { href: 'https://auth.openai.com/authorize' };
+
+function inspectLoginAuthState() {
+ return {
+ state: 'oauth_consent_page',
+ url: location.href,
+ };
+}
+
+function throwIfStopped() {}
+async function sleep() {
+ throw new Error('should not wait once oauth consent is detected');
+}
+
+${extractFunction('createStep6SuccessResult')}
+${extractFunction('createStep6OAuthConsentSuccessResult')}
+${extractFunction('createStep6RecoverableResult')}
+${extractFunction('normalizeStep6Snapshot')}
+${extractFunction('getStep6OptionMessage')}
+${extractFunction('resolveStep6PostSubmitSnapshot')}
+${extractFunction('waitForStep6PostSubmitTransition')}
+${extractFunction('waitForStep6PasswordSubmitTransition')}
+
+return {
+ run() {
+ return waitForStep6PasswordSubmitTransition(123, 1000);
+ },
+};
+`)();
+
+ const transition = await api.run();
+
+ assert.equal(transition.action, 'done');
+ assert.equal(transition.result.state, 'oauth_consent_page');
+ assert.equal(transition.result.skipLoginVerificationStep, true);
+ assert.equal(transition.result.directOAuthConsentPage, true);
+ assert.equal(transition.result.loginVerificationRequestedAt, null);
+});
+
+test('step 7 entry succeeds when the auth page is already on OAuth consent', async () => {
+ const logs = [];
+ const api = new Function(`
+const location = { href: 'https://auth.openai.com/authorize' };
+const logs = arguments[0];
+
+function inspectLoginAuthState() {
+ return {
+ state: 'oauth_consent_page',
+ url: location.href,
+ };
+}
+
+function throwIfStopped() {}
+async function sleep() {}
+function log(message, level = 'info') {
+ logs.push({ message, level });
+}
+
+${extractFunction('createStep6SuccessResult')}
+${extractFunction('createStep6OAuthConsentSuccessResult')}
+${extractFunction('normalizeStep6Snapshot')}
+${extractFunction('waitForKnownLoginAuthState')}
+${extractFunction('step6_login')}
+
+return {
+ run() {
+ return step6_login({ email: 'user@example.com' });
+ },
+};
+`)(logs);
+
+ const result = await api.run();
+
+ assert.equal(result.step6Outcome, 'success');
+ assert.equal(result.state, 'oauth_consent_page');
+ assert.equal(result.skipLoginVerificationStep, true);
+ assert.equal(result.directOAuthConsentPage, true);
+ assert.equal(logs.some(({ level }) => level === 'ok'), true);
+});
diff --git a/tests/verification-flow-polling.test.js b/tests/verification-flow-polling.test.js
index df4f6d8..426b828 100644
--- a/tests/verification-flow-polling.test.js
+++ b/tests/verification-flow-polling.test.js
@@ -833,6 +833,69 @@ test('verification flow uses configured login resend count for step 8', async ()
assert.equal(pollCalls, 3);
});
+test('verification flow can complete Plus visible login-code step with shared step 8 semantics', async () => {
+ const completed = [];
+ const fillMessages = [];
+
+ const helpers = api.createVerificationFlowHelpers({
+ addLog: async () => {},
+ chrome: { tabs: { update: async () => {} } },
+ CLOUDFLARE_TEMP_EMAIL_PROVIDER: 'cloudflare-temp-email',
+ completeStepFromBackground: async (step, payload) => {
+ completed.push({ step, payload });
+ },
+ confirmCustomVerificationStepBypassRequest: async () => ({ confirmed: true }),
+ getHotmailVerificationPollConfig: () => ({}),
+ getHotmailVerificationRequestTimestamp: () => 0,
+ getState: async () => ({}),
+ getTabId: async () => 1,
+ HOTMAIL_PROVIDER: 'hotmail-api',
+ isStopError: () => false,
+ LUCKMAIL_PROVIDER: 'luckmail-api',
+ MAIL_2925_VERIFICATION_INTERVAL_MS: 15000,
+ MAIL_2925_VERIFICATION_MAX_ATTEMPTS: 15,
+ pollCloudflareTempEmailVerificationCode: async () => ({}),
+ pollHotmailVerificationCode: async () => ({}),
+ pollLuckmailVerificationCode: async () => ({}),
+ sendToContentScript: async (_source, message) => {
+ if (message.type === 'FILL_CODE') {
+ fillMessages.push(message);
+ }
+ return {};
+ },
+ sendToMailContentScriptResilient: async () => ({ code: '654321', emailTimestamp: 456 }),
+ setState: async () => {},
+ setStepStatus: async () => {},
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ VERIFICATION_POLL_MAX_ROUNDS: 5,
+ });
+
+ await helpers.resolveVerificationStep(
+ 8,
+ { email: 'user@example.com', lastLoginCode: null },
+ { provider: 'qq', label: 'QQ 邮箱' },
+ {
+ completionStep: 11,
+ requestFreshCodeFirst: false,
+ maxResendRequests: 0,
+ resendIntervalMs: 0,
+ }
+ );
+
+ assert.deepStrictEqual(fillMessages.map((message) => message.step), [8]);
+ assert.deepStrictEqual(completed, [
+ {
+ step: 11,
+ payload: {
+ emailTimestamp: 456,
+ code: '654321',
+ phoneVerificationRequired: false,
+ },
+ },
+ ]);
+});
+
test('verification flow waits during resend cooldown instead of tight-looping', async () => {
const sleepCalls = [];
let pollCalls = 0;
diff --git a/项目完整链路说明.md b/项目完整链路说明.md
index 39d7153..d0469ea 100644
--- a/项目完整链路说明.md
+++ b/项目完整链路说明.md
@@ -23,6 +23,7 @@
- 轮询登录验证码
- 自动确认 OAuth 同意页
- 把 localhost 回调提交到 CPA、SUB2API 或 Codex2API
+- 可选开启 Plus 模式：先完成 Plus Checkout、账单地址、PayPal 登录授权与订阅回跳确认，再复用 OAuth 后半段链路
## 2. 核心运行参与者
@@ -44,6 +45,7 @@
- 在日志区通过“记录”按钮打开独立的邮箱记录覆盖层，并展示成功/失败/停止/重试统计与分页列表
- 查询 GitHub Releases 并展示更新卡片；当前更新服务会区分 `Pro` 与 legacy `v` 两个版本族，排序时优先保持版本族语义一致，同时会在读取缓存后重新排序，避免旧缓存把 `v` 版本误显示为比 `Pro` 更新
- 展示一个单独的“接码”开关；开启后才展示 HeroSMS 的接码国家与 API Key 设置，用于 OAuth 登录链路命中手机号验证页时直接续跑手机验证
+- 展示 `Plus 模式` 开关与 PayPal 账号/密码配置；开启后步骤列表切换为 Plus 模式 12 步定义，普通模式的 Cookie 清理与登录验证码步骤不再显示或执行
- 为 Hotmail / 2925 账号池复用同一套“添加账号 / 取消添加 / 批量导入 / 收起列表”表单交互；共享的显隐控制放在 `sidepanel/account-pool-ui.js`，各自 manager 只保留 provider 相关字段校验与业务操作
### 2.2 Background Service Worker
@@ -116,6 +118,7 @@
- 步骤顺序靠 `order`
- 步骤文件名靠语义
- 新增步骤时不需要重命名后续文件
+- 普通模式使用 10 步定义；Plus 模式使用 12 步定义，其中 Plus 可见步骤 10/11/12 复用原 OAuth 登录、OAuth 同意页与平台回调验证执行器，但按 Plus 可见步骤编号记录状态
## 4. 状态与存储链路
@@ -138,6 +141,7 @@
- 第 8 步固定的验证码页显示邮箱 `step8VerificationTargetEmail`
- 当前手机号验证激活记录 `currentPhoneActivation`
- 可复用的手机号验证激活记录 `reusablePhoneActivation`
+- Plus checkout / PayPal 运行态：`plusCheckoutTabId`、`plusCheckoutUrl`、`plusCheckoutCountry`、`plusCheckoutCurrency`、`plusBillingCountryText`、`plusBillingAddress`、`plusPaypalApprovedAt`、`plusReturnUrl`
- localhost 回调地址
- 自动运行轮次信息
- 当前自动运行 session 标识 `autoRunSessionId`
@@ -156,6 +160,8 @@
- CPA / SUB2API 配置
- Codex2API 配置
+- Plus 模式开关 `plusModeEnabled`
+- PayPal 登录配置 `paypalEmail / paypalPassword`
- 邮箱 provider 配置
- Hotmail 账号池
- 2925 账号池
@@ -479,6 +485,34 @@ Codex2API 补充：
- 步骤 10 会先尝试提交已捕获的 callback URL，随后轮询公开贡献状态，直到进入最终态
- `auto_approved` 与 `manual_review_required` 视为主流程完成；`auto_rejected / expired / error` 视为当前轮失败
+## 6.1 Plus 模式链路
+
+Plus 模式通过 `plusModeEnabled` 开启，目标是在普通注册资料完成后，不执行原 Step 6 Cookie 清理，也不执行原 Step 8 登录验证码步骤，而是先完成 Plus Checkout 与 PayPal 授权，再复用现有 OAuth 后半段。
+
+Plus 模式可见步骤：
+
+1. 第 1~5 步：沿用普通注册入口、邮箱、密码、注册验证码、资料填写链路。
+2. 第 6 步 `创建 Plus Checkout`：打开已登录 ChatGPT 页面，通过 `/api/auth/session` 读取 accessToken，再请求 `https://chatgpt.com/backend-api/payments/checkout` 创建 `chatgptplusplan` 的 checkout session，并打开 `https://chatgpt.com/checkout/openai_ie/{checkout_session_id}`。
+3. 第 7 步 `填写账单并提交订阅`：选择 PayPal，生成账单全名，从 `data/address-sources.js` 读取同国家 seed query，触发 checkout 内置 Google 地址推荐，选择推荐项并校验地址第 1 行、城市、州/省、邮编等结构化字段，再点击“订阅”。运行时会按 Stripe iframe 拆分执行：付款方式在 `elements-inner-payment` frame，账单地址在 `elements-inner-address` frame，Google 推荐在 `elements-inner-autocompl` frame 时单独点击推荐项。
+4. 第 8 步 `PayPal 登录与授权`：在 PayPal 页面填写 `paypalEmail / paypalPassword`，登录前固定等待 1 秒，关闭可见通行密钥提示，点击“同意并继续”。
+5. 第 9 步 `订阅回跳确认`：等待 PayPal 授权后回跳到 ChatGPT / OpenAI 页面，页面加载完成后固定等待 1 秒。
+6. 第 10 步：复用原 Step 7 OAuth 登录执行器，但状态和日志按 Plus 可见第 10 步记录。
+7. 第 11 步：复用原 Step 9 OAuth 同意页点击和 localhost callback 捕获执行器，但状态和日志按 Plus 可见第 11 步记录。
+8. 第 12 步：复用原 Step 10 CPA / SUB2API / Codex2API 平台回调验证执行器，但状态和日志按 Plus 可见第 12 步记录。
+
+隐藏与跳过规则：
+
+- 原 Step 6 `清理登录 Cookies`：Plus 模式下隐藏且不执行，因为 Plus Checkout 创建依赖当前 ChatGPT 登录态。
+- 原 Step 8 `获取登录验证码`：Plus 模式下隐藏且默认跳过，Plus 后半段直接从可见第 10 步进入第 11 步。
+- 原 Step 9 不能跳过；它负责点击 OAuth 同意页并捕获 `localhostUrl`。
+- 原 Step 10 不能跳过；它依赖 `localhostUrl` 完成平台侧账号创建或回调验证。
+
+等待模型：
+
+- Plus Checkout 和 PayPal 专用步骤使用“无限等待但可停止”的后台等待 helper。
+- 每次页面加载完成后固定等待 1 秒，再继续下一次输入、点击或状态判断。
+- 第一版不实时抓取外部地址网站；地址自动化只依赖本地 seed query 和 checkout 页面内置 Google 地址推荐。
+
## 7. 邮箱与 provider 链路
### 7.1 2026-04-17 补充：Gmail / 2925 统一别名邮箱链路
@@ -716,9 +750,11 @@ Codex2API 补充：
- 如果当前 `Mail = 自定义邮箱` 且配置了 `customMailProviderPool`，会先按当前目标轮次把号池中的对应邮箱写回运行态
- 如果当前生成方式是 `custom-pool`，会先按当前目标轮次把邮箱池中的对应邮箱写回运行态
5. 执行 `runAutoSequenceFromStep`
+ - 自动运行会按当前 `plusModeEnabled` 选择普通 10 步或 Plus 12 步可见步骤；Plus 模式下第 6~9 步走 checkout / PayPal，第 10~12 步复用 OAuth 后半段
- 步骤 7 内部仍保留登录态恢复的有限重试，但 `add-phone / 手机号页` 属于立即跳出的不可重试错误
- 步骤 8 若在验证码提交后进入 `add-phone / 手机号页`，会直接抛出 fatal 错误，不再先标记步骤成功
- - 一旦进入步骤 7~10，遇到普通报错且认证流程未进入 `add-phone`，则自动回到步骤 7 无限重开
+ - 普通模式一旦进入步骤 7~10，遇到普通报错且认证流程未进入 `add-phone`，则自动回到步骤 7 无限重开
+ - Plus 模式在 checkout / PayPal 结束后，如果 OAuth 后半段遇到普通报错且认证流程未进入 `add-phone`，则自动回到 Plus 可见步骤 10 重新开始授权链路
- 如果命中 `add-phone / 手机号页` 这类 fatal 错误，则不会再做当前轮的内部重试；当开启自动重试/跳过失败时，会直接结束当前轮并继续下一轮，而不是把整条自动流程暂停
- 如果是手动停止，则立即退出自动流程，不会再触发“回到步骤 7 重开”
6. 如果失败，根据设置决定：
diff --git a/项目文件结构说明.md b/项目文件结构说明.md
index 45966c6..90c198b 100644
--- a/项目文件结构说明.md
+++ b/项目文件结构说明.md
@@ -43,7 +43,7 @@
## `background/`
- `background/account-run-history.js`：邮箱记录模块，负责以邮箱为主键维护最新记录（同邮箱后续状态覆盖），在步骤 2 设定邮箱后支持先写入“停止/未完成”占位状态，统一归一化成功/失败/停止三态并落地到 `chrome.storage.local`，支持清理记录，并按默认本地 helper 地址自动尝试把完整快照同步到本地 helper；若 helper 未启动，则静默跳过。
-- `background/auto-run-controller.js`：自动运行主控制器，封装多轮执行、重试、轮次摘要、线程间隔与倒计时恢复逻辑；当前自动流程会绑定 `autoRunSessionId`，手动停止后旧的倒计时计划、旧重试链路和旧恢复入口不会再复活已失效的自动运行；fresh-attempt reset 时会额外保留 `gmailBaseEmail`、`mail2925BaseEmail` 与当前 2925 账号选择，避免自动流程重置后丢失别名基邮箱与 2925 切号上下文。
+- `background/auto-run-controller.js`：自动运行主控制器，封装多轮执行、重试、轮次摘要、线程间隔与倒计时恢复逻辑；当前自动流程会绑定 `autoRunSessionId`，手动停止后旧的倒计时计划、旧重试链路和旧恢复入口不会再复活已失效的自动运行；fresh-attempt reset 时会额外保留 Plus 模式与 PayPal 配置、`gmailBaseEmail`、`mail2925BaseEmail` 与当前 2925 账号选择，避免自动流程重置后丢失关键持久配置。
- `background/contribution-oauth.js`：贡献模式的公开 OAuth 流程模块，负责调用 `apikey.qzz.io` 的公开贡献接口、保存贡献会话运行态、在主 10 步流程里为步骤 7 提供贡献登录地址、在步骤 9/10 衔接 callback 捕获与兼容提交 `/oauth/api/submit-callback`，并把真实服务端状态映射回 sidepanel 运行态。
- `background/generated-email-helpers.js`：生成邮箱辅助层，除了 Duck / Cloudflare / iCloud / Cloudflare Temp Email，也统一承接 Gmail / 2925 的别名邮箱生成入口与自定义邮箱池读取；当 provider 为 2925 且 `mail2925Mode = provide` 时，会先确保当前账号池里已有可用账号，再基于该账号生成别名邮箱；若 `mail2925Mode = receive`，则会回退到普通邮箱生成链路；当生成方式为 iCloud 且 `icloudFetchMode = always_new` 时，会强制跳过未用别名复用并新建别名；当生成方式为 `custom-pool` 时，会按当前目标轮次读取邮箱池中的对应邮箱。
- `background/logging-status.js`：后台日志、步骤状态、错误信息和若干状态判断的公共工具层；当前额外承接 `add-phone / 手机号页` 这类认证 fatal 错误的共享判定，并会把 Step 2 的“手机号输入模式未切成功”与真正的 auth `add-phone` 页面区分开，避免自动运行误停机。
@@ -60,13 +60,17 @@
- `background/steps/clear-login-cookies.js`：步骤 6 实现，负责登录前 Cookie 清理。
- `background/steps/confirm-oauth.js`：步骤 9 实现，负责 OAuth 同意页按钮定位、点击、localhost 回调监听与回调完成。
+- `background/steps/create-plus-checkout.js`：Plus 模式第 6 步实现，负责在已登录 ChatGPT 页面创建 Plus checkout session，打开 `chatgpt.com/checkout/openai_ie/{checkout_session_id}` 短链，并记录 checkout 运行态。
- `background/steps/fetch-login-code.js`：步骤 8 实现，负责登录验证码阶段的邮箱轮询、验证码回填与回退控制；验证码获取后直接提交，不再在提交前回放步骤 7 刷新 OAuth；对非 2925 provider 会固定当前验证码页显示邮箱作为本次 Step 8 的目标邮箱；当 provider 为 2925 时，会在轮询前先确保当前 2925 账号已自动登录。
- `background/steps/fetch-signup-code.js`：步骤 4 实现，负责注册验证码阶段的页面准备与验证码流程入口；当 provider 为 2925 时，会在轮询前先确保当前 2925 账号已自动登录。
+- `background/steps/fill-plus-checkout.js`：Plus 模式第 7 步实现，负责驱动 checkout 页面选择 PayPal、生成账单姓名、读取本地地址 seed、触发地址推荐、提交订阅并等待跳转到 PayPal。
- `background/steps/fill-password.js`：步骤 3 实现，负责密码生成、保存、回填与提交。
- `background/steps/fill-profile.js`：步骤 5 实现，负责姓名、生日填写并把资料提交给注册页内容脚本。
- `background/steps/oauth-login.js`：步骤 7 实现，负责刷新 OAuth 链接、登录和确保进入验证码页；普通可恢复登录态失败会按上限重试，但一旦识别到认证流程进入 `add-phone / 手机号页`，会立即退出步骤 7 内部重试。
- `background/steps/open-chatgpt.js`：步骤 1 实现，负责打开 ChatGPT 官网并确认入口就绪。
+- `background/steps/paypal-approve.js`：Plus 模式第 8 步实现，负责驱动 PayPal 登录、关闭可见通行密钥提示、点击“同意并继续”，并等待授权流程离开 PayPal 页面。
- `background/steps/platform-verify.js`：步骤 10 实现，负责 CPA / SUB2API 回调验证，以及 Codex2API 的协议式 callback code/state 交换。
+- `background/steps/plus-return-confirm.js`：Plus 模式第 9 步实现，负责等待 PayPal 授权后回跳到 ChatGPT / OpenAI 页面，页面加载完成后固定等待 1 秒再完成。
- `background/steps/registry.js`：步骤注册表工厂，负责用稳定的步骤元数据映射到执行器。
- `background/steps/submit-signup-email.js`：步骤 2 实现，负责注册入口点击、邮箱提交与提交后落地页分支判断。
@@ -80,7 +84,9 @@
- `content/inbucket-mail.js`：Inbucket 邮箱轮询脚本，负责在 Inbucket 页面中读取、删除验证码邮件。
- `content/mail-163.js`：163 / 163 VIP / 126 邮箱轮询脚本，负责网页邮箱验证码读取和邮件清理。
- `content/mail-2925.js`：2925 邮箱页面脚本，负责 2925 邮箱自动登录态确认、收件轮询、按步骤会话隔离“已试验证码”、在每次重发验证码之间执行一轮最多 15 次的邮箱刷新轮询、命中邮件后立即删当前邮件，以及在成功后配合后台执行整箱清理；若页面出现“子邮箱已达上限邮箱”提示，会立即上报后台进入切号链路；当后台显式开启 `mail2925MatchTargetEmail` 时，会对邮件里显式出现的目标邮箱做弱匹配，避免 `receive` 模式误捞别人的验证码。
+- `content/paypal-flow.js`：PayPal 页面脚本，负责识别登录表单、填写 PayPal 账号密码、处理页面内可见通行密钥提示，并点击 PayPal 授权页的“同意并继续”按钮。
- `content/phone-auth.js`：认证页手机号验证脚本，负责识别 `add-phone / phone-verification` 页面、选择国家、填写手机号、提交短信验证码、触发重发短信，以及把“回到 add-phone / 进入 OAuth 同意页”的结果反馈给后台。
+- `content/plus-checkout.js`：ChatGPT Plus checkout 页面脚本，负责读取 `/api/auth/session` 创建 Plus checkout、选择 PayPal、填写账单姓名、触发 Google 地址推荐、校验结构化地址字段并点击订阅。
- `content/qq-mail.js`：QQ 邮箱轮询脚本，负责网页邮箱验证码读取。
- `content/signup-page.js`：注册、登录、授权主内容脚本，负责 OpenAI / ChatGPT 页面上的步骤执行；其中 Step 2 / 3 的延迟点击与延迟提交在真正触发前会先检查 Stop 状态，避免停止后页面继续自动点击；当前 Step 2 会在注册弹窗默认处于手机号输入模式时自动切回邮箱输入模式，并兼容本地化邮箱占位与 `aria-label`；登录链路还会显式识别 `phone-verification` 页面，避免把手机验证码页误判成邮箱验证码页或普通未知页。
- `content/sub2api-panel.js`：SUB2API 后台内容脚本，负责获取 OAuth 地址和提交 localhost 回调；当前承接步骤 10。
@@ -90,7 +96,8 @@
## `data/`
- `data/names.js`：随机姓名、生日等测试数据源。
-- `data/step-definitions.js`：共享步骤元数据，前后台共同使用，用于动态渲染和步骤注册。
+- `data/address-sources.js`：Plus 模式本地地址 seed 表，负责按国家选择用于触发 checkout 内置 Google 地址推荐的查询词和结构化地址 fallback；第一版不实时抓取外部地址网站。
+- `data/step-definitions.js`：共享步骤元数据，前后台共同使用，用于动态渲染和步骤注册；当前同时提供普通 10 步定义与 Plus 模式 12 步定义。
## `docs/`
@@ -125,13 +132,14 @@
- `sidepanel/contribution-content-update-service.js`：侧边栏贡献内容更新服务，负责拉取 `https://apikey.qzz.io/api/content-summary`、缓存公开公告/教程摘要，并输出可用于提示展示的 `promptVersion` 与最新更新时间。
- `sidepanel/contribution-mode.js`：侧边栏贡献模式管理器，负责顶部“贡献”按钮、确认弹窗、贡献模式显隐、复用主自动流程启动、侧栏内贡献状态轮询、上传页跳转，以及贡献模式下对来源选择、配置入口、记录入口和敏感配置行（包括 Codex2API 配置）的禁用与隐藏。
- `sidepanel/sidepanel.css`：侧边栏样式文件；当前额外提供 Hotmail / 2925 共用的号池表单容器、操作按钮行与统一的收起态列表高度样式。
-- `sidepanel/sidepanel.html`：侧边栏页面结构；当前步骤列表已改为动态容器，日志区提供“记录”按钮并挂接邮箱记录覆盖层，顶部新增“贡献”按钮并在设置卡片中新增贡献模式主面板；贡献按钮下方额外挂接一个可关闭的轻提示气泡，用于提示公开公告 / 使用教程有更新；贡献面板内展示 `OAUTH / 回调 / 总状态` 三块真实运行态信息，同时把“接码”开关与“验证码重发”拆成同一行展示；只有开启接码后，下面的 HeroSMS 平台、国家与 API Key 行才会显示；页面继续加载 `managed-alias-utils.js`，并把旧的“邮箱前缀”字段语义改为“别名基邮箱”；当 provider 为 2925 时，会额外显示 `提供邮箱 / 接收邮箱` 模式切换，并把“2925 号池”从别名基邮箱行拆成独立配置行，避免 receive 模式把账号池开关一起隐藏；当前在 `邮箱生成` 区域新增 `自定义邮箱池` 选项和多行邮箱池输入框，并在 `邮箱服务 = 自定义邮箱` 时额外显示 `自定义号池` 文本框；来源下拉框当前支持 `CPA / SUB2API / Codex2API`，其中 Codex2API 额外提供后台地址和管理密钥配置行；Hotmail / 2925 两个账号池当前都使用统一的头部“添加账号/取消添加”按钮和共享表单容器。
-- `sidepanel/sidepanel.js`：侧边栏主入口脚本，负责 UI 状态同步、动态步骤渲染、按钮交互、共享验证码自动重发次数配置与广播接收，并装配 Hotmail / 2925 / iCloud / LuckMail / 贡献模式 / 邮箱记录面板 / 贡献内容更新服务；当前贡献模式的“开始贡献”会直接复用主自动流程启动逻辑，而独立 manager 负责贡献运行态展示与轮询，同时把 Gmail / 2925 的基邮箱输入、完整注册邮箱输入、自动生成按钮与兼容性校验统一接到共享别名逻辑上；当 provider 为 2925 时，会根据 `mail2925Mode` 决定是否启用别名基邮箱链路，而 2925 号池开关与当前账号选择则独立显示并同时服务于 provide / receive 两种模式；`自定义邮箱池` 模式会按邮箱池长度锁定自动轮数，并把当前输入的邮箱池配置参与自动启动前保存；`邮箱服务 = 自定义邮箱` 时，如果配置了 `customMailProviderPool`，也会按号池长度锁定自动轮数并在 Auto 中按轮次分配注册邮箱，同时在普通失败时继续复用当前邮箱，只有成功或出现手机号验证时才切换下一个邮箱；Step 8 的自定义邮箱确认弹窗当前额外提供“出现手机号验证”按钮，用于直接走与真实 add-phone 一致的 fatal 分支；HeroSMS 国家列表会在 sidepanel 初始化时拉取并恢复到本地保存的国家/API 设置，接码开关关闭时会直接隐藏相关配置；账号记录快照同步改为默认自动模式，只要本地 helper 可用就会自动落盘；新来源 Codex2API 在这里仅补充来源配置接线、表单显隐和 Step 10 按钮文案，不承接协议业务逻辑；Hotmail / 2925 的新增表单显隐统一接到 `sidepanel/account-pool-ui.js` 这一层共享 helper；侧边栏初始化与点击“自动”前会刷新一次贡献站公开内容摘要，并按本地关闭版本决定是否展示轻提示，同时在首次初始化后按现有规则决定是否弹出新手引导提示。
+- `sidepanel/sidepanel.html`：侧边栏页面结构；当前步骤列表已改为动态容器，日志区提供“记录”按钮并挂接邮箱记录覆盖层，顶部新增“贡献”按钮并在设置卡片中新增贡献模式主面板；贡献按钮下方额外挂接一个可关闭的轻提示气泡，用于提示公开公告 / 使用教程有更新；贡献面板内展示 `OAUTH / 回调 / 总状态` 三块真实运行态信息，同时把“接码”开关与“验证码重发”拆成同一行展示；只有开启接码后，下面的 HeroSMS 平台、国家与 API Key 行才会显示；页面继续加载 `managed-alias-utils.js`，并把旧的“邮箱前缀”字段语义改为“别名基邮箱”；当 provider 为 2925 时，会额外显示 `提供邮箱 / 接收邮箱` 模式切换，并把“2925 号池”从别名基邮箱行拆成独立配置行，避免 receive 模式把账号池开关一起隐藏；当前在 `邮箱生成` 区域新增 `自定义邮箱池` 选项和多行邮箱池输入框，并在 `邮箱服务 = 自定义邮箱` 时额外显示 `自定义号池` 文本框；来源下拉框当前支持 `CPA / SUB2API / Codex2API`，其中 Codex2API 额外提供后台地址和管理密钥配置行；设置卡片新增 `Plus 模式` 开关与 PayPal 账号/密码输入行；Hotmail / 2925 两个账号池当前都使用统一的头部“添加账号/取消添加”按钮和共享表单容器。
+- `sidepanel/sidepanel.js`：侧边栏主入口脚本，负责 UI 状态同步、动态步骤渲染、按钮交互、共享验证码自动重发次数配置与广播接收，并装配 Hotmail / 2925 / iCloud / LuckMail / 贡献模式 / 邮箱记录面板 / 贡献内容更新服务；当前贡献模式的“开始贡献”会直接复用主自动流程启动逻辑，而独立 manager 负责贡献运行态展示与轮询，同时把 Gmail / 2925 的基邮箱输入、完整注册邮箱输入、自动生成按钮与兼容性校验统一接到共享别名逻辑上；当 provider 为 2925 时，会根据 `mail2925Mode` 决定是否启用别名基邮箱链路，而 2925 号池开关与当前账号选择则独立显示并同时服务于 provide / receive 两种模式；`自定义邮箱池` 模式会按邮箱池长度锁定自动轮数，并把当前输入的邮箱池配置参与自动启动前保存；`邮箱服务 = 自定义邮箱` 时，如果配置了 `customMailProviderPool`，也会按号池长度锁定自动轮数并在 Auto 中按轮次分配注册邮箱，同时在普通失败时继续复用当前邮箱，只有成功或出现手机号验证时才切换下一个邮箱；Plus 模式开启后，步骤列表会切换为 12 步，并显示 PayPal 凭据配置；Step 8 的自定义邮箱确认弹窗当前额外提供“出现手机号验证”按钮，用于直接走与真实 add-phone 一致的 fatal 分支；HeroSMS 国家列表会在 sidepanel 初始化时拉取并恢复到本地保存的国家/API 设置，接码开关关闭时会直接隐藏相关配置；账号记录快照同步改为默认自动模式，只要本地 helper 可用就会自动落盘；新来源 Codex2API 在这里仅补充来源配置接线、表单显隐和 Step 10 按钮文案，不承接协议业务逻辑；Hotmail / 2925 的新增表单显隐统一接到 `sidepanel/account-pool-ui.js` 这一层共享 helper；侧边栏初始化与点击“自动”前会刷新一次贡献站公开内容摘要，并按本地关闭版本决定是否展示轻提示，同时在首次初始化后按现有规则决定是否弹出新手引导提示。
- `sidepanel/update-service.js`：侧边栏更新检查服务，负责 GitHub Releases 查询、`Pro` / `v` 双版本族排序、缓存读取与版本展示。
## `tests/`
- `tests/activation-utils.test.js`：测试内容脚本激活策略与平台回调可恢复错误判断。
+- `tests/address-sources.test.js`：测试 Plus 模式本地地址 seed 表的国家归一化、fallback 国家选择与基础地址字段。
- `tests/auth-page-recovery.test.js`：测试认证页共享恢复层的重试页识别与恢复行为。
- `tests/auto-run-fresh-attempt-reset.test.js`：测试自动运行在新一轮开始前会重置旧运行时上下文，并补充 `gmailBaseEmail` / `mail2925BaseEmail` 在 fresh reset 后仍被保留的回归验证。
- `tests/auto-run-step4-mail2925-thread-terminate.test.js`：测试步骤 4 命中 2925“结束当前尝试”错误时，不会再沿用当前邮箱回到步骤 1 重开，而是直接把错误抛给自动重试控制器。
@@ -167,6 +175,7 @@
- `tests/background-tab-runtime-module.test.js`：测试标签运行时模块已接入且导出工厂，并覆盖等待标签完成、等待标签稳定完成，以及等待过程中的 Stop 中断行为。
- `tests/background-verification-flow-module.test.js`：测试验证码流程模块已接入且导出工厂。
- `tests/phone-verification-flow.test.js`：测试手机号验证共享流程对 HeroSMS 的取号、复用、重发、换号与 Step 7 重开错误分支。
+- `tests/plus-checkout-billing-tab-resolution.test.js`：测试 Plus 第 7 步可直接接管当前 checkout 标签页，并把 PayPal、账单地址、Google 地址推荐和订阅按钮操作路由到对应 Stripe iframe。
- `tests/cloudflare-temp-email-provider.test.js`：测试 Cloudflare Temp Email provider 的轮询与目标邮箱选择逻辑。
- `tests/cloudflare-temp-email-utils.test.js`：测试 Cloudflare Temp Email 工具层的 URL、域名、邮件解析逻辑。
- `tests/content-utils.test.js`：测试内容脚本公共工具层对 `mail.126.com` 等网页邮箱来源的识别逻辑。