diff --git a/sidepanel/sidepanel.js b/sidepanel/sidepanel.js
index 837d9767..a4c8ad40 100644
--- a/sidepanel/sidepanel.js
+++ b/sidepanel/sidepanel.js
@@ -297,9 +297,17 @@ const rowTempEmailLookupMode = document.getElementById('row-temp-email-lookup-mo
const tempEmailLookupModeButtons = Array.from(document.querySelectorAll('[data-temp-email-lookup-mode]'));
const rowTempEmailReceiveMailbox = document.getElementById('row-temp-email-receive-mailbox');
const inputTempEmailReceiveMailbox = document.getElementById('input-temp-email-receive-mailbox');
-const rowTempEmailRandomSubdomainToggle = document.getElementById('row-temp-email-random-subdomain-toggle');
+const rowTempEmailSubdomainMode = document.getElementById('row-temp-email-subdomain-mode');
+const tempEmailSubdomainModeButtons = Array.from(document.querySelectorAll('[data-temp-email-subdomain-mode]'));
+const tempEmailSubdomainModeCaption = document.getElementById('temp-email-subdomain-mode-caption');
const inputTempEmailUseRandomSubdomain = document.getElementById('input-temp-email-use-random-subdomain');
+const inputTempEmailUseFixedSubdomain = document.getElementById('input-temp-email-use-fixed-subdomain');
+const rowTempEmailFixedSubdomainPrefix = document.getElementById('row-temp-email-fixed-subdomain-prefix');
+const inputTempEmailSubdomainPrefix = document.getElementById('input-temp-email-subdomain-prefix');
+const tempEmailSubdomainPrefixFeedback = document.getElementById('temp-email-subdomain-prefix-feedback');
+const tempEmailEffectiveDomainPreview = document.getElementById('temp-email-effective-domain-preview');
const rowTempEmailDomain = document.getElementById('row-temp-email-domain');
+const labelTempEmailDomain = document.getElementById('label-temp-email-domain');
const selectTempEmailDomain = document.getElementById('select-temp-email-domain');
const tempEmailDomainPickerRoot = document.getElementById('temp-email-domain-picker');
const btnTempEmailDomainMenu = document.getElementById('btn-temp-email-domain-menu');
@@ -825,6 +833,10 @@ const DEFAULT_MAIL_2925_MODE = MAIL_2925_MODE_PROVIDE;
const CLOUDFLARE_TEMP_EMAIL_LOOKUP_MODE_RECEIVE_MAILBOX = 'receive-mailbox';
const CLOUDFLARE_TEMP_EMAIL_LOOKUP_MODE_REGISTRATION_EMAIL = 'registration-email';
const DEFAULT_CLOUDFLARE_TEMP_EMAIL_LOOKUP_MODE = CLOUDFLARE_TEMP_EMAIL_LOOKUP_MODE_RECEIVE_MAILBOX;
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_NONE = 'none';
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM = 'random';
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED = 'fixed';
+const DEFAULT_CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE = CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_NONE;
const NEW_USER_GUIDE_PROMPT_DISMISSED_STORAGE_KEY = 'multipage-new-user-guide-prompt-dismissed';
const AUTO_SKIP_FAILURES_PROMPT_DISMISSED_STORAGE_KEY = 'multipage-auto-skip-failures-prompt-dismissed';
const AUTO_RUN_FALLBACK_RISK_PROMPT_DISMISSED_STORAGE_KEY = 'multipage-auto-run-fallback-risk-prompt-dismissed';
@@ -4092,6 +4104,54 @@ function normalizeCloudflareTempEmailDomainValue(value = '') {
return normalizeCloudflareDomainValue(value);
}
+function normalizeCloudflareTempEmailSubdomainPrefixValue(value = '') {
+ let normalized = String(value || '').trim().toLowerCase();
+ if (!normalized) return '';
+ normalized = normalized.replace(/^@+/, '');
+ normalized = normalized.replace(/^https?:\/\//, '');
+ normalized = normalized.replace(/\/.*$/, '');
+ normalized = normalized.replace(/^\.+|\.+$/g, '');
+ if (!/^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(normalized)) {
+ return '';
+ }
+ return normalized;
+}
+
+function buildCloudflareTempEmailEffectiveDomainValue(domain = '', subdomainPrefix = '', options = {}) {
+ const normalizedDomain = normalizeCloudflareTempEmailDomainValue(domain);
+ if (!normalizedDomain) return '';
+ const normalizedPrefix = normalizeCloudflareTempEmailSubdomainPrefixValue(subdomainPrefix);
+ if (options.requirePrefix && !normalizedPrefix) return '';
+ return normalizedPrefix ? `${normalizedPrefix}.${normalizedDomain}` : normalizedDomain;
+}
+
+function getCloudflareTempEmailSubdomainPrefixValidation(value = '') {
+ const raw = String(value || '').trim();
+ if (!raw) {
+ return {
+ raw,
+ normalized: '',
+ valid: false,
+ message: '请填写子域前缀',
+ };
+ }
+ const normalized = normalizeCloudflareTempEmailSubdomainPrefixValue(raw);
+ if (!normalized) {
+ return {
+ raw,
+ normalized: '',
+ valid: false,
+ message: '仅支持 1-63 位字母、数字或中划线，且不能以中划线开头或结尾',
+ };
+ }
+ return {
+ raw,
+ normalized,
+ valid: true,
+ message: '',
+ };
+}
+
function normalizeCloudflareTempEmailDomains(values = []) {
const seen = new Set();
const domains = [];
@@ -4181,8 +4241,17 @@ function applyCloudflareTempEmailSettingsState(state = {}) {
inputTempEmailCustomAuth.value = state?.cloudflareTempEmailCustomAuth || '';
inputTempEmailReceiveMailbox.value = state?.cloudflareTempEmailReceiveMailbox || '';
setCloudflareTempEmailLookupMode(state?.cloudflareTempEmailLookupMode);
- if (inputTempEmailUseRandomSubdomain) {
- inputTempEmailUseRandomSubdomain.checked = Boolean(state?.cloudflareTempEmailUseRandomSubdomain);
+ setCloudflareTempEmailSubdomainMode(
+ state?.cloudflareTempEmailUseFixedSubdomain
+ ? CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED
+ : (state?.cloudflareTempEmailUseRandomSubdomain
+ ? CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM
+ : CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_NONE)
+ );
+ if (inputTempEmailSubdomainPrefix) {
+ inputTempEmailSubdomainPrefix.value = normalizeCloudflareTempEmailSubdomainPrefixValue(
+ state?.cloudflareTempEmailSubdomainPrefix || ''
+ );
}
renderCloudflareTempEmailDomainOptions(state?.cloudflareTempEmailDomain || '');
setCloudflareTempEmailDomainEditMode(false, { clearInput: true });
@@ -4233,6 +4302,7 @@ function collectSettingsPayload() {
const selectedCloudflareTempEmailDomain = normalizeCloudflareTempEmailDomainValue(
!cloudflareTempEmailDomainEditMode ? selectTempEmailDomain.value : tempEmailActiveDomain
) || tempEmailActiveDomain;
+ const cloudflareTempEmailSubdomainMode = getSelectedCloudflareTempEmailSubdomainMode();
const normalizeCloudMailBaseUrlInput = typeof normalizeCloudMailBaseUrlValue === 'function'
? normalizeCloudMailBaseUrlValue
: normalizeCloudflareTempEmailBaseUrlValue;
@@ -5128,7 +5198,13 @@ function collectSettingsPayload() {
? getSelectedCloudflareTempEmailLookupMode()
: 'receive-mailbox',
cloudflareTempEmailReceiveMailbox: normalizeCloudflareTempEmailReceiveMailboxValue(inputTempEmailReceiveMailbox.value),
- cloudflareTempEmailUseRandomSubdomain: Boolean(inputTempEmailUseRandomSubdomain?.checked),
+ cloudflareTempEmailUseRandomSubdomain: cloudflareTempEmailSubdomainMode
+ === CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM,
+ cloudflareTempEmailUseFixedSubdomain: cloudflareTempEmailSubdomainMode
+ === CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED,
+ cloudflareTempEmailSubdomainPrefix: normalizeCloudflareTempEmailSubdomainPrefixValue(
+ inputTempEmailSubdomainPrefix?.value || ''
+ ),
cloudflareTempEmailDomain: selectedCloudflareTempEmailDomain,
cloudflareTempEmailDomains: tempEmailDomains,
cloudMailBaseUrl: normalizeCloudMailBaseUrlInput((typeof inputCloudMailBaseUrl !== 'undefined' && inputCloudMailBaseUrl) ? inputCloudMailBaseUrl.value : ''),
@@ -5209,6 +5285,17 @@ function normalizeCloudflareTempEmailLookupMode(value = '') {
: DEFAULT_CLOUDFLARE_TEMP_EMAIL_LOOKUP_MODE;
}
+function normalizeCloudflareTempEmailSubdomainMode(value = '') {
+ const normalized = String(value || '').trim().toLowerCase();
+ if (normalized === CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM) {
+ return CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM;
+ }
+ if (normalized === CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED) {
+ return CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED;
+ }
+ return DEFAULT_CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE;
+}
+
function normalizeHotmailServiceMode(value = '') {
if (typeof normalizeHotmailServiceModeFromUtils === 'function') {
return normalizeHotmailServiceModeFromUtils(value);
@@ -8842,6 +8929,37 @@ function setCloudflareTempEmailLookupMode(mode) {
});
}
+function syncCloudflareTempEmailSubdomainModeButtons(mode) {
+ const resolvedMode = normalizeCloudflareTempEmailSubdomainMode(mode);
+ tempEmailSubdomainModeButtons.forEach((button) => {
+ const active = button.dataset.tempEmailSubdomainMode === resolvedMode;
+ button.classList.toggle('is-active', active);
+ button.setAttribute('aria-pressed', String(active));
+ });
+}
+
+function getSelectedCloudflareTempEmailSubdomainMode() {
+ if (inputTempEmailUseFixedSubdomain?.checked) {
+ return CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED;
+ }
+ if (inputTempEmailUseRandomSubdomain?.checked) {
+ return CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM;
+ }
+ const activeButton = tempEmailSubdomainModeButtons.find((button) => button.classList.contains('is-active'));
+ return normalizeCloudflareTempEmailSubdomainMode(activeButton?.dataset.tempEmailSubdomainMode);
+}
+
+function setCloudflareTempEmailSubdomainMode(mode) {
+ const resolvedMode = normalizeCloudflareTempEmailSubdomainMode(mode);
+ if (inputTempEmailUseRandomSubdomain) {
+ inputTempEmailUseRandomSubdomain.checked = resolvedMode === CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM;
+ }
+ if (inputTempEmailUseFixedSubdomain) {
+ inputTempEmailUseFixedSubdomain.checked = resolvedMode === CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED;
+ }
+ syncCloudflareTempEmailSubdomainModeButtons(resolvedMode);
+}
+
function getSelectedHotmailServiceMode() {
const activeButton = hotmailServiceModeButtons.find((button) => button.classList.contains('is-active'));
return normalizeHotmailServiceMode(activeButton?.dataset.hotmailServiceMode);
@@ -12958,8 +13076,26 @@ function updateMailProviderUI() {
const isIcloudComCnHost = selectedIcloudHost === 'icloud.com.cn';
const showIcloudTargetMailboxType = useIcloudProvider;
const showIcloudForwardMailProvider = useIcloudProvider && icloudTargetMailboxType === 'forward-mailbox';
- const showCloudflareTempEmailRandomSubdomainToggle = useEmailGenerator && useCloudflareTempEmailGenerator;
+ const showCloudflareTempEmailSubdomainMode = useEmailGenerator && useCloudflareTempEmailGenerator;
+ const cloudflareTempEmailSubdomainMode = getSelectedCloudflareTempEmailSubdomainMode();
+ syncCloudflareTempEmailSubdomainModeButtons(cloudflareTempEmailSubdomainMode);
+ const showCloudflareTempEmailFixedSubdomainPrefix = showCloudflareTempEmailSubdomainMode
+ && cloudflareTempEmailSubdomainMode === CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED;
const showCloudflareTempEmailDomain = useEmailGenerator && useCloudflareTempEmailGenerator;
+ const { domains: tempEmailDomains, activeDomain: tempEmailActiveDomain } = getCloudflareTempEmailDomainsFromState();
+ const selectedTempEmailDomain = normalizeCloudflareTempEmailDomainValue(
+ selectTempEmailDomain?.value || tempEmailActiveDomain
+ ) || tempEmailActiveDomain;
+ const fixedSubdomainValidation = getCloudflareTempEmailSubdomainPrefixValidation(
+ inputTempEmailSubdomainPrefix?.value || ''
+ );
+ const fixedSubdomainConfigInvalid = showCloudflareTempEmailFixedSubdomainPrefix
+ && !fixedSubdomainValidation.valid;
+ const tempEmailEffectiveDomain = buildCloudflareTempEmailEffectiveDomainValue(
+ selectedTempEmailDomain,
+ fixedSubdomainValidation.normalized,
+ { requirePrefix: true }
+ );
if (rowEmailGenerator) {
rowEmailGenerator.style.display = useEmailGenerator ? '' : 'none';
}
@@ -13015,11 +13151,38 @@ function updateMailProviderUI() {
rowTempEmailLookupMode.style.display = showCloudflareTempEmailLookupMode ? '' : 'none';
}
rowTempEmailReceiveMailbox.style.display = showCloudflareTempEmailReceiveMailbox ? '' : 'none';
- if (rowTempEmailRandomSubdomainToggle) {
- rowTempEmailRandomSubdomainToggle.style.display = showCloudflareTempEmailRandomSubdomainToggle ? '' : 'none';
+ if (rowTempEmailSubdomainMode) {
+ rowTempEmailSubdomainMode.style.display = showCloudflareTempEmailSubdomainMode ? '' : 'none';
+ }
+ if (tempEmailSubdomainModeCaption) {
+ tempEmailSubdomainModeCaption.textContent = cloudflareTempEmailSubdomainMode === CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM
+ ? '需后端、DNS、Email Routing/MX 覆盖随机子域'
+ : (cloudflareTempEmailSubdomainMode === CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED
+ ? '需后端、DNS、Email Routing/MX 覆盖固定子域'
+ : '按基础域名直接生成');
+ }
+ if (rowTempEmailFixedSubdomainPrefix) {
+ rowTempEmailFixedSubdomainPrefix.style.display = showCloudflareTempEmailFixedSubdomainPrefix ? '' : 'none';
+ }
+ if (inputTempEmailSubdomainPrefix) {
+ inputTempEmailSubdomainPrefix.classList.toggle('is-invalid', fixedSubdomainConfigInvalid);
+ inputTempEmailSubdomainPrefix.setAttribute('aria-invalid', String(fixedSubdomainConfigInvalid));
+ }
+ if (tempEmailSubdomainPrefixFeedback) {
+ tempEmailSubdomainPrefixFeedback.textContent = fixedSubdomainConfigInvalid
+ ? fixedSubdomainValidation.message
+ : '';
+ tempEmailSubdomainPrefixFeedback.classList.toggle('is-error', fixedSubdomainConfigInvalid);
+ }
+ if (tempEmailEffectiveDomainPreview) {
+ tempEmailEffectiveDomainPreview.textContent = showCloudflareTempEmailFixedSubdomainPrefix && tempEmailEffectiveDomain
+ ? `最终域名：${tempEmailEffectiveDomain}`
+ : '';
}
rowTempEmailDomain.style.display = showCloudflareTempEmailDomain ? '' : 'none';
- const { domains: tempEmailDomains } = getCloudflareTempEmailDomainsFromState();
+ if (labelTempEmailDomain) {
+ labelTempEmailDomain.textContent = showCloudflareTempEmailFixedSubdomainPrefix ? '基础域名' : 'Temp 域名';
+ }
if (showCloudflareTempEmailDomain) {
setCloudflareTempEmailDomainEditMode(cloudflareTempEmailDomainEditMode || tempEmailDomains.length === 0, { clearInput: false });
} else {
@@ -13079,7 +13242,7 @@ function updateMailProviderUI() {
if (useCustomEmail && useCustomMailProviderPool) {
inputEmail.placeholder = '号池会按顺序自动回填当前轮邮箱，也可以手动覆盖';
}
- btnFetchEmail.disabled = useLuckmail || useCustomEmail || useCustomEmailPool || isAutoRunLockedPhase();
+ btnFetchEmail.disabled = useLuckmail || useCustomEmail || useCustomEmailPool || fixedSubdomainConfigInvalid || isAutoRunLockedPhase();
if (!btnFetchEmail.disabled) {
btnFetchEmail.textContent = uiCopy.buttonLabel;
}
@@ -13116,8 +13279,17 @@ function updateMailProviderUI() {
if (autoHintText && showCloudflareTempEmailReceiveMailbox && !useCustomEmailPool) {
autoHintText.textContent = '若注册邮箱会转发到 Cloudflare Temp Email，请在“邮件接收”中填写实际接收转发邮件的邮箱。';
}
- if (autoHintText && showCloudflareTempEmailRandomSubdomainToggle && inputTempEmailUseRandomSubdomain?.checked) {
- autoHintText.textContent = '已启用随机子域名：扩展会按当前选中的 Temp 域名提交，并额外携带 enableRandomSubdomain；是否生效取决于后端 RANDOM_SUBDOMAIN_DOMAINS 配置。';
+ if (
+ autoHintText
+ && showCloudflareTempEmailSubdomainMode
+ && cloudflareTempEmailSubdomainMode === CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM
+ ) {
+ autoHintText.textContent = '已启用随机子域名：扩展会按当前选中的基础域名提交，并额外携带 enableRandomSubdomain；后端 RANDOM_SUBDOMAIN_DOMAINS、DNS、Email Routing/MX 都需要覆盖对应子域。';
+ }
+ if (autoHintText && showCloudflareTempEmailFixedSubdomainPrefix) {
+ autoHintText.textContent = tempEmailEffectiveDomain
+ ? `已启用固定子域名：本次会向后端提交 ${tempEmailEffectiveDomain}；后端 ENABLE_CREATE_ADDRESS_SUBDOMAIN_MATCH、DNS、Email Routing/MX 都需要覆盖该子域。`
+ : `已启用固定子域名：${fixedSubdomainValidation.message}；后端、DNS、Email Routing/MX 都需要覆盖该子域。`;
}
if (autoHintText && useIcloudProvider && showIcloudForwardMailProvider) {
const forwardProvider = normalizeIcloudForwardMailProvider(icloudForwardMailProviderValue);
@@ -16507,10 +16679,30 @@ inputTempEmailReceiveMailbox.addEventListener('blur', () => {
saveSettings({ silent: true }).catch(() => { });
});
-inputTempEmailUseRandomSubdomain?.addEventListener('change', () => {
+tempEmailSubdomainModeButtons.forEach((button) => {
+ button.addEventListener('click', () => {
+ const nextMode = normalizeCloudflareTempEmailSubdomainMode(button.dataset.tempEmailSubdomainMode);
+ const previousMode = getSelectedCloudflareTempEmailSubdomainMode();
+ if (nextMode === previousMode) {
+ return;
+ }
+ setCloudflareTempEmailSubdomainMode(nextMode);
+ updateMailProviderUI();
+ clearRegistrationEmail({ silent: true }).catch(() => { });
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+ });
+});
+
+inputTempEmailSubdomainPrefix?.addEventListener('input', () => {
updateMailProviderUI();
clearRegistrationEmail({ silent: true }).catch(() => { });
markSettingsDirty(true);
+ scheduleSettingsAutoSave();
+});
+inputTempEmailSubdomainPrefix?.addEventListener('blur', () => {
+ inputTempEmailSubdomainPrefix.value = normalizeCloudflareTempEmailSubdomainPrefixValue(inputTempEmailSubdomainPrefix.value);
+ updateMailProviderUI();
saveSettings({ silent: true }).catch(() => { });
});
@@ -17688,14 +17880,38 @@ chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
if (message.payload.cloudflareTempEmailReceiveMailbox !== undefined) {
inputTempEmailReceiveMailbox.value = message.payload.cloudflareTempEmailReceiveMailbox || '';
}
- if (message.payload.cloudflareTempEmailUseRandomSubdomain !== undefined && inputTempEmailUseRandomSubdomain) {
- inputTempEmailUseRandomSubdomain.checked = Boolean(message.payload.cloudflareTempEmailUseRandomSubdomain);
+ if (
+ message.payload.cloudflareTempEmailUseRandomSubdomain !== undefined
+ || message.payload.cloudflareTempEmailUseFixedSubdomain !== undefined
+ ) {
+ const useFixedSubdomain = Boolean(
+ message.payload.cloudflareTempEmailUseFixedSubdomain
+ ?? latestState?.cloudflareTempEmailUseFixedSubdomain
+ );
+ const useRandomSubdomain = Boolean(
+ message.payload.cloudflareTempEmailUseRandomSubdomain
+ ?? latestState?.cloudflareTempEmailUseRandomSubdomain
+ );
+ setCloudflareTempEmailSubdomainMode(
+ useFixedSubdomain
+ ? CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED
+ : (useRandomSubdomain
+ ? CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM
+ : CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_NONE)
+ );
+ }
+ if (message.payload.cloudflareTempEmailSubdomainPrefix !== undefined && inputTempEmailSubdomainPrefix) {
+ inputTempEmailSubdomainPrefix.value = normalizeCloudflareTempEmailSubdomainPrefixValue(
+ message.payload.cloudflareTempEmailSubdomainPrefix || ''
+ );
}
if (message.payload.cloudflareTempEmailDomain !== undefined || message.payload.cloudflareTempEmailDomains !== undefined) {
renderCloudflareTempEmailDomainOptions(message.payload.cloudflareTempEmailDomain || latestState?.cloudflareTempEmailDomain || '');
}
if (
message.payload.cloudflareTempEmailUseRandomSubdomain !== undefined
+ || message.payload.cloudflareTempEmailUseFixedSubdomain !== undefined
+ || message.payload.cloudflareTempEmailSubdomainPrefix !== undefined
|| message.payload.cloudflareTempEmailLookupMode !== undefined
|| message.payload.cloudflareTempEmailDomain !== undefined
|| message.payload.cloudflareTempEmailDomains !== undefined
@@ -18300,6 +18516,7 @@ updateConfigMenuControls();
setLocalCpaStep9Mode(DEFAULT_LOCAL_CPA_STEP9_MODE);
setMail2925Mode(DEFAULT_MAIL_2925_MODE);
setCloudflareTempEmailLookupMode(DEFAULT_CLOUDFLARE_TEMP_EMAIL_LOOKUP_MODE);
+setCloudflareTempEmailSubdomainMode(DEFAULT_CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE);
initializeReleaseInfo().catch((err) => {
console.error('Failed to initialize release info:', err);
});
diff --git a/tests/background-cloudflare-temp-email-settings.test.js b/tests/background-cloudflare-temp-email-settings.test.js
index 12cb135a..37c3e27e 100644
--- a/tests/background-cloudflare-temp-email-settings.test.js
+++ b/tests/background-cloudflare-temp-email-settings.test.js
@@ -73,6 +73,8 @@ const PERSISTED_SETTING_DEFAULTS = {
accountRunHistoryTextEnabled: false,
cloudflareTempEmailLookupMode: 'receive-mailbox',
cloudflareTempEmailUseRandomSubdomain: false,
+ cloudflareTempEmailUseFixedSubdomain: false,
+ cloudflareTempEmailSubdomainPrefix: '',
cloudflareTempEmailDomain: '',
cloudflareTempEmailDomains: [],
};
@@ -97,6 +99,16 @@ function normalizeCloudflareDomains(value) { return Array.isArray(value) ? value
function normalizeCloudflareTempEmailBaseUrl(value) { return String(value || '').trim(); }
function normalizeCloudflareTempEmailAddress(value = '') { return String(value || '').trim().toLowerCase(); }
function normalizeCloudflareTempEmailDomain(value) { return String(value || '').trim().toLowerCase(); }
+function normalizeCloudflareTempEmailSubdomainPrefix(value) {
+ const normalized = String(value || '').trim().toLowerCase();
+ return /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(normalized) ? normalized : '';
+}
+function buildCloudflareTempEmailEffectiveDomain(config = {}) {
+ const domain = normalizeCloudflareTempEmailDomain(config.domain);
+ const prefix = normalizeCloudflareTempEmailSubdomainPrefix(config.subdomainPrefix);
+ if (!domain) return '';
+ return config.useFixedSubdomain ? (prefix ? \`\${prefix}.\${domain}\` : '') : domain;
+}
function normalizeCloudflareTempEmailDomains(value) {
const seen = new Set();
const domains = [];
@@ -120,17 +132,24 @@ return {
`)();
assert.equal(api.normalizePersistentSettingValue('cloudflareTempEmailUseRandomSubdomain', 1), true);
+ assert.equal(api.normalizePersistentSettingValue('cloudflareTempEmailUseFixedSubdomain', 1), true);
+ assert.equal(api.normalizePersistentSettingValue('cloudflareTempEmailSubdomainPrefix', 'Team-1'), 'team-1');
+ assert.equal(api.normalizePersistentSettingValue('cloudflareTempEmailSubdomainPrefix', 'team.one'), '');
assert.equal(api.normalizePersistentSettingValue('cloudflareTempEmailLookupMode', 'registration-email'), 'registration-email');
assert.equal(api.normalizePersistentSettingValue('cloudflareTempEmailLookupMode', 'bad'), 'receive-mailbox');
const payload = api.buildPersistentSettingsPayload({
cloudflareTempEmailLookupMode: 'registration-email',
cloudflareTempEmailUseRandomSubdomain: true,
+ cloudflareTempEmailUseFixedSubdomain: true,
+ cloudflareTempEmailSubdomainPrefix: 'Team',
cloudflareTempEmailDomain: 'mail.example.com',
cloudflareTempEmailDomains: ['mail.example.com', 'alt.example.com'],
});
assert.equal(payload.cloudflareTempEmailLookupMode, 'registration-email');
- assert.equal(payload.cloudflareTempEmailUseRandomSubdomain, true);
+ assert.equal(payload.cloudflareTempEmailUseRandomSubdomain, false);
+ assert.equal(payload.cloudflareTempEmailUseFixedSubdomain, true);
+ assert.equal(payload.cloudflareTempEmailSubdomainPrefix, 'team');
assert.equal(payload.cloudflareTempEmailDomain, 'mail.example.com');
assert.deepEqual(payload.cloudflareTempEmailDomains, ['mail.example.com', 'alt.example.com']);
@@ -141,6 +160,8 @@ return {
cloudflareTempEmailLookupMode: 'registration-email',
cloudflareTempEmailReceiveMailbox: 'Forward@Example.com',
cloudflareTempEmailUseRandomSubdomain: true,
+ cloudflareTempEmailUseFixedSubdomain: true,
+ cloudflareTempEmailSubdomainPrefix: 'Team',
cloudflareTempEmailDomain: 'mail.example.com',
cloudflareTempEmailDomains: ['mail.example.com'],
});
@@ -150,9 +171,12 @@ return {
customAuth: 'custom-secret',
lookupMode: 'registration-email',
receiveMailbox: 'forward@example.com',
- useRandomSubdomain: true,
+ useRandomSubdomain: false,
+ useFixedSubdomain: true,
+ subdomainPrefix: 'team',
domain: 'mail.example.com',
domains: ['mail.example.com'],
+ effectiveDomain: 'team.mail.example.com',
});
});
@@ -169,6 +193,8 @@ const PERSISTED_SETTING_DEFAULTS = {
autoDeleteUsedIcloudAlias: false,
accountRunHistoryTextEnabled: false,
cloudflareTempEmailUseRandomSubdomain: false,
+ cloudflareTempEmailUseFixedSubdomain: false,
+ cloudflareTempEmailSubdomainPrefix: '',
cloudflareTempEmailDomain: '',
cloudflareTempEmailDomains: [],
};
@@ -200,6 +226,7 @@ function normalizeCloudflareTempEmailBaseUrl(value) { return String(value || '')
function normalizeCloudflareTempEmailAddress(value = '') { return String(value || '').trim().toLowerCase(); }
function normalizeCloudflareTempEmailReceiveMailbox(value = '') { return String(value || '').trim().toLowerCase(); }
function normalizeCloudflareTempEmailDomain(value) { return String(value || '').trim().toLowerCase(); }
+function normalizeCloudflareTempEmailSubdomainPrefix(value) { return String(value || '').trim().toLowerCase(); }
function normalizeCloudflareTempEmailDomains(value) { return Array.isArray(value) ? value.map((item) => String(item || '').trim().toLowerCase()).filter(Boolean) : []; }
function normalizeHotmailAccounts(value) { return Array.isArray(value) ? value : []; }
function normalizeMail2925Accounts(value) { return Array.isArray(value) ? value : []; }
diff --git a/tests/background-generated-email-module.test.js b/tests/background-generated-email-module.test.js
index b6a55dc5..8fde2689 100644
--- a/tests/background-generated-email-module.test.js
+++ b/tests/background-generated-email-module.test.js
@@ -561,6 +561,84 @@ test('generated email helper requests random subdomain creation while preserving
});
});
+test('generated email helper uses fixed subdomain as the effective temp email domain', async () => {
+ const api = loadGeneratedEmailHelpersApi();
+ const requests = [];
+ const savedEmails = [];
+
+ const helpers = api.createGeneratedEmailHelpers({
+ addLog: async () => {},
+ buildGeneratedAliasEmail: () => {
+ throw new Error('should not build managed alias');
+ },
+ buildCloudflareTempEmailEffectiveDomain: (config) => `${config.subdomainPrefix}.${config.domain}`,
+ buildCloudflareTempEmailHeaders: () => ({ 'x-admin-auth': 'admin-secret' }),
+ CLOUDFLARE_TEMP_EMAIL_GENERATOR: 'cloudflare-temp-email',
+ DUCK_AUTOFILL_URL: 'https://duckduckgo.com/email',
+ fetch: async (url, options = {}) => {
+ requests.push({
+ url,
+ method: options.method,
+ body: options.body ? JSON.parse(options.body) : null,
+ });
+ return {
+ ok: true,
+ text: async () => JSON.stringify({ address: 'user@team.mail.example.com' }),
+ };
+ },
+ fetchIcloudHideMyEmail: async () => {
+ throw new Error('should not use icloud generator');
+ },
+ getCloudflareTempEmailAddressFromResponse: (payload) => payload.address,
+ getCloudflareTempEmailConfig: () => ({
+ baseUrl: 'https://temp.example.com',
+ adminAuth: 'admin-secret',
+ customAuth: '',
+ useRandomSubdomain: true,
+ useFixedSubdomain: true,
+ subdomainPrefix: 'team',
+ domain: 'mail.example.com',
+ }),
+ getState: async () => ({
+ mailProvider: '163',
+ emailGenerator: 'cloudflare-temp-email',
+ }),
+ ensureMail2925AccountForFlow: async () => {
+ throw new Error('should not allocate mail2925 account');
+ },
+ joinCloudflareTempEmailUrl: (baseUrl, path) => `${baseUrl}${path}`,
+ normalizeCloudflareDomain: () => '',
+ normalizeCloudflareTempEmailAddress: (value) => String(value || '').trim().toLowerCase(),
+ normalizeEmailGenerator: (value) => String(value || '').trim().toLowerCase(),
+ isGeneratedAliasProvider: () => false,
+ reuseOrCreateTab: async () => {},
+ sendToContentScript: async () => {
+ throw new Error('should not use duck generator');
+ },
+ setEmailState: async (email) => {
+ savedEmails.push(email);
+ },
+ throwIfStopped: () => {},
+ });
+
+ const email = await helpers.fetchGeneratedEmail({
+ emailGenerator: 'cloudflare-temp-email',
+ }, {
+ generator: 'cloudflare-temp-email',
+ localPart: 'user',
+ });
+
+ assert.equal(email, 'user@team.mail.example.com');
+ assert.deepEqual(savedEmails, ['user@team.mail.example.com']);
+ assert.equal(requests.length, 1);
+ assert.deepEqual(requests[0].body, {
+ enablePrefix: true,
+ enableRandomSubdomain: false,
+ name: 'user',
+ domain: 'team.mail.example.com',
+ });
+});
+
test('generated email helper honors iCloud always-new fetch mode', async () => {
const api = loadGeneratedEmailHelpersApi();
const icloudOptions = [];
diff --git a/tests/cloudflare-temp-email-utils.test.js b/tests/cloudflare-temp-email-utils.test.js
index 7de385c6..75276abd 100644
--- a/tests/cloudflare-temp-email-utils.test.js
+++ b/tests/cloudflare-temp-email-utils.test.js
@@ -2,12 +2,14 @@ const test = require('node:test');
const assert = require('node:assert/strict');
const {
+ buildCloudflareTempEmailEffectiveDomain,
buildCloudflareTempEmailHeaders,
getCloudflareTempEmailAddressFromResponse,
normalizeCloudflareTempEmailBaseUrl,
normalizeCloudflareTempEmailDomain,
normalizeCloudflareTempEmailDomains,
normalizeCloudflareTempEmailMailApiMessages,
+ normalizeCloudflareTempEmailSubdomainPrefix,
} = require('../cloudflare-temp-email-utils.js');
const {
pickVerificationMessageWithTimeFallback,
@@ -34,6 +36,38 @@ test('normalizeCloudflareTempEmailDomain and domains de-duplicate valid entries'
);
});
+test('cloudflare temp email fixed subdomain helpers validate one label and build effective domain', () => {
+ assert.equal(normalizeCloudflareTempEmailSubdomainPrefix(' Team-1 '), 'team-1');
+ assert.equal(normalizeCloudflareTempEmailSubdomainPrefix('a.example'), '');
+ assert.equal(normalizeCloudflareTempEmailSubdomainPrefix('-team'), '');
+ assert.equal(normalizeCloudflareTempEmailSubdomainPrefix('team_1'), '');
+
+ assert.equal(
+ buildCloudflareTempEmailEffectiveDomain({
+ domain: 'Mail.Example.com',
+ useFixedSubdomain: true,
+ subdomainPrefix: 'Team',
+ }),
+ 'team.mail.example.com'
+ );
+ assert.equal(
+ buildCloudflareTempEmailEffectiveDomain({
+ domain: 'mail.example.com',
+ useFixedSubdomain: false,
+ subdomainPrefix: 'team',
+ }),
+ 'mail.example.com'
+ );
+ assert.equal(
+ buildCloudflareTempEmailEffectiveDomain({
+ domain: 'mail.example.com',
+ useFixedSubdomain: true,
+ subdomainPrefix: '',
+ }),
+ ''
+ );
+});
+
test('buildCloudflareTempEmailHeaders includes auth headers and content type when needed', () => {
assert.deepEqual(
buildCloudflareTempEmailHeaders(
diff --git a/tests/sidepanel-cloudflare-temp-email-random-subdomain.test.js b/tests/sidepanel-cloudflare-temp-email-random-subdomain.test.js
index 8a4e7674..317596a5 100644
--- a/tests/sidepanel-cloudflare-temp-email-random-subdomain.test.js
+++ b/tests/sidepanel-cloudflare-temp-email-random-subdomain.test.js
@@ -58,6 +58,31 @@ function createRow(initialDisplay = 'none') {
};
}
+function createClassList(initial = []) {
+ const values = new Set(initial);
+ return {
+ toggle(name, force) {
+ if (force === undefined) {
+ if (values.has(name)) {
+ values.delete(name);
+ return false;
+ }
+ values.add(name);
+ return true;
+ }
+ if (force) {
+ values.add(name);
+ return true;
+ }
+ values.delete(name);
+ return false;
+ },
+ contains(name) {
+ return values.has(name);
+ },
+ };
+}
+
test('sidepanel html places cloudflare temp email controls in a standalone section', () => {
const html = fs.readFileSync('sidepanel/sidepanel.html', 'utf8');
assert.match(html, /id="cloudflare-temp-email-section"/);
@@ -67,9 +92,20 @@ test('sidepanel html places cloudflare temp email controls in a standalone secti
assert.match(html, /id="row-temp-email-lookup-mode"/);
assert.match(html, /data-temp-email-lookup-mode="receive-mailbox"/);
assert.match(html, /data-temp-email-lookup-mode="registration-email"/);
- assert.match(html, /id="row-temp-email-random-subdomain-toggle"/);
+ assert.match(html, /id="row-temp-email-subdomain-mode"/);
+ assert.match(html, /data-temp-email-subdomain-mode="none"/);
+ assert.match(html, /data-temp-email-subdomain-mode="random"/);
+ assert.match(html, /data-temp-email-subdomain-mode="fixed"/);
assert.match(html, /id="input-temp-email-use-random-subdomain"/);
+ assert.match(html, /id="input-temp-email-use-fixed-subdomain"/);
+ assert.match(html, /id="row-temp-email-fixed-subdomain-prefix"/);
+ assert.match(html, /id="input-temp-email-subdomain-prefix"/);
+ assert.match(html, /id="temp-email-subdomain-prefix-feedback"/);
+ assert.match(html, /id="temp-email-effective-domain-preview"/);
+ assert.match(html, /id="label-temp-email-domain"/);
assert.match(html, /id="btn-temp-email-domain-mode"[^>]*>更新 {
+ const active = button.dataset.tempEmailSubdomainMode === resolvedMode;
+ button.classList.toggle('is-active', active);
+ button.setAttribute('aria-pressed', String(active));
+ });
+}
+function getSelectedCloudflareTempEmailSubdomainMode() {
+ if (inputTempEmailUseFixedSubdomain.checked) return 'fixed';
+ if (inputTempEmailUseRandomSubdomain.checked) return 'random';
+ return 'none';
+}
+function getCloudflareTempEmailSubdomainPrefixValidation(value = '') {
+ const raw = String(value || '').trim();
+ if (!raw) return { raw, normalized: '', valid: false, message: '请填写子域前缀' };
+ const normalized = normalizeCloudflareTempEmailSubdomainPrefixValue(raw);
+ return normalized
+ ? { raw, normalized, valid: true, message: '' }
+ : { raw, normalized: '', valid: false, message: '仅支持 1-63 位字母、数字或中划线，且不能以中划线开头或结尾' };
+}
function getManagedAliasProviderUiCopy() { return null; }
function getCurrentRegistrationEmailUiCopy() {
return {
@@ -460,6 +601,17 @@ function getSelectedHotmailServiceMode() { return 'local'; }
function getCloudflareDomainsFromState() { return { domains: [], activeDomain: '' }; }
function setCloudflareDomainEditMode() {}
function getCloudflareTempEmailDomainsFromState() { return { domains: ['mail.example.com'], activeDomain: 'mail.example.com' }; }
+function normalizeCloudflareTempEmailDomainValue(value = '') { return String(value || '').trim().toLowerCase(); }
+function normalizeCloudflareTempEmailSubdomainPrefixValue(value = '') {
+ const normalized = String(value || '').trim().toLowerCase();
+ return /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(normalized) ? normalized : '';
+}
+function buildCloudflareTempEmailEffectiveDomainValue(domain = '', subdomainPrefix = '', options = {}) {
+ const normalizedDomain = normalizeCloudflareTempEmailDomainValue(domain);
+ const normalizedPrefix = normalizeCloudflareTempEmailSubdomainPrefixValue(subdomainPrefix);
+ if (options.requirePrefix && !normalizedPrefix) return '';
+ return normalizedPrefix ? \`\${normalizedPrefix}.\${normalizedDomain}\` : normalizedDomain;
+}
function setCloudflareTempEmailDomainEditMode(editing) { calls.tempDomainEditMode.push(editing); }
function queueIcloudAliasRefresh() {}
function hideIcloudLoginHelp() {}
@@ -476,9 +628,17 @@ return {
cloudflareTempEmailSection,
rowTempEmailLookupMode,
rowTempEmailReceiveMailbox,
- rowTempEmailRandomSubdomainToggle,
+ rowTempEmailSubdomainMode,
+ rowTempEmailFixedSubdomainPrefix,
rowTempEmailDomain,
+ labelTempEmailDomain,
inputTempEmailUseRandomSubdomain,
+ inputTempEmailUseFixedSubdomain,
+ inputTempEmailSubdomainPrefix,
+ tempEmailSubdomainModeCaption,
+ tempEmailSubdomainPrefixFeedback,
+ tempEmailEffectiveDomainPreview,
+ btnFetchEmail,
selectMailProvider,
selectEmailGenerator,
setLookupMode(value) {
@@ -491,8 +651,10 @@ return {
api.updateMailProviderUI();
assert.equal(api.cloudflareTempEmailSection.style.display, '');
- assert.equal(api.rowTempEmailRandomSubdomainToggle.style.display, '');
+ assert.equal(api.rowTempEmailSubdomainMode.style.display, '');
+ assert.equal(api.rowTempEmailFixedSubdomainPrefix.style.display, 'none');
assert.equal(api.rowTempEmailDomain.style.display, '');
+ assert.equal(api.labelTempEmailDomain.textContent, 'Temp 域名');
api.selectMailProvider.value = 'cloudflare-temp-email';
api.selectEmailGenerator.value = 'duck';
@@ -513,4 +675,29 @@ return {
assert.equal(api.cloudflareTempEmailSection.style.display, '');
assert.equal(api.rowTempEmailDomain.style.display, '');
assert.match(api.autoHintText.textContent, /RANDOM_SUBDOMAIN_DOMAINS/);
+ assert.match(api.autoHintText.textContent, /Email Routing\/MX/);
+ assert.match(api.tempEmailSubdomainModeCaption.textContent, /随机子域/);
+
+ api.inputTempEmailUseRandomSubdomain.checked = false;
+ api.inputTempEmailUseFixedSubdomain.checked = true;
+ api.inputTempEmailSubdomainPrefix.value = 'team';
+ api.updateMailProviderUI();
+ assert.equal(api.rowTempEmailFixedSubdomainPrefix.style.display, '');
+ assert.equal(api.labelTempEmailDomain.textContent, '基础域名');
+ assert.equal(api.tempEmailEffectiveDomainPreview.textContent, '最终域名：team.mail.example.com');
+ assert.equal(api.tempEmailSubdomainPrefixFeedback.textContent, '');
+ assert.equal(api.inputTempEmailSubdomainPrefix.attributes['aria-invalid'], 'false');
+ assert.equal(api.btnFetchEmail.disabled, false);
+ assert.match(api.autoHintText.textContent, /team\.mail\.example\.com/);
+ assert.match(api.autoHintText.textContent, /ENABLE_CREATE_ADDRESS_SUBDOMAIN_MATCH/);
+ assert.match(api.autoHintText.textContent, /Email Routing\/MX/);
+
+ api.inputTempEmailSubdomainPrefix.value = '';
+ api.updateMailProviderUI();
+ assert.equal(api.btnFetchEmail.disabled, true);
+ assert.equal(api.tempEmailEffectiveDomainPreview.textContent, '');
+ assert.equal(api.tempEmailSubdomainPrefixFeedback.textContent, '请填写子域前缀');
+ assert.equal(api.tempEmailSubdomainPrefixFeedback.classList.contains('is-error'), true);
+ assert.equal(api.inputTempEmailSubdomainPrefix.attributes['aria-invalid'], 'true');
+ assert.match(api.autoHintText.textContent, /请填写子域前缀/);
});
diff --git a/tests/sidepanel-contribution-mode.test.js b/tests/sidepanel-contribution-mode.test.js
index 69494716..76de5efc 100644
--- a/tests/sidepanel-contribution-mode.test.js
+++ b/tests/sidepanel-contribution-mode.test.js
@@ -245,6 +245,15 @@ const inputTempEmailAdminAuth = { value: 'admin-secret' };
const inputTempEmailCustomAuth = { value: 'custom-secret' };
const inputTempEmailReceiveMailbox = { value: 'relay@example.com' };
const inputTempEmailUseRandomSubdomain = { checked: true };
+const inputTempEmailUseFixedSubdomain = { checked: false };
+const inputTempEmailSubdomainPrefix = { value: '' };
+function getSelectedCloudflareTempEmailSubdomainMode() {
+ if (inputTempEmailUseFixedSubdomain.checked) return 'fixed';
+ if (inputTempEmailUseRandomSubdomain.checked) return 'random';
+ return 'none';
+}
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM = 'random';
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED = 'fixed';
const inputAutoSkipFailures = { checked: false };
const inputAutoSkipFailuresThreadIntervalMinutes = { value: '5' };
const inputAutoStepDelaySeconds = { value: '10' };
@@ -293,6 +302,7 @@ function normalizeLuckmailBaseUrl(value) { return String(value || '').trim(); }
function normalizeLuckmailEmailType(value) { return String(value || '').trim(); }
function normalizeCloudflareTempEmailBaseUrlValue(value) { return String(value || '').trim(); }
function normalizeCloudflareTempEmailReceiveMailboxValue(value) { return String(value || '').trim(); }
+function normalizeCloudflareTempEmailSubdomainPrefixValue(value) { return String(value || '').trim().toLowerCase(); }
function normalizeAutoRunThreadIntervalMinutes(value) { return Number(value) || 0; }
function normalizeAutoStepDelaySeconds(value) { return value === '' ? null : Number(value); }
function normalizeVerificationResendCount(value, fallback) { return Number.isFinite(Number(value)) ? Number(value) : fallback; }
diff --git a/tests/sidepanel-icloud-provider.test.js b/tests/sidepanel-icloud-provider.test.js
index 4526d32b..2c2ba23b 100644
--- a/tests/sidepanel-icloud-provider.test.js
+++ b/tests/sidepanel-icloud-provider.test.js
@@ -130,6 +130,15 @@ const inputTempEmailAdminAuth = { value: '' };
const inputTempEmailCustomAuth = { value: '' };
const inputTempEmailReceiveMailbox = { value: '' };
const inputTempEmailUseRandomSubdomain = { checked: false };
+const inputTempEmailUseFixedSubdomain = { checked: false };
+const inputTempEmailSubdomainPrefix = { value: '' };
+function getSelectedCloudflareTempEmailSubdomainMode() {
+ if (inputTempEmailUseFixedSubdomain.checked) return 'fixed';
+ if (inputTempEmailUseRandomSubdomain.checked) return 'random';
+ return 'none';
+}
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM = 'random';
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED = 'fixed';
const inputAutoSkipFailures = { checked: false };
const inputAutoSkipFailuresThreadIntervalMinutes = { value: '0' };
const inputAutoStepDelaySeconds = { value: '' };
@@ -215,6 +224,7 @@ function normalizeLuckmailBaseUrl(value) { return String(value || '').trim(); }
function normalizeLuckmailEmailType(value) { return String(value || '').trim() || 'ms_graph'; }
function normalizeCloudflareTempEmailBaseUrlValue(value) { return String(value || '').trim(); }
function normalizeCloudflareTempEmailReceiveMailboxValue(value) { return String(value || '').trim(); }
+function normalizeCloudflareTempEmailSubdomainPrefixValue(value) { return String(value || '').trim().toLowerCase(); }
function normalizeAccountRunHistoryHelperBaseUrlValue(value) { return String(value || '').trim(); }
function normalizeAutoRunThreadIntervalMinutes(value) { return Number(value) || 0; }
function normalizeAutoStepDelaySeconds(value) { return value === '' ? null : Number(value); }
@@ -272,8 +282,13 @@ const rowTempEmailBaseUrl = createRow();
const rowTempEmailAdminAuth = createRow();
const rowTempEmailCustomAuth = createRow();
const rowTempEmailReceiveMailbox = createRow();
-const rowTempEmailRandomSubdomainToggle = createRow();
+const rowTempEmailLookupMode = createRow();
+const rowTempEmailSubdomainMode = createRow();
+const tempEmailSubdomainModeButtons = [];
+const tempEmailSubdomainModeCaption = { textContent: '' };
+const rowTempEmailFixedSubdomainPrefix = createRow();
const rowTempEmailDomain = createRow();
+const labelTempEmailDomain = { textContent: '' };
const cloudflareTempEmailSection = createRow();
const hotmailSection = createRow();
const mail2925Section = createRow();
@@ -295,14 +310,30 @@ const rowHotmailLocalBaseUrl = createRow();
const inputMail2925UseAccountPool = { checked: false };
const selectMailProvider = { value: 'icloud' };
const selectEmailGenerator = { value: 'duck', disabled: false, options: [] };
+const selectTempEmailDomain = { value: '' };
const selectIcloudTargetMailboxType = { value: 'icloud-inbox' };
const selectIcloudForwardMailProvider = { value: 'gmail' };
const selectIcloudHostPreference = { value: 'icloud.com.cn' };
const inputTempEmailUseRandomSubdomain = { checked: false };
+const inputTempEmailUseFixedSubdomain = { checked: false };
+const inputTempEmailSubdomainPrefix = {
+ value: '',
+ classList: { toggle() {} },
+ setAttribute() {},
+};
+const tempEmailSubdomainPrefixFeedback = {
+ textContent: '',
+ classList: { toggle() {} },
+};
+const tempEmailEffectiveDomainPreview = { textContent: '' };
const inputRunCount = { disabled: false };
const currentAutoRun = { autoRunning: false };
const MAIL_PROVIDER_LOGIN_CONFIGS = { gmail: { label: 'Gmail 邮箱' } };
const ICLOUD_FORWARD_MAIL_PROVIDER_LABELS = { gmail: 'Gmail 邮箱' };
+const CLOUDFLARE_TEMP_EMAIL_LOOKUP_MODE_REGISTRATION_EMAIL = 'registration-email';
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_NONE = 'none';
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM = 'random';
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED = 'fixed';
function normalizeIcloudHost(value) { return String(value || '').trim().toLowerCase(); }
function normalizeIcloudTargetMailboxType(value) { return String(value || '').trim().toLowerCase() === 'forward-mailbox' ? 'forward-mailbox' : 'icloud-inbox'; }
function normalizeIcloudForwardMailProvider(value) { return String(value || '').trim().toLowerCase() === 'gmail' ? 'gmail' : 'qq'; }
@@ -313,6 +344,27 @@ function isIcloudMailProvider() { return selectMailProvider.value === ICLOUD_PRO
function usesCustomMailProviderPool() { return false; }
function usesGeneratedAliasMailProvider() { return false; }
function getSelectedMail2925Mode() { return 'provide'; }
+function getSelectedCloudflareTempEmailLookupMode() { return 'receive-mailbox'; }
+function syncCloudflareTempEmailSubdomainModeButtons() {}
+function getSelectedCloudflareTempEmailSubdomainMode() {
+ if (inputTempEmailUseFixedSubdomain.checked) return 'fixed';
+ if (inputTempEmailUseRandomSubdomain.checked) return 'random';
+ return 'none';
+}
+function normalizeCloudflareTempEmailDomainValue(value = '') { return String(value || '').trim().toLowerCase(); }
+function normalizeCloudflareTempEmailSubdomainPrefixValue(value = '') { return String(value || '').trim().toLowerCase(); }
+function getCloudflareTempEmailSubdomainPrefixValidation(value = '') {
+ const raw = String(value || '').trim();
+ return raw
+ ? { raw, normalized: raw.toLowerCase(), valid: true, message: '' }
+ : { raw, normalized: '', valid: false, message: '请填写子域前缀' };
+}
+function buildCloudflareTempEmailEffectiveDomainValue(domain = '', subdomainPrefix = '', options = {}) {
+ const normalizedDomain = normalizeCloudflareTempEmailDomainValue(domain);
+ const normalizedPrefix = normalizeCloudflareTempEmailSubdomainPrefixValue(subdomainPrefix);
+ if (options.requirePrefix && !normalizedPrefix) return '';
+ return normalizedPrefix && normalizedDomain ? \`\${normalizedPrefix}.\${normalizedDomain}\` : normalizedDomain;
+}
function getManagedAliasProviderUiCopy() { return null; }
function getCurrentRegistrationEmailUiCopy() { return { buttonLabel: '获取邮箱', placeholder: '邮箱', label: '邮箱' }; }
function updateMailLoginButtonState() {}
diff --git a/tests/sidepanel-mail2925-base-email.test.js b/tests/sidepanel-mail2925-base-email.test.js
index 3b737f6c..39c9357d 100644
--- a/tests/sidepanel-mail2925-base-email.test.js
+++ b/tests/sidepanel-mail2925-base-email.test.js
@@ -201,6 +201,15 @@ const inputTempEmailAdminAuth = { value: '' };
const inputTempEmailCustomAuth = { value: '' };
const inputTempEmailReceiveMailbox = { value: '' };
const inputTempEmailUseRandomSubdomain = { checked: false };
+const inputTempEmailUseFixedSubdomain = { checked: false };
+const inputTempEmailSubdomainPrefix = { value: '' };
+function getSelectedCloudflareTempEmailSubdomainMode() {
+ if (inputTempEmailUseFixedSubdomain.checked) return 'fixed';
+ if (inputTempEmailUseRandomSubdomain.checked) return 'random';
+ return 'none';
+}
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM = 'random';
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED = 'fixed';
const inputAutoSkipFailures = { checked: false };
const inputAutoSkipFailuresThreadIntervalMinutes = { value: '0' };
const inputAutoStepDelaySeconds = { value: '' };
@@ -253,6 +262,7 @@ function normalizeLuckmailBaseUrl(value) { return String(value || '').trim(); }
function normalizeLuckmailEmailType(value) { return String(value || '').trim() || 'ms_graph'; }
function normalizeCloudflareTempEmailBaseUrlValue(value) { return String(value || '').trim(); }
function normalizeCloudflareTempEmailReceiveMailboxValue(value) { return String(value || '').trim(); }
+function normalizeCloudflareTempEmailSubdomainPrefixValue(value) { return String(value || '').trim().toLowerCase(); }
function normalizeAccountRunHistoryHelperBaseUrlValue(value) { return String(value || '').trim(); }
function normalizeAutoRunThreadIntervalMinutes(value) { return Number(value) || 0; }
function normalizeAutoStepDelaySeconds(value) { return value === '' ? null : Number(value); }
diff --git a/tests/sidepanel-phone-verification-settings.test.js b/tests/sidepanel-phone-verification-settings.test.js
index 4cbf7756..9548234f 100644
--- a/tests/sidepanel-phone-verification-settings.test.js
+++ b/tests/sidepanel-phone-verification-settings.test.js
@@ -976,6 +976,15 @@ const inputTempEmailAdminAuth = { value: '' };
const inputTempEmailCustomAuth = { value: '' };
const inputTempEmailReceiveMailbox = { value: '' };
const inputTempEmailUseRandomSubdomain = { checked: false };
+const inputTempEmailUseFixedSubdomain = { checked: false };
+const inputTempEmailSubdomainPrefix = { value: '' };
+function getSelectedCloudflareTempEmailSubdomainMode() {
+ if (inputTempEmailUseFixedSubdomain.checked) return 'fixed';
+ if (inputTempEmailUseRandomSubdomain.checked) return 'random';
+ return 'none';
+}
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_RANDOM = 'random';
+const CLOUDFLARE_TEMP_EMAIL_SUBDOMAIN_MODE_FIXED = 'fixed';
const inputAutoSkipFailures = { checked: false };
const inputAutoSkipFailuresThreadIntervalMinutes = { value: '0' };
const inputAutoStepDelaySeconds = { value: '' };
@@ -1067,6 +1076,7 @@ function normalizeLuckmailBaseUrl(value) { return String(value || '').trim(); }
function normalizeLuckmailEmailType(value) { return String(value || '').trim() || 'ms_graph'; }
function normalizeCloudflareTempEmailBaseUrlValue(value) { return String(value || '').trim(); }
function normalizeCloudflareTempEmailReceiveMailboxValue(value) { return String(value || '').trim(); }
+function normalizeCloudflareTempEmailSubdomainPrefixValue(value) { return String(value || '').trim().toLowerCase(); }
function normalizeAccountRunHistoryHelperBaseUrlValue(value) { return String(value || '').trim(); }
function normalizeAutoRunThreadIntervalMinutes(value) { return Number(value) || 0; }
function normalizeAutoStepDelaySeconds(value) { return value === '' ? null : Number(value); }
diff --git "a/\351\241\271\347\233\256\345\256\214\346\225\264\351\223\276\350\267\257\350\257\264\346\230\216.md" "b/\351\241\271\347\233\256\345\256\214\346\225\264\351\223\276\350\267\257\350\257\264\346\230\216.md"
index 80078ddb..61745994 100644
--- "a/\351\241\271\347\233\256\345\256\214\346\225\264\351\223\276\350\267\257\350\257\264\346\230\216.md"
+++ "b/\351\241\271\347\233\256\345\256\214\346\225\264\351\223\276\350\267\257\350\257\264\346\230\216.md"
@@ -59,7 +59,7 @@
- 展示 `Plus 模式` 开关、`账号接入策略` 与 `Plus 支付` 配置；`账号接入策略` 固定放在 `Plus 支付` 上方，只提供 `OAuth / 使用会话 JSON 导入` 两种接入方式，会话导入的 CPA / SUB2API 目标由上方 `来源` 自动决定，不支持会话导入的来源会直接禁用为仅 OAuth；支付方式支持 PayPal / GoPay / GPC，PayPal 展示账号池下拉与添加按钮，GoPay 展示手机号和 PIN，GPC 展示只读 API 地址、API Key、专用手机号、OTP 渠道、本地 OTP helper 开关与 URL、PIN；GPC 的 `购买卡密` 按钮打开卡密购买页，`转换 API Key` 按钮打开 `https://gpc.qlhazycoder.top/`；步骤列表会按支付方式和账号接入策略动态切换，普通模式的注册成功等待步骤不再显示或执行；Plus 模式下手机号注册不可用，只允许邮箱注册
- 展示 `执行范围` 配置；当前 UI 只在 codex/openai flow 显示，保存为通用的 `stepExecutionRangeByFlow`，用于指定允许执行的起止步骤。开启后，范围外节点在侧栏中显示为禁用态，手动按钮、手动跳过入口与进度计数只按允许节点计算。
- 为 Hotmail / 2925 账号池复用同一套“添加账号 / 取消添加 / 批量导入 / 收起列表”表单交互；共享的显隐控制放在 `sidepanel/account-pool-ui.js`，各自 manager 只保留 provider 相关字段校验与业务操作
-- `Cloudflare Temp Email` 在侧栏中有独立区域，支持“按注册邮箱查信 / 按接收邮箱查信”切换、可编辑域名列表、随机子域名开关，以及教程/部署入口；域名选择由 `sidepanel/editable-list-picker.js` 统一承接
+- `Cloudflare Temp Email` 在侧栏中有独立区域，支持“按注册邮箱查信 / 按接收邮箱查信”切换、可编辑域名列表、随机子域名开关、固定子域名开关与子域前缀输入，以及教程/部署入口；域名选择由 `sidepanel/editable-list-picker.js` 统一承接
- `SUB2API` 目标在分组配置下方额外暴露 `账号优先级`；该值会随设置一起持久化，并在后台直连创建账号时原样透传给 SUB2API 管理接口
- 点击“自动”或其他自动化入口时，sidepanel 会附带当前浏览器窗口 ID；后台后续查找、复用和接管标签页时优先锁定在这一个 automation window 内，避免串到其他窗口
@@ -273,7 +273,7 @@
- 2925 是否启用号池模式 `mail2925UseAccountPool`
- 2925 当前选中的号池账号 ID `currentMail2925AccountId`
- Cloudflare / Temp Email 设置
-- Cloudflare Temp Email 细分配置：`cloudflareTempEmailLookupMode / cloudflareTempEmailUseRandomSubdomain / cloudflareTempEmailDomain / cloudflareTempEmailDomains`
+- Cloudflare Temp Email 细分配置：`cloudflareTempEmailLookupMode / cloudflareTempEmailUseRandomSubdomain / cloudflareTempEmailUseFixedSubdomain / cloudflareTempEmailSubdomainPrefix / cloudflareTempEmailDomain / cloudflareTempEmailDomains`
- 注册方式 `signupMethod`
- 接码开关、接码平台 `phoneSmsProvider`，以及 HeroSMS / 5sim 各自的 API Key、国家/地区、价格上限和平台扩展设置
- iCloud 相关偏好
@@ -1251,4 +1251,3 @@ Hide My Email 获取与管理链路：
- `2925` 在 Step 4 / Step 8 现在会携带固定的步骤开始时间窗口，实际筛选下限为“步骤开始时间向前回看 10 分钟”。
- 为了保留这段固定时间窗内已经到达的验证码邮件，后台不再在轮询开始前预先清空 2925 邮箱。
- `2925` 验证码最终提交成功后，后台仍会异步发送 `DELETE_ALL_EMAILS` 做收尾清理。
-
diff --git "a/\351\241\271\347\233\256\346\226\207\344\273\266\347\273\223\346\236\204\350\257\264\346\230\216.md" "b/\351\241\271\347\233\256\346\226\207\344\273\266\347\273\223\346\236\204\350\257\264\346\230\216.md"
index ed3c2233..8ba22aef 100644
--- "a/\351\241\271\347\233\256\346\226\207\344\273\266\347\273\223\346\236\204\350\257\264\346\230\216.md"
+++ "b/\351\241\271\347\233\256\346\226\207\344\273\266\347\273\223\346\236\204\350\257\264\346\230\216.md"
@@ -23,7 +23,7 @@
- `README.md`：面向使用者的精简说明文档，主要介绍项目用途、功能范围、快速开始与文档入口；不再承载过多技术实现细节。
- `background.js`：扩展后台 Service Worker 入口壳，负责模块装配、初始化、全局常量、少量保留的领域函数与运行入口；当前已按 `activeFlowId` 装配 flow-aware 的步骤定义、执行注册表、自动运行与状态同步，OAuth 后链 5 分钟总预算只由 `openai + cpa` target capability 自动启用，其他来源与 flow 不启用该预算；`openai` flow 继续承接 `stepExecutionRangeByFlow`，`kiro` flow 走独立的“注册页 1-6 步 -> 桌面授权 7-8 步 -> `kiro.rs` 上传 9 步”链路，`grok` flow 走独立的“注册页 1-4 步 -> SSO Cookie 提取 5 步 -> `webchat2api` 上传 6 步”链路。
- `cloudmail-utils.js`：Cloud Mail / SkyMail 相关的纯工具函数，负责 API 地址、域名、鉴权头、邮件列表响应与邮件正文归一化。
-- `cloudflare-temp-email-utils.js`：Cloudflare Temp Email 相关的纯工具函数，负责 URL、域名、邮件内容与 MIME 数据归一化。
+- `cloudflare-temp-email-utils.js`：Cloudflare Temp Email 相关的纯工具函数，负责 URL、基础域名、固定子域有效域名、邮件内容与 MIME 数据归一化。
- `gopay-utils.js`：GoPay / GPC Plus 支付相关纯工具函数，负责支付方式归一化、GoPay 手机号/OTP/PIN 归一化、GPC API 地址归一化、API Key 请求头、任务创建/查询/OTP/PIN/停止 URL 与余额响应解析。
- `hotmail-utils.js`：Hotmail 账号与验证码提取相关的纯工具函数，负责账号筛选、验证码匹配、第三方接口数据归一化。
- `icloud-utils.js`：iCloud 隐私邮箱相关的纯工具函数，负责 host、别名列表、保留状态、已用状态等归一化。
@@ -255,7 +255,7 @@
- `tests/background-account-history-settings.test.js`：测试账号运行历史的独立配置项归一化，不再复用 Hotmail 模式作为启停条件。
- `tests/background-auth-chain-guard.test.js`：测试认证顶层链路的去重、Stop 重抛、OAuth 总预算窗口和 `fetch-signup-code` 网络重试边界。
- `tests/background-auth-tab-snapshot.test.js`：测试认证标签快照在脚本执行失败时会回退到标签页 URL 做页面状态判断。
-- `tests/background-cloudflare-temp-email-settings.test.js`：测试 Cloudflare Temp Email 随机子域名设置与 OAuth 总超时配置的持久化归一化。
+- `tests/background-cloudflare-temp-email-settings.test.js`：测试 Cloudflare Temp Email 随机/固定子域名设置与 OAuth 总超时配置的持久化归一化。
- `tests/background-cpa-api.test.js`：测试 CPA 管理接口模块的地址归一化、OAuth 地址获取、callback 提交，以及 ChatGPT 会话导入 payload 构建与返回结果。
- `tests/background-cpa-session-import.test.js`：测试 CPA 会话导入尾节点的标签页选择、会话读取、日志上报、结果透传和后台接线约束。
- `tests/background-cpa-state-plumbing.test.js`：测试步骤 1 与消息路由对 CPA OAuth 运行态字段的保存、回写和 reset 接线。
@@ -338,7 +338,7 @@
- `tests/qq-mail-content.test.js`：测试 QQ 邮箱内容脚本会把 runtime mail rule 的验证码模式转发到新邮件匹配链路。
- `tests/run-count-unlimited.test.js`：测试自动运行轮数不再被 50 封顶，且旧 active 状态不会把手动输入轮数重置回去。
- `tests/cloudflare-temp-email-provider.test.js`：测试 Cloudflare Temp Email provider 的轮询与目标邮箱选择逻辑。
-- `tests/cloudflare-temp-email-utils.test.js`：测试 Cloudflare Temp Email 工具层的 URL、域名、邮件解析逻辑。
+- `tests/cloudflare-temp-email-utils.test.js`：测试 Cloudflare Temp Email 工具层的 URL、域名、固定子域有效域名与邮件解析逻辑。
- `tests/cloudmail-provider.test.js`：测试 Cloud Mail provider 的验证码轮询和生成/转发收件目标邮箱选择逻辑，并覆盖生成邮箱时对共享注册邮箱状态持久化的接入。
- `tests/cloudmail-utils.test.js`：测试 Cloud Mail 工具层的 URL、域名、鉴权头、Token 与邮件响应归一化逻辑。
- `tests/content-operation-delay.test.js`：测试内容脚本操作间延迟层的执行顺序、默认启用、排除步骤、悬挂恢复和 stop-aware sleep。
@@ -382,7 +382,7 @@
- `tests/grok-runner.test.js`：测试 Grok 注册页执行器对邮箱提交、验证码轮询、资料提交、SSO Cookie 提取、账号记录收尾和完成状态持久化的关键链路。
- `tests/sidepanel-auto-run-content-refresh.test.js`：测试点击“自动”时会先冻结当前轮数并刷新贡献内容更新摘要，且刷新失败或启动前状态回灌不会阻塞或改写自动流程启动目标。
- `tests/sidepanel-auto-run-risk-warning.test.js`：测试自动运行在高轮数且未配置节点轮询时会弹出风险提醒。
-- `tests/sidepanel-cloudflare-temp-email-random-subdomain.test.js`：测试 Cloudflare Temp Email 独立区域、随机子域名开关、域名列表恢复与提示文案联动。
+- `tests/sidepanel-cloudflare-temp-email-random-subdomain.test.js`：测试 Cloudflare Temp Email 独立区域、随机/固定子域名开关、域名列表恢复与提示文案联动。
- `tests/sidepanel-header-links.test.js`：测试侧边栏头部仓库首页与 Releases 入口的 HTML 接线与链接解析。
- `tests/sidepanel-icloud-manager.test.js`：测试侧边栏 iCloud 管理器模块接线与空态渲染。
- `tests/sidepanel-icloud-provider.test.js`：测试侧边栏 iCloud 登录地址解析、目标邮箱类型 / 转发邮箱 provider 保存、回显和显隐联动。
@@ -433,4 +433,3 @@
- `tests/verification-stop-propagation.test.js`：测试验证码流程在 Stop 场景下的错误传播与不中途降级。
- `tests/verification-flow-polling.test.js`：测试 2925 长轮询参数、验证码提交流程中的 `beforeSubmit` 钩子执行顺序，以及步骤 8 提交验证码后进入手机号页时会把“继续手机号验证”状态交给步骤 9 处理。
-