Hermes/FlowPilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: 合并最新 dev（2925 模式选择）并修复测试 mock

Browse Source 
- 解决 background.js 3 处冲突：保留 LuckMail 逻辑 + 采用 dev 的 isGeneratedAliasProvider(state) 新 API
- 解决 sidepanel.js 3 处冲突：保留 LuckMail UI + 采用 dev 的 mail2925Mode 参数
- step9 测试补充 normalizeMail2925Mode/getMail2925Mode 提取和 MAIL_2925_MODE 常量
- 全部 76 个测试通过
This commit is contained in:
笨笨
2026-04-15 00:09:11 +08:00
parent 69f1419d3d 4fb62e5e1c
commit 1731d770af
4 changed files with 120 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
background.js
+31 -6
View File
@@ -104,6 +104,9 @@ const AUTO_STEP_DELAY_MIN_ALLOWED_SECONDS = 0;
const AUTO_STEP_DELAY_MAX_ALLOWED_SECONDS = 600;
const LEGACY_AUTO_STEP_DELAY_KEYS = ['autoStepRandomDelayMinSeconds', 'autoStepRandomDelayMaxSeconds'];
const DEFAULT_LOCAL_CPA_STEP9_MODE = 'submit';
const MAIL_2925_MODE_PROVIDE = 'provide';
const MAIL_2925_MODE_RECEIVE = 'receive';
const DEFAULT_MAIL_2925_MODE = MAIL_2925_MODE_PROVIDE;
const HOTMAIL_SERVICE_MODE_REMOTE = 'remote';
const HOTMAIL_SERVICE_MODE_LOCAL = 'local';
const DEFAULT_HOTMAIL_REMOTE_BASE_URL = '';
@@ -135,6 +138,7 @@ const PERSISTED_SETTING_DEFAULTS = {
autoRunDelayMinutes: 30,
autoStepDelaySeconds: null,
mailProvider: '163',
mail2925Mode: DEFAULT_MAIL_2925_MODE,
emailGenerator: 'duck',
autoDeleteUsedIcloudAlias: false,
icloudHostPreference: 'auto',
@@ -372,6 +376,12 @@ function buildLuckmailSessionSettingsPayload(input = {}) {
return payload;
}
function normalizeMail2925Mode(value = '') {
return String(value || '').trim().toLowerCase() === MAIL_2925_MODE_RECEIVE
? MAIL_2925_MODE_RECEIVE
: DEFAULT_MAIL_2925_MODE;
}
function normalizeLocalCpaStep9Mode(value = '') {
return String(value || '').trim().toLowerCase() === 'bypass'
? 'bypass'
@@ -499,6 +509,8 @@ function normalizePersistentSettingValue(key, value) {
return normalizeAutoStepDelaySeconds(value, PERSISTED_SETTING_DEFAULTS.autoStepDelaySeconds);
case 'mailProvider':
return normalizeMailProvider(value);
case 'mail2925Mode':
return normalizeMail2925Mode(value);
case 'emailGenerator':
return normalizeEmailGenerator(value);
case 'autoDeleteUsedIcloudAlias':
@@ -1004,6 +1016,13 @@ function isCustomMailProvider(stateOrProvider) {
return provider === 'custom';
}
function getMail2925Mode(stateOrMode) {
if (typeof stateOrMode === 'string') {
return normalizeMail2925Mode(stateOrMode);
}
return normalizeMail2925Mode(stateOrMode?.mail2925Mode);
}
async function syncHotmailAccounts(accounts) {
const normalized = normalizeHotmailAccounts(accounts);
await setPersistentSettings({ hotmailAccounts: normalized });
@@ -1627,14 +1646,20 @@ function generateRandomSuffix(length = 6) {
return suffix;
}
function isGeneratedAliasProvider(provider) {
return provider === '2925';
function isGeneratedAliasProvider(stateOrProvider, mail2925Mode = undefined) {
const provider = typeof stateOrProvider === 'string'
? stateOrProvider
: stateOrProvider?.mailProvider;
const resolvedMail2925Mode = mail2925Mode !== undefined
? normalizeMail2925Mode(mail2925Mode)
: getMail2925Mode(stateOrProvider);
return provider === '2925' && resolvedMail2925Mode === MAIL_2925_MODE_PROVIDE;
}
function shouldUseCustomRegistrationEmail(state = {}) {
return isCustomMailProvider(state)
|| (!isHotmailProvider(state)
&& !isGeneratedAliasProvider(state.mailProvider)
&& !isGeneratedAliasProvider(state)
&& normalizeEmailGenerator(state.emailGenerator) === 'custom');
}
@@ -1646,7 +1671,7 @@ function buildGeneratedAliasEmail(state) {
throw new Error('2925 邮箱前缀未设置，请先在侧边栏填写。');
}
if (provider === '2925') {
if (provider === '2925' && isGeneratedAliasProvider(state)) {
return `${emailPrefix}${generateRandomSuffix(6)}@2925.com`;
}
@@ -5317,7 +5342,7 @@ async function ensureAutoEmailReady(targetRun, totalRuns, attemptRuns) {
return purchase.email_address;
}
if (isGeneratedAliasProvider(currentState.mailProvider)) {
if (isGeneratedAliasProvider(currentState)) {
if (!currentState.emailPrefix) {
throw new Error('2925 邮箱前缀未设置，请先在侧边栏填写。');
}
@@ -6449,7 +6474,7 @@ async function executeStep3(state) {
} else if (isLuckmailProvider(state)) {
const purchase = await ensureLuckmailPurchaseForFlow({ allowReuse: true });
resolvedEmail = purchase.email_address;
} else if (isGeneratedAliasProvider(state.mailProvider)) {
} else if (isGeneratedAliasProvider(state)) {
resolvedEmail = buildGeneratedAliasEmail(state);
}
sidepanel/sidepanel.html
+7
View File
@@ -165,6 +165,13 @@
<button id="btn-mail-login" class="btn btn-outline btn-sm data-inline-btn" type="button" disabled>登录</button>
</div>
</div>
<div class="data-row" id="row-mail-2925-mode" style="display:none;">
<span class="data-label">2925 模式</span>
<div id="mail-2925-mode-group" class="choice-group" role="group" aria-label="2925 邮箱模式">
<button type="button" class="choice-btn" data-mail-2925-mode="provide">提供邮箱</button>
<button type="button" class="choice-btn" data-mail-2925-mode="receive">接收邮箱</button>
</div>
</div>
<div class="data-row" id="row-email-generator">
<span class="data-label">邮箱生成</span>
<select id="select-email-generator" class="data-select">
sidepanel/sidepanel.js
+77 -12
View File
@@ -66,6 +66,8 @@ const rowSub2ApiGroup = document.getElementById('row-sub2api-group');
const inputSub2ApiGroup = document.getElementById('input-sub2api-group');
const selectMailProvider = document.getElementById('select-mail-provider');
const btnMailLogin = document.getElementById('btn-mail-login');
const rowMail2925Mode = document.getElementById('row-mail-2925-mode');
const mail2925ModeButtons = Array.from(document.querySelectorAll('[data-mail-2925-mode]'));
const rowEmailGenerator = document.getElementById('row-email-generator');
const selectEmailGenerator = document.getElementById('select-email-generator');
const rowTempEmailBaseUrl = document.getElementById('row-temp-email-base-url');
@@ -188,6 +190,9 @@ const AUTO_RUN_MAX_RETRIES_PER_ROUND = 3;
const AUTO_STEP_DELAY_MIN_SECONDS = 0;
const AUTO_STEP_DELAY_MAX_SECONDS = 600;
const DEFAULT_LOCAL_CPA_STEP9_MODE = 'submit';
const MAIL_2925_MODE_PROVIDE = 'provide';
const MAIL_2925_MODE_RECEIVE = 'receive';
const DEFAULT_MAIL_2925_MODE = MAIL_2925_MODE_PROVIDE;
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_FALLBACK_RISK_WARNING_MIN_RUNS = 15;
@@ -304,7 +309,8 @@ const LOG_LEVEL_LABELS = {
};
function usesGeneratedAliasMailProvider(provider) {
return provider === '2925';
return String(provider || '').trim() === '2925'
&& getSelectedMail2925Mode() === MAIL_2925_MODE_PROVIDE;
}
function showToast(message, type = 'error', duration = 4000) {
@@ -1090,6 +1096,7 @@ function collectSettingsPayload() {
sub2apiGroupName: inputSub2ApiGroup.value.trim(),
customPassword: inputPassword.value,
mailProvider: selectMailProvider.value,
mail2925Mode: getSelectedMail2925Mode(),
emailGenerator: selectEmailGenerator.value,
autoDeleteUsedIcloudAlias: checkboxAutoDeleteIcloud?.checked,
icloudHostPreference: selectIcloudHostPreference?.value || 'auto',
@@ -1124,6 +1131,12 @@ function normalizeLocalCpaStep9Mode(value = '') {
: DEFAULT_LOCAL_CPA_STEP9_MODE;
}
function normalizeMail2925Mode(value = '') {
return String(value || '').trim().toLowerCase() === MAIL_2925_MODE_RECEIVE
? MAIL_2925_MODE_RECEIVE
: DEFAULT_MAIL_2925_MODE;
}
function normalizeHotmailServiceMode(value = '') {
return HOTMAIL_SERVICE_MODE_LOCAL;
}
@@ -1142,6 +1155,20 @@ function setLocalCpaStep9Mode(mode) {
});
}
function getSelectedMail2925Mode() {
const activeButton = mail2925ModeButtons.find((button) => button.classList.contains('is-active'));
return normalizeMail2925Mode(activeButton?.dataset.mail2925Mode);
}
function setMail2925Mode(mode) {
const resolvedMode = normalizeMail2925Mode(mode);
mail2925ModeButtons.forEach((button) => {
const active = button.dataset.mail2925Mode === resolvedMode;
button.classList.toggle('is-active', active);
button.setAttribute('aria-pressed', String(active));
});
}
function getSelectedHotmailServiceMode() {
const activeButton = hotmailServiceModeButtons.find((button) => button.classList.contains('is-active'));
return normalizeHotmailServiceMode(activeButton?.dataset.hotmailServiceMode);
@@ -1388,13 +1415,14 @@ function applySettingsState(state) {
? 'custom'
: '163');
selectMailProvider.value = restoredMailProvider;
setMail2925Mode(state?.mail2925Mode);
{
const restoredGenerator = String(state?.emailGenerator || '').trim().toLowerCase();
if (restoredGenerator === 'icloud') {
const restoredEmailGenerator = String(state?.emailGenerator || '').trim().toLowerCase();
if (restoredEmailGenerator === 'icloud') {
selectEmailGenerator.value = 'icloud';
} else if (restoredGenerator === 'cloudflare') {
} else if (restoredEmailGenerator === 'cloudflare') {
selectEmailGenerator.value = 'cloudflare';
} else if (restoredGenerator === 'cloudflare-temp-email') {
} else if (restoredEmailGenerator === 'cloudflare-temp-email') {
selectEmailGenerator.value = 'cloudflare-temp-email';
} else {
selectEmailGenerator.value = 'duck';
@@ -2253,9 +2281,13 @@ function isCurrentEmailManagedByLuckmail(state = latestState) {
return inputEmailValue === luckmailEmail || stateEmailValue === luckmailEmail;
}
function isCurrentEmailManagedByGeneratedAlias(provider = latestState?.mailProvider, state = latestState) {
function isCurrentEmailManagedByGeneratedAlias(
provider = latestState?.mailProvider,
state = latestState,
mail2925Mode = latestState?.mail2925Mode
) {
const normalizedProvider = String(provider || '').trim();
if (!usesGeneratedAliasMailProvider(normalizedProvider)) {
if (!(normalizedProvider === '2925' && normalizeMail2925Mode(mail2925Mode) === MAIL_2925_MODE_PROVIDE)) {
return false;
}
@@ -2490,7 +2522,8 @@ function renderHotmailAccounts() {
function updateMailProviderUI() {
const use2925 = selectMailProvider.value === '2925';
const useGeneratedAlias = usesGeneratedAliasMailProvider(selectMailProvider.value);
const mail2925Mode = getSelectedMail2925Mode();
const useGeneratedAlias = use2925 && mail2925Mode === MAIL_2925_MODE_PROVIDE;
const useInbucket = selectMailProvider.value === 'inbucket';
const useHotmail = selectMailProvider.value === 'hotmail-api';
const useLuckmail = isLuckmailProvider();
@@ -2498,6 +2531,9 @@ function updateMailProviderUI() {
const useEmailGenerator = !useHotmail && !useLuckmail && !useGeneratedAlias && !useCustomEmail;
const useCloudflareTempEmailProvider = selectMailProvider.value === 'cloudflare-temp-email';
updateMailLoginButtonState();
if (rowMail2925Mode) {
rowMail2925Mode.style.display = use2925 ? '' : 'none';
}
rowEmailPrefix.style.display = useGeneratedAlias ? '' : 'none';
const hotmailServiceMode = getSelectedHotmailServiceMode();
rowInbucketHost.style.display = useInbucket ? '' : 'none';
@@ -2565,7 +2601,7 @@ function updateMailProviderUI() {
? '由 Hotmail 账号池自动分配'
: (useLuckmail
? '步骤 3 自动购买 LuckMail 邮箱并回填'
: (use2925 ? '步骤 3 自动生成 2925 邮箱并回填' : uiCopy.placeholder));
: (useGeneratedAlias ? '步骤 3 自动生成 2925 邮箱并回填' : uiCopy.placeholder));
btnFetchEmail.disabled = useGeneratedAlias || useLuckmail || useCustomEmail || isAutoRunLockedPhase();
if (!btnFetchEmail.disabled) {
btnFetchEmail.textContent = uiCopy.buttonLabel;
@@ -4292,6 +4328,7 @@ inputPassword.addEventListener('blur', () => {
selectMailProvider.addEventListener('change', async () => {
const previousProvider = latestState?.mailProvider || '';
const previousMail2925Mode = latestState?.mail2925Mode;
const nextProvider = selectMailProvider.value;
updateMailProviderUI();
const leavingHotmail = previousProvider === 'hotmail-api'
@@ -4300,9 +4337,12 @@ selectMailProvider.addEventListener('change', async () => {
const leavingLuckmail = previousProvider === LUCKMAIL_PROVIDER
&& nextProvider !== LUCKMAIL_PROVIDER
&& isCurrentEmailManagedByLuckmail();
const leavingGeneratedAlias = previousProvider !== nextProvider
&& usesGeneratedAliasMailProvider(previousProvider)
&& isCurrentEmailManagedByGeneratedAlias(previousProvider);
const leavingGeneratedAlias = (
previousProvider !== nextProvider
|| (previousProvider === '2925' && normalizeMail2925Mode(previousMail2925Mode) !== getSelectedMail2925Mode())
) && previousProvider === '2925'
&& normalizeMail2925Mode(previousMail2925Mode) === MAIL_2925_MODE_PROVIDE
&& isCurrentEmailManagedByGeneratedAlias(previousProvider, latestState, previousMail2925Mode);
if (leavingHotmail || leavingLuckmail || leavingGeneratedAlias) {
await clearRegistrationEmail({ silent: true }).catch(() => { });
}
@@ -4313,6 +4353,30 @@ selectMailProvider.addEventListener('change', async () => {
saveSettings({ silent: true }).catch(() => { });
});
mail2925ModeButtons.forEach((button) => {
button.addEventListener('click', async () => {
const nextMode = normalizeMail2925Mode(button.dataset.mail2925Mode);
const previousMode = normalizeMail2925Mode(latestState?.mail2925Mode);
if (nextMode === getSelectedMail2925Mode()) {
return;
}
setMail2925Mode(nextMode);
updateMailProviderUI();
const leavingGeneratedAlias = selectMailProvider.value === '2925'
&& previousMode === MAIL_2925_MODE_PROVIDE
&& nextMode !== MAIL_2925_MODE_PROVIDE
&& isCurrentEmailManagedByGeneratedAlias('2925', latestState, previousMode);
if (leavingGeneratedAlias) {
await clearRegistrationEmail({ silent: true }).catch(() => { });
}
markSettingsDirty(true);
saveSettings({ silent: true }).catch(() => { });
});
});
selectEmailGenerator.addEventListener('change', () => {
updateMailProviderUI();
clearRegistrationEmail({ silent: true }).catch(() => { });
@@ -4832,6 +4896,7 @@ initHotmailListExpandedState();
updateSaveButtonState();
updateConfigMenuControls();
setLocalCpaStep9Mode(DEFAULT_LOCAL_CPA_STEP9_MODE);
setMail2925Mode(DEFAULT_MAIL_2925_MODE);
initializeReleaseInfo().catch((err) => {
console.error('Failed to initialize release info:', err);
});
tests/step9-localhost-cleanup-scope.test.js
+5
View File
@@ -53,6 +53,8 @@ function extractFunction(name) {
const bundle = [
extractFunction('getTabRegistry'),
extractFunction('normalizeEmailGenerator'),
extractFunction('normalizeMail2925Mode'),
extractFunction('getMail2925Mode'),
extractFunction('parseUrlSafely'),
extractFunction('isHotmailProvider'),
extractFunction('isCustomMailProvider'),
@@ -70,6 +72,9 @@ const api = new Function(`
const HOTMAIL_PROVIDER = 'hotmail-api';
const CLOUDFLARE_TEMP_EMAIL_PROVIDER = 'cloudflare-temp-email';
const CLOUDFLARE_TEMP_EMAIL_GENERATOR = 'cloudflare-temp-email';
const MAIL_2925_MODE_PROVIDE = 'provide';
const MAIL_2925_MODE_RECEIVE = 'receive';
const DEFAULT_MAIL_2925_MODE = MAIL_2925_MODE_PROVIDE;
let currentState = {
tabRegistry: {
'signup-page': { tabId: 1, ready: true },