@@ -1891,6 +1956,9 @@
+
+
+
diff --git a/sidepanel/sidepanel.js b/sidepanel/sidepanel.js
index 837d9767..bf6eb515 100644
--- a/sidepanel/sidepanel.js
+++ b/sidepanel/sidepanel.js
@@ -51,6 +51,31 @@ const btnOpenContributionUpload = document.getElementById('btn-open-contribution
const btnExitContributionMode = document.getElementById('btn-exit-contribution-mode');
const displayOauthUrl = document.getElementById('display-oauth-url');
const displayLocalhostUrl = document.getElementById('display-localhost-url');
+const inputReauthAccountFile = document.getElementById('input-reauth-account-file');
+const reauthJsonStatus = document.getElementById('reauth-json-status');
+const rowReauthAccountPicker = document.getElementById('row-reauth-account-picker');
+const selectReauthAccount = document.getElementById('select-reauth-account');
+const selectReauthMailProvider = document.getElementById('select-reauth-mail-provider');
+const displayReauthResultAccount = document.getElementById('display-reauth-result-account');
+const btnReauthCopyResult = document.getElementById('btn-reauth-copy-result');
+const reauthCopyStatus = document.getElementById('reauth-copy-status');
+const rowReauthBatchToggle = document.getElementById('row-reauth-batch-toggle');
+const inputReauthBatchMode = document.getElementById('input-reauth-batch-mode');
+const rowReauthBatchActions = document.getElementById('row-reauth-batch-actions');
+const btnReauthStartBatch = document.getElementById('btn-reauth-start-batch');
+const btnReauthStopBatch = document.getElementById('btn-reauth-stop-batch');
+const rowReauthBatchProgress = document.getElementById('row-reauth-batch-progress');
+const displayReauthBatchProgress = document.getElementById('display-reauth-batch-progress');
+const displayReauthBatchSummary = document.getElementById('display-reauth-batch-summary');
+const btnReauthDownloadResult = document.getElementById('btn-reauth-download-result');
+const rowReauthModePicker = document.getElementById('row-reauth-mode-picker');
+const rowReauthProviderPicker = document.getElementById('row-reauth-provider-picker');
+const reauthProgressFill = document.getElementById('reauth-progress-fill');
+const reauthProgressCounter = document.getElementById('reauth-progress-counter');
+const reauthProgressCurrent = document.getElementById('reauth-progress-current');
+const reauthProgressStatusBadge = document.getElementById('reauth-progress-status-badge');
+const reauthResultSummary = document.getElementById('reauth-result-summary');
+const btnReauthToggleDetails = document.getElementById('btn-reauth-toggle-details');
const displayStatus = document.getElementById('display-status');
const statusBar = document.getElementById('status-bar');
const inputEmail = document.getElementById('input-email');
@@ -11629,6 +11654,9 @@ async function restoreState() {
displayLocalhostUrl.textContent = state.localhostUrl;
displayLocalhostUrl.classList.add('has-value');
}
+ renderReauthResultAccount(state.reauthResultAccount);
+ applyReauthBatchProgress(state.reauthBatchProgress || null);
+ applyReauthBatchResult(state.reauthBatchResult || null);
if (state.nodeStatuses) {
for (const [nodeId, status] of Object.entries(state.nodeStatuses)) {
updateNodeUI(nodeId, status);
@@ -13539,6 +13567,35 @@ function updatePanelModeUI() {
? 'SUB2API 回调验证'
: (useCodex2Api ? 'Codex2API 回调验证' : 'CPA 回调验证');
}
+
+ applyOpenAiReauthRowVisibility(activeFlowId);
+}
+
+const REAUTH_HIDDEN_ROW_IDS = [
+ 'row-source-selector',
+ 'row-custom-password',
+ 'row-mail-provider',
+ 'row-email-generator',
+ 'row-auto-run-controls',
+];
+
+function applyOpenAiReauthRowVisibility(activeFlowId) {
+ const isReauthFlow = String(activeFlowId || '').trim().toLowerCase() === 'openai-reauth';
+ REAUTH_HIDDEN_ROW_IDS.forEach((rowId) => {
+ const element = document.getElementById(rowId);
+ if (!element) return;
+ if (isReauthFlow) {
+ element.dataset.reauthHidden = '1';
+ element.style.display = 'none';
+ } else if (element.dataset.reauthHidden === '1') {
+ element.style.display = '';
+ delete element.dataset.reauthHidden;
+ }
+ });
+ if (isReauthFlow && typeof syncReauthMailProviderToGlobal === 'function') {
+ // 仅同步显示，不写 storage —— 否则与 background SAVE_SETTING → STATE_CHANGED 广播形成死循环
+ syncReauthMailProviderToGlobal({ persist: false });
+ }
}
// ============================================================
@@ -14817,7 +14874,13 @@ stepsList?.addEventListener('click', async (event) => {
}
}
} else {
- const response = await sendSidepanelMessage({ type: 'EXECUTE_NODE', source: 'sidepanel', payload: { nodeId } });
+ const reauthPayload = { nodeId };
+ if (nodeId === 'prepare-reauth') {
+ const account = ensurePendingReauthAccount();
+ if (!account) return;
+ reauthPayload.reauthInputAccount = account;
+ }
+ const response = await sendSidepanelMessage({ type: 'EXECUTE_NODE', source: 'sidepanel', payload: reauthPayload });
if (response?.error) {
throw new Error(response.error);
}
@@ -15124,20 +15187,32 @@ async function startAutoRunFromCurrentSettings() {
? getSelectedTargetId(activeFlowId)
: normalizeTargetIdForFlow(activeFlowId, latestState?.targetId || '', getDefaultTargetIdForFlow(activeFlowId));
btnAutoRun.innerHTML = '
运行中...';
+ const autoRunPayload = {
+ totalRuns,
+ activeFlowId,
+ targetId,
+ autoRunSkipFailures,
+ accountContributionEnabled: Boolean(latestState?.accountContributionEnabled),
+ contributionAdapterId: latestState?.contributionAdapterId || '',
+ contributionNickname,
+ contributionQq,
+ mode,
+ };
+ if (activeFlowId === 'openai-reauth') {
+ const reauthAccount = ensurePendingReauthAccount();
+ if (!reauthAccount) {
+ btnAutoRun.disabled = false;
+ inputRunCount.disabled = false;
+ btnAutoRun.innerHTML = '
自动';
+ clearPendingAutoRunStartRunCount();
+ return false;
+ }
+ autoRunPayload.reauthInputAccount = reauthAccount;
+ }
const response = await sendSidepanelMessage({
type: 'AUTO_RUN',
source: 'sidepanel',
- payload: {
- totalRuns,
- activeFlowId,
- targetId,
- autoRunSkipFailures,
- accountContributionEnabled: Boolean(latestState?.accountContributionEnabled),
- contributionAdapterId: latestState?.contributionAdapterId || '',
- contributionNickname,
- contributionQq,
- mode,
- },
+ payload: autoRunPayload,
});
if (response?.error) {
clearPendingAutoRunStartRunCount();
@@ -17320,6 +17395,22 @@ btnPhoneSmsProviderOrderReset?.addEventListener('click', () => {
chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
switch (message.type) {
+ case 'STATE_PATCH': {
+ // background setState 写完 chrome.storage.session 后会广播此消息，
+ // payload 为 sessionUpdates（实际生效的增量）。这里按需把关心字段
+ // dispatch 到对应渲染函数；其它字段交给原有 NODE_STATUS_CHANGED / GET_STATE
+ // 通道（不在此处覆盖既有渲染逻辑）。
+ const patch = message?.payload;
+ if (!patch || typeof patch !== 'object') break;
+ if (Object.prototype.hasOwnProperty.call(patch, 'reauthBatchProgress')) {
+ try { applyReauthBatchProgress(patch.reauthBatchProgress || null); } catch (_) { }
+ }
+ if (Object.prototype.hasOwnProperty.call(patch, 'reauthBatchResult')) {
+ try { applyReauthBatchResult(patch.reauthBatchResult || null); } catch (_) { }
+ }
+ break;
+ }
+
case 'REQUEST_CUSTOM_VERIFICATION_BYPASS_CONFIRMATION': {
(async () => {
const step = Number(message.payload?.step);
@@ -17378,6 +17469,9 @@ chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
displayLocalhostUrl.textContent = state.localhostUrl;
displayLocalhostUrl.classList.add('has-value');
}
+ renderReauthResultAccount(state.reauthResultAccount);
+ applyReauthBatchProgress(state.reauthBatchProgress || null);
+ applyReauthBatchResult(state.reauthBatchResult || null);
}
}
).catch(() => { });
@@ -18343,3 +18437,552 @@ Promise.allSettled([
console.error('Failed to initialize sidepanel state:', err);
});
});
+
+let pendingReauthAccounts = null;
+let lastReauthFileText = '';
+
+function setReauthJsonStatus(text, level = '') {
+ if (!reauthJsonStatus) return;
+ reauthJsonStatus.textContent = text || '';
+ reauthJsonStatus.classList.remove('ok', 'error', 'warn');
+ if (['ok', 'error', 'warn'].includes(level)) reauthJsonStatus.classList.add(level);
+}
+
+function setReauthCopyStatus(text, level = '') {
+ if (!reauthCopyStatus) return;
+ reauthCopyStatus.textContent = text || '';
+ reauthCopyStatus.classList.remove('ok', 'error', 'warn');
+ if (['ok', 'error', 'warn'].includes(level)) reauthCopyStatus.classList.add(level);
+}
+
+function getReauthValidatorApi() {
+ return (typeof self !== 'undefined' ? self : window).MultiPageOpenAiReauthAccountValidator || null;
+}
+
+function populateReauthMailProviderOptions() {
+ if (!selectReauthMailProvider) return;
+ const validator = getReauthValidatorApi();
+ const options = Array.isArray(validator?.MAIL_PROVIDER_OPTIONS) ? validator.MAIL_PROVIDER_OPTIONS : [];
+ if (!options.length) return;
+ const previousValue = selectReauthMailProvider.value;
+ selectReauthMailProvider.innerHTML = '';
+ for (const entry of options) {
+ const option = document.createElement('option');
+ option.value = String(entry?.value || '');
+ option.textContent = String(entry?.label || entry?.value || '');
+ selectReauthMailProvider.appendChild(option);
+ }
+ if (previousValue && options.some((entry) => entry?.value === previousValue)) {
+ selectReauthMailProvider.value = previousValue;
+ }
+}
+populateReauthMailProviderOptions();
+
+function renderReauthAccountPicker(accounts) {
+ if (!selectReauthAccount || !rowReauthAccountPicker) return;
+ selectReauthAccount.innerHTML = '';
+ accounts.forEach((entry) => {
+ const option = document.createElement('option');
+ option.value = String(entry.index);
+ option.textContent = `${entry.index + 1}. ${entry.email}`;
+ selectReauthAccount.appendChild(option);
+ });
+ selectReauthAccount.value = '0';
+ rowReauthAccountPicker.style.display = accounts.length > 1 ? '' : 'none';
+}
+
+function clearReauthAccountPicker() {
+ if (selectReauthAccount) selectReauthAccount.innerHTML = '';
+ if (rowReauthAccountPicker) rowReauthAccountPicker.style.display = 'none';
+}
+
+function parsePendingReauthAccounts(rawText, fileLabel = '') {
+ const validator = getReauthValidatorApi();
+ if (!validator || typeof validator.parseAccountsFromJson !== 'function') {
+ setReauthJsonStatus('校验器未加载，请检查扩展安装。', 'error');
+ pendingReauthAccounts = null;
+ clearReauthAccountPicker();
+ applyReauthBatchUiVisibility();
+ return null;
+ }
+ const result = validator.parseAccountsFromJson(rawText || '');
+ if (!result.ok) {
+ setReauthJsonStatus(result.error, 'error');
+ if (typeof showToast === 'function') {
+ showToast(`账号 JSON 校验失败：${result.error}`, 'error');
+ }
+ pendingReauthAccounts = null;
+ clearReauthAccountPicker();
+ applyReauthBatchUiVisibility();
+ return null;
+ }
+ pendingReauthAccounts = result.accounts;
+ renderReauthAccountPicker(result.accounts);
+ const prefix = fileLabel ? `从「${fileLabel}」` : '';
+ setReauthJsonStatus(
+ result.accounts.length === 1
+ ? `${prefix}已识别 1 个账号：${result.accounts[0].email}`
+ : `${prefix}已识别 ${result.accounts.length} 个账号，可选单个账号或开启「批量模式」一次性处理全部`,
+ 'ok'
+ );
+ applyReauthBatchUiVisibility();
+ return result.accounts;
+}
+
+// ============================================================
+// Reauth 批量模式 UI 控制
+// ============================================================
+
+let lastReauthBatchProgress = null;
+let lastReauthBatchResult = null;
+let reauthBatchRunningLocal = false;
+
+function isReauthBatchModeEnabled() {
+ return Boolean(inputReauthBatchMode?.checked);
+}
+
+function hasMultipleReauthAccounts() {
+ return Array.isArray(pendingReauthAccounts) && pendingReauthAccounts.length > 1;
+}
+
+function applyReauthBatchUiVisibility() {
+ const accountsCount = Array.isArray(pendingReauthAccounts) ? pendingReauthAccounts.length : 0;
+ const hasAccounts = accountsCount > 0;
+ const showBatchToggle = accountsCount > 1;
+
+ if (rowReauthBatchToggle) {
+ rowReauthBatchToggle.style.display = showBatchToggle ? '' : 'none';
+ }
+ if (!showBatchToggle && inputReauthBatchMode) {
+ inputReauthBatchMode.checked = false;
+ }
+
+ const batchMode = showBatchToggle && isReauthBatchModeEnabled();
+
+ // 模式行：账号数 ≥ 2 时显示（用于切换 toggle 和单账号下拉）
+ if (rowReauthModePicker) {
+ rowReauthModePicker.style.display = showBatchToggle ? '' : 'none';
+ }
+ // 单账号下拉：账号数 ≥ 2 且非批量模式时显示
+ if (rowReauthAccountPicker) {
+ rowReauthAccountPicker.style.display = (showBatchToggle && !batchMode) ? '' : 'none';
+ }
+ // 邮箱来源：有账号时显示
+ if (rowReauthProviderPicker) {
+ rowReauthProviderPicker.style.display = hasAccounts ? '' : 'none';
+ }
+ // 批量操作行：批量模式时显示
+ if (rowReauthBatchActions) {
+ rowReauthBatchActions.style.display = batchMode ? '' : 'none';
+ }
+ // 进度行：批量模式时显示
+ if (rowReauthBatchProgress) {
+ rowReauthBatchProgress.style.display = batchMode ? '' : 'none';
+ }
+ // 下载文件按钮：只要有批量结果就显示（不依赖 batchMode toggle），保证 sidepanel 重开后仍可下载
+ if (btnReauthDownloadResult) {
+ const hasBatchJson = Boolean(lastReauthBatchResult?.updatedFileJson);
+ btnReauthDownloadResult.style.display = (batchMode || hasBatchJson) ? '' : 'none';
+ }
+ // 启动按钮：批量模式且未运行时可点
+ if (btnReauthStartBatch) {
+ btnReauthStartBatch.disabled = !batchMode || reauthBatchRunningLocal;
+ }
+ // 停止按钮：批量模式且运行中时显示
+ if (btnReauthStopBatch) {
+ btnReauthStopBatch.style.display = (batchMode && reauthBatchRunningLocal) ? '' : 'none';
+ }
+ // 折叠详情按钮：有批量结果 JSON 时显示（同样不依赖 toggle）
+ if (btnReauthToggleDetails) {
+ const hasJson = Boolean(lastReauthBatchResult?.updatedFileJson);
+ btnReauthToggleDetails.style.display = hasJson ? '' : 'none';
+ }
+}
+
+function getProgressStatusLabel(status) {
+ return ({
+ pending: '准备中',
+ running: '处理中',
+ success: '成功',
+ failed: '失败',
+ completed: '已完成',
+ stopped: '已停止',
+ aborted: '已中断',
+ })[status] || '';
+}
+
+function formatBatchProgressText(progress) {
+ if (!progress || typeof progress !== 'object') return '尚未开始';
+ const { current = 0, total = 0, currentEmail = '', currentStatus = '' } = progress;
+ if (currentStatus === 'completed') return `批量已完成（共 ${total} 个账号）`;
+ if (currentStatus === 'stopped') return `已被用户停止（${current}/${total}）`;
+ if (currentStatus === 'aborted') return `批量中断（${current}/${total}）`;
+ if (currentStatus === 'pending') return total > 0 ? `准备中，共 ${total} 个账号` : '尚未开始';
+ return `当前：${currentEmail || `账号 #${current}`}`;
+}
+
+function applyReauthBatchProgress(progress) {
+ lastReauthBatchProgress = progress || null;
+ const running = Boolean(progress) && ['pending', 'running'].includes(String(progress?.currentStatus || ''));
+ reauthBatchRunningLocal = running;
+
+ const total = Math.max(0, Number(progress?.total) || 0);
+ const current = Math.max(0, Math.min(total, Number(progress?.current) || 0));
+ const status = String(progress?.currentStatus || '');
+ const percent = total > 0 ? Math.round((current / total) * 100) : 0;
+
+ if (reauthProgressFill) {
+ reauthProgressFill.style.width = `${percent}%`;
+ reauthProgressFill.classList.remove('is-success', 'is-stopped', 'is-aborted');
+ if (status === 'completed') reauthProgressFill.classList.add('is-success');
+ if (status === 'stopped') reauthProgressFill.classList.add('is-stopped');
+ if (status === 'aborted') reauthProgressFill.classList.add('is-aborted');
+ }
+ if (reauthProgressCounter) {
+ reauthProgressCounter.textContent = total > 0 ? `${current} / ${total}` : '0 / 0';
+ }
+ if (reauthProgressCurrent) {
+ reauthProgressCurrent.textContent = progress?.currentEmail || '';
+ }
+ if (reauthProgressStatusBadge) {
+ const label = getProgressStatusLabel(status);
+ reauthProgressStatusBadge.textContent = label;
+ reauthProgressStatusBadge.className = `reauth-status-badge ${status || ''}`.trim();
+ }
+ if (displayReauthBatchProgress) {
+ displayReauthBatchProgress.textContent = formatBatchProgressText(progress);
+ }
+ applyReauthBatchUiVisibility();
+}
+
+function applyReauthBatchResult(result) {
+ lastReauthBatchResult = result || null;
+ reauthBatchRunningLocal = false;
+
+ if (displayReauthBatchSummary && reauthResultSummary) {
+ reauthResultSummary.classList.remove('all-success', 'has-failure', 'aborted');
+ if (!result || typeof result !== 'object') {
+ displayReauthBatchSummary.textContent = '等待重新授权完成...';
+ } else {
+ const { successCount = 0, failedCount = 0, total = 0, aborted = false } = result;
+ const failedEmails = Array.isArray(result.failed)
+ ? result.failed.map((f) => f?.email).filter(Boolean)
+ : [];
+ const parts = [`成功 ${successCount} / 总计 ${total}`];
+ if (failedCount > 0) {
+ const preview = failedEmails.slice(0, 3).join(', ');
+ const more = failedEmails.length > 3 ? ` … +${failedEmails.length - 3}` : '';
+ parts.push(`失败 ${failedCount}（${preview}${more}）`);
+ }
+ if (aborted) {
+ parts.push('已中断');
+ reauthResultSummary.classList.add('aborted');
+ } else if (failedCount > 0) {
+ reauthResultSummary.classList.add('has-failure');
+ } else if (successCount === total && total > 0) {
+ reauthResultSummary.classList.add('all-success');
+ }
+ displayReauthBatchSummary.textContent = parts.join(' · ');
+ }
+ }
+
+ if (displayReauthResultAccount && result?.updatedFileJson) {
+ displayReauthResultAccount.textContent = result.updatedFileJson;
+ displayReauthResultAccount.classList.add('has-value');
+ }
+ if (btnReauthCopyResult) {
+ btnReauthCopyResult.disabled = !result?.updatedFileJson;
+ }
+ if (btnReauthDownloadResult) {
+ btnReauthDownloadResult.disabled = !result?.updatedFileJson;
+ }
+ // 重置折叠状态：每次新结果默认折叠
+ if (displayReauthResultAccount && result?.updatedFileJson) {
+ displayReauthResultAccount.style.display = 'none';
+ }
+ if (btnReauthToggleDetails) {
+ btnReauthToggleDetails.textContent = '▼ 展开详情';
+ btnReauthToggleDetails.setAttribute('aria-expanded', 'false');
+ }
+ applyReauthBatchUiVisibility();
+}
+
+function buildReauthBatchAccounts(provider) {
+ const accounts = Array.isArray(pendingReauthAccounts) ? pendingReauthAccounts : [];
+ if (!accounts.length) return [];
+ const validator = getReauthValidatorApi();
+ if (!validator || typeof validator.buildResolvedAccount !== 'function') return [];
+ return accounts
+ .map((entry) => {
+ try {
+ return validator.buildResolvedAccount(entry.account, provider);
+ } catch {
+ return null;
+ }
+ })
+ .filter(Boolean);
+}
+
+async function handleReauthBatchStart() {
+ if (!hasMultipleReauthAccounts()) {
+ setReauthJsonStatus('批量模式至少需要 2 个账号。', 'error');
+ return;
+ }
+ const provider = String(selectReauthMailProvider?.value || '').trim();
+ if (!provider) {
+ setReauthJsonStatus('请先选择「邮箱来源」。', 'error');
+ return;
+ }
+ const accounts = buildReauthBatchAccounts(provider);
+ if (accounts.length === 0) {
+ setReauthJsonStatus('未能构造可用账号列表。', 'error');
+ return;
+ }
+
+ reauthBatchRunningLocal = true;
+ applyReauthBatchProgress({ current: 0, total: accounts.length, currentEmail: '', currentStatus: 'pending' });
+
+ try {
+ const response = await chrome.runtime.sendMessage({
+ type: 'START_REAUTH_BATCH',
+ source: 'sidepanel',
+ payload: {
+ accounts,
+ mailProvider: provider,
+ originalFileText: lastReauthFileText || '',
+ skipOnFailure: true,
+ },
+ });
+ if (response?.error) {
+ throw new Error(response.error);
+ }
+ setReauthJsonStatus(`已启动批量授权（${accounts.length} 个账号）。`, 'ok');
+ } catch (error) {
+ reauthBatchRunningLocal = false;
+ applyReauthBatchUiVisibility();
+ const message = error?.message || String(error || '');
+ setReauthJsonStatus(`批量启动失败：${message}`, 'error');
+ if (typeof showToast === 'function') {
+ showToast(`批量启动失败：${message}`, 'error');
+ }
+ }
+}
+
+async function handleReauthBatchStop() {
+ try {
+ await chrome.runtime.sendMessage({ type: 'STOP_FLOW', source: 'sidepanel', payload: {} });
+ setReauthJsonStatus('已请求停止批量授权...', 'warn');
+ } catch (error) {
+ const message = error?.message || String(error || '');
+ setReauthJsonStatus(`停止请求失败：${message}`, 'error');
+ }
+}
+
+function generateBatchDownloadFileName() {
+ const now = new Date();
+ const pad = (n) => String(n).padStart(2, '0');
+ return `sub2api-reauth-${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}.json`;
+}
+
+async function handleReauthBatchDownload() {
+ const text = lastReauthBatchResult?.updatedFileJson
+ || (displayReauthResultAccount?.textContent || '');
+ if (!text) {
+ setReauthCopyStatus('暂无可下载的批量结果。', 'error');
+ return;
+ }
+ const filename = generateBatchDownloadFileName();
+ try {
+ if (chrome?.downloads?.download) {
+ const blob = new Blob([text], { type: 'application/json' });
+ const url = URL.createObjectURL(blob);
+ let revoked = false;
+ const revokeUrl = () => {
+ if (revoked) return;
+ revoked = true;
+ try { URL.revokeObjectURL(url); } catch {}
+ };
+ let downloadId;
+ try {
+ downloadId = await chrome.downloads.download({ url, filename, saveAs: true });
+ } catch (downloadError) {
+ revokeUrl();
+ throw downloadError;
+ }
+ let cleanupDownloadListener = () => {};
+ if (Number.isInteger(downloadId) && chrome.downloads?.onChanged?.addListener) {
+ const onDownloadChanged = (delta = {}) => {
+ if (delta.id !== downloadId) return;
+ const state = delta.state?.current;
+ if (state === 'complete' || state === 'interrupted') {
+ cleanupDownloadListener();
+ revokeUrl();
+ }
+ };
+ cleanupDownloadListener = () => {
+ try { chrome.downloads.onChanged.removeListener(onDownloadChanged); } catch {}
+ };
+ chrome.downloads.onChanged.addListener(onDownloadChanged);
+ }
+ // saveAs 对话框可能停留较久；监听不到最终状态时以长兜底释放 object URL。
+ setTimeout(() => {
+ cleanupDownloadListener();
+ revokeUrl();
+ }, 10 * 60 * 1000);
+ setReauthCopyStatus(`已触发下载：${filename}`, 'ok');
+ return;
+ }
+ } catch (error) {
+ console.warn('[reauth] download failed, fallback to clipboard:', error);
+ }
+ try {
+ await navigator.clipboard.writeText(text);
+ setReauthCopyStatus('下载不可用，已复制到剪贴板', 'ok');
+ } catch (error) {
+ setReauthCopyStatus(`下载与复制均失败：${error?.message || error}`, 'error');
+ }
+}
+
+inputReauthBatchMode?.addEventListener('change', () => {
+ applyReauthBatchUiVisibility();
+});
+btnReauthStartBatch?.addEventListener('click', () => {
+ handleReauthBatchStart();
+});
+btnReauthStopBatch?.addEventListener('click', () => {
+ handleReauthBatchStop();
+});
+btnReauthDownloadResult?.addEventListener('click', () => {
+ handleReauthBatchDownload();
+});
+btnReauthToggleDetails?.addEventListener('click', () => {
+ if (!displayReauthResultAccount) return;
+ const isHidden = displayReauthResultAccount.style.display === 'none';
+ displayReauthResultAccount.style.display = isHidden ? '' : 'none';
+ if (btnReauthToggleDetails) {
+ btnReauthToggleDetails.textContent = isHidden ? '▲ 收起详情' : '▼ 展开详情';
+ btnReauthToggleDetails.setAttribute('aria-expanded', isHidden ? 'true' : 'false');
+ }
+});
+
+function ensurePendingReauthAccount() {
+ if (!pendingReauthAccounts && lastReauthFileText) {
+ parsePendingReauthAccounts(lastReauthFileText);
+ }
+ const accounts = pendingReauthAccounts;
+ if (!accounts || !accounts.length) {
+ setReauthJsonStatus('请先选择账号 JSON 文件。', 'error');
+ if (typeof showToast === 'function') {
+ showToast('请先选择账号 JSON 文件。', 'error');
+ }
+ return null;
+ }
+
+ const selectedIndex = selectReauthAccount && accounts.length > 1
+ ? Number(selectReauthAccount.value)
+ : 0;
+ const entry = accounts[Number.isInteger(selectedIndex) ? selectedIndex : 0] || accounts[0];
+ if (!entry) {
+ setReauthJsonStatus('未选择账号。', 'error');
+ return null;
+ }
+
+ const provider = String(selectReauthMailProvider?.value || '').trim();
+ if (!provider) {
+ setReauthJsonStatus('请先选择「邮箱来源」。', 'error');
+ if (typeof showToast === 'function') {
+ showToast('请先在「邮箱来源」下拉框选择 mailProvider。', 'error');
+ }
+ return null;
+ }
+
+ const validator = getReauthValidatorApi();
+ if (!validator || typeof validator.buildResolvedAccount !== 'function') {
+ setReauthJsonStatus('校验器未加载。', 'error');
+ return null;
+ }
+ return validator.buildResolvedAccount(entry.account, provider);
+}
+
+function renderReauthResultAccount(account) {
+ if (!displayReauthResultAccount || !btnReauthCopyResult) return;
+ const batchMode = isReauthBatchModeEnabled();
+ if (account && typeof account === 'object') {
+ displayReauthResultAccount.textContent = JSON.stringify(account, null, 2);
+ displayReauthResultAccount.classList.add('has-value');
+ btnReauthCopyResult.disabled = false;
+ // 单账号模式下直接展示完整 JSON；批量模式下默认折叠（由 applyReauthBatchResult 控制）
+ if (!batchMode) {
+ displayReauthResultAccount.style.display = '';
+ }
+ // 单账号模式下也填充 summary 区，给师兄一个简短确认
+ if (!batchMode && reauthResultSummary && displayReauthBatchSummary) {
+ const email = account?.credentials?.email || account?.email || account?.name || '';
+ reauthResultSummary.classList.remove('has-failure', 'aborted');
+ reauthResultSummary.classList.add('all-success');
+ displayReauthBatchSummary.textContent = `已重新授权：${email}`;
+ }
+ } else {
+ displayReauthResultAccount.textContent = '等待重新授权完成...';
+ displayReauthResultAccount.classList.remove('has-value');
+ btnReauthCopyResult.disabled = true;
+ if (!batchMode) {
+ displayReauthResultAccount.style.display = '';
+ if (reauthResultSummary && displayReauthBatchSummary) {
+ reauthResultSummary.classList.remove('has-failure', 'aborted', 'all-success');
+ displayReauthBatchSummary.textContent = '等待重新授权完成...';
+ }
+ }
+ }
+}
+
+inputReauthAccountFile?.addEventListener('change', async (event) => {
+ const file = event.target?.files?.[0];
+ pendingReauthAccounts = null;
+ lastReauthFileText = '';
+ clearReauthAccountPicker();
+ applyReauthBatchUiVisibility();
+ if (!file) {
+ setReauthJsonStatus('未选择文件');
+ return;
+ }
+ try {
+ const text = await file.text();
+ lastReauthFileText = text;
+ parsePendingReauthAccounts(text, file.name);
+ } catch (error) {
+ setReauthJsonStatus(`文件读取失败：${error?.message || error}`, 'error');
+ }
+});
+
+btnReauthCopyResult?.addEventListener('click', async () => {
+ const text = displayReauthResultAccount?.textContent || '';
+ if (!text) return;
+ try {
+ await navigator.clipboard.writeText(text);
+ setReauthCopyStatus('已复制', 'ok');
+ } catch (error) {
+ setReauthCopyStatus(`复制失败：${error?.message || error}`, 'error');
+ }
+});
+
+// reauth 流程：让「邮箱来源」选择同步到全局 mailProvider，
+// 复用注册流程的 provider section 可见性逻辑（cloudflare / icloud / hotmail 等配置卡片）
+// 参数 persist 控制是否写回 storage：
+// - 用户主动 change 时 persist=true，会触发 saveSettings
+// - UI 刷新（如 applyOpenAiReauthRowVisibility）触发时 persist=false，仅同步显示，避免 SAVE_SETTING ↔ STATE_CHANGED 死循环
+function syncReauthMailProviderToGlobal({ persist = false } = {}) {
+ const provider = String(selectReauthMailProvider?.value || '').trim();
+ if (!provider) return;
+ if (selectMailProvider && selectMailProvider.value !== provider) {
+ selectMailProvider.value = provider;
+ }
+ if (typeof updateMailProviderUI === 'function') updateMailProviderUI();
+ if (!persist) return;
+ if (typeof markSettingsDirty === 'function') markSettingsDirty(true);
+ if (typeof saveSettings === 'function') saveSettings({ silent: true }).catch(() => { });
+}
+
+selectReauthMailProvider?.addEventListener('change', () => {
+ syncReauthMailProviderToGlobal({ persist: true });
+});
diff --git a/tests/openai-reauth-batch-runner.test.js b/tests/openai-reauth-batch-runner.test.js
new file mode 100644
index 00000000..173a8c53
--- /dev/null
+++ b/tests/openai-reauth-batch-runner.test.js
@@ -0,0 +1,480 @@
+'use strict';
+
+const assert = require('node:assert');
+const test = require('node:test');
+const fs = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+
+const RUNNER_PATH = path.join(
+ __dirname,
+ '..',
+ 'flows',
+ 'openai-reauth',
+ 'background',
+ 'batch-runner.js'
+);
+
+function loadRunnerModule() {
+ const source = fs.readFileSync(RUNNER_PATH, 'utf-8');
+ const sandbox = { self: {}, globalThis: {}, console, setTimeout, clearTimeout };
+ vm.createContext(sandbox);
+ vm.runInContext(source, sandbox);
+ return sandbox.self.MultiPageOpenAiReauthBatchRunner;
+}
+
+function buildDeps(overrides = {}) {
+ const calls = {
+ log: [],
+ setState: [],
+ executeNode: [],
+ sleep: [],
+ };
+
+ let mockState = {};
+ let stopFlag = false;
+ let pollIndex = 0;
+
+ function getMockState() {
+ return JSON.parse(JSON.stringify(mockState));
+ }
+
+ const deps = {
+ addLog: async (message, level, options) => {
+ calls.log.push({ message, level, options });
+ },
+ setState: async (updates) => {
+ calls.setState.push(JSON.parse(JSON.stringify(updates || {})));
+ mockState = { ...mockState, ...(updates || {}) };
+ },
+ getState: async () => getMockState(),
+ executeNode: async (nodeId) => {
+ calls.executeNode.push(nodeId);
+ if (typeof overrides.executeNodeHandler === 'function') {
+ const result = await overrides.executeNodeHandler(nodeId, pollIndex, mockState);
+ if (result && typeof result === 'object') {
+ mockState = { ...mockState, ...result };
+ }
+ return;
+ }
+ // 默认 stub：在最后一个 node（capture-reauth-callback）执行后写入成功 result
+ if (nodeId === 'capture-reauth-callback') {
+ pollIndex += 1;
+ const successAccount = {
+ ...(mockState.reauthInputAccount || {}),
+ credentials: {
+ ...(mockState.reauthInputAccount?.credentials || {}),
+ access_token: `new_access_${pollIndex}`,
+ refresh_token: `new_refresh_${pollIndex}`,
+ },
+ };
+ mockState = { ...mockState, reauthResultAccount: successAccount };
+ }
+ },
+ getNodeIdsForState: overrides.getNodeIdsForState || (() => [
+ 'prepare-reauth',
+ 'submit-reauth-email',
+ 'fetch-reauth-code',
+ 'capture-reauth-callback',
+ ]),
+ throwIfStopped: () => {
+ if (stopFlag) {
+ const err = new Error('已被用户停止');
+ throw err;
+ }
+ },
+ sleepWithStop: async (ms) => {
+ calls.sleep.push(ms);
+ if (typeof overrides.onSleep === 'function') {
+ await overrides.onSleep(ms, calls.sleep.length);
+ }
+ },
+ interAccountDelayMs: overrides.interAccountDelayMs ?? 0,
+ };
+
+ return {
+ deps,
+ calls,
+ setStopped: (value) => { stopFlag = Boolean(value); },
+ getMockState,
+ };
+}
+
+// ============================================================
+// 纯函数：extractAccountEmail
+// ============================================================
+
+test('extractAccountEmail 优先 credentials.email > email > name', () => {
+ const mod = loadRunnerModule();
+ assert.equal(
+ mod.extractAccountEmail({ credentials: { email: 'A@x.com' }, email: 'B@y.com', name: 'C@z.com' }),
+ 'a@x.com'
+ );
+ assert.equal(
+ mod.extractAccountEmail({ email: 'B@Y.com', name: 'C@z.com' }),
+ 'b@y.com'
+ );
+ assert.equal(mod.extractAccountEmail({ name: 'C@Z.com' }), 'c@z.com');
+ assert.equal(mod.extractAccountEmail(null), '');
+ assert.equal(mod.extractAccountEmail({}), '');
+});
+
+// ============================================================
+// 纯函数：mergeBatchResultsIntoFile
+// ============================================================
+
+test('mergeBatchResultsIntoFile：sub2api accounts 数组按 email 替换成功账号', () => {
+ const mod = loadRunnerModule();
+ const original = JSON.stringify({
+ accounts: [
+ { name: 'A@2925.com', credentials: { email: 'A@2925.com', access_token: 'old_a' }, priority: 1 },
+ { name: 'B@2925.com', credentials: { email: 'B@2925.com', access_token: 'old_b' }, priority: 2 },
+ ],
+ });
+ const success = [
+ { name: 'A@2925.com', credentials: { email: 'a@2925.com', access_token: 'new_a' } },
+ ];
+
+ const merged = JSON.parse(mod.mergeBatchResultsIntoFile(original, success));
+ assert.equal(merged.accounts[0].credentials.access_token, 'new_a');
+ assert.equal(merged.accounts[0].priority, 1, '原 priority 必须保留');
+ assert.equal(merged.accounts[1].credentials.access_token, 'old_b', '未在 success 列表的账号保留原状');
+});
+
+test('mergeBatchResultsIntoFile：顶层数组形式正常 merge', () => {
+ const mod = loadRunnerModule();
+ const original = JSON.stringify([
+ { email: 'a@x.com', credentials: { email: 'a@x.com', access_token: 'old' } },
+ ]);
+ const success = [{ email: 'a@x.com', credentials: { email: 'a@x.com', access_token: 'new' } }];
+
+ const merged = JSON.parse(mod.mergeBatchResultsIntoFile(original, success));
+ assert.equal(merged[0].credentials.access_token, 'new');
+});
+
+test('mergeBatchResultsIntoFile：单账号对象形式正常 merge', () => {
+ const mod = loadRunnerModule();
+ const original = JSON.stringify({
+ email: 'a@x.com',
+ credentials: { email: 'a@x.com', access_token: 'old' },
+ extra: { keep: true },
+ });
+ const success = [{ email: 'a@x.com', credentials: { email: 'a@x.com', access_token: 'new' } }];
+
+ const merged = JSON.parse(mod.mergeBatchResultsIntoFile(original, success));
+ assert.equal(merged.credentials.access_token, 'new');
+ assert.deepEqual(merged.extra, { keep: true });
+});
+
+test('mergeBatchResultsIntoFile：原始文本不可解析时退化为 success 数组', () => {
+ const mod = loadRunnerModule();
+ const merged = JSON.parse(mod.mergeBatchResultsIntoFile('not a json', [{ email: 'a@x.com' }]));
+ assert.deepEqual(merged, [{ email: 'a@x.com' }]);
+});
+
+test('mergeBatchResultsIntoFile：空 originalFileText 退化为 success 数组', () => {
+ const mod = loadRunnerModule();
+ const merged = JSON.parse(mod.mergeBatchResultsIntoFile('', [{ email: 'a@x.com' }]));
+ assert.deepEqual(merged, [{ email: 'a@x.com' }]);
+});
+
+// ============================================================
+// executeReauthBatch 主流程
+// ============================================================
+
+test('executeReauthBatch：空 accounts 抛错', async () => {
+ const mod = loadRunnerModule();
+ const { deps } = buildDeps();
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ await assert.rejects(
+ () => executeReauthBatch({ accounts: [] }),
+ /批量队列为空/
+ );
+});
+
+test('executeReauthBatch：顺序跑完 3 个账号，全部成功', async () => {
+ const mod = loadRunnerModule();
+ const { deps, calls } = buildDeps();
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ const accounts = [
+ { email: 'a@2925.com', credentials: { email: 'a@2925.com', access_token: 'old_a' } },
+ { email: 'b@2925.com', credentials: { email: 'b@2925.com', access_token: 'old_b' } },
+ { email: 'c@2925.com', credentials: { email: 'c@2925.com', access_token: 'old_c' } },
+ ];
+
+ const result = await executeReauthBatch({
+ accounts,
+ mailProvider: '2925',
+ originalFileText: JSON.stringify({ accounts }),
+ });
+
+ assert.equal(result.successCount, 3);
+ assert.equal(result.failedCount, 0);
+ assert.equal(result.total, 3);
+ assert.equal(result.aborted, false);
+ // 每个账号 4 个 node，共 12 次 executeNode
+ assert.equal(calls.executeNode.length, 12);
+
+ const merged = JSON.parse(result.updatedFileJson);
+ assert.equal(merged.accounts.length, 3);
+ assert.equal(merged.accounts[0].credentials.access_token, 'new_access_1');
+ assert.equal(merged.accounts[2].credentials.access_token, 'new_access_3');
+});
+
+test('executeReauthBatch：中间账号失败时 skip 继续，最终统计正确', async () => {
+ const mod = loadRunnerModule();
+ let nodeRun = 0;
+ const { deps } = buildDeps({
+ executeNodeHandler: async (nodeId, currentSuccess, state) => {
+ nodeRun += 1;
+ const targetEmail = state?.reauthInputAccount?.credentials?.email;
+ if (nodeId === 'fetch-reauth-code' && targetEmail === 'b@2925.com') {
+ throw new Error('mock 第二个账号 fetch-code 失败');
+ }
+ if (nodeId === 'capture-reauth-callback') {
+ return {
+ reauthResultAccount: {
+ ...(state.reauthInputAccount || {}),
+ credentials: {
+ ...(state.reauthInputAccount?.credentials || {}),
+ access_token: `new_for_${targetEmail}`,
+ },
+ },
+ };
+ }
+ },
+ });
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ const accounts = [
+ { credentials: { email: 'a@2925.com' } },
+ { credentials: { email: 'b@2925.com' } },
+ { credentials: { email: 'c@2925.com' } },
+ ];
+
+ const result = await executeReauthBatch({
+ accounts,
+ mailProvider: '2925',
+ });
+
+ assert.equal(result.successCount, 2);
+ assert.equal(result.failedCount, 1);
+ assert.equal(result.failed[0].email, 'b@2925.com');
+ assert.match(result.failed[0].error, /fetch-code 失败/);
+ assert.equal(result.aborted, false);
+});
+
+test('executeReauthBatch：skipOnFailure=false 时失败立即终止', async () => {
+ const mod = loadRunnerModule();
+ const { deps, calls, getMockState } = buildDeps({
+ executeNodeHandler: async (nodeId, _, state) => {
+ const email = state?.reauthInputAccount?.credentials?.email;
+ if (email === 'b@2925.com' && nodeId === 'prepare-reauth') {
+ throw new Error('mock 第二账号一上来就 fail');
+ }
+ if (nodeId === 'capture-reauth-callback') {
+ return {
+ reauthResultAccount: {
+ ...(state.reauthInputAccount || {}),
+ credentials: {
+ ...(state.reauthInputAccount?.credentials || {}),
+ access_token: 'new',
+ },
+ },
+ };
+ }
+ },
+ });
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ const accounts = [
+ { credentials: { email: 'a@2925.com' } },
+ { credentials: { email: 'b@2925.com' } },
+ { credentials: { email: 'c@2925.com' } },
+ ];
+
+ await assert.rejects(
+ () => executeReauthBatch({
+ accounts,
+ mailProvider: '2925',
+ skipOnFailure: false,
+ }),
+ /mock 第二账号一上来就 fail/
+ );
+
+ // 第三个账号不应被处理
+ const lastStateUpdate = calls.setState[calls.setState.length - 1];
+ assert.equal(lastStateUpdate.reauthBatchResult.aborted, true);
+ assert.equal(lastStateUpdate.reauthBatchResult.successCount, 1);
+ assert.equal(lastStateUpdate.reauthBatchResult.failedCount, 1);
+ assert.match(lastStateUpdate.reauthBatchResult.stopReason, /第二账号一上来就 fail/);
+});
+
+test('executeReauthBatch：stop 信号 → 立即终止，aborted=true & stopReason=user_stop', async () => {
+ const mod = loadRunnerModule();
+ let nodeRun = 0;
+ const { deps, calls } = buildDeps({
+ executeNodeHandler: async (nodeId, _, state) => {
+ nodeRun += 1;
+ if (nodeRun === 5) {
+ throw new Error('已被用户停止');
+ }
+ if (nodeId === 'capture-reauth-callback') {
+ return {
+ reauthResultAccount: {
+ ...(state.reauthInputAccount || {}),
+ credentials: {
+ ...(state.reauthInputAccount?.credentials || {}),
+ access_token: 'new',
+ },
+ },
+ };
+ }
+ },
+ });
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ const accounts = [
+ { credentials: { email: 'a@2925.com' } },
+ { credentials: { email: 'b@2925.com' } },
+ { credentials: { email: 'c@2925.com' } },
+ ];
+
+ await assert.rejects(
+ () => executeReauthBatch({ accounts, mailProvider: '2925' }),
+ /已被用户停止/
+ );
+
+ const lastStateUpdate = calls.setState[calls.setState.length - 1];
+ assert.equal(lastStateUpdate.reauthBatchResult.aborted, true);
+ assert.equal(lastStateUpdate.reauthBatchResult.stopReason, 'user_stop');
+ assert.equal(lastStateUpdate.reauthBatchProgress.currentStatus, 'stopped');
+});
+
+test('executeReauthBatch：progress 每轮 currentStatus 流转 running → success / failed', async () => {
+ const mod = loadRunnerModule();
+ const { deps, calls } = buildDeps();
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ await executeReauthBatch({
+ accounts: [{ credentials: { email: 'a@2925.com' } }],
+ mailProvider: '2925',
+ originalFileText: JSON.stringify({ accounts: [{ credentials: { email: 'a@2925.com' } }] }),
+ });
+
+ const progressUpdates = calls.setState
+ .filter((u) => u.reauthBatchProgress)
+ .map((u) => u.reauthBatchProgress.currentStatus);
+
+ assert.ok(progressUpdates.includes('pending'));
+ assert.ok(progressUpdates.includes('running'));
+ assert.ok(progressUpdates.includes('success'));
+ assert.ok(progressUpdates.includes('completed'));
+});
+
+test('executeReauthBatch：runSingleAccount 把 mailProvider 注入到 state.reauthInputAccount', async () => {
+ const mod = loadRunnerModule();
+ const { deps, calls } = buildDeps();
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ await executeReauthBatch({
+ accounts: [{ credentials: { email: 'a@2925.com' } }],
+ mailProvider: '2925',
+ });
+
+ const inputAccountUpdate = calls.setState
+ .find((u) => u.reauthInputAccount && u.reauthInputAccount.credentials?.email === 'a@2925.com');
+ assert.ok(inputAccountUpdate);
+ assert.equal(inputAccountUpdate.reauthInputAccount.mailProvider, '2925');
+});
+
+test('executeReauthBatch：优先使用注入的 extractAccountEmail，避免依赖全局 validator', async () => {
+ const mod = loadRunnerModule();
+ const { deps } = buildDeps();
+ deps.extractAccountEmail = (account) => account?.aliasEmail || '';
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ const accounts = [
+ { aliasEmail: 'Injected@Example.com', credentials: { access_token: 'old' }, priority: 5 },
+ ];
+ const result = await executeReauthBatch({
+ accounts,
+ mailProvider: '2925',
+ originalFileText: JSON.stringify({ accounts }),
+ });
+
+ assert.equal(result.success[0].email, 'injected@example.com');
+ const merged = JSON.parse(result.updatedFileJson);
+ assert.equal(merged.accounts[0].credentials.access_token, 'new_access_1');
+ assert.equal(merged.accounts[0].priority, 5);
+});
+
+test('executeReauthBatch：终止状态写入失败时仍抛出原始错误', async () => {
+ const mod = loadRunnerModule();
+ const { deps, calls } = buildDeps({
+ executeNodeHandler: async () => {
+ throw new Error('original batch failure');
+ },
+ });
+ const originalSetState = deps.setState;
+ deps.setState = async (updates) => {
+ if (updates?.reauthBatchResult) {
+ throw new Error('secondary state failure');
+ }
+ return originalSetState(updates);
+ };
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ await assert.rejects(
+ () => executeReauthBatch({
+ accounts: [{ credentials: { email: 'a@2925.com' } }],
+ mailProvider: '2925',
+ skipOnFailure: false,
+ }),
+ /original batch failure/
+ );
+ assert.ok(calls.log.some((entry) => /状态写入失败/.test(entry.message)));
+});
+
+test('executeReauthBatch：每账号开始前清空 reauthResultAccount / nodeStatuses 避免污染', async () => {
+ const mod = loadRunnerModule();
+ const { deps, calls } = buildDeps();
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ await executeReauthBatch({
+ accounts: [
+ { credentials: { email: 'a@2925.com' } },
+ { credentials: { email: 'b@2925.com' } },
+ ],
+ mailProvider: '2925',
+ });
+
+ const inputResets = calls.setState.filter(
+ (u) => u.reauthInputAccount && u.reauthResultAccount === null
+ );
+ assert.equal(inputResets.length, 2, '每个账号开始时都应 reset reauthResultAccount');
+ inputResets.forEach((reset) => {
+ assert.deepEqual(reset.nodeStatuses, {}, '应重置 nodeStatuses');
+ });
+});
+
+test('executeReauthBatch：interAccountDelayMs > 0 时账号之间会 sleep（最后一个账号不 sleep）', async () => {
+ const mod = loadRunnerModule();
+ const { deps, calls } = buildDeps({ interAccountDelayMs: 1000 });
+ const { executeReauthBatch } = mod.createReauthBatchRunner(deps);
+
+ await executeReauthBatch({
+ accounts: [
+ { credentials: { email: 'a@2925.com' } },
+ { credentials: { email: 'b@2925.com' } },
+ { credentials: { email: 'c@2925.com' } },
+ ],
+ mailProvider: '2925',
+ });
+
+ // 3 个账号之间 sleep 2 次
+ assert.equal(calls.sleep.length, 2);
+ assert.equal(calls.sleep[0], 1000);
+});
diff --git a/tests/openai-reauth-capture-callback.test.js b/tests/openai-reauth-capture-callback.test.js
new file mode 100644
index 00000000..f16f79b3
--- /dev/null
+++ b/tests/openai-reauth-capture-callback.test.js
@@ -0,0 +1,417 @@
+'use strict';
+
+const assert = require('node:assert');
+const test = require('node:test');
+const fs = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+
+const STEP_PATH = path.join(__dirname, '..', 'flows', 'openai-reauth', 'background', 'steps', 'capture-reauth-callback.js');
+
+function loadStepModule() {
+ const source = fs.readFileSync(STEP_PATH, 'utf-8');
+ const sandbox = { self: {}, globalThis: {}, console, setTimeout, clearTimeout };
+ vm.createContext(sandbox);
+ vm.runInContext(source, sandbox);
+ return sandbox.self.MultiPageOpenAiReauthCaptureCallbackStep;
+}
+
+function buildMockChromeApi() {
+ const navListeners = [];
+ const committedListeners = [];
+ const tabUpdatedListeners = [];
+ const removedTabs = [];
+ const sentMessages = [];
+ return {
+ navListeners,
+ committedListeners,
+ tabUpdatedListeners,
+ removedTabs,
+ sentMessages,
+ api: {
+ webNavigation: {
+ onBeforeNavigate: {
+ addListener: (fn) => navListeners.push(fn),
+ removeListener: (fn) => {
+ const idx = navListeners.indexOf(fn);
+ if (idx >= 0) navListeners.splice(idx, 1);
+ },
+ },
+ onCommitted: {
+ addListener: (fn) => committedListeners.push(fn),
+ removeListener: (fn) => {
+ const idx = committedListeners.indexOf(fn);
+ if (idx >= 0) committedListeners.splice(idx, 1);
+ },
+ },
+ },
+ tabs: {
+ onUpdated: {
+ addListener: (fn) => tabUpdatedListeners.push(fn),
+ removeListener: (fn) => {
+ const idx = tabUpdatedListeners.indexOf(fn);
+ if (idx >= 0) tabUpdatedListeners.splice(idx, 1);
+ },
+ },
+ remove: async (tabId) => { removedTabs.push(tabId); },
+ sendMessage: async (tabId, message) => {
+ sentMessages.push({ tabId, message });
+ return null;
+ },
+ },
+ },
+ };
+}
+
+function buildBaseDeps(overrides = {}) {
+ const completeCalls = [];
+ const setStateCalls = [];
+ const logCalls = [];
+ return {
+ completeCalls,
+ setStateCalls,
+ logCalls,
+ deps: {
+ addLog: async (message, level, options) => { logCalls.push({ message, level, options }); },
+ completeNodeFromBackground: async (nodeId, payload) => { completeCalls.push({ nodeId, payload }); },
+ exchangeAuthorizationCode: async ({ code, codeVerifier }) => ({
+ accessToken: `access_for_${code}_${codeVerifier}`,
+ refreshToken: 'refresh_x',
+ idToken: 'id_x',
+ expiresIn: 3600,
+ }),
+ parseCallbackUrl: (url, expected) => {
+ if (!url.includes('localhost:1455/auth/callback')) return null;
+ const parsed = new URL(url);
+ const code = parsed.searchParams.get('code');
+ const stateParam = parsed.searchParams.get('state');
+ if (expected && stateParam !== expected) return { error: 'state mismatch' };
+ return code ? { code, state: stateParam } : null;
+ },
+ buildUpdatedAccount: (original, tokens) => ({
+ ...original,
+ credentials: {
+ ...(original.credentials || {}),
+ access_token: tokens.accessToken,
+ refresh_token: tokens.refreshToken,
+ },
+ }),
+ setState: async (patch) => { setStateCalls.push(patch); },
+ ...overrides,
+ },
+ };
+}
+
+test('收到合法 localhost 回调时换 token、更新 account 并 complete', async () => {
+ const mod = loadStepModule();
+ const chromeMock = buildMockChromeApi();
+ const harness = buildBaseDeps();
+ const { executeCaptureReauthCallback } = mod.createCaptureReauthCallbackExecutor({
+ ...harness.deps,
+ chrome: chromeMock.api,
+ });
+
+ const promise = executeCaptureReauthCallback({
+ nodeId: 'capture-reauth-callback',
+ reauthState: 'STATE_TOKEN',
+ reauthCodeVerifier: 'VERIFIER_TOKEN',
+ reauthInputAccount: { name: 'a@b.com', credentials: { email: 'a@b.com' } },
+ });
+
+ assert.equal(chromeMock.navListeners.length, 1);
+ assert.equal(chromeMock.committedListeners.length, 1);
+ assert.equal(chromeMock.tabUpdatedListeners.length, 1);
+
+ chromeMock.navListeners[0]({
+ url: 'http://localhost:1455/auth/callback?code=ABC&state=STATE_TOKEN',
+ tabId: 99,
+ });
+
+ await promise;
+
+ assert.equal(chromeMock.navListeners.length, 0, '应已清理监听器');
+ assert.equal(chromeMock.removedTabs[0], 99, '应关闭回调 tab');
+ assert.equal(harness.completeCalls.length, 1);
+ assert.equal(harness.completeCalls[0].payload.reauthResultAccount.credentials.access_token,
+ 'access_for_ABC_VERIFIER_TOKEN');
+ const lastSetState = harness.setStateCalls[harness.setStateCalls.length - 1];
+ assert.ok(lastSetState.reauthResultAccount);
+ assert.equal(lastSetState.reauthCodeVerifier, '');
+ assert.equal(lastSetState.reauthState, '');
+});
+
+test('state 不匹配时拒绝并清理监听器', async () => {
+ const mod = loadStepModule();
+ const chromeMock = buildMockChromeApi();
+ const harness = buildBaseDeps();
+ const { executeCaptureReauthCallback } = mod.createCaptureReauthCallbackExecutor({
+ ...harness.deps,
+ chrome: chromeMock.api,
+ });
+
+ const promise = executeCaptureReauthCallback({
+ reauthState: 'STATE_GOOD',
+ reauthCodeVerifier: 'VERIFIER',
+ reauthInputAccount: { name: 'x@y.com' },
+ });
+
+ chromeMock.navListeners[0]({
+ url: 'http://localhost:1455/auth/callback?code=Z&state=BAD',
+ tabId: 1,
+ });
+
+ await assert.rejects(promise, /state mismatch/);
+ assert.equal(chromeMock.navListeners.length, 0);
+});
+
+test('缺少 reauthState 时立刻拒绝', async () => {
+ const mod = loadStepModule();
+ const chromeMock = buildMockChromeApi();
+ const harness = buildBaseDeps();
+ const { executeCaptureReauthCallback } = mod.createCaptureReauthCallbackExecutor({
+ ...harness.deps,
+ chrome: chromeMock.api,
+ });
+
+ await assert.rejects(
+ executeCaptureReauthCallback({
+ reauthCodeVerifier: 'V',
+ reauthInputAccount: { name: 'a' },
+ }),
+ /OAuth state/
+ );
+});
+
+test('缺少 codeVerifier 时立刻拒绝', async () => {
+ const mod = loadStepModule();
+ const chromeMock = buildMockChromeApi();
+ const harness = buildBaseDeps();
+ const { executeCaptureReauthCallback } = mod.createCaptureReauthCallbackExecutor({
+ ...harness.deps,
+ chrome: chromeMock.api,
+ });
+
+ await assert.rejects(
+ executeCaptureReauthCallback({
+ reauthState: 'S',
+ reauthInputAccount: { name: 'a' },
+ }),
+ /code_verifier/
+ );
+});
+
+test('缺少 reauthInputAccount 时立刻拒绝', async () => {
+ const mod = loadStepModule();
+ const chromeMock = buildMockChromeApi();
+ const harness = buildBaseDeps();
+ const { executeCaptureReauthCallback } = mod.createCaptureReauthCallbackExecutor({
+ ...harness.deps,
+ chrome: chromeMock.api,
+ });
+
+ await assert.rejects(
+ executeCaptureReauthCallback({
+ reauthState: 'S',
+ reauthCodeVerifier: 'V',
+ }),
+ /账号 JSON/
+ );
+});
+
+test('Token 交换失败时拒绝并写入 reauthLastError', async () => {
+ const mod = loadStepModule();
+ const chromeMock = buildMockChromeApi();
+ const harness = buildBaseDeps({
+ exchangeAuthorizationCode: async () => { throw new Error('upstream rejected'); },
+ });
+ const { executeCaptureReauthCallback } = mod.createCaptureReauthCallbackExecutor({
+ ...harness.deps,
+ chrome: chromeMock.api,
+ });
+
+ const promise = executeCaptureReauthCallback({
+ reauthState: 'STATE',
+ reauthCodeVerifier: 'V',
+ reauthInputAccount: { name: 'a' },
+ });
+
+ chromeMock.navListeners[0]({
+ url: 'http://localhost:1455/auth/callback?code=C&state=STATE',
+ tabId: 7,
+ });
+
+ await assert.rejects(promise, /upstream rejected/);
+ const errorPatch = harness.setStateCalls.find((p) => p.reauthLastError);
+ assert.ok(errorPatch, '失败时应写入 reauthLastError');
+ assert.match(errorPatch.reauthLastError, /upstream rejected/);
+});
+
+test('tabUpdated 路径同样能捕获回调', async () => {
+ const mod = loadStepModule();
+ const chromeMock = buildMockChromeApi();
+ const harness = buildBaseDeps();
+ const { executeCaptureReauthCallback } = mod.createCaptureReauthCallbackExecutor({
+ ...harness.deps,
+ chrome: chromeMock.api,
+ });
+
+ const promise = executeCaptureReauthCallback({
+ reauthState: 'S',
+ reauthCodeVerifier: 'V',
+ reauthInputAccount: { name: 'x' },
+ });
+
+ chromeMock.tabUpdatedListeners[0](
+ 42,
+ {},
+ { url: 'http://localhost:1455/auth/callback?code=K&state=S' }
+ );
+
+ await promise;
+ assert.equal(harness.completeCalls.length, 1);
+ assert.equal(chromeMock.removedTabs[0], 42);
+});
+
+test('进入手机验证页时抛出账号级 fatal，批量可跳过当前账号', async () => {
+ const mod = loadStepModule();
+ const chromeMock = buildMockChromeApi();
+ const harness = buildBaseDeps({
+ getTabId: async () => 99,
+ isTabAlive: async () => true,
+ ensureStep8SignupPageReady: async () => {},
+ waitForStep8Ready: async () => {
+ throw new Error('步骤 4：自动确认 OAuth 只处理 OAuth 授权页，当前仍在手机验证码页。 URL: https://auth.openai.com/phone-verification');
+ },
+ prepareStep8DebuggerClick: async () => {},
+ clickWithDebugger: async () => {},
+ triggerStep8ContentStrategy: async () => {},
+ waitForStep8ClickEffect: async () => ({}),
+ getStep8EffectLabel: () => '无跳转',
+ reloadStep8ConsentPage: async () => {},
+ sleepWithStop: async () => {},
+ STEP8_STRATEGIES: [{ id: 'primary', label: '主按钮' }],
+ });
+ const { executeCaptureReauthCallback } = mod.createCaptureReauthCallbackExecutor({
+ ...harness.deps,
+ chrome: chromeMock.api,
+ });
+
+ const promise = executeCaptureReauthCallback({
+ reauthState: 'S',
+ reauthCodeVerifier: 'V',
+ reauthInputAccount: { name: 'phone-check@example.com' },
+ });
+
+ await assert.rejects(
+ promise,
+ /ACCOUNT_FATAL::phone_verification_required::.*手机验证/
+ );
+ assert.equal(harness.completeCalls.length, 0);
+ assert.equal(chromeMock.navListeners.length, 0, 'fatal 后应清理 onBeforeNavigate');
+ assert.equal(chromeMock.committedListeners.length, 0, 'fatal 后应清理 onCommitted');
+ assert.equal(chromeMock.tabUpdatedListeners.length, 0, 'fatal 后应清理 tabs.onUpdated');
+});
+
+test('步骤4启动后立即预检手机验证页，不等待 OAuth ready 超时', async () => {
+ const mod = loadStepModule();
+ const chromeMock = buildMockChromeApi();
+ chromeMock.api.tabs.get = async () => ({
+ id: 88,
+ url: 'https://auth.openai.com/phone-verification',
+ title: '验证您的手机号码',
+ });
+ let waitForReadyCalled = false;
+ const harness = buildBaseDeps({
+ getTabId: async () => 88,
+ isTabAlive: async () => true,
+ ensureStep8SignupPageReady: async () => {},
+ waitForStep8Ready: async () => {
+ waitForReadyCalled = true;
+ return { consentReady: true };
+ },
+ prepareStep8DebuggerClick: async () => {},
+ clickWithDebugger: async () => {},
+ triggerStep8ContentStrategy: async () => {},
+ waitForStep8ClickEffect: async () => ({}),
+ getStep8EffectLabel: () => '无跳转',
+ reloadStep8ConsentPage: async () => {},
+ sleepWithStop: async () => {},
+ STEP8_STRATEGIES: [{ id: 'primary', label: '主按钮' }],
+ });
+ const { executeCaptureReauthCallback } = mod.createCaptureReauthCallbackExecutor({
+ ...harness.deps,
+ chrome: chromeMock.api,
+ });
+
+ const promise = executeCaptureReauthCallback({
+ reauthState: 'S',
+ reauthCodeVerifier: 'V',
+ reauthInputAccount: { name: 'phone-preflight@example.com' },
+ });
+
+ await assert.rejects(
+ promise,
+ /ACCOUNT_FATAL::phone_verification_required::.*手机验证/
+ );
+ assert.equal(waitForReadyCalled, false, '应在等待 OAuth ready 前直接跳过');
+ assert.equal(harness.completeCalls.length, 0);
+ assert.equal(chromeMock.navListeners.length, 0);
+ assert.equal(chromeMock.committedListeners.length, 0);
+ assert.equal(chromeMock.tabUpdatedListeners.length, 0);
+});
+
+test('createExecutor 在 deps 缺失时直接抛错（不允许半成品）', () => {
+ const mod = loadStepModule();
+ const chromeMock = buildMockChromeApi();
+ const baseDeps = {
+ ...buildBaseDeps().deps,
+ chrome: chromeMock.api,
+ };
+ const cases = [
+ {
+ name: 'completeNodeFromBackground',
+ expected: /completeNodeFromBackground/,
+ mutate: (deps) => { delete deps.completeNodeFromBackground; },
+ },
+ {
+ name: 'exchangeAuthorizationCode',
+ expected: /exchangeAuthorizationCode/,
+ mutate: (deps) => { delete deps.exchangeAuthorizationCode; },
+ },
+ {
+ name: 'parseCallbackUrl',
+ expected: /parseCallbackUrl/,
+ mutate: (deps) => { delete deps.parseCallbackUrl; },
+ },
+ {
+ name: 'buildUpdatedAccount',
+ expected: /buildUpdatedAccount/,
+ mutate: (deps) => { delete deps.buildUpdatedAccount; },
+ },
+ {
+ name: 'setState',
+ expected: /setState/,
+ mutate: (deps) => { delete deps.setState; },
+ },
+ {
+ name: 'chrome.webNavigation',
+ expected: /webNavigation \/ chrome\.tabs/,
+ mutate: (deps) => { deps.chrome = { tabs: chromeMock.api.tabs }; },
+ },
+ {
+ name: 'chrome.tabs',
+ expected: /webNavigation \/ chrome\.tabs/,
+ mutate: (deps) => { deps.chrome = { webNavigation: chromeMock.api.webNavigation }; },
+ },
+ ];
+
+ for (const entry of cases) {
+ const deps = { ...baseDeps };
+ entry.mutate(deps);
+ assert.throws(
+ () => mod.createCaptureReauthCallbackExecutor(deps),
+ entry.expected,
+ `missing ${entry.name} should throw`
+ );
+ }
+});
diff --git a/tests/openai-reauth-cookie-cleanup.test.js b/tests/openai-reauth-cookie-cleanup.test.js
new file mode 100644
index 00000000..0f292949
--- /dev/null
+++ b/tests/openai-reauth-cookie-cleanup.test.js
@@ -0,0 +1,116 @@
+'use strict';
+
+const assert = require('node:assert');
+const test = require('node:test');
+const fs = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+
+const COOKIE_CLEANUP_PATH = path.join(__dirname, '..', 'flows', 'openai-reauth', 'background', 'cookie-cleanup.js');
+
+function loadCookieCleanupModule() {
+ const source = fs.readFileSync(COOKIE_CLEANUP_PATH, 'utf-8');
+ const sandbox = { self: {}, globalThis: {}, console };
+ vm.createContext(sandbox);
+ vm.runInContext(source, sandbox);
+ return sandbox.self.MultiPageOpenAiReauthCookieCleanup;
+}
+
+function buildFakeChromeApi(cookies, options = {}) {
+ const removeCalls = [];
+ return {
+ removeCalls,
+ chromeApi: {
+ cookies: {
+ getAllCookieStores: async () => options.stores || [{ id: '0' }],
+ getAll: async (query) => cookies.filter((c) =>
+ (!query.storeId || c.storeId === query.storeId)
+ && (!query.domain || c.domain === query.domain || c.domain === `.${query.domain}`)
+ ),
+ remove: async (details) => {
+ removeCalls.push(details);
+ if (options.removeFails && options.removeFails.has(details.name)) {
+ throw new Error(`mock remove failure for ${details.name}`);
+ }
+ return { name: details.name, url: details.url };
+ },
+ },
+ },
+ };
+}
+
+test('REAUTH_COOKIE_CLEAR_DOMAINS 包含 6 个目标 domain', () => {
+ const mod = loadCookieCleanupModule();
+ assert.deepEqual(
+ [...mod.REAUTH_COOKIE_CLEAR_DOMAINS].sort(),
+ [
+ 'accounts.openai.com',
+ 'auth.openai.com',
+ 'auth0.openai.com',
+ 'chat.openai.com',
+ 'chatgpt.com',
+ 'openai.com',
+ ]
+ );
+});
+
+test('clearOpenAiAuthCookies 收集并删除目标 domain 的 cookie', async () => {
+ const mod = loadCookieCleanupModule();
+ const fake = buildFakeChromeApi([
+ { name: 'session', domain: '.openai.com', path: '/', storeId: '0' },
+ { name: 'auth_token', domain: 'auth.openai.com', path: '/', storeId: '0' },
+ { name: 'cf_token', domain: 'chatgpt.com', path: '/', storeId: '0' },
+ { name: 'unrelated', domain: 'google.com', path: '/', storeId: '0' },
+ ]);
+ const result = await mod.clearOpenAiAuthCookies({ chromeApi: fake.chromeApi });
+ assert.equal(result.collected, 3);
+ assert.equal(result.removed, 3);
+ assert.equal(fake.removeCalls.length, 3);
+ for (const call of fake.removeCalls) {
+ assert.match(call.url, /^https:\/\/(chatgpt\.com|auth\.openai\.com|openai\.com)\/$/);
+ }
+ assert.equal(fake.removeCalls.find((c) => c.name === 'unrelated'), undefined);
+});
+
+test('clearOpenAiAuthCookies 跨 storeId 不重复', async () => {
+ const mod = loadCookieCleanupModule();
+ const fake = buildFakeChromeApi(
+ [
+ { name: 'a', domain: 'auth.openai.com', path: '/', storeId: '0' },
+ { name: 'a', domain: 'auth.openai.com', path: '/', storeId: '1' },
+ ],
+ { stores: [{ id: '0' }, { id: '1' }] }
+ );
+ const result = await mod.clearOpenAiAuthCookies({ chromeApi: fake.chromeApi });
+ assert.equal(result.collected, 2);
+ assert.equal(result.removed, 2);
+});
+
+test('clearOpenAiAuthCookies 部分失败时不影响其他 cookie', async () => {
+ const mod = loadCookieCleanupModule();
+ const fake = buildFakeChromeApi(
+ [
+ { name: 'good', domain: 'auth.openai.com', path: '/', storeId: '0' },
+ { name: 'bad', domain: 'auth.openai.com', path: '/', storeId: '0' },
+ ],
+ { removeFails: new Set(['bad']) }
+ );
+ const result = await mod.clearOpenAiAuthCookies({ chromeApi: fake.chromeApi });
+ assert.equal(result.collected, 2);
+ assert.equal(result.removed, 1);
+});
+
+test('clearOpenAiAuthCookies 在 chromeApi 缺失时安全返回', async () => {
+ const mod = loadCookieCleanupModule();
+ const result = await mod.clearOpenAiAuthCookies({});
+ assert.deepEqual(result, { collected: 0, removed: 0 });
+});
+
+test('clearOpenAiAuthCookies 保留 partitionKey', async () => {
+ const mod = loadCookieCleanupModule();
+ const fake = buildFakeChromeApi([
+ { name: 'p', domain: 'auth.openai.com', path: '/', storeId: '0', partitionKey: { topLevelSite: 'https://chatgpt.com' } },
+ ]);
+ await mod.clearOpenAiAuthCookies({ chromeApi: fake.chromeApi });
+ assert.deepEqual(fake.removeCalls[0].partitionKey, { topLevelSite: 'https://chatgpt.com' });
+});
diff --git a/tests/openai-reauth-fetch-code.test.js b/tests/openai-reauth-fetch-code.test.js
new file mode 100644
index 00000000..4c470e3c
--- /dev/null
+++ b/tests/openai-reauth-fetch-code.test.js
@@ -0,0 +1,343 @@
+'use strict';
+
+const assert = require('node:assert');
+const test = require('node:test');
+const fs = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+
+const STEP_PATH = path.join(
+ __dirname,
+ '..',
+ 'flows',
+ 'openai-reauth',
+ 'background',
+ 'steps',
+ 'fetch-reauth-code.js'
+);
+
+function loadStepModule() {
+ const source = fs.readFileSync(STEP_PATH, 'utf-8');
+ const sandbox = { self: {}, globalThis: {}, console, setTimeout, clearTimeout };
+ vm.createContext(sandbox);
+ vm.runInContext(source, sandbox);
+ return sandbox.self.MultiPageOpenAiReauthFetchCodeStep;
+}
+
+function buildDeps(overrides = {}) {
+ const calls = {
+ log: [],
+ poll: [],
+ resilient: [],
+ complete: [],
+ sleep: [],
+ };
+
+ let stopped = false;
+ const stopAfter = overrides.stopAfter || null;
+ let pollInvokeCount = 0;
+
+ const deps = {
+ addLog: async (message, level, options) => {
+ calls.log.push({ message, level, options });
+ },
+ completeNodeFromBackground: async (nodeId, payload) => {
+ calls.complete.push({ nodeId, payload });
+ },
+ pollFlowVerificationCode: async (options) => {
+ pollInvokeCount += 1;
+ calls.poll.push(options);
+ const handler = overrides.pollHandler;
+ if (typeof handler === 'function') {
+ return handler(options, pollInvokeCount);
+ }
+ return { code: '654321' };
+ },
+ sendToContentScriptResilient: async (target, message, options) => {
+ calls.resilient.push({ target, message, options });
+ const handler = overrides.resilientHandler;
+ if (typeof handler === 'function') {
+ return handler(target, message, options);
+ }
+ return {};
+ },
+ throwIfStopped: () => {
+ if (stopped) {
+ const err = new Error('已被用户停止');
+ throw err;
+ }
+ },
+ sleepWithStop: overrides.sleepWithStop || (async (ms) => {
+ calls.sleep.push(ms);
+ if (stopAfter && calls.sleep.length >= stopAfter) {
+ stopped = true;
+ const err = new Error('已被用户停止');
+ throw err;
+ }
+ }),
+ maxResendRequests: overrides.maxResendRequests ?? 2,
+ resendIntervalMs: overrides.resendIntervalMs ?? 10,
+ };
+
+ return { deps, calls, setStopped: (value) => { stopped = Boolean(value); } };
+}
+
+test('executeFetchReauthCode 缺少邮箱抛错', async () => {
+ const mod = loadStepModule();
+ const { deps } = buildDeps();
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await assert.rejects(
+ () => executeFetchReauthCode({}),
+ /缺少邮箱地址/
+ );
+});
+
+test('executeFetchReauthCode skipReauthVerificationStep 跳过轮询直接 complete', async () => {
+ const mod = loadStepModule();
+ const { deps, calls } = buildDeps();
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await executeFetchReauthCode({
+ reauthEmail: 'demo@2925.com',
+ skipReauthVerificationStep: true,
+ });
+
+ assert.equal(calls.poll.length, 0);
+ assert.equal(calls.resilient.length, 0);
+ assert.equal(calls.complete.length, 1);
+ assert.equal(calls.complete[0].nodeId, 'fetch-reauth-code');
+ assert.equal(calls.complete[0].payload.skipReauthVerificationStep, true);
+});
+
+test('executeFetchReauthCode 首轮 poll 成功 → 不触发 resend，直接 FILL_CODE + complete', async () => {
+ const mod = loadStepModule();
+ const { deps, calls } = buildDeps({
+ pollHandler: async () => ({ code: '123456' }),
+ });
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await executeFetchReauthCode({
+ reauthEmail: 'demo@2925.com',
+ mailProvider: '2925',
+ });
+
+ assert.equal(calls.poll.length, 1);
+ // 首轮不应有 resend
+ const resendCalls = calls.resilient.filter(
+ (c) => c.message?.type === 'RESEND_VERIFICATION_CODE'
+ );
+ assert.equal(resendCalls.length, 0);
+ // FILL_CODE 调用一次
+ const fillCalls = calls.resilient.filter((c) => c.message?.type === 'FILL_CODE');
+ assert.equal(fillCalls.length, 1);
+ assert.equal(fillCalls[0].message.payload.code, '123456');
+ assert.equal(calls.complete.length, 1);
+ assert.equal(calls.complete[0].payload.reauthVerificationCode, '123456');
+});
+
+test('executeFetchReauthCode 第一轮失败 → 调 RESEND_VERIFICATION_CODE → 第二轮成功', async () => {
+ const mod = loadStepModule();
+ let pollAttempt = 0;
+ const { deps, calls } = buildDeps({
+ pollHandler: async () => {
+ pollAttempt += 1;
+ if (pollAttempt === 1) {
+ throw new Error('邮箱轮询完成，但未取到 OAuth 验证码。');
+ }
+ return { code: '999000' };
+ },
+ maxResendRequests: 3,
+ resendIntervalMs: 5,
+ });
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await executeFetchReauthCode({
+ reauthEmail: 'demo@2925.com',
+ mailProvider: '2925',
+ });
+
+ assert.equal(calls.poll.length, 2);
+ const resendCalls = calls.resilient.filter(
+ (c) => c.message?.type === 'RESEND_VERIFICATION_CODE'
+ );
+ assert.equal(resendCalls.length, 1);
+ assert.equal(resendCalls[0].message.step, 3);
+
+ const fillCalls = calls.resilient.filter((c) => c.message?.type === 'FILL_CODE');
+ assert.equal(fillCalls.length, 1);
+ assert.equal(fillCalls[0].message.payload.code, '999000');
+ assert.equal(calls.complete.length, 1);
+});
+
+test('executeFetchReauthCode 所有轮 poll 均失败 → 抛出最后一个 error', async () => {
+ const mod = loadStepModule();
+ const { deps, calls } = buildDeps({
+ pollHandler: async () => {
+ throw new Error('邮箱轮询完成，但未取到 OAuth 验证码。');
+ },
+ maxResendRequests: 2,
+ });
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await assert.rejects(
+ () => executeFetchReauthCode({
+ reauthEmail: 'demo@2925.com',
+ mailProvider: '2925',
+ }),
+ /未取到/
+ );
+
+ // 总轮数 = maxResendRequests + 1 = 3
+ assert.equal(calls.poll.length, 3);
+ const resendCalls = calls.resilient.filter(
+ (c) => c.message?.type === 'RESEND_VERIFICATION_CODE'
+ );
+ assert.equal(resendCalls.length, 2);
+ assert.equal(calls.complete.length, 0);
+});
+
+test('executeFetchReauthCode RESEND 调用本身失败时不中断主轮询', async () => {
+ const mod = loadStepModule();
+ let pollAttempt = 0;
+ let resendAttempt = 0;
+ const { deps, calls } = buildDeps({
+ pollHandler: async () => {
+ pollAttempt += 1;
+ if (pollAttempt === 1) {
+ throw new Error('邮箱轮询完成，但未取到 OAuth 验证码。');
+ }
+ return { code: '777888' };
+ },
+ resilientHandler: async (target, message) => {
+ if (message?.type === 'RESEND_VERIFICATION_CODE') {
+ resendAttempt += 1;
+ return { error: 'mock resend failed' };
+ }
+ return {};
+ },
+ maxResendRequests: 2,
+ });
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await executeFetchReauthCode({
+ reauthEmail: 'demo@2925.com',
+ mailProvider: '2925',
+ });
+
+ assert.equal(resendAttempt, 1);
+ assert.equal(calls.poll.length, 2);
+ const fillCalls = calls.resilient.filter((c) => c.message?.type === 'FILL_CODE');
+ assert.equal(fillCalls.length, 1);
+});
+
+test('executeFetchReauthCode 在 stop 信号下立刻终止，不继续 resend / poll', async () => {
+ const mod = loadStepModule();
+ let pollAttempt = 0;
+ const { deps, calls } = buildDeps({
+ pollHandler: async () => {
+ pollAttempt += 1;
+ throw new Error('邮箱轮询完成，但未取到 OAuth 验证码。');
+ },
+ // sleepWithStop 第一次就抛 stop
+ sleepWithStop: async () => {
+ const err = new Error('已被用户停止');
+ throw err;
+ },
+ maxResendRequests: 3,
+ });
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await assert.rejects(
+ () => executeFetchReauthCode({
+ reauthEmail: 'demo@2925.com',
+ mailProvider: '2925',
+ }),
+ /已被用户停止/
+ );
+
+ // 仅第一轮 poll，之后 sleep 抛 stop，第二轮 poll 不会被调用
+ assert.equal(pollAttempt, 1);
+});
+
+test('executeFetchReauthCode 2925 时 payloadOverrides.maxAttempts = 6（缩短单轮 poll）', async () => {
+ const mod = loadStepModule();
+ const { deps, calls } = buildDeps({
+ pollHandler: async () => ({ code: '111222' }),
+ });
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await executeFetchReauthCode({
+ reauthEmail: 'demo@2925.com',
+ mailProvider: '2925',
+ });
+
+ assert.equal(calls.poll.length, 1);
+ const pollOptions = calls.poll[0];
+ assert.equal(pollOptions.payloadOverrides?.maxAttempts, 6);
+ assert.equal(mod.MAIL_2925_POLL_MAX_ATTEMPTS, 6);
+});
+
+test('executeFetchReauthCode 非 2925 provider 不强制覆盖 maxAttempts', async () => {
+ const mod = loadStepModule();
+ const { deps, calls } = buildDeps({
+ pollHandler: async () => ({ code: '333444' }),
+ });
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await executeFetchReauthCode({
+ reauthEmail: 'demo@hotmail.com',
+ mailProvider: 'hotmail-api',
+ });
+
+ assert.equal(calls.poll.length, 1);
+ const pollOptions = calls.poll[0];
+ assert.equal(pollOptions.payloadOverrides?.maxAttempts, undefined);
+});
+
+test('executeFetchReauthCode FILL_CODE 返回 error → throw 并不调 completeNode', async () => {
+ const mod = loadStepModule();
+ const { deps, calls } = buildDeps({
+ pollHandler: async () => ({ code: '555666' }),
+ resilientHandler: async (target, message) => {
+ if (message?.type === 'FILL_CODE') {
+ return { error: '未找到验证码输入框。' };
+ }
+ return {};
+ },
+ maxResendRequests: 0,
+ });
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await assert.rejects(
+ () => executeFetchReauthCode({
+ reauthEmail: 'demo@2925.com',
+ mailProvider: '2925',
+ }),
+ /未找到验证码输入框/
+ );
+
+ assert.equal(calls.complete.length, 0);
+});
+
+test('executeFetchReauthCode RESEND 中收到 stop 信号 → 立刻抛 stop', async () => {
+ const mod = loadStepModule();
+ let pollAttempt = 0;
+ const { deps } = buildDeps({
+ pollHandler: async () => {
+ pollAttempt += 1;
+ if (pollAttempt === 1) {
+ throw new Error('邮箱轮询完成，但未取到 OAuth 验证码。');
+ }
+ return { code: '111111' };
+ },
+ resilientHandler: async (target, message) => {
+ if (message?.type === 'RESEND_VERIFICATION_CODE') {
+ throw new Error('已被用户停止');
+ }
+ return {};
+ },
+ maxResendRequests: 2,
+ });
+ const { executeFetchReauthCode } = mod.createFetchReauthCodeExecutor(deps);
+ await assert.rejects(
+ () => executeFetchReauthCode({
+ reauthEmail: 'demo@2925.com',
+ mailProvider: '2925',
+ }),
+ /已被用户停止/
+ );
+
+ // 只跑一次 poll，resend 抛 stop 后直接外抛，不进入第二轮 poll
+ assert.equal(pollAttempt, 1);
+});
diff --git a/tests/openai-reauth-mail-rules.test.js b/tests/openai-reauth-mail-rules.test.js
new file mode 100644
index 00000000..9e11dd90
--- /dev/null
+++ b/tests/openai-reauth-mail-rules.test.js
@@ -0,0 +1,128 @@
+'use strict';
+
+const assert = require('node:assert');
+const test = require('node:test');
+const fs = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+
+const MAIL_RULES_PATH = path.join(__dirname, '..', 'flows', 'openai-reauth', 'mail-rules.js');
+
+function loadMailRulesModule() {
+ const source = fs.readFileSync(MAIL_RULES_PATH, 'utf-8');
+ const sandbox = { self: {}, globalThis: {} };
+ vm.createContext(sandbox);
+ vm.runInContext(source, sandbox);
+ return sandbox.self.MultiPageOpenAiReauthMailRules;
+}
+
+test('createOpenAiReauthMailRules 暴露统一接口', () => {
+ const mod = loadMailRulesModule();
+ const rules = mod.createOpenAiReauthMailRules({});
+ assert.equal(typeof rules.buildVerificationPollPayload, 'function');
+ assert.equal(typeof rules.buildVerificationPollPayloadForNode, 'function');
+ assert.equal(typeof rules.getRuleDefinition, 'function');
+ assert.equal(typeof rules.getRuleDefinitionForNode, 'function');
+});
+
+test('getRuleDefinitionForNode 仅识别 fetch-reauth-code', () => {
+ const mod = loadMailRulesModule();
+ const rules = mod.createOpenAiReauthMailRules({});
+ const ok = rules.getRuleDefinitionForNode('fetch-reauth-code', { reauthEmail: 'a@b.com' });
+ assert.ok(ok);
+ assert.equal(ok.flowId, 'openai-reauth');
+ assert.equal(ok.ruleId, 'openai-reauth-code');
+ assert.equal(ok.nodeId, 'fetch-reauth-code');
+ assert.equal(ok.step, 3);
+ assert.equal(ok.targetEmail, 'a@b.com');
+
+ assert.equal(rules.getRuleDefinitionForNode('fetch-signup-code', { email: 'x@y.com' }), null);
+ assert.equal(rules.getRuleDefinitionForNode('fetch-login-code', { email: 'x@y.com' }), null);
+ assert.equal(rules.getRuleDefinitionForNode('', { email: 'x@y.com' }), null);
+});
+
+test('targetEmail 优先 reauthEmail，缺失时 fallback 到 email', () => {
+ const mod = loadMailRulesModule();
+ const rules = mod.createOpenAiReauthMailRules({});
+ const a = rules.getRuleDefinitionForNode('fetch-reauth-code', { reauthEmail: 'r@x.com', email: 'fallback@x.com' });
+ assert.equal(a.targetEmail, 'r@x.com');
+ const b = rules.getRuleDefinitionForNode('fetch-reauth-code', { email: 'only@x.com' });
+ assert.equal(b.targetEmail, 'only@x.com');
+});
+
+test('targetEmailHints 包含原始邮箱与 username=domain 形式', () => {
+ const mod = loadMailRulesModule();
+ const rules = mod.createOpenAiReauthMailRules({});
+ const result = rules.getRuleDefinitionForNode('fetch-reauth-code', { reauthEmail: 'foo@2925.com' });
+ assert.deepEqual(result.targetEmailHints, ['foo@2925.com', 'foo=2925.com']);
+});
+
+test('mail2925 provider 切换到长间隔与多次重试', () => {
+ const mod = loadMailRulesModule();
+ const rules = mod.createOpenAiReauthMailRules({
+ MAIL_2925_VERIFICATION_INTERVAL_MS: 15000,
+ MAIL_2925_VERIFICATION_MAX_ATTEMPTS: 15,
+ });
+ const result = rules.getRuleDefinitionForNode('fetch-reauth-code', {
+ reauthEmail: 'r@2925.com',
+ mailProvider: '2925',
+ mail2925Mode: 'receive',
+ });
+ assert.equal(result.maxAttempts, 15);
+ assert.equal(result.intervalMs, 15000);
+ assert.equal(result.mail2925MatchTargetEmail, true);
+ assert.equal(result.filterAfterTimestamp, 0);
+});
+
+test('非 2925 provider 使用默认短间隔与 5 次重试', () => {
+ const mod = loadMailRulesModule();
+ const rules = mod.createOpenAiReauthMailRules({});
+ const result = rules.getRuleDefinitionForNode('fetch-reauth-code', {
+ reauthEmail: 'r@hotmail.com',
+ mailProvider: 'hotmail-api',
+ });
+ assert.equal(result.maxAttempts, 5);
+ assert.equal(result.intervalMs, 3000);
+ assert.equal(result.mail2925MatchTargetEmail, false);
+});
+
+test('hotmail provider 使用 timestamp dep 提供的 filter', () => {
+ const mod = loadMailRulesModule();
+ let receivedStep = null;
+ let receivedState = null;
+ const rules = mod.createOpenAiReauthMailRules({
+ getHotmailVerificationRequestTimestamp: (step, state) => {
+ receivedStep = step;
+ receivedState = state;
+ return 1779999999999;
+ },
+ });
+ const result = rules.getRuleDefinitionForNode('fetch-reauth-code', {
+ reauthEmail: 'r@hotmail.com',
+ mailProvider: 'hotmail-api',
+ });
+ assert.equal(receivedStep, 3);
+ assert.equal(receivedState.reauthEmail, 'r@hotmail.com');
+ assert.equal(result.filterAfterTimestamp, 1779999999999);
+});
+
+test('buildVerificationPollPayloadForNode 合并 overrides', () => {
+ const mod = loadMailRulesModule();
+ const rules = mod.createOpenAiReauthMailRules({});
+ const result = rules.buildVerificationPollPayloadForNode(
+ 'fetch-reauth-code',
+ { reauthEmail: 'a@b.com' },
+ { filterAfterTimestamp: 12345 }
+ );
+ assert.equal(result.filterAfterTimestamp, 12345);
+ assert.equal(result.targetEmail, 'a@b.com');
+});
+
+test('buildVerificationPollPayloadForNode 拒绝未知 nodeId', () => {
+ const mod = loadMailRulesModule();
+ const rules = mod.createOpenAiReauthMailRules({});
+ assert.equal(
+ rules.buildVerificationPollPayloadForNode('fetch-login-code', { email: 'x@y.com' }),
+ null
+ );
+});
diff --git a/tests/openai-reauth-oauth-client.test.js b/tests/openai-reauth-oauth-client.test.js
new file mode 100644
index 00000000..780ab22f
--- /dev/null
+++ b/tests/openai-reauth-oauth-client.test.js
@@ -0,0 +1,231 @@
+'use strict';
+
+const assert = require('node:assert');
+const test = require('node:test');
+const fs = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+const { webcrypto } = require('node:crypto');
+
+const OAUTH_CLIENT_PATH = path.join(__dirname, '..', 'flows', 'openai-reauth', 'background', 'oauth-client.js');
+
+function loadOAuthClientModule() {
+ const source = fs.readFileSync(OAUTH_CLIENT_PATH, 'utf-8');
+ const sandbox = {
+ self: {},
+ globalThis: {},
+ crypto: webcrypto,
+ TextEncoder,
+ TextDecoder,
+ fetch: globalThis.fetch,
+ URL,
+ URLSearchParams,
+ Uint8Array,
+ Buffer,
+ btoa: (str) => Buffer.from(str, 'binary').toString('base64'),
+ atob: (str) => Buffer.from(str, 'base64').toString('binary'),
+ console,
+ };
+ sandbox.self.crypto = webcrypto;
+ vm.createContext(sandbox);
+ vm.runInContext(source, sandbox);
+ return sandbox.self.MultiPageOpenAiReauthOAuthClient;
+}
+
+test('PKCE RFC 7636 已知向量验证', async () => {
+ const mod = loadOAuthClientModule();
+ const knownVerifier = 'dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk';
+ const expected = 'E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM';
+ const bytes = await mod.sha256Bytes(knownVerifier);
+ const actual = mod.base64UrlEncode(bytes);
+ assert.equal(actual, expected, '已知向量应通过 RFC 7636 验证');
+});
+
+test('generatePkcePair 返回合规的 verifier 和 challenge', async () => {
+ const mod = loadOAuthClientModule();
+ const { codeVerifier, codeChallenge } = await mod.generatePkcePair();
+ assert.match(codeVerifier, /^[A-Za-z0-9\-._~]{43,128}$/, 'verifier 字符集和长度合规');
+ assert.match(codeChallenge, /^[A-Za-z0-9_-]{43}$/, 'challenge 是 43 字符 base64url 无填充');
+});
+
+test('generateState 返回 64 字符 hex', () => {
+ const mod = loadOAuthClientModule();
+ const s = mod.generateState();
+ assert.match(s, /^[0-9a-f]{64}$/);
+});
+
+test('buildAuthorizeUrl 重建用户给的示例链接', () => {
+ const mod = loadOAuthClientModule();
+ const url = mod.buildAuthorizeUrl({
+ codeChallenge: 'xu7USQwZr4TDQWbZPOmqmkzwB5bbuTzHK0Z3AToSF9Y',
+ state: '17cd69f25d8fc9253b6850031c465cc57dc6badd7943f6306444b37c3ce565b7',
+ });
+ const expected = 'https://auth.openai.com/oauth/authorize?client_id=app_EMoamEEZ73f0CkXaXp7hrann&code_challenge=xu7USQwZr4TDQWbZPOmqmkzwB5bbuTzHK0Z3AToSF9Y&code_challenge_method=S256&codex_cli_simplified_flow=true&id_token_add_organizations=true&redirect_uri=http%3A%2F%2Flocalhost%3A1455%2Fauth%2Fcallback&response_type=code&scope=openid+profile+email+offline_access&state=17cd69f25d8fc9253b6850031c465cc57dc6badd7943f6306444b37c3ce565b7';
+ assert.equal(url, expected);
+});
+
+test('buildAuthorizeUrl 缺少参数时抛错', () => {
+ const mod = loadOAuthClientModule();
+ assert.throws(() => mod.buildAuthorizeUrl({ codeChallenge: 'x' }), /state/);
+ assert.throws(() => mod.buildAuthorizeUrl({ state: 'y' }), /codeChallenge/);
+});
+
+test('parseCallbackUrl 成功路径', () => {
+ const mod = loadOAuthClientModule();
+ const result = mod.parseCallbackUrl(
+ 'http://localhost:1455/auth/callback?code=abc123&state=xyz',
+ 'xyz'
+ );
+ assert.equal(result.code, 'abc123');
+ assert.equal(result.state, 'xyz');
+ assert.equal(result.error, undefined);
+});
+
+test('parseCallbackUrl state 不匹配时返回 error', () => {
+ const mod = loadOAuthClientModule();
+ const result = mod.parseCallbackUrl(
+ 'http://localhost:1455/auth/callback?code=abc&state=actual',
+ 'expected'
+ );
+ assert.ok(result.error.includes('state'));
+});
+
+test('parseCallbackUrl 拒绝非法 URL 路径与端口', () => {
+ const mod = loadOAuthClientModule();
+ assert.equal(mod.parseCallbackUrl('http://localhost:1455/other?code=x&state=y', 'y'), null);
+ assert.equal(mod.parseCallbackUrl('http://localhost:9999/auth/callback?code=x&state=y', 'y'), null);
+ assert.equal(mod.parseCallbackUrl('http://evil.com/auth/callback?code=x&state=y', 'y'), null);
+});
+
+test('parseCallbackUrl error_description 优先', () => {
+ const mod = loadOAuthClientModule();
+ const result = mod.parseCallbackUrl(
+ 'http://localhost:1455/auth/callback?error=access_denied&error_description=user_canceled&state=y',
+ 'y'
+ );
+ assert.equal(result.error, 'user_canceled');
+ assert.equal(result.code, undefined);
+});
+
+test('exchangeAuthorizationCode 用 fake fetch 验证请求体与字段抽取', async () => {
+ const mod = loadOAuthClientModule();
+ let capturedUrl = '';
+ let capturedBody = '';
+ let capturedHeaders = null;
+ const fakeFetch = async (url, options) => {
+ capturedUrl = url;
+ capturedBody = options.body;
+ capturedHeaders = options.headers;
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ access_token: 'tok_access',
+ refresh_token: 'tok_refresh',
+ id_token: 'tok_id',
+ expires_in: 3600,
+ token_type: 'Bearer',
+ }),
+ };
+ };
+ const result = await mod.exchangeAuthorizationCode({
+ code: 'code_value',
+ codeVerifier: 'verifier_value',
+ fetchImpl: fakeFetch,
+ });
+ assert.equal(capturedUrl, 'https://auth.openai.com/oauth/token');
+ assert.equal(capturedHeaders['Content-Type'], 'application/x-www-form-urlencoded');
+ const params = new URLSearchParams(capturedBody);
+ assert.equal(params.get('grant_type'), 'authorization_code');
+ assert.equal(params.get('client_id'), 'app_EMoamEEZ73f0CkXaXp7hrann');
+ assert.equal(params.get('code'), 'code_value');
+ assert.equal(params.get('code_verifier'), 'verifier_value');
+ assert.equal(params.get('redirect_uri'), 'http://localhost:1455/auth/callback');
+ assert.equal(result.accessToken, 'tok_access');
+ assert.equal(result.refreshToken, 'tok_refresh');
+ assert.equal(result.idToken, 'tok_id');
+ assert.equal(result.expiresIn, 3600);
+});
+
+test('exchangeAuthorizationCode 失败响应抛出详细错误', async () => {
+ const mod = loadOAuthClientModule();
+ const fakeFetch = async () => ({
+ ok: false,
+ status: 400,
+ text: async () => JSON.stringify({ error: 'invalid_grant', error_description: 'code expired' }),
+ });
+ await assert.rejects(
+ () => mod.exchangeAuthorizationCode({ code: 'c', codeVerifier: 'v', fetchImpl: fakeFetch }),
+ /code expired|invalid_grant/
+ );
+});
+
+test('exchangeAuthorizationCode 缺少 access_token 时抛错', async () => {
+ const mod = loadOAuthClientModule();
+ const fakeFetch = async () => ({
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({ refresh_token: 'r' }),
+ });
+ await assert.rejects(
+ () => mod.exchangeAuthorizationCode({ code: 'c', codeVerifier: 'v', fetchImpl: fakeFetch }),
+ /access_token|refresh_token/
+ );
+});
+
+test('decodeJwtPayload 能解码示例 id_token', () => {
+ const mod = loadOAuthClientModule();
+ const samplePayload = { email: 'foo@bar.com', exp: 1779903020 };
+ const headerB64 = Buffer.from(JSON.stringify({ alg: 'none' }), 'utf-8').toString('base64url');
+ const payloadB64 = Buffer.from(JSON.stringify(samplePayload), 'utf-8').toString('base64url');
+ const jwt = `${headerB64}.${payloadB64}.sig`;
+ const decoded = mod.decodeJwtPayload(jwt);
+ assert.deepEqual(decoded, samplePayload);
+});
+
+test('buildUpdatedAccount 保留原账号外层字段，仅替换 credentials', () => {
+ const mod = loadOAuthClientModule();
+ const idPayload = {
+ email: 'ranger@2925.com',
+ 'https://api.openai.com/auth': {
+ chatgpt_account_id: 'acct_123',
+ chatgpt_user_id: 'user_456',
+ chatgpt_plan_type: 'plus',
+ organizations: [
+ { id: 'org-x', is_default: false },
+ { id: 'org-default', is_default: true },
+ ],
+ },
+ 'https://api.openai.com/profile': { email: 'ranger@2925.com', email_verified: true },
+ };
+ const idTokenJwt = [
+ Buffer.from(JSON.stringify({ alg: 'none' })).toString('base64url'),
+ Buffer.from(JSON.stringify(idPayload)).toString('base64url'),
+ 'sig',
+ ].join('.');
+ const original = {
+ name: 'ranger@2925.com',
+ platform: 'openai',
+ type: 'oauth',
+ credentials: { email: 'ranger@2925.com', client_id: 'old', refresh_token: 'old-refresh' },
+ extra: { email: 'ranger@2925.com' },
+ concurrency: 3,
+ priority: 3,
+ };
+ const updated = mod.buildUpdatedAccount(original, {
+ accessToken: 'new-access',
+ refreshToken: 'new-refresh',
+ idToken: idTokenJwt,
+ expiresIn: 3600,
+ });
+ assert.equal(updated.name, 'ranger@2925.com');
+ assert.equal(updated.concurrency, 3);
+ assert.equal(updated.credentials.access_token, 'new-access');
+ assert.equal(updated.credentials.refresh_token, 'new-refresh');
+ assert.equal(updated.credentials.id_token, idTokenJwt);
+ assert.equal(updated.credentials.chatgpt_account_id, 'acct_123');
+ assert.equal(updated.credentials.organization_id, 'org-default');
+ assert.equal(updated.credentials.plan_type, 'plus');
+ assert.equal(updated.credentials.client_id, 'app_EMoamEEZ73f0CkXaXp7hrann');
+ assert.ok(updated.credentials.expires_at > Math.floor(Date.now() / 1000));
+});
diff --git a/tests/openai-reauth-validate-account-json.test.js b/tests/openai-reauth-validate-account-json.test.js
new file mode 100644
index 00000000..a95a25a1
--- /dev/null
+++ b/tests/openai-reauth-validate-account-json.test.js
@@ -0,0 +1,162 @@
+'use strict';
+
+const assert = require('node:assert');
+const test = require('node:test');
+const fs = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+
+const VALIDATOR_PATH = path.join(__dirname, '..', 'flows', 'openai-reauth', 'reauth-account-validator.js');
+
+function loadValidatorModule() {
+ const source = fs.readFileSync(VALIDATOR_PATH, 'utf-8');
+ const sandbox = { self: {}, globalThis: {} };
+ vm.createContext(sandbox);
+ vm.runInContext(source, sandbox);
+ return sandbox.self.MultiPageOpenAiReauthAccountValidator;
+}
+
+test('SUPPORTED_MAIL_PROVIDERS 暴露 7 个 provider', () => {
+ const mod = loadValidatorModule();
+ assert.deepEqual([...mod.SUPPORTED_MAIL_PROVIDERS].sort(), [
+ '2925',
+ 'cloudflare-temp-email',
+ 'cloudmail',
+ 'hotmail-api',
+ 'icloud',
+ 'luckmail-api',
+ 'yyds-mail',
+ ]);
+});
+
+test('parseAccountsFromJson 空文本返回错误', () => {
+ const mod = loadValidatorModule();
+ const r = mod.parseAccountsFromJson('');
+ assert.equal(r.ok, false);
+ assert.match(r.error, /请粘贴/);
+});
+
+test('parseAccountsFromJson 非法 JSON', () => {
+ const mod = loadValidatorModule();
+ assert.equal(mod.parseAccountsFromJson('{not json').ok, false);
+});
+
+test('parseAccountsFromJson 非对象/数组拒绝', () => {
+ const mod = loadValidatorModule();
+ assert.equal(mod.parseAccountsFromJson('"str"').ok, false);
+ assert.equal(mod.parseAccountsFromJson('42').ok, false);
+ assert.equal(mod.parseAccountsFromJson('null').ok, false);
+});
+
+test('parseAccountsFromJson 单账号对象', () => {
+ const mod = loadValidatorModule();
+ const r = mod.parseAccountsFromJson(JSON.stringify({
+ credentials: { email: 'a@b.com' },
+ }));
+ assert.equal(r.ok, true);
+ assert.equal(r.accounts.length, 1);
+ assert.equal(r.accounts[0].email, 'a@b.com');
+ assert.equal(r.accounts[0].index, 0);
+});
+
+test('parseAccountsFromJson sub2api 整文件 - 3 个账号', () => {
+ const mod = loadValidatorModule();
+ const r = mod.parseAccountsFromJson(JSON.stringify({
+ exported_at: '2026-05-28T07:52:21Z',
+ proxies: [],
+ accounts: [
+ { name: 'a@2925.com', credentials: { email: 'a@2925.com' } },
+ { name: 'b@2925.com', credentials: { email: 'b@2925.com' } },
+ { name: 'c@2925.com', credentials: { email: 'c@2925.com' } },
+ ],
+ }));
+ assert.equal(r.ok, true);
+ assert.equal(r.accounts.length, 3);
+ assert.equal(r.accounts[0].email, 'a@2925.com');
+ assert.equal(r.accounts[1].email, 'b@2925.com');
+ assert.equal(r.accounts[2].email, 'c@2925.com');
+});
+
+test('parseAccountsFromJson accounts 是数组（无 wrapper）', () => {
+ const mod = loadValidatorModule();
+ const r = mod.parseAccountsFromJson(JSON.stringify([
+ { credentials: { email: 'x@y.com' } },
+ ]));
+ assert.equal(r.ok, true);
+ assert.equal(r.accounts.length, 1);
+});
+
+test('parseAccountsFromJson accounts 数组为空时拒绝', () => {
+ const mod = loadValidatorModule();
+ const r = mod.parseAccountsFromJson(JSON.stringify({ accounts: [] }));
+ assert.equal(r.ok, false);
+ assert.match(r.error, /列表为空/);
+});
+
+test('parseAccountsFromJson 某个 account 缺 email 时报错并指明 index', () => {
+ const mod = loadValidatorModule();
+ const r = mod.parseAccountsFromJson(JSON.stringify({
+ accounts: [
+ { credentials: { email: 'a@b.com' } },
+ { credentials: {} },
+ ],
+ }));
+ assert.equal(r.ok, false);
+ assert.match(r.error, /accounts\[1\]/);
+ assert.match(r.error, /email/);
+});
+
+test('parseAccountsFromJson email 格式非法时报错', () => {
+ const mod = loadValidatorModule();
+ const r = mod.parseAccountsFromJson(JSON.stringify({
+ accounts: [{ credentials: { email: 'not-email' } }],
+ }));
+ assert.equal(r.ok, false);
+ assert.match(r.error, /格式无效/);
+});
+
+test('parseAccountsFromJson 兼容 email 在顶层 / name 字段', () => {
+ const mod = loadValidatorModule();
+ const r1 = mod.parseAccountsFromJson(JSON.stringify({ accounts: [{ email: 'top@x.com' }] }));
+ assert.equal(r1.accounts[0].email, 'top@x.com');
+ const r2 = mod.parseAccountsFromJson(JSON.stringify({ accounts: [{ name: 'name@x.com' }] }));
+ assert.equal(r2.accounts[0].email, 'name@x.com');
+});
+
+test('buildResolvedAccount 注入 mailProvider', () => {
+ const mod = loadValidatorModule();
+ const original = {
+ name: 'a@2925.com',
+ platform: 'openai',
+ credentials: { email: 'a@2925.com', refresh_token: 'old' },
+ concurrency: 3,
+ };
+ const resolved = mod.buildResolvedAccount(original, '2925');
+ assert.equal(resolved.mailProvider, '2925');
+ assert.equal(resolved.concurrency, 3);
+ assert.equal(resolved.credentials.refresh_token, 'old');
+});
+
+test('buildResolvedAccount 拒绝空 provider', () => {
+ const mod = loadValidatorModule();
+ assert.throws(
+ () => mod.buildResolvedAccount({ credentials: { email: 'a@b.com' } }, ''),
+ /mailProvider/
+ );
+});
+
+test('buildResolvedAccount 不修改原对象（不可变）', () => {
+ const mod = loadValidatorModule();
+ const original = { credentials: { email: 'a@b.com' } };
+ const resolved = mod.buildResolvedAccount(original, 'hotmail-api');
+ assert.equal(original.mailProvider, undefined);
+ assert.equal(resolved.mailProvider, 'hotmail-api');
+});
+
+test('extractAccountEmail 优先级：credentials.email > email > name', () => {
+ const mod = loadValidatorModule();
+ assert.equal(mod.extractAccountEmail({ credentials: { email: 'c@x.com' }, email: 'e@x.com', name: 'n@x.com' }), 'c@x.com');
+ assert.equal(mod.extractAccountEmail({ email: 'e@x.com', name: 'n@x.com' }), 'e@x.com');
+ assert.equal(mod.extractAccountEmail({ name: 'n@x.com' }), 'n@x.com');
+ assert.equal(mod.extractAccountEmail({}), '');
+});
diff --git a/tests/sidepanel-flow-source-registry.test.js b/tests/sidepanel-flow-source-registry.test.js
index 804cb743..f52c1ddc 100644
--- a/tests/sidepanel-flow-source-registry.test.js
+++ b/tests/sidepanel-flow-source-registry.test.js
@@ -322,6 +322,9 @@ function updatePlusModeUI() {
function updatePhoneVerificationSettingsUI() {
calls.push({ type: 'phone' });
}
+function applyOpenAiReauthRowVisibility(activeFlowId) {
+ calls.push({ type: 'reauth-visibility', flowId: activeFlowId });
+}
function resolveCurrentSidepanelCapabilities() {
return {
visibleGroupIds: ['service-account', 'openai-plus', 'openai-phone'],
@@ -346,7 +349,7 @@ return {
assert.deepEqual(
api.calls.map((entry) => entry.type),
- ['render-flow', 'render-target', 'groups', 'plus', 'phone']
+ ['render-flow', 'render-target', 'groups', 'plus', 'phone', 'reauth-visibility']
);
assert.equal(api.selectFlow.value, 'openai');
assert.equal(api.selectPanelMode.value, 'cpa');