就绪
diff --git a/sidepanel/sidepanel.js b/sidepanel/sidepanel.js
index f9748f8..eb1af75 100644
--- a/sidepanel/sidepanel.js
+++ b/sidepanel/sidepanel.js
@@ -122,6 +122,10 @@ const rowIpProxyAccountLifeMinutes = document.getElementById('row-ip-proxy-accou
const inputIpProxyAccountLifeMinutes = document.getElementById('input-ip-proxy-account-life-minutes');
const rowIpProxyPoolTargetCount = document.getElementById('row-ip-proxy-pool-target-count');
const inputIpProxyPoolTargetCount = document.getElementById('input-ip-proxy-pool-target-count');
+const rowIpProxyAutoSyncEnabled = document.getElementById('row-ip-proxy-auto-sync-enabled');
+const inputIpProxyAutoSyncEnabled = document.getElementById('input-ip-proxy-auto-sync-enabled');
+const rowIpProxyAutoSyncInterval = document.getElementById('row-ip-proxy-auto-sync-interval');
+const inputIpProxyAutoSyncIntervalMinutes = document.getElementById('input-ip-proxy-auto-sync-interval-minutes');
const rowIpProxyHost = document.getElementById('row-ip-proxy-host');
const inputIpProxyHost = document.getElementById('input-ip-proxy-host');
const rowIpProxyPort = document.getElementById('row-ip-proxy-port');
@@ -294,16 +298,31 @@ const rowPhoneVerificationEnabled = document.getElementById('row-phone-verificat
const btnTogglePhoneVerificationSection = document.getElementById('btn-toggle-phone-verification-section');
const rowPhoneVerificationFold = document.getElementById('row-phone-verification-fold');
const inputPhoneVerificationEnabled = document.getElementById('input-phone-verification-enabled');
+const rowPhoneSmsProvider = document.getElementById('row-phone-sms-provider');
+const selectPhoneSmsProvider = document.getElementById('select-phone-sms-provider');
+const rowPhoneSmsProviderOrder = document.getElementById('row-phone-sms-provider-order');
+const rowPhoneSmsProviderOrderActions = document.getElementById('row-phone-sms-provider-order-actions');
const rowHeroSmsPlatform = document.getElementById('row-hero-sms-platform');
const rowHeroSmsCountry = document.getElementById('row-hero-sms-country');
const rowHeroSmsCountryFallback = document.getElementById('row-hero-sms-country-fallback');
const rowHeroSmsAcquirePriority = document.getElementById('row-hero-sms-acquire-priority');
const rowHeroSmsApiKey = document.getElementById('row-hero-sms-api-key');
const rowHeroSmsMaxPrice = document.getElementById('row-hero-sms-max-price');
+const rowFiveSimApiKey = document.getElementById('row-five-sim-api-key');
+const rowFiveSimCountry = document.getElementById('row-five-sim-country');
+const rowFiveSimCountryFallback = document.getElementById('row-five-sim-country-fallback');
+const rowFiveSimOperator = document.getElementById('row-five-sim-operator');
+const rowFiveSimProduct = document.getElementById('row-five-sim-product');
+const rowNexSmsApiKey = document.getElementById('row-nex-sms-api-key');
+const rowNexSmsCountry = document.getElementById('row-nex-sms-country');
+const rowNexSmsCountryFallback = document.getElementById('row-nex-sms-country-fallback');
+const rowNexSmsServiceCode = document.getElementById('row-nex-sms-service-code');
const rowHeroSmsRuntimePair = document.getElementById('row-hero-sms-runtime-pair');
const rowHeroSmsCurrentNumber = document.getElementById('row-hero-sms-current-number');
+const rowHeroSmsCurrentCountdown = document.getElementById('row-hero-sms-current-countdown');
const rowHeroSmsPriceTiers = document.getElementById('row-hero-sms-price-tiers');
const rowHeroSmsCurrentCode = document.getElementById('row-hero-sms-current-code');
+const rowHeroSmsPreferredActivation = document.getElementById('row-hero-sms-preferred-activation');
const rowPhoneCodeSettingsGroup = document.getElementById('row-phone-code-settings-group');
const rowPhoneVerificationResendCount = document.getElementById('row-phone-verification-resend-count');
const rowPhoneReplacementLimit = document.getElementById('row-phone-replacement-limit');
@@ -313,7 +332,15 @@ const rowPhoneCodePollIntervalSeconds = document.getElementById('row-phone-code-
const rowPhoneCodePollMaxRounds = document.getElementById('row-phone-code-poll-max-rounds');
const inputHeroSmsApiKey = document.getElementById('input-hero-sms-api-key');
const btnToggleHeroSmsApiKey = document.getElementById('btn-toggle-hero-sms-api-key');
+const inputFiveSimApiKey = document.getElementById('input-five-sim-api-key');
+const btnToggleFiveSimApiKey = document.getElementById('btn-toggle-five-sim-api-key');
+const inputFiveSimOperator = document.getElementById('input-five-sim-operator');
+const inputFiveSimProduct = document.getElementById('input-five-sim-product');
+const inputNexSmsApiKey = document.getElementById('input-nex-sms-api-key');
+const btnToggleNexSmsApiKey = document.getElementById('btn-toggle-nex-sms-api-key');
+const inputNexSmsServiceCode = document.getElementById('input-nex-sms-service-code');
const inputHeroSmsMaxPrice = document.getElementById('input-hero-sms-max-price');
+const inputHeroSmsPreferredPrice = document.getElementById('input-hero-sms-preferred-price');
const inputPhoneReplacementLimit = document.getElementById('input-phone-replacement-limit');
const inputPhoneCodeWaitSeconds = document.getElementById('input-phone-code-wait-seconds');
const inputPhoneCodeTimeoutWindows = document.getElementById('input-phone-code-timeout-windows');
@@ -323,16 +350,36 @@ const inputHeroSmsReuseEnabled = document.getElementById('input-hero-sms-reuse-e
const selectHeroSmsCountry = document.getElementById('select-hero-sms-country');
const selectHeroSmsCountryFallback = document.getElementById('select-hero-sms-country-fallback');
const selectHeroSmsAcquirePriority = document.getElementById('select-hero-sms-acquire-priority');
+const selectHeroSmsPreferredActivation = document.getElementById('select-hero-sms-preferred-activation');
+const selectFiveSimCountry = document.getElementById('select-five-sim-country');
const heroSmsCountryMenuShell = document.getElementById('hero-sms-country-menu-shell');
const btnHeroSmsCountryMenu = document.getElementById('btn-hero-sms-country-menu');
const heroSmsCountryMenu = document.getElementById('hero-sms-country-menu');
const btnHeroSmsCountryClear = document.getElementById('btn-hero-sms-country-clear');
+const fiveSimCountryMenuShell = document.getElementById('five-sim-country-menu-shell');
+const btnFiveSimCountryMenu = document.getElementById('btn-five-sim-country-menu');
+const fiveSimCountryMenu = document.getElementById('five-sim-country-menu');
+const btnFiveSimCountryClear = document.getElementById('btn-five-sim-country-clear');
+const selectNexSmsCountry = document.getElementById('select-nex-sms-country');
+const nexSmsCountryMenuShell = document.getElementById('nex-sms-country-menu-shell');
+const btnNexSmsCountryMenu = document.getElementById('btn-nex-sms-country-menu');
+const nexSmsCountryMenu = document.getElementById('nex-sms-country-menu');
+const btnNexSmsCountryClear = document.getElementById('btn-nex-sms-country-clear');
+const selectPhoneSmsProviderOrder = document.getElementById('select-phone-sms-provider-order');
+const phoneSmsProviderOrderMenuShell = document.getElementById('phone-sms-provider-order-menu-shell');
+const btnPhoneSmsProviderOrderMenu = document.getElementById('btn-phone-sms-provider-order-menu');
+const phoneSmsProviderOrderMenu = document.getElementById('phone-sms-provider-order-menu');
+const btnPhoneSmsProviderOrderReset = document.getElementById('btn-phone-sms-provider-order-reset');
const btnHeroSmsPricePreview = document.getElementById('btn-hero-sms-price-preview');
const displayHeroSmsPlatform = document.getElementById('display-hero-sms-platform');
const displayHeroSmsCurrentNumber = document.getElementById('display-hero-sms-current-number');
+const displayHeroSmsCurrentCountdown = document.getElementById('display-hero-sms-current-countdown');
const displayHeroSmsPriceTiers = document.getElementById('display-hero-sms-price-tiers');
const displayHeroSmsCurrentCode = document.getElementById('display-hero-sms-current-code');
const displayHeroSmsCountryFallbackOrder = document.getElementById('display-hero-sms-country-fallback-order');
+const displayFiveSimCountryFallbackOrder = document.getElementById('display-five-sim-country-fallback-order');
+const displayNexSmsCountryFallbackOrder = document.getElementById('display-nex-sms-country-fallback-order');
+const displayPhoneSmsProviderOrder = document.getElementById('display-phone-sms-provider-order');
const rowAccountRunHistoryHelperBaseUrl = document.getElementById('row-account-run-history-helper-base-url');
const inputAccountRunHistoryHelperBaseUrl = document.getElementById('input-account-run-history-helper-base-url');
const autoStartModal = document.getElementById('auto-start-modal');
@@ -359,8 +406,20 @@ const stepsList = document.querySelector('.steps-list');
let currentPlusModeEnabled = false;
let currentPlusPaymentMethod = 'paypal';
let heroSmsCountrySelectionOrder = [];
+let phoneSmsProviderOrderSelection = [];
let heroSmsCountryMenuSearchKeyword = '';
const heroSmsCountrySearchTextById = new Map();
+const phonePreferredActivationOptionMap = new Map();
+let phoneRuntimeCountdownTimer = null;
+let phoneRuntimeCountdownEndsAt = 0;
+let phoneRuntimeCountdownWindowIndex = 0;
+let phoneRuntimeCountdownWindowTotal = 0;
+let fiveSimCountrySelectionOrder = [];
+let fiveSimCountryMenuSearchKeyword = '';
+const fiveSimCountrySearchTextByCode = new Map();
+let nexSmsCountrySelectionOrder = [];
+let nexSmsCountryMenuSearchKeyword = '';
+const nexSmsCountrySearchTextById = new Map();
let stepDefinitions = getStepDefinitionsForMode(false, currentPlusPaymentMethod);
let STEP_IDS = stepDefinitions.map((step) => Number(step.id)).filter(Number.isFinite);
let STEP_DEFAULT_STATUSES = Object.fromEntries(STEP_IDS.map((stepId) => [stepId, 'pending']));
@@ -392,10 +451,25 @@ const DEFAULT_PHONE_CODE_POLL_INTERVAL_SECONDS = 5;
const PHONE_CODE_POLL_MAX_ROUNDS_MIN = 1;
const PHONE_CODE_POLL_MAX_ROUNDS_MAX = 120;
const DEFAULT_PHONE_CODE_POLL_MAX_ROUNDS = 4;
+const PHONE_SMS_PROVIDER_HERO = 'hero-sms';
+const PHONE_SMS_PROVIDER_FIVE_SIM = '5sim';
+const PHONE_SMS_PROVIDER_NEXSMS = 'nexsms';
+const DEFAULT_PHONE_SMS_PROVIDER = PHONE_SMS_PROVIDER_HERO;
+const DEFAULT_PHONE_SMS_PROVIDER_ORDER = Object.freeze([
+ PHONE_SMS_PROVIDER_HERO,
+ PHONE_SMS_PROVIDER_FIVE_SIM,
+ PHONE_SMS_PROVIDER_NEXSMS,
+]);
+const DEFAULT_FIVE_SIM_COUNTRY_ORDER = Object.freeze(['thailand']);
+const DEFAULT_FIVE_SIM_OPERATOR = 'any';
+const DEFAULT_FIVE_SIM_PRODUCT = 'openai';
+const DEFAULT_NEX_SMS_COUNTRY_ORDER = Object.freeze([1]);
+const DEFAULT_NEX_SMS_SERVICE_CODE = 'ot';
const HERO_SMS_COUNTRY_SELECTION_MAX = 3;
const DEFAULT_HERO_SMS_REUSE_ENABLED = true;
const HERO_SMS_ACQUIRE_PRIORITY_COUNTRY = 'country';
const HERO_SMS_ACQUIRE_PRIORITY_PRICE = 'price';
+const HERO_SMS_ACQUIRE_PRIORITY_PRICE_HIGH = 'price_high';
const DEFAULT_HERO_SMS_ACQUIRE_PRIORITY = HERO_SMS_ACQUIRE_PRIORITY_COUNTRY;
const HERO_SMS_FALLBACK_COUNTRY_ITEMS = Object.freeze([
{ id: 52, chn: '泰国', eng: 'Thailand' },
@@ -405,6 +479,18 @@ const HERO_SMS_FALLBACK_COUNTRY_ITEMS = Object.freeze([
{ id: 43, chn: '德国', eng: 'Germany' },
{ id: 73, chn: '法国', eng: 'France' },
]);
+const FIVE_SIM_FALLBACK_COUNTRY_ITEMS = Object.freeze([
+ { code: 'thailand', iso: 'TH', text_en: 'Thailand' },
+ { code: 'england', iso: 'GB', text_en: 'United Kingdom' },
+ { code: 'usa', iso: 'US', text_en: 'United States' },
+ { code: 'japan', iso: 'JP', text_en: 'Japan' },
+ { code: 'germany', iso: 'DE', text_en: 'Germany' },
+]);
+const NEX_SMS_FALLBACK_COUNTRY_ITEMS = Object.freeze([
+ { id: 1, name: 'Ukraine' },
+ { id: 6, name: 'Indonesia' },
+ { id: 7, name: 'Malaysia' },
+]);
const HERO_SMS_COUNTRY_CODE_ALIAS_OVERRIDES = Object.freeze({
'bahamas': ['BS'],
'bolivia': ['BO'],
@@ -1213,9 +1299,6 @@ async function openConfirmModalWithOption({
};
}
-
-// Override the initial GoPay confirmation helpers so the dialog can
-// recover after an accidental close instead of silently leaving step 7 hanging.
async function openPlusManualConfirmationDialog(options = {}) {
const method = String(options.method || '').trim().toLowerCase();
const title = String(options.title || '').trim() || (method === 'gopay' ? 'GoPay 订阅确认' : '手动确认');
@@ -1682,12 +1765,6 @@ async function settlePendingSettingsBeforeImport() {
await waitForSettingsSaveIdle();
}
-async function persistCurrentSettingsForAction() {
- clearTimeout(settingsAutoSaveTimer);
- await waitForSettingsSaveIdle();
- await saveSettings({ silent: true, force: true });
-}
-
function downloadTextFile(content, fileName, mimeType = 'application/json;charset=utf-8') {
const blob = new Blob([content], { type: mimeType });
const objectUrl = URL.createObjectURL(blob);
@@ -2322,6 +2399,17 @@ function collectSettingsPayload() {
}
return String(Math.max(1, Math.min(500, numeric)));
});
+ const normalizeIpProxyAutoSyncIntervalMinutesSafe = (value = '', fallback = 15) => {
+ const rawValue = String(value ?? '').trim();
+ if (!rawValue) {
+ return Math.max(1, Math.min(1440, Number(fallback) || 15));
+ }
+ const numeric = Number.parseInt(rawValue, 10);
+ if (!Number.isFinite(numeric)) {
+ return Math.max(1, Math.min(1440, Number(fallback) || 15));
+ }
+ return Math.max(1, Math.min(1440, numeric));
+ };
const normalizeIpProxyAccountLifeMinutesSafe = typeof normalizeIpProxyAccountLifeMinutes === 'function'
? normalizeIpProxyAccountLifeMinutes
: ((value = '', fallback = '') => {
@@ -2417,6 +2505,12 @@ function collectSettingsPayload() {
const ipProxyPoolTargetCountRawValue = typeof inputIpProxyPoolTargetCount !== 'undefined'
? inputIpProxyPoolTargetCount?.value
: '';
+ const ipProxyAutoSyncEnabledRawValue = typeof inputIpProxyAutoSyncEnabled !== 'undefined'
+ ? Boolean(inputIpProxyAutoSyncEnabled?.checked)
+ : Boolean(latestState?.ipProxyAutoSyncEnabled);
+ const ipProxyAutoSyncIntervalMinutesRawValue = typeof inputIpProxyAutoSyncIntervalMinutes !== 'undefined'
+ ? inputIpProxyAutoSyncIntervalMinutes?.value
+ : '';
const ipProxyHostRawValue = typeof inputIpProxyHost !== 'undefined'
? inputIpProxyHost?.value
: '';
@@ -2478,9 +2572,162 @@ function collectSettingsPayload() {
const mail2925UseAccountPool = typeof inputMail2925UseAccountPool !== 'undefined'
? Boolean(inputMail2925UseAccountPool?.checked)
: Boolean(latestState?.mail2925UseAccountPool);
+ const normalizePhoneSmsProviderSafe = typeof normalizePhoneSmsProviderValue === 'function'
+ ? normalizePhoneSmsProviderValue
+ : ((value = '') => {
+ const normalized = String(value || '').trim().toLowerCase();
+ if (normalized === '5sim') return '5sim';
+ if (normalized === 'nexsms') return 'nexsms';
+ return 'hero-sms';
+ });
+ const normalizePhoneSmsProviderOrderSafe = typeof normalizePhoneSmsProviderOrderValue === 'function'
+ ? normalizePhoneSmsProviderOrderValue
+ : ((value = [], fallbackOrder = ['hero-sms', '5sim', 'nexsms']) => {
+ const source = Array.isArray(value)
+ ? value
+ : String(value || '')
+ .split(/[\r\n,，;；|/]+/)
+ .map((entry) => String(entry || '').trim())
+ .filter(Boolean);
+ const normalized = [];
+ const seen = new Set();
+ source.forEach((entry) => {
+ const provider = normalizePhoneSmsProviderSafe(entry);
+ if (seen.has(provider)) {
+ return;
+ }
+ seen.add(provider);
+ normalized.push(provider);
+ });
+ if (normalized.length) {
+ return normalized.slice(0, 3);
+ }
+ const fallbackNormalized = [];
+ (Array.isArray(fallbackOrder) ? fallbackOrder : ['hero-sms', '5sim', 'nexsms']).forEach((entry) => {
+ const provider = normalizePhoneSmsProviderSafe(entry);
+ if (!provider || fallbackNormalized.includes(provider)) {
+ return;
+ }
+ fallbackNormalized.push(provider);
+ });
+ return fallbackNormalized.slice(0, 3);
+ });
+ const normalizeFiveSimCountryOrderSafe = typeof normalizeFiveSimCountryOrderValue === 'function'
+ ? normalizeFiveSimCountryOrderValue
+ : ((value = []) => {
+ const source = Array.isArray(value)
+ ? value
+ : String(value || '')
+ .split(/[\r\n,，;；]+/)
+ .map((entry) => String(entry || '').trim())
+ .filter(Boolean);
+ const normalized = Array.from(new Set(source
+ .map((entry) => String(entry || '').trim().toLowerCase().replace(/[^a-z0-9_-]/g, ''))
+ .filter(Boolean)));
+ return normalized.length ? normalized.slice(0, 10) : [];
+ });
+ const normalizeFiveSimOperatorSafe = typeof normalizeFiveSimOperatorValue === 'function'
+ ? normalizeFiveSimOperatorValue
+ : ((value = '') => String(value || '').trim().toLowerCase().replace(/[^a-z0-9_-]/g, '') || 'any');
+ const normalizeFiveSimProductSafe = typeof normalizeFiveSimProductValue === 'function'
+ ? normalizeFiveSimProductValue
+ : ((value = '') => String(value || '').trim().toLowerCase().replace(/[^a-z0-9_-]/g, '') || 'openai');
+ const normalizeNexSmsCountryOrderSafe = typeof normalizeNexSmsCountryOrderValue === 'function'
+ ? normalizeNexSmsCountryOrderValue
+ : ((value = []) => {
+ const source = Array.isArray(value)
+ ? value
+ : String(value || '')
+ .split(/[\r\n,，;；]+/)
+ .map((entry) => String(entry || '').trim())
+ .filter(Boolean);
+ const normalized = [];
+ const seen = new Set();
+ source.forEach((entry) => {
+ const parsed = Math.floor(Number(entry && typeof entry === 'object' ? (entry.id || entry.countryId || entry.country) : entry));
+ if (!Number.isFinite(parsed) || parsed < 0 || seen.has(parsed)) {
+ return;
+ }
+ seen.add(parsed);
+ normalized.push(parsed);
+ });
+ return normalized.length ? normalized.slice(0, 10) : [];
+ });
+ const normalizeNexSmsServiceCodeSafe = typeof normalizeNexSmsServiceCodeValue === 'function'
+ ? normalizeNexSmsServiceCodeValue
+ : ((value = '') => String(value || '').trim().toLowerCase().replace(/[^a-z0-9_-]/g, '') || 'ot');
+ const fiveSimProviderValue = typeof PHONE_SMS_PROVIDER_FIVE_SIM !== 'undefined'
+ ? PHONE_SMS_PROVIDER_FIVE_SIM
+ : '5sim';
+ const heroProviderValue = typeof PHONE_SMS_PROVIDER_HERO !== 'undefined'
+ ? PHONE_SMS_PROVIDER_HERO
+ : 'hero-sms';
+ const nexSmsProviderValue = typeof PHONE_SMS_PROVIDER_NEXSMS !== 'undefined'
+ ? PHONE_SMS_PROVIDER_NEXSMS
+ : 'nexsms';
+ const phoneSmsProviderValue = normalizePhoneSmsProviderSafe(
+ (typeof getSelectedPhoneSmsProvider === 'function'
+ ? getSelectedPhoneSmsProvider()
+ : (latestState?.phoneSmsProvider || heroProviderValue))
+ );
+ const persistedProviderOrder = (
+ typeof getSelectedPhoneSmsProviderOrder === 'function'
+ ? getSelectedPhoneSmsProviderOrder()
+ : normalizePhoneSmsProviderOrderSafe(
+ Array.isArray(latestState?.phoneSmsProviderOrder)
+ ? latestState.phoneSmsProviderOrder
+ : []
+ )
+ );
+ const phoneSmsProviderOrderValue = persistedProviderOrder.length
+ ? normalizePhoneSmsProviderOrderSafe(persistedProviderOrder, [])
+ : [];
const heroSmsApiKeyValue = typeof inputHeroSmsApiKey !== 'undefined' && inputHeroSmsApiKey
? (inputHeroSmsApiKey.value || '')
: '';
+ const fiveSimApiKeyValue = typeof inputFiveSimApiKey !== 'undefined' && inputFiveSimApiKey
+ ? String(inputFiveSimApiKey.value || '').trim()
+ : String(latestState?.fiveSimApiKey || '').trim();
+ const fiveSimCountryOrderValue = (
+ typeof getSelectedFiveSimCountries === 'function'
+ )
+ ? normalizeFiveSimCountryOrderSafe(
+ getSelectedFiveSimCountries().map((country) => country.code || country.id)
+ )
+ : normalizeFiveSimCountryOrderSafe(
+ Array.isArray(latestState?.fiveSimCountryOrder)
+ ? latestState.fiveSimCountryOrder
+ : []
+ );
+ const fiveSimOperatorValue = typeof inputFiveSimOperator !== 'undefined' && inputFiveSimOperator
+ ? normalizeFiveSimOperatorSafe(inputFiveSimOperator.value)
+ : normalizeFiveSimOperatorSafe(
+ latestState?.fiveSimOperator || (typeof DEFAULT_FIVE_SIM_OPERATOR !== 'undefined' ? DEFAULT_FIVE_SIM_OPERATOR : 'any')
+ );
+ const fiveSimProductValue = typeof inputFiveSimProduct !== 'undefined' && inputFiveSimProduct
+ ? normalizeFiveSimProductSafe(inputFiveSimProduct.value)
+ : normalizeFiveSimProductSafe(
+ latestState?.fiveSimProduct || (typeof DEFAULT_FIVE_SIM_PRODUCT !== 'undefined' ? DEFAULT_FIVE_SIM_PRODUCT : 'openai')
+ );
+ const nexSmsApiKeyValue = typeof inputNexSmsApiKey !== 'undefined' && inputNexSmsApiKey
+ ? String(inputNexSmsApiKey.value || '').trim()
+ : String(latestState?.nexSmsApiKey || '').trim();
+ const nexSmsCountryOrderValue = (
+ typeof getSelectedNexSmsCountries === 'function'
+ )
+ ? normalizeNexSmsCountryOrderSafe(
+ getSelectedNexSmsCountries().map((country) => country.id)
+ )
+ : normalizeNexSmsCountryOrderSafe(
+ Array.isArray(latestState?.nexSmsCountryOrder)
+ ? latestState.nexSmsCountryOrder
+ : []
+ );
+ const nexSmsServiceCodeValue = typeof inputNexSmsServiceCode !== 'undefined' && inputNexSmsServiceCode
+ ? normalizeNexSmsServiceCodeSafe(inputNexSmsServiceCode.value)
+ : normalizeNexSmsServiceCodeSafe(
+ latestState?.nexSmsServiceCode || (typeof DEFAULT_NEX_SMS_SERVICE_CODE !== 'undefined' ? DEFAULT_NEX_SMS_SERVICE_CODE : 'ot')
+ );
const defaultHeroSmsReuseEnabled = typeof DEFAULT_HERO_SMS_REUSE_ENABLED !== 'undefined'
? DEFAULT_HERO_SMS_REUSE_ENABLED
: true;
@@ -2499,19 +2746,21 @@ function collectSettingsPayload() {
const heroSmsReuseEnabledValue = typeof inputHeroSmsReuseEnabled !== 'undefined' && inputHeroSmsReuseEnabled
? normalizeHeroSmsReuseEnabledValue(inputHeroSmsReuseEnabled.checked)
: defaultHeroSmsReuseEnabled;
- const normalizeHeroSmsAcquirePriorityValue = typeof normalizeHeroSmsAcquirePriority === 'function'
- ? normalizeHeroSmsAcquirePriority
- : (value) => (String(value || '').trim().toLowerCase() === 'price' ? 'price' : 'country');
+ const defaultHeroSmsAcquirePriority = typeof DEFAULT_HERO_SMS_ACQUIRE_PRIORITY !== 'undefined'
+ ? DEFAULT_HERO_SMS_ACQUIRE_PRIORITY
+ : (typeof HERO_SMS_ACQUIRE_PRIORITY_COUNTRY !== 'undefined' ? HERO_SMS_ACQUIRE_PRIORITY_COUNTRY : 'country');
const heroSmsAcquirePriorityValue = typeof selectHeroSmsAcquirePriority !== 'undefined' && selectHeroSmsAcquirePriority
- ? normalizeHeroSmsAcquirePriorityValue(selectHeroSmsAcquirePriority.value)
- : normalizeHeroSmsAcquirePriorityValue(
- typeof DEFAULT_HERO_SMS_ACQUIRE_PRIORITY !== 'undefined'
- ? DEFAULT_HERO_SMS_ACQUIRE_PRIORITY
- : 'country'
- );
+ ? normalizeHeroSmsAcquirePriority(selectHeroSmsAcquirePriority.value)
+ : defaultHeroSmsAcquirePriority;
const heroSmsMaxPriceValue = typeof inputHeroSmsMaxPrice !== 'undefined' && inputHeroSmsMaxPrice
? normalizeHeroSmsMaxPriceValue(inputHeroSmsMaxPrice.value)
: '';
+ const heroSmsPreferredPriceValue = typeof inputHeroSmsPreferredPrice !== 'undefined' && inputHeroSmsPreferredPrice
+ ? normalizeHeroSmsMaxPriceValue(inputHeroSmsPreferredPrice.value)
+ : '';
+ const phonePreferredActivationValue = typeof getSelectedPhonePreferredActivation === 'function'
+ ? getSelectedPhonePreferredActivation()
+ : null;
const phoneVerificationReplacementLimitValue = typeof inputPhoneReplacementLimit !== 'undefined' && inputPhoneReplacementLimit
? normalizePhoneVerificationReplacementLimit(
inputPhoneReplacementLimit.value,
@@ -2542,16 +2791,25 @@ function collectSettingsPayload() {
latestState?.phoneCodePollMaxRounds
)
: defaultPhoneCodePollMaxRounds;
- const heroSmsCountry = typeof getSelectedHeroSmsCountryOption === 'function'
- ? getSelectedHeroSmsCountryOption()
+ const heroSmsCountry = phoneSmsProviderValue === heroProviderValue
+ ? (typeof getSelectedHeroSmsCountryOption === 'function'
+ ? getSelectedHeroSmsCountryOption()
+ : {
+ id: 0,
+ label: '未设置',
+ })
: {
- id: typeof DEFAULT_HERO_SMS_COUNTRY_ID !== 'undefined' ? DEFAULT_HERO_SMS_COUNTRY_ID : 52,
- label: typeof DEFAULT_HERO_SMS_COUNTRY_LABEL !== 'undefined' ? DEFAULT_HERO_SMS_COUNTRY_LABEL : 'Thailand',
+ id: normalizeHeroSmsCountryId(latestState?.heroSmsCountryId, 0),
+ label: normalizeHeroSmsCountryLabel(latestState?.heroSmsCountryLabel),
};
- const heroSmsCountryFallback = typeof syncHeroSmsFallbackSelectionOrderFromSelect === 'function'
- ? syncHeroSmsFallbackSelectionOrderFromSelect()
- .filter((country) => Number(country.id) !== Number(heroSmsCountry.id))
- : [];
+ const heroSmsCountryFallback = phoneSmsProviderValue === heroProviderValue
+ ? (typeof syncHeroSmsFallbackSelectionOrderFromSelect === 'function'
+ ? syncHeroSmsFallbackSelectionOrderFromSelect()
+ .filter((country) => Number(country.id) !== Number(heroSmsCountry.id))
+ : [])
+ : normalizeHeroSmsCountryFallbackList(
+ Array.isArray(latestState?.heroSmsCountryFallback) ? latestState.heroSmsCountryFallback : []
+ );
const payPalAccounts = typeof getPayPalAccounts === 'function'
? getPayPalAccounts(latestState)
: (Array.isArray(latestState?.paypalAccounts) ? latestState.paypalAccounts : []);
@@ -2586,6 +2844,11 @@ function collectSettingsPayload() {
ipProxyAccountSessionPrefix: currentIpProxyServiceProfile.accountSessionPrefix,
ipProxyAccountLifeMinutes: currentIpProxyServiceProfile.accountLifeMinutes,
ipProxyPoolTargetCount: currentIpProxyServiceProfile.poolTargetCount,
+ ipProxyAutoSyncEnabled: Boolean(ipProxyAutoSyncEnabledRawValue),
+ ipProxyAutoSyncIntervalMinutes: normalizeIpProxyAutoSyncIntervalMinutesSafe(
+ ipProxyAutoSyncIntervalMinutesRawValue,
+ latestState?.ipProxyAutoSyncIntervalMinutes
+ ),
ipProxyHost: currentIpProxyServiceProfile.host,
ipProxyPort: normalizeIpProxyPortSafe(currentIpProxyServiceProfile.port),
ipProxyProtocol: currentIpProxyServiceProfile.protocol,
@@ -2651,18 +2914,29 @@ function collectSettingsPayload() {
autoRunDelayEnabled: inputAutoDelayEnabled.checked,
autoRunDelayMinutes: normalizeAutoDelayMinutes(inputAutoDelayMinutes.value),
autoStepDelaySeconds: normalizeAutoStepDelaySeconds(inputAutoStepDelaySeconds.value),
- oauthFlowTimeoutEnabled: inputOAuthFlowTimeoutEnabled
+ oauthFlowTimeoutEnabled: typeof inputOAuthFlowTimeoutEnabled !== 'undefined' && inputOAuthFlowTimeoutEnabled
? Boolean(inputOAuthFlowTimeoutEnabled.checked)
: true,
phoneVerificationEnabled: Boolean(inputPhoneVerificationEnabled?.checked),
+ phoneSmsProvider: phoneSmsProviderValue,
+ phoneSmsProviderOrder: phoneSmsProviderOrderValue,
verificationResendCount: normalizeVerificationResendCount(
inputVerificationResendCount?.value,
DEFAULT_VERIFICATION_RESEND_COUNT
),
heroSmsApiKey: heroSmsApiKeyValue,
+ fiveSimApiKey: fiveSimApiKeyValue,
+ fiveSimCountryOrder: fiveSimCountryOrderValue,
+ fiveSimOperator: fiveSimOperatorValue,
+ fiveSimProduct: fiveSimProductValue,
+ nexSmsApiKey: nexSmsApiKeyValue,
+ nexSmsCountryOrder: nexSmsCountryOrderValue,
+ nexSmsServiceCode: nexSmsServiceCodeValue,
heroSmsReuseEnabled: heroSmsReuseEnabledValue,
heroSmsAcquirePriority: heroSmsAcquirePriorityValue,
heroSmsMaxPrice: heroSmsMaxPriceValue,
+ heroSmsPreferredPrice: heroSmsPreferredPriceValue,
+ phonePreferredActivation: phonePreferredActivationValue,
phoneVerificationReplacementLimit: phoneVerificationReplacementLimitValue,
phoneCodeWaitSeconds: phoneCodeWaitSecondsValue,
phoneCodeTimeoutWindows: phoneCodeTimeoutWindowsValue,
@@ -2719,8 +2993,16 @@ function normalizeAccountRunHistoryHelperBaseUrlValue(value = '') {
}
}
-function normalizeHeroSmsCountryId(value) {
- return Math.max(1, Math.floor(Number(value) || DEFAULT_HERO_SMS_COUNTRY_ID));
+function normalizeHeroSmsCountryId(value, fallback = DEFAULT_HERO_SMS_COUNTRY_ID) {
+ const parsed = Math.floor(Number(value));
+ if (Number.isFinite(parsed) && parsed > 0) {
+ return parsed;
+ }
+ const fallbackParsed = Math.floor(Number(fallback));
+ if (Number.isFinite(fallbackParsed) && fallbackParsed > 0) {
+ return fallbackParsed;
+ }
+ return 0;
}
function normalizeHeroSmsCountryLabel(value = '') {
@@ -2739,6 +3021,498 @@ function normalizeHeroSmsMaxPriceValue(value = '') {
return String(Math.round(numeric * 10000) / 10000);
}
+function normalizePhoneSmsProviderValue(value = '') {
+ const normalized = String(value || '').trim().toLowerCase();
+ if (normalized === PHONE_SMS_PROVIDER_FIVE_SIM) {
+ return PHONE_SMS_PROVIDER_FIVE_SIM;
+ }
+ if (normalized === PHONE_SMS_PROVIDER_NEXSMS) {
+ return PHONE_SMS_PROVIDER_NEXSMS;
+ }
+ return PHONE_SMS_PROVIDER_HERO;
+}
+
+function normalizePhoneSmsProviderOrderValue(value = [], fallbackOrder = []) {
+ const source = Array.isArray(value)
+ ? value
+ : String(value || '')
+ .split(/[\r\n,，;；|/]+/)
+ .map((entry) => String(entry || '').trim())
+ .filter(Boolean);
+ const normalized = [];
+ const seen = new Set();
+
+ source.forEach((entry) => {
+ const provider = normalizePhoneSmsProviderValue(entry);
+ if (seen.has(provider)) {
+ return;
+ }
+ seen.add(provider);
+ normalized.push(provider);
+ });
+
+ if (normalized.length) {
+ return normalized.slice(0, 3);
+ }
+
+ const fallback = Array.isArray(fallbackOrder) ? fallbackOrder : [];
+ if (!fallback.length) {
+ return [];
+ }
+ const fallbackNormalized = [];
+ fallback.forEach((entry) => {
+ const provider = normalizePhoneSmsProviderValue(entry);
+ if (!provider || fallbackNormalized.includes(provider)) {
+ return;
+ }
+ fallbackNormalized.push(provider);
+ });
+ return fallbackNormalized.slice(0, 3);
+}
+
+function formatPhoneSmsProviderOrderSummary(order = []) {
+ const normalized = normalizePhoneSmsProviderOrderValue(order, []);
+ if (!normalized.length) {
+ return '未设置';
+ }
+ return normalized
+ .map((provider, index) => `${index + 1}. ${getPhoneSmsProviderLabel(provider)}`)
+ .join(' → ');
+}
+
+function updatePhoneSmsProviderOrderSummary(order = []) {
+ const normalized = normalizePhoneSmsProviderOrderValue(order, []);
+ if (displayPhoneSmsProviderOrder) {
+ displayPhoneSmsProviderOrder.textContent = formatPhoneSmsProviderOrderSummary(normalized);
+ }
+ if (btnPhoneSmsProviderOrderMenu) {
+ btnPhoneSmsProviderOrderMenu.textContent = normalized.length
+ ? `${normalized.map((provider) => getPhoneSmsProviderLabel(provider)).join(' / ')} (${normalized.length}/3)`
+ : `未选择 (0/3)`;
+ }
+}
+
+function resolveNormalizedProviderOrderForRuntime(state = {}) {
+ const rawOrder = Array.isArray(state?.phoneSmsProviderOrder)
+ ? state.phoneSmsProviderOrder
+ : [];
+ const normalizedOrder = normalizePhoneSmsProviderOrderValue(rawOrder, []);
+ if (normalizedOrder.length) {
+ return normalizedOrder;
+ }
+ const fallbackProvider = normalizePhoneSmsProviderValue(
+ state?.phoneSmsProvider || selectPhoneSmsProvider?.value || DEFAULT_PHONE_SMS_PROVIDER
+ );
+ return [fallbackProvider];
+}
+
+function setPhoneSmsProviderOrderMenuOpen(open) {
+ const nextOpen = Boolean(open);
+ if (btnPhoneSmsProviderOrderMenu) {
+ btnPhoneSmsProviderOrderMenu.setAttribute('aria-expanded', String(nextOpen));
+ }
+ if (phoneSmsProviderOrderMenu) {
+ phoneSmsProviderOrderMenu.hidden = !nextOpen;
+ }
+}
+
+function renderPhoneSmsProviderOrderMenu() {
+ if (!phoneSmsProviderOrderMenu || !selectPhoneSmsProviderOrder) {
+ return;
+ }
+ phoneSmsProviderOrderMenu.innerHTML = '';
+ const selectedOrder = normalizePhoneSmsProviderOrderValue(phoneSmsProviderOrderSelection, []);
+ const selectedSet = new Set(selectedOrder);
+
+ Array.from(selectPhoneSmsProviderOrder.options || []).forEach((option) => {
+ const provider = normalizePhoneSmsProviderValue(option.value || '');
+ const active = selectedSet.has(provider);
+ const orderIndex = active ? selectedOrder.findIndex((entry) => entry === provider) + 1 : 0;
+ const item = document.createElement('button');
+ item.type = 'button';
+ item.className = 'header-dropdown-item hero-sms-country-menu-item';
+ item.classList.toggle('is-active', active);
+
+ const labelText = document.createElement('span');
+ labelText.className = 'hero-sms-country-menu-item-label';
+ labelText.textContent = getPhoneSmsProviderLabel(provider);
+
+ const badge = document.createElement('span');
+ badge.className = 'hero-sms-country-menu-item-badge';
+ badge.textContent = active ? `✓ ${orderIndex}` : '';
+
+ item.appendChild(labelText);
+ item.appendChild(badge);
+ item.addEventListener('click', () => {
+ option.selected = !option.selected;
+ const nextOrder = syncPhoneSmsProviderOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ syncProvider: false,
+ });
+ updatePhoneSmsProviderOrderSummary(nextOrder);
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+ });
+ phoneSmsProviderOrderMenu.appendChild(item);
+ });
+}
+
+function syncPhoneSmsProviderOrderFromSelect(options = {}) {
+ const selectionLimit = Math.max(1, Math.floor(Number(options.maxSelection) || 3));
+ const enforceMax = options.enforceMax !== false;
+ const ensureDefault = options.ensureDefault !== false;
+ const syncProvider = Boolean(options.syncProvider);
+ const showLimitToast = Boolean(options.showLimitToast);
+ if (!selectPhoneSmsProviderOrder) {
+ phoneSmsProviderOrderSelection = [];
+ updatePhoneSmsProviderOrderSummary([]);
+ return [];
+ }
+
+ const selectedProviders = Array.from(selectPhoneSmsProviderOrder.options)
+ .filter((option) => option.selected)
+ .map((option) => normalizePhoneSmsProviderValue(option.value || ''))
+ .filter(Boolean);
+ const selectedSet = new Set(selectedProviders);
+
+ let nextOrder = phoneSmsProviderOrderSelection.filter((provider) => selectedSet.has(provider));
+ selectedProviders.forEach((provider) => {
+ if (!nextOrder.includes(provider)) {
+ nextOrder.push(provider);
+ }
+ });
+
+ if (ensureDefault && !nextOrder.length) {
+ const fallbackProvider = getSelectedPhoneSmsProvider();
+ nextOrder = normalizePhoneSmsProviderOrderValue([fallbackProvider], []);
+ }
+
+ if (enforceMax && nextOrder.length > selectionLimit) {
+ const droppedCount = nextOrder.length - selectionLimit;
+ nextOrder = nextOrder.slice(0, selectionLimit);
+ if (showLimitToast && droppedCount > 0 && typeof showToast === 'function') {
+ showToast(`服务商顺序最多 ${selectionLimit} 个，已保留前 ${selectionLimit} 个。`, 'warn', 2200);
+ }
+ }
+
+ const nextOrderSet = new Set(nextOrder);
+ Array.from(selectPhoneSmsProviderOrder.options).forEach((option) => {
+ const provider = normalizePhoneSmsProviderValue(option.value || '');
+ option.selected = nextOrderSet.has(provider);
+ });
+
+ phoneSmsProviderOrderSelection = [...nextOrder];
+ if (syncProvider && nextOrder.length && selectPhoneSmsProvider) {
+ selectPhoneSmsProvider.value = normalizePhoneSmsProviderValue(nextOrder[0]);
+ }
+ renderPhoneSmsProviderOrderMenu();
+ updatePhoneSmsProviderOrderSummary(nextOrder);
+ return nextOrder;
+}
+
+function applyPhoneSmsProviderOrderSelection(order = [], options = {}) {
+ const ensureDefault = options.ensureDefault !== false;
+ const syncProvider = Boolean(options.syncProvider);
+ const normalizedOrder = normalizePhoneSmsProviderOrderValue(order, []);
+ phoneSmsProviderOrderSelection = [...normalizedOrder];
+ if (selectPhoneSmsProviderOrder) {
+ const selectedSet = new Set(normalizedOrder);
+ Array.from(selectPhoneSmsProviderOrder.options).forEach((option) => {
+ const provider = normalizePhoneSmsProviderValue(option.value || '');
+ option.selected = selectedSet.has(provider);
+ });
+ }
+ return syncPhoneSmsProviderOrderFromSelect({
+ ensureDefault,
+ enforceMax: true,
+ syncProvider,
+ showLimitToast: false,
+ });
+}
+
+function clearPhoneSmsProviderOrderSelection(options = {}) {
+ const syncProvider = Boolean(options.syncProvider);
+ phoneSmsProviderOrderSelection = [];
+ if (selectPhoneSmsProviderOrder) {
+ Array.from(selectPhoneSmsProviderOrder.options || []).forEach((option) => {
+ option.selected = false;
+ });
+ }
+ const nextOrder = syncPhoneSmsProviderOrderFromSelect({
+ ensureDefault: false,
+ enforceMax: true,
+ syncProvider,
+ showLimitToast: false,
+ });
+ if (!nextOrder.length && !syncProvider && selectPhoneSmsProvider) {
+ selectPhoneSmsProvider.value = normalizePhoneSmsProviderValue(
+ selectPhoneSmsProvider.value || DEFAULT_PHONE_SMS_PROVIDER
+ );
+ }
+ return nextOrder;
+}
+
+function getSelectedPhoneSmsProviderOrder() {
+ const normalized = syncPhoneSmsProviderOrderFromSelect({
+ ensureDefault: false,
+ enforceMax: true,
+ syncProvider: false,
+ showLimitToast: false,
+ });
+ return normalizePhoneSmsProviderOrderValue(normalized, []);
+}
+
+function getSelectedPhoneSmsProvider() {
+ if (!selectPhoneSmsProvider) {
+ return DEFAULT_PHONE_SMS_PROVIDER;
+ }
+ const normalized = normalizePhoneSmsProviderValue(selectPhoneSmsProvider.value);
+ selectPhoneSmsProvider.value = normalized;
+ return normalized;
+}
+
+function normalizeFiveSimCountryCode(value = '', fallback = 'thailand') {
+ const normalized = String(value || '')
+ .trim()
+ .toLowerCase()
+ .replace(/[^a-z0-9_-]/g, '');
+ return normalized || fallback;
+}
+
+function normalizeFiveSimCountryOrderValue(value = []) {
+ const source = Array.isArray(value)
+ ? value
+ : String(value || '')
+ .split(/[\r\n,，;；]+/)
+ .map((entry) => String(entry || '').trim())
+ .filter(Boolean);
+ const normalized = [];
+ const seen = new Set();
+
+ source.forEach((entry) => {
+ const code = normalizeFiveSimCountryCode(
+ entry && typeof entry === 'object' && !Array.isArray(entry)
+ ? (entry.code || entry.country || entry.id || '')
+ : entry,
+ ''
+ );
+ if (!code || seen.has(code)) {
+ return;
+ }
+ seen.add(code);
+ normalized.push(code);
+ });
+
+ if (!normalized.length) {
+ return [];
+ }
+ return normalized.slice(0, 10);
+}
+
+function formatFiveSimCountryOrderValue(value = []) {
+ return normalizeFiveSimCountryOrderValue(value).join(',');
+}
+
+function normalizeFiveSimOperatorValue(value = '') {
+ return normalizeFiveSimCountryCode(value, DEFAULT_FIVE_SIM_OPERATOR);
+}
+
+function normalizeFiveSimProductValue(value = '') {
+ return normalizeFiveSimCountryCode(value, DEFAULT_FIVE_SIM_PRODUCT);
+}
+
+function normalizeNexSmsCountryIdValue(value, fallback = 0) {
+ const parsed = Math.floor(Number(value));
+ if (Number.isFinite(parsed) && parsed >= 0) {
+ return parsed;
+ }
+ const fallbackParsed = Math.floor(Number(fallback));
+ if (Number.isFinite(fallbackParsed) && fallbackParsed >= 0) {
+ return fallbackParsed;
+ }
+ return 0;
+}
+
+function normalizeNexSmsCountryOrderValue(value = []) {
+ const source = Array.isArray(value)
+ ? value
+ : String(value || '')
+ .split(/[\r\n,，;；]+/)
+ .map((entry) => String(entry || '').trim())
+ .filter(Boolean);
+ const normalized = [];
+ const seen = new Set();
+ source.forEach((entry) => {
+ const countryId = normalizeNexSmsCountryIdValue(
+ entry && typeof entry === 'object' && !Array.isArray(entry)
+ ? (entry.id || entry.countryId || entry.country || '')
+ : entry,
+ -1
+ );
+ if (countryId < 0 || seen.has(countryId)) {
+ return;
+ }
+ seen.add(countryId);
+ normalized.push(countryId);
+ });
+ if (!normalized.length) {
+ return [];
+ }
+ return normalized.slice(0, 10);
+}
+
+function normalizeNexSmsServiceCodeValue(value = '') {
+ const normalized = String(value || '')
+ .trim()
+ .toLowerCase()
+ .replace(/[^a-z0-9_-]/g, '');
+ return normalized || DEFAULT_NEX_SMS_SERVICE_CODE;
+}
+
+function normalizeFiveSimCountryLabel(value = '', fallback = 'Thailand') {
+ return String(value || '').trim() || fallback;
+}
+
+function normalizeFiveSimCountryFallbackList(value = []) {
+ const source = Array.isArray(value)
+ ? value
+ : String(value || '')
+ .split(/[\r\n,，;；]+/)
+ .map((entry) => String(entry || '').trim())
+ .filter(Boolean);
+ const normalized = [];
+ const seen = new Set();
+ source.forEach((entry) => {
+ let code = '';
+ let label = '';
+ if (entry && typeof entry === 'object' && !Array.isArray(entry)) {
+ code = normalizeFiveSimCountryCode(entry.code || entry.id || entry.country || '', '');
+ label = normalizeFiveSimCountryLabel(entry.label || entry.countryLabel || '');
+ } else {
+ code = normalizeFiveSimCountryCode(entry, '');
+ }
+ if (!code || seen.has(code)) {
+ return;
+ }
+ seen.add(code);
+ normalized.push({
+ id: code,
+ code,
+ label: label || code,
+ });
+ });
+ return normalized;
+}
+
+function normalizeNexSmsCountryLabel(value = '', fallback = '') {
+ return String(value || '').trim() || fallback;
+}
+
+function normalizeNexSmsCountryFallbackList(value = []) {
+ const source = Array.isArray(value)
+ ? value
+ : String(value || '')
+ .split(/[\r\n,，;；]+/)
+ .map((entry) => String(entry || '').trim())
+ .filter(Boolean);
+ const normalized = [];
+ const seen = new Set();
+ source.forEach((entry) => {
+ let countryId = -1;
+ let label = '';
+ if (entry && typeof entry === 'object' && !Array.isArray(entry)) {
+ countryId = normalizeNexSmsCountryIdValue(entry.id || entry.countryId || entry.country || '', -1);
+ label = normalizeNexSmsCountryLabel(entry.label || entry.countryLabel || '');
+ } else {
+ countryId = normalizeNexSmsCountryIdValue(entry, -1);
+ }
+ if (countryId < 0 || seen.has(countryId)) {
+ return;
+ }
+ seen.add(countryId);
+ normalized.push({
+ id: countryId,
+ label: label || `Country #${countryId}`,
+ });
+ });
+ return normalized;
+}
+
+function getFiveSimCountryDisplayNameByIso(isoCode = '') {
+ const normalizedIso = String(isoCode || '').trim().toUpperCase();
+ if (!normalizedIso || typeof Intl === 'undefined' || typeof Intl.DisplayNames !== 'function') {
+ return '';
+ }
+ try {
+ const zhDisplayNames = new Intl.DisplayNames(['zh-CN'], { type: 'region' });
+ return String(zhDisplayNames.of(normalizedIso) || '').trim();
+ } catch {
+ return '';
+ }
+}
+
+function buildFiveSimCountryDisplayLabel(country = {}) {
+ const code = normalizeFiveSimCountryCode(country.code || country.id || country.country || '', 'thailand');
+ const english = String(country.text_en || country.eng || country.english || code).trim();
+ const iso = String(
+ country.isoCode
+ || country.iso
+ || country.countryCode
+ || ''
+ ).trim().toUpperCase();
+ const chinese = getFiveSimCountryDisplayNameByIso(iso);
+ const base = chinese && english
+ ? `${chinese} (${english})`
+ : (chinese || english || code);
+ return iso ? `${base} [${iso}]` : base;
+}
+
+function buildFiveSimCountrySearchText(country = {}, label = '', code = '') {
+ const tokens = new Set();
+ const iso = String(country.isoCode || country.iso || country.countryCode || '').trim().toUpperCase();
+ const chinese = getFiveSimCountryDisplayNameByIso(iso);
+ [label, code, iso, chinese, country.text_en, country.english, country.text_ru].forEach((entry) => {
+ const token = String(entry || '').trim();
+ if (token) {
+ tokens.add(token);
+ }
+ });
+ return Array.from(tokens).join(' ');
+}
+
+function parseFiveSimCountriesPayload(payload = {}) {
+ if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
+ return [];
+ }
+ const entries = Object.entries(payload)
+ .map(([countryCode, details]) => {
+ const isoObject = details?.iso && typeof details.iso === 'object' ? details.iso : {};
+ const isoCode = Object.keys(isoObject)[0] || '';
+ const normalizedCode = normalizeFiveSimCountryCode(countryCode, '');
+ if (!normalizedCode) {
+ return null;
+ }
+ const option = {
+ code: normalizedCode,
+ id: normalizedCode,
+ isoCode: String(isoCode || '').trim().toUpperCase(),
+ text_en: String(details?.text_en || normalizedCode).trim(),
+ };
+ const label = buildFiveSimCountryDisplayLabel(option);
+ return {
+ id: normalizedCode,
+ code: normalizedCode,
+ isoCode: option.isoCode,
+ label,
+ searchText: buildFiveSimCountrySearchText(option, label, normalizedCode),
+ };
+ })
+ .filter(Boolean);
+ return entries.sort((left, right) => String(left.label || '').localeCompare(String(right.label || '')));
+}
+
function normalizePhoneVerificationReplacementLimit(value, fallback = DEFAULT_PHONE_VERIFICATION_REPLACEMENT_LIMIT) {
const rawValue = String(value ?? '').trim();
const parsed = Number.parseInt(rawValue, 10);
@@ -2807,9 +3581,14 @@ function normalizeHeroSmsReuseEnabledValue(value) {
}
function normalizeHeroSmsAcquirePriority(value = '') {
- return String(value || '').trim().toLowerCase() === HERO_SMS_ACQUIRE_PRIORITY_PRICE
- ? HERO_SMS_ACQUIRE_PRIORITY_PRICE
- : HERO_SMS_ACQUIRE_PRIORITY_COUNTRY;
+ const normalized = String(value || '').trim().toLowerCase();
+ if (normalized === HERO_SMS_ACQUIRE_PRIORITY_PRICE) {
+ return HERO_SMS_ACQUIRE_PRIORITY_PRICE;
+ }
+ if (normalized === HERO_SMS_ACQUIRE_PRIORITY_PRICE_HIGH) {
+ return HERO_SMS_ACQUIRE_PRIORITY_PRICE_HIGH;
+ }
+ return HERO_SMS_ACQUIRE_PRIORITY_COUNTRY;
}
function normalizeHeroSmsCountryFallbackList(value = []) {
@@ -2957,11 +3736,23 @@ function normalizeHeroSmsFetchErrorMessage(error) {
}
function normalizeHeroSmsPriceForPreview(value) {
- const price = Number(value);
- if (!Number.isFinite(price) || price < 0) {
+ const direct = Number(value);
+ if (Number.isFinite(direct) && direct >= 0) {
+ return direct;
+ }
+ const text = String(value ?? '').trim();
+ if (!text) {
return null;
}
- return price;
+ const matched = text.match(/-?\d+(?:[.,]\d+)?/);
+ if (!matched) {
+ return null;
+ }
+ const parsed = Number(String(matched[0] || '').replace(',', '.'));
+ if (!Number.isFinite(parsed) || parsed < 0) {
+ return null;
+ }
+ return parsed;
}
function formatHeroSmsPriceForPreview(value) {
@@ -2998,26 +3789,174 @@ function collectHeroSmsPriceEntriesForPreview(payload, entries = []) {
return entries;
}
- const cost = normalizeHeroSmsPriceForPreview(payload.cost);
- if (cost !== null) {
- const count = Number(payload.count);
- const physicalCount = Number(payload.physicalCount);
- const hasCount = Number.isFinite(count);
- const hasPhysicalCount = Number.isFinite(physicalCount);
- const stockCount = Math.max(hasCount ? count : 0, hasPhysicalCount ? physicalCount : 0);
- const hasStockField = hasCount || hasPhysicalCount;
+ const directPrice = normalizeHeroSmsPriceForPreview(
+ payload.cost
+ ?? payload.price
+ ?? payload.retail_price
+ ?? payload.retailPrice
+ );
+ if (directPrice !== null) {
+ const stockCandidates = [
+ payload.count,
+ payload.physicalCount,
+ payload.stock,
+ payload.available,
+ payload.quantity,
+ payload.qty,
+ payload.left,
+ payload.free,
+ ]
+ .map((value) => Number(value))
+ .filter((value) => Number.isFinite(value));
+ const hasStockField = stockCandidates.length > 0;
+ const stockCount = hasStockField ? Math.max(...stockCandidates) : 0;
entries.push({
- cost,
+ cost: directPrice,
hasStockField,
stockCount: Number.isFinite(stockCount) ? stockCount : 0,
inStock: !hasStockField || stockCount > 0,
});
}
+ const pushTierMapEntries = (tierMap) => {
+ if (!tierMap || typeof tierMap !== 'object') {
+ return;
+ }
+ Object.entries(tierMap).forEach(([priceKey, countRaw]) => {
+ const priceValue = normalizeHeroSmsPriceForPreview(priceKey);
+ if (priceValue === null) {
+ return;
+ }
+ const stockCount = Number(countRaw);
+ if (!Number.isFinite(stockCount)) {
+ return;
+ }
+ entries.push({
+ cost: priceValue,
+ hasStockField: true,
+ stockCount: Math.max(0, stockCount),
+ inStock: stockCount > 0,
+ });
+ });
+ };
+
+ pushTierMapEntries(payload.freePriceMap);
+ pushTierMapEntries(payload.priceMap);
+
+ // Some HeroSMS payloads encode tiers as object keys, e.g.:
+ // { "0.05": { count: 0 }, "0.35": { count: 12 } }
+ // Parse those keyed tiers as well, so preview does not miss higher-price stock.
+ Object.entries(payload).forEach(([key, value]) => {
+ const keyedPrice = normalizeHeroSmsPriceForPreview(key);
+ if (keyedPrice === null) {
+ return;
+ }
+ if (value && typeof value === 'object') {
+ const stockCandidates = [
+ value.count,
+ value.physicalCount,
+ value.stock,
+ value.available,
+ value.quantity,
+ value.qty,
+ value.left,
+ value.free,
+ ]
+ .map((raw) => Number(raw))
+ .filter((raw) => Number.isFinite(raw));
+ const hasStockField = stockCandidates.length > 0;
+ const trimmedKey = String(key || '').trim();
+ const looksLikeCountryOrServiceKey = /^[0-9]{1,4}$/.test(trimmedKey);
+ const looksLikeDecimalPriceKey = /^-?\d+[.,]\d+$/.test(trimmedKey)
+ || /^[^\d-]*-?\d+[.,]\d+[^\d]*$/.test(trimmedKey);
+ // Guard against country/service IDs encoded as numeric keys (e.g. "52", "16").
+ // For numeric keys we require explicit stock fields, while decimal price keys can
+ // still be consumed even when the provider only returns a scalar quantity.
+ if (looksLikeCountryOrServiceKey && !looksLikeDecimalPriceKey) {
+ return;
+ }
+ const stockCount = hasStockField ? Math.max(...stockCandidates) : 0;
+ entries.push({
+ cost: keyedPrice,
+ hasStockField,
+ stockCount: Number.isFinite(stockCount) ? stockCount : 0,
+ inStock: stockCount > 0,
+ });
+ return;
+ }
+ const numericCount = Number(value);
+ if (Number.isFinite(numericCount)) {
+ entries.push({
+ cost: keyedPrice,
+ hasStockField: true,
+ stockCount: Math.max(0, numericCount),
+ inStock: numericCount > 0,
+ });
+ }
+ });
+
Object.values(payload).forEach((entry) => collectHeroSmsPriceEntriesForPreview(entry, entries));
return entries;
}
+function collectHeroSmsPriceEntriesFromTopCountriesPayload(payload, countryId, entries = []) {
+ const normalizedCountryId = normalizeHeroSmsCountryId(countryId, 0);
+ if (normalizedCountryId <= 0) {
+ return entries;
+ }
+ if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
+ return entries;
+ }
+ Object.values(payload).forEach((entry) => {
+ if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+ return;
+ }
+ const entryCountryId = normalizeHeroSmsCountryId(
+ entry.country ?? entry.countryId ?? entry.country_id ?? entry.id,
+ 0
+ );
+ if (entryCountryId !== normalizedCountryId) {
+ return;
+ }
+ collectHeroSmsPriceEntriesForPreview(entry, entries);
+ });
+ return entries;
+}
+
+function collectHeroSmsPriceEntriesFromVerificationPayload(payload, countryId, serviceCode = 'dr', entries = []) {
+ const normalizedCountryId = normalizeHeroSmsCountryId(countryId, 0);
+ if (normalizedCountryId <= 0) {
+ return entries;
+ }
+ if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
+ return entries;
+ }
+ const normalizedServiceCode = String(serviceCode || '').trim();
+ if (!normalizedServiceCode) {
+ return entries;
+ }
+ const serviceNode = payload?.[normalizedServiceCode];
+ if (!serviceNode || typeof serviceNode !== 'object' || Array.isArray(serviceNode)) {
+ return entries;
+ }
+ const countryNode = serviceNode?.[String(normalizedCountryId)];
+ if (!countryNode || typeof countryNode !== 'object' || Array.isArray(countryNode)) {
+ return entries;
+ }
+ const priceValue = normalizeHeroSmsPriceForPreview(countryNode.price);
+ if (priceValue === null) {
+ return entries;
+ }
+ const stockCount = Number(countryNode.count);
+ entries.push({
+ cost: priceValue,
+ hasStockField: Number.isFinite(stockCount),
+ stockCount: Number.isFinite(stockCount) ? Math.max(0, stockCount) : 0,
+ inStock: !Number.isFinite(stockCount) || stockCount > 0,
+ });
+ return entries;
+}
+
function collectHeroSmsPriceCandidatesForPreview(payload, candidates = []) {
collectHeroSmsPriceEntriesForPreview(payload, [])
.filter((entry) => entry.inStock)
@@ -3094,18 +4033,123 @@ function summarizeHeroSmsPreviewError(payload, responseStatus = 0) {
return text || '未知错误';
}
+function formatPriceTiersForPreview(entries = [], options = {}) {
+ const maxPrice = Number(options?.maxPrice);
+ const hasMaxPrice = Number.isFinite(maxPrice) && maxPrice > 0;
+ const normalized = Array.from(
+ new Map(
+ (Array.isArray(entries) ? entries : [])
+ .map((entry) => {
+ const price = Number(entry?.price ?? entry?.cost);
+ if (!Number.isFinite(price) || price <= 0) {
+ return null;
+ }
+ const normalizedPrice = Math.round(price * 10000) / 10000;
+ const countRaw = Number(entry?.count);
+ const count = Number.isFinite(countRaw) ? Math.max(0, Math.floor(countRaw)) : null;
+ return [normalizedPrice, count];
+ })
+ .filter(Boolean)
+ ).entries()
+ )
+ .map(([price, count]) => ({ price: Number(price), count }))
+ .sort((left, right) => left.price - right.price);
+ if (!normalized.length) {
+ return '';
+ }
+
+ const limit = 16;
+ const displayed = normalized.slice(0, limit);
+ const suffix = normalized.length > limit ? ` ... +${normalized.length - limit} 档` : '';
+ return displayed.map((entry) => {
+ const priceText = formatHeroSmsPriceForPreview(entry.price) || String(entry.price);
+ const countText = entry.count === null ? '' : `x${entry.count}`;
+ const overLimitText = hasMaxPrice && entry.price > maxPrice ? '↑' : '';
+ return `${priceText}${countText ? `(${countText})` : ''}${overLimitText}`;
+ }).join(', ') + suffix;
+}
+
+function formatPriceTiersWithZeroStockForPreview(entries = [], options = {}) {
+ const maxPrice = Number(options?.maxPrice);
+ const hasMaxPrice = Number.isFinite(maxPrice) && maxPrice > 0;
+ const normalized = Array.from(
+ new Map(
+ (Array.isArray(entries) ? entries : [])
+ .map((entry) => {
+ const price = Number(entry?.price ?? entry?.cost);
+ if (!Number.isFinite(price) || price <= 0) {
+ return null;
+ }
+ const normalizedPrice = Math.round(price * 10000) / 10000;
+ const countRaw = Number(entry?.count);
+ const count = Number.isFinite(countRaw) ? Math.max(0, Math.floor(countRaw)) : null;
+ return [normalizedPrice, count];
+ })
+ .filter(Boolean)
+ ).entries()
+ )
+ .map(([price, count]) => ({ price: Number(price), count }))
+ .sort((left, right) => left.price - right.price);
+ if (!normalized.length) {
+ return '';
+ }
+
+ const limit = 16;
+ const displayed = normalized.slice(0, limit);
+ const suffix = normalized.length > limit ? ` ... +${normalized.length - limit} 档` : '';
+ return displayed.map((entry) => {
+ const priceText = formatHeroSmsPriceForPreview(entry.price) || String(entry.price);
+ const countText = entry.count === null ? '' : `x${entry.count}`;
+ const overLimitText = hasMaxPrice && entry.price > maxPrice ? '↑' : '';
+ return `${priceText}${countText ? `(${countText})` : ''}${overLimitText}`;
+ }).join(', ') + suffix;
+}
+
+function describeNexSmsPreviewPayload(payload) {
+ if (payload === undefined || payload === null) {
+ return '';
+ }
+ if (typeof payload === 'string') {
+ return payload.trim();
+ }
+ if (typeof payload === 'number' || typeof payload === 'boolean') {
+ return String(payload);
+ }
+ if (typeof payload === 'object') {
+ const directMessage = String(
+ payload.message
+ || payload.msg
+ || payload.error
+ || payload.title
+ || payload.statusText
+ || payload?.data?.message
+ || payload?.data?.error
+ || ''
+ ).trim();
+ if (directMessage) {
+ return directMessage;
+ }
+ try {
+ return JSON.stringify(payload);
+ } catch {
+ return '[object]';
+ }
+ }
+ return String(payload);
+}
+
function getSelectedHeroSmsCountryOption() {
const selectedCountries = syncHeroSmsFallbackSelectionOrderFromSelect({
enforceMax: true,
- ensureDefault: true,
+ ensureDefault: false,
showLimitToast: false,
});
if (selectedCountries.length) {
return selectedCountries[0];
}
return {
- id: DEFAULT_HERO_SMS_COUNTRY_ID,
- label: DEFAULT_HERO_SMS_COUNTRY_LABEL,
+ id: 0,
+ label: '未设置',
};
}
@@ -3113,6 +4157,57 @@ function updateHeroSmsPlatformDisplay() {
if (!displayHeroSmsPlatform) {
return;
}
+ const normalizeProvider = typeof normalizePhoneSmsProviderValue === 'function'
+ ? normalizePhoneSmsProviderValue
+ : ((value = '') => {
+ const normalized = String(value || '').trim().toLowerCase();
+ if (normalized === '5sim') return '5sim';
+ if (normalized === 'nexsms') return 'nexsms';
+ return 'hero-sms';
+ });
+ const fiveSimProviderValue = typeof PHONE_SMS_PROVIDER_FIVE_SIM !== 'undefined' ? PHONE_SMS_PROVIDER_FIVE_SIM : '5sim';
+ const nexSmsProviderValue = typeof PHONE_SMS_PROVIDER_NEXSMS !== 'undefined' ? PHONE_SMS_PROVIDER_NEXSMS : 'nexsms';
+ const defaultProviderValue = typeof DEFAULT_PHONE_SMS_PROVIDER !== 'undefined' ? DEFAULT_PHONE_SMS_PROVIDER : 'hero-sms';
+ const providerOrderForDisplay = resolveNormalizedProviderOrderForRuntime(latestState || {});
+ const provider = providerOrderForDisplay[0] || (
+ typeof getSelectedPhoneSmsProvider === 'function'
+ ? getSelectedPhoneSmsProvider()
+ : normalizeProvider(selectPhoneSmsProvider?.value || defaultProviderValue)
+ );
+ if (provider === fiveSimProviderValue) {
+ const defaultProduct = typeof DEFAULT_FIVE_SIM_PRODUCT !== 'undefined' ? DEFAULT_FIVE_SIM_PRODUCT : 'openai';
+ const product = typeof normalizeFiveSimProductValue === 'function'
+ ? normalizeFiveSimProductValue(inputFiveSimProduct?.value || latestState?.fiveSimProduct || defaultProduct)
+ : String(inputFiveSimProduct?.value || latestState?.fiveSimProduct || defaultProduct).trim().toLowerCase();
+ const primaryCountry = (
+ typeof getSelectedFiveSimCountries === 'function'
+ ? getSelectedFiveSimCountries()?.[0]?.label
+ : ''
+ ) || '未设置国家';
+ displayHeroSmsPlatform.textContent = `5sim / ${product} / ${primaryCountry}`;
+ return;
+ }
+ if (provider === nexSmsProviderValue) {
+ const defaultServiceCode = typeof DEFAULT_NEX_SMS_SERVICE_CODE !== 'undefined' ? DEFAULT_NEX_SMS_SERVICE_CODE : 'ot';
+ const serviceCode = typeof normalizeNexSmsServiceCodeValue === 'function'
+ ? normalizeNexSmsServiceCodeValue(inputNexSmsServiceCode?.value || latestState?.nexSmsServiceCode || defaultServiceCode)
+ : String(inputNexSmsServiceCode?.value || latestState?.nexSmsServiceCode || defaultServiceCode).trim().toLowerCase();
+ const primaryCountry = (
+ typeof getSelectedNexSmsCountries === 'function'
+ ? getSelectedNexSmsCountries()?.[0]?.label
+ : ''
+ ) || '未设置国家';
+ displayHeroSmsPlatform.textContent = `NexSMS / ${serviceCode} / ${primaryCountry}`;
+ return;
+ }
+ const heroPrimary = typeof getSelectedHeroSmsCountryOption === 'function'
+ ? getSelectedHeroSmsCountryOption()
+ : null;
+ const heroPrimaryLabel = String(heroPrimary?.label || '').trim();
+ if (heroPrimary && Number(heroPrimary.id) > 0 && heroPrimaryLabel) {
+ displayHeroSmsPlatform.textContent = `HeroSMS / OpenAI / ${heroPrimaryLabel}`;
+ return;
+ }
displayHeroSmsPlatform.textContent = 'HeroSMS / OpenAI';
}
@@ -3131,13 +4226,38 @@ function renderHeroSmsCountryFallbackOrder(countries = []) {
return;
}
const normalized = normalizeHeroSmsCountryFallbackList(countries);
+ displayHeroSmsCountryFallbackOrder.textContent = '';
if (!normalized.length) {
displayHeroSmsCountryFallbackOrder.textContent = '未设置';
return;
}
- displayHeroSmsCountryFallbackOrder.textContent = normalized
- .map((country) => `${country.label}(${country.id})`)
- .join(' -> ');
+ normalized.forEach((country, index) => {
+ const chip = document.createElement('span');
+ chip.className = 'country-order-chip';
+ const label = document.createElement('span');
+ label.className = 'country-order-chip-label';
+ label.textContent = `${index + 1}. ${country.label}(${country.id})`;
+ const removeBtn = document.createElement('button');
+ removeBtn.type = 'button';
+ removeBtn.className = 'country-order-remove';
+ removeBtn.title = `移除 ${country.label}`;
+ removeBtn.setAttribute('aria-label', `移除 ${country.label}`);
+ removeBtn.textContent = '×';
+ removeBtn.addEventListener('click', (event) => {
+ event.preventDefault();
+ event.stopPropagation();
+ removeHeroSmsCountryFromOrder(country.id);
+ });
+ chip.appendChild(label);
+ chip.appendChild(removeBtn);
+ displayHeroSmsCountryFallbackOrder.appendChild(chip);
+ if (index < normalized.length - 1) {
+ const separator = document.createElement('span');
+ separator.className = 'country-order-separator';
+ separator.textContent = '→';
+ displayHeroSmsCountryFallbackOrder.appendChild(separator);
+ }
+ });
}
function setHeroSmsCountryMenuOpen(open) {
@@ -3198,7 +4318,7 @@ function updateHeroSmsCountryMenuSummary(selectedCountries = []) {
}
const normalized = normalizeHeroSmsCountryFallbackList(selectedCountries);
if (!normalized.length) {
- btnHeroSmsCountryMenu.textContent = `${DEFAULT_HERO_SMS_COUNTRY_LABEL} (1/${HERO_SMS_COUNTRY_SELECTION_MAX})`;
+ btnHeroSmsCountryMenu.textContent = `未选择 (0/${HERO_SMS_COUNTRY_SELECTION_MAX})`;
return;
}
const labels = normalized.map((country) => country.label);
@@ -3262,12 +4382,12 @@ function renderHeroSmsCountryChoiceButtons() {
item.dataset.searchText = `${label} ${countryId} ${heroSmsCountrySearchTextById.get(countryId) || ''}`;
item.addEventListener('click', () => {
option.selected = !option.selected;
- const selectedCountries = syncHeroSmsFallbackSelectionOrderFromSelect({
+ syncHeroSmsFallbackSelectionOrderFromSelect({
enforceMax: true,
- ensureDefault: true,
+ ensureDefault: false,
showLimitToast: true,
});
- updateHeroSmsPlatformDisplay(selectedCountries[0]?.label || DEFAULT_HERO_SMS_COUNTRY_LABEL);
+ updateHeroSmsPlatformDisplay();
markSettingsDirty(true);
saveSettings({ silent: true }).catch(() => { });
});
@@ -3292,13 +4412,10 @@ function syncHeroSmsFallbackSelectionOrderFromSelect(options = {}) {
const showLimitToast = Boolean(options.showLimitToast);
if (!countrySelect) {
- const defaultCountry = {
- id: normalizeHeroSmsCountryId(DEFAULT_HERO_SMS_COUNTRY_ID),
- label: DEFAULT_HERO_SMS_COUNTRY_LABEL,
- };
- heroSmsCountrySelectionOrder = [defaultCountry.id];
- renderHeroSmsCountryFallbackOrder([defaultCountry]);
- return [defaultCountry];
+ heroSmsCountrySelectionOrder = [];
+ renderHeroSmsCountryFallbackOrder([]);
+ renderHeroSmsCountryChoiceButtons();
+ return [];
}
const selectedIds = Array.from(countrySelect.options)
@@ -3360,6 +4477,7 @@ function applyHeroSmsFallbackSelection(countries = [], options = {}) {
...normalizeHeroSmsCountryFallbackList(countries),
];
const normalized = normalizeHeroSmsCountryFallbackList(sourceCountries)
+ .filter((entry) => Number(entry.id) > 0)
.slice(0, HERO_SMS_COUNTRY_SELECTION_MAX);
const selectedIds = normalized
.map((entry) => Number(entry.id))
@@ -3375,27 +4493,240 @@ function applyHeroSmsFallbackSelection(countries = [], options = {}) {
heroSmsCountrySelectionOrder = [...selectedIds];
return syncHeroSmsFallbackSelectionOrderFromSelect({
enforceMax: true,
- ensureDefault: true,
+ ensureDefault: false,
showLimitToast: false,
});
}
+function normalizePhoneActivationState(record = {}) {
+ if (!record || typeof record !== 'object' || Array.isArray(record)) {
+ return null;
+ }
+ const provider = normalizePhoneSmsProviderValue(record.provider || latestState?.phoneSmsProvider || PHONE_SMS_PROVIDER_HERO);
+ const activationId = String(record.activationId ?? record.id ?? record.activation ?? '').trim();
+ const phoneNumber = String(record.phoneNumber ?? record.phone ?? record.number ?? '').trim();
+ if (!activationId || !phoneNumber) {
+ return null;
+ }
+ const normalized = {
+ provider,
+ activationId,
+ phoneNumber,
+ serviceCode: String(record.serviceCode || '').trim(),
+ successfulUses: Math.max(0, Math.floor(Number(record.successfulUses) || 0)),
+ maxUses: Math.max(1, Math.floor(Number(record.maxUses) || 3)),
+ };
+
+ if (provider === PHONE_SMS_PROVIDER_FIVE_SIM) {
+ normalized.countryId = normalizeFiveSimCountryCode(
+ record.countryCode || record.countryId || '',
+ ''
+ );
+ } else if (provider === PHONE_SMS_PROVIDER_NEXSMS) {
+ normalized.countryId = normalizeNexSmsCountryId(record.countryId, -1);
+ } else {
+ normalized.countryId = normalizeHeroSmsCountryId(record.countryId, 0);
+ }
+
+ const countryLabel = String(record.countryLabel || '').trim();
+ if (countryLabel) {
+ normalized.countryLabel = countryLabel;
+ }
+ const expiresAt = Number(record.expiresAt);
+ if (Number.isFinite(expiresAt) && expiresAt > 0) {
+ normalized.expiresAt = Math.floor(expiresAt);
+ }
+ return normalized;
+}
+
+function buildPhoneActivationOptionKey(activation) {
+ const normalized = normalizePhoneActivationState(activation);
+ if (!normalized) {
+ return '';
+ }
+ return [
+ normalized.provider,
+ String(normalized.activationId || '').trim(),
+ String(normalized.phoneNumber || '').trim(),
+ ].join('::');
+}
+
+function resolvePhoneActivationCountryLabel(activation = null) {
+ const normalized = normalizePhoneActivationState(activation);
+ if (!normalized) {
+ return '';
+ }
+ if (normalized.countryLabel) {
+ return normalized.countryLabel;
+ }
+ if (normalized.provider === PHONE_SMS_PROVIDER_FIVE_SIM) {
+ return String(normalized.countryId || '').trim();
+ }
+ if (normalized.provider === PHONE_SMS_PROVIDER_NEXSMS) {
+ const countryId = normalizeNexSmsCountryId(normalized.countryId, -1);
+ return countryId >= 0 ? `Country #${countryId}` : '';
+ }
+ return normalizeHeroSmsCountryLabel(
+ getHeroSmsCountryLabelById(normalized.countryId || '')
+ );
+}
+
+function getPhoneSmsProviderLabel(provider = '') {
+ const normalized = normalizePhoneSmsProviderValue(provider);
+ if (normalized === PHONE_SMS_PROVIDER_FIVE_SIM) {
+ return '5sim';
+ }
+ if (normalized === PHONE_SMS_PROVIDER_NEXSMS) {
+ return 'NexSMS';
+ }
+ return 'HeroSMS';
+}
+
+function buildPhoneActivationOptionLabel(activation = null, sourceLabel = '') {
+ const normalized = normalizePhoneActivationState(activation);
+ if (!normalized) {
+ return '';
+ }
+ const countryLabel = resolvePhoneActivationCountryLabel(normalized);
+ const providerLabel = getPhoneSmsProviderLabel(normalized.provider);
+ const reuseLabel = normalized.maxUses > 1
+ ? ` / ${Math.max(0, normalized.successfulUses) + 1}/${normalized.maxUses}`
+ : '';
+ const sourcePrefix = sourceLabel ? `[${sourceLabel}] ` : '';
+ return `${sourcePrefix}${normalized.phoneNumber} / ${providerLabel}${countryLabel ? ` / ${countryLabel}` : ''} (#${normalized.activationId})${reuseLabel}`;
+}
+
+function stopPhoneRuntimeCountdownTicker() {
+ clearInterval(phoneRuntimeCountdownTimer);
+ phoneRuntimeCountdownTimer = null;
+}
+
+function renderPhoneRuntimeCountdown() {
+ if (!displayHeroSmsCurrentCountdown) {
+ return;
+ }
+ const hasActivation = Boolean(normalizePhoneActivationState(latestState?.currentPhoneActivation));
+ const endsAt = Number(phoneRuntimeCountdownEndsAt) || 0;
+ const now = Date.now();
+ if (!hasActivation || !Number.isFinite(endsAt) || endsAt <= 0) {
+ displayHeroSmsCurrentCountdown.textContent = hasActivation ? '等待中' : '未启动';
+ stopPhoneRuntimeCountdownTicker();
+ return;
+ }
+ const remainingMs = endsAt - now;
+ const windowHint = (
+ phoneRuntimeCountdownWindowTotal > 0
+ ? `（${Math.max(1, phoneRuntimeCountdownWindowIndex)}/${phoneRuntimeCountdownWindowTotal}）`
+ : ''
+ );
+ if (remainingMs <= 0) {
+ displayHeroSmsCurrentCountdown.textContent = `00:00:00${windowHint}`;
+ stopPhoneRuntimeCountdownTicker();
+ return;
+ }
+ displayHeroSmsCurrentCountdown.textContent = `${formatCountdown(remainingMs)}${windowHint}`;
+}
+
+function syncPhoneRuntimeCountdown(state = {}) {
+ phoneRuntimeCountdownEndsAt = Math.max(0, Number(state?.currentPhoneVerificationCountdownEndsAt) || 0);
+ phoneRuntimeCountdownWindowIndex = Math.max(0, Math.floor(Number(state?.currentPhoneVerificationCountdownWindowIndex) || 0));
+ phoneRuntimeCountdownWindowTotal = Math.max(0, Math.floor(Number(state?.currentPhoneVerificationCountdownWindowTotal) || 0));
+ renderPhoneRuntimeCountdown();
+ if (phoneRuntimeCountdownEndsAt > Date.now()) {
+ if (!phoneRuntimeCountdownTimer) {
+ phoneRuntimeCountdownTimer = setInterval(() => {
+ renderPhoneRuntimeCountdown();
+ }, 1000);
+ }
+ } else {
+ stopPhoneRuntimeCountdownTicker();
+ }
+}
+
+function renderPhonePreferredActivationOptions(state = {}) {
+ if (!selectHeroSmsPreferredActivation) {
+ return;
+ }
+ const provider = normalizePhoneSmsProviderValue(
+ state?.phoneSmsProvider || latestState?.phoneSmsProvider || getSelectedPhoneSmsProvider()
+ );
+ const selectedPreferred = normalizePhoneActivationState(state?.phonePreferredActivation || latestState?.phonePreferredActivation);
+ const reusablePool = Array.isArray(state?.phoneReusableActivationPool)
+ ? state.phoneReusableActivationPool
+ : (Array.isArray(latestState?.phoneReusableActivationPool) ? latestState.phoneReusableActivationPool : []);
+ const optionEntries = [];
+ const seen = new Set();
+ const pushActivationOption = (activation, sourceLabel) => {
+ const normalized = normalizePhoneActivationState(activation);
+ if (!normalized || normalized.provider !== provider) {
+ return;
+ }
+ const key = buildPhoneActivationOptionKey(normalized);
+ if (!key || seen.has(key)) {
+ return;
+ }
+ seen.add(key);
+ optionEntries.push({
+ key,
+ activation: normalized,
+ label: buildPhoneActivationOptionLabel(normalized, sourceLabel),
+ });
+ };
+ pushActivationOption(state?.currentPhoneActivation || latestState?.currentPhoneActivation, '当前');
+ pushActivationOption(state?.reusablePhoneActivation || latestState?.reusablePhoneActivation, '复用');
+ reusablePool.forEach((activation) => pushActivationOption(activation, '池'));
+ pushActivationOption(selectedPreferred, '已选');
+
+ phonePreferredActivationOptionMap.clear();
+ selectHeroSmsPreferredActivation.innerHTML = '';
+ const autoOption = document.createElement('option');
+ autoOption.value = '';
+ autoOption.textContent = '自动（先复用已有可用号，再创建新号）';
+ selectHeroSmsPreferredActivation.appendChild(autoOption);
+ optionEntries.forEach((entry) => {
+ phonePreferredActivationOptionMap.set(entry.key, entry.activation);
+ const option = document.createElement('option');
+ option.value = entry.key;
+ option.textContent = entry.label;
+ selectHeroSmsPreferredActivation.appendChild(option);
+ });
+
+ const selectedKey = buildPhoneActivationOptionKey(selectedPreferred);
+ if (selectedKey && phonePreferredActivationOptionMap.has(selectedKey)) {
+ selectHeroSmsPreferredActivation.value = selectedKey;
+ } else {
+ selectHeroSmsPreferredActivation.value = '';
+ }
+}
+
+function getSelectedPhonePreferredActivation() {
+ if (!selectHeroSmsPreferredActivation) {
+ return null;
+ }
+ const selectedKey = String(selectHeroSmsPreferredActivation.value || '').trim();
+ if (!selectedKey) {
+ return null;
+ }
+ const activation = phonePreferredActivationOptionMap.get(selectedKey);
+ return activation ? { ...activation } : null;
+}
+
function updateHeroSmsRuntimeDisplay(state = {}) {
if (displayHeroSmsCurrentNumber) {
- const activation = state?.currentPhoneActivation || null;
+ const activation = normalizePhoneActivationState(state?.currentPhoneActivation || latestState?.currentPhoneActivation);
const phoneNumber = String(activation?.phoneNumber || '').trim();
const activationId = String(activation?.activationId || '').trim();
- const countryLabel = normalizeHeroSmsCountryLabel(
- activation?.countryLabel || getHeroSmsCountryLabelById(activation?.countryId || '')
- );
+ const countryLabel = resolvePhoneActivationCountryLabel(activation);
displayHeroSmsCurrentNumber.textContent = phoneNumber
? `${phoneNumber}${activationId ? ` (#${activationId})` : ''}${countryLabel ? ` / ${countryLabel}` : ''}`
: '未分配';
}
if (displayHeroSmsCurrentCode) {
- const code = String(state?.currentPhoneVerificationCode || '').trim();
+ const code = String(state?.currentPhoneVerificationCode ?? latestState?.currentPhoneVerificationCode ?? '').trim();
displayHeroSmsCurrentCode.textContent = code || '未获取';
}
+ syncPhoneRuntimeCountdown(state);
+ renderPhonePreferredActivationOptions(state);
}
async function loadHeroSmsCountries() {
@@ -3505,106 +4836,1474 @@ async function loadHeroSmsCountries() {
Array.from(countrySelect.options).forEach((option) => {
option.selected = selectedSet.has(String(option.value));
});
- const selectedCountries = syncHeroSmsFallbackSelectionOrderFromSelect({
+ syncHeroSmsFallbackSelectionOrderFromSelect({
enforceMax: true,
- ensureDefault: true,
+ ensureDefault: false,
showLimitToast: false,
});
- updateHeroSmsPlatformDisplay(
- selectedCountries[0]?.label || DEFAULT_HERO_SMS_COUNTRY_LABEL
- );
+ updateHeroSmsPlatformDisplay();
}
-async function previewHeroSmsPriceTiers() {
- if (!displayHeroSmsPriceTiers) {
+function getFiveSimCountryLabelByCode(code = '') {
+ const normalizedCode = normalizeFiveSimCountryCode(code, '');
+ if (!normalizedCode || !selectFiveSimCountry) {
+ return '';
+ }
+ const matched = Array.from(selectFiveSimCountry.options || [])
+ .find((option) => String(option.value || '').trim() === normalizedCode);
+ return normalizeFiveSimCountryLabel(matched?.textContent || '', normalizedCode);
+}
+
+function renderFiveSimCountryFallbackOrder(countries = []) {
+ if (!displayFiveSimCountryFallbackOrder) {
+ return;
+ }
+ const normalized = normalizeFiveSimCountryFallbackList(countries);
+ displayFiveSimCountryFallbackOrder.textContent = '';
+ if (!normalized.length) {
+ displayFiveSimCountryFallbackOrder.textContent = '未设置';
+ return;
+ }
+ normalized.forEach((country, index) => {
+ const chip = document.createElement('span');
+ chip.className = 'country-order-chip';
+ const label = document.createElement('span');
+ label.className = 'country-order-chip-label';
+ label.textContent = `${index + 1}. ${country.label}`;
+ const removeBtn = document.createElement('button');
+ removeBtn.type = 'button';
+ removeBtn.className = 'country-order-remove';
+ removeBtn.title = `移除 ${country.label}`;
+ removeBtn.setAttribute('aria-label', `移除 ${country.label}`);
+ removeBtn.textContent = '×';
+ removeBtn.addEventListener('click', (event) => {
+ event.preventDefault();
+ event.stopPropagation();
+ removeFiveSimCountryFromOrder(country.code || country.id);
+ });
+ chip.appendChild(label);
+ chip.appendChild(removeBtn);
+ displayFiveSimCountryFallbackOrder.appendChild(chip);
+ if (index < normalized.length - 1) {
+ const separator = document.createElement('span');
+ separator.className = 'country-order-separator';
+ separator.textContent = '→';
+ displayFiveSimCountryFallbackOrder.appendChild(separator);
+ }
+ });
+}
+
+function setFiveSimCountryMenuOpen(open) {
+ const nextOpen = Boolean(open);
+ if (btnFiveSimCountryMenu) {
+ btnFiveSimCountryMenu.setAttribute('aria-expanded', String(nextOpen));
+ }
+ if (fiveSimCountryMenu) {
+ fiveSimCountryMenu.hidden = !nextOpen;
+ if (nextOpen) {
+ const searchInput = fiveSimCountryMenu.querySelector('.hero-sms-country-menu-search-input');
+ if (searchInput) {
+ fiveSimCountryMenuSearchKeyword = '';
+ searchInput.value = '';
+ applyFiveSimCountryMenuFilter('');
+ setTimeout(() => {
+ searchInput.focus();
+ searchInput.select();
+ }, 0);
+ }
+ }
+ }
+}
+
+function applyFiveSimCountryMenuFilter(keyword = '') {
+ if (!fiveSimCountryMenu) {
+ return;
+ }
+ const normalizedKeyword = String(keyword || '').trim().toLowerCase();
+ const items = Array.from(fiveSimCountryMenu.querySelectorAll('.hero-sms-country-menu-item'));
+ let visibleCount = 0;
+ items.forEach((item) => {
+ const haystack = String(item.dataset.searchText || '').toLowerCase();
+ const visible = !normalizedKeyword || haystack.includes(normalizedKeyword);
+ item.hidden = !visible;
+ if (visible) {
+ visibleCount += 1;
+ }
+ });
+
+ let empty = fiveSimCountryMenu.querySelector('.hero-sms-country-menu-empty');
+ if (visibleCount === 0) {
+ if (!empty) {
+ empty = document.createElement('span');
+ empty.className = 'data-value hero-sms-country-menu-empty';
+ empty.textContent = '没有匹配国家';
+ fiveSimCountryMenu.appendChild(empty);
+ }
+ } else if (empty) {
+ empty.remove();
+ }
+}
+
+function updateFiveSimCountryMenuSummary(selectedCountries = []) {
+ if (!btnFiveSimCountryMenu) {
+ return;
+ }
+ const normalized = normalizeFiveSimCountryFallbackList(selectedCountries);
+ if (!normalized.length) {
+ btnFiveSimCountryMenu.textContent = `未选择 (0/${HERO_SMS_COUNTRY_SELECTION_MAX})`;
+ return;
+ }
+ const labels = normalized.map((country) => country.label);
+ btnFiveSimCountryMenu.textContent = `${labels.join(' / ')} (${normalized.length}/${HERO_SMS_COUNTRY_SELECTION_MAX})`;
+}
+
+function renderFiveSimCountryChoiceButtons() {
+ if (!fiveSimCountryMenu || !selectFiveSimCountry) {
+ return;
+ }
+ const options = Array.from(selectFiveSimCountry.options || []);
+ const selectedOrder = [...fiveSimCountrySelectionOrder];
+ const selectedSet = new Set(selectedOrder);
+
+ fiveSimCountryMenu.innerHTML = '';
+ const searchWrap = document.createElement('div');
+ searchWrap.className = 'hero-sms-country-menu-search';
+ const searchInput = document.createElement('input');
+ searchInput.type = 'search';
+ searchInput.className = 'data-input mono hero-sms-country-menu-search-input';
+ searchInput.placeholder = '搜索国家（中/英/代码）';
+ searchInput.value = fiveSimCountryMenuSearchKeyword;
+ searchInput.addEventListener('input', () => {
+ fiveSimCountryMenuSearchKeyword = String(searchInput.value || '').trim();
+ applyFiveSimCountryMenuFilter(fiveSimCountryMenuSearchKeyword);
+ });
+ searchWrap.appendChild(searchInput);
+ fiveSimCountryMenu.appendChild(searchWrap);
+
+ if (!options.length) {
+ const empty = document.createElement('span');
+ empty.className = 'data-value hero-sms-country-menu-empty';
+ empty.textContent = '暂无国家选项';
+ fiveSimCountryMenu.appendChild(empty);
+ updateFiveSimCountryMenuSummary([]);
return;
}
- const selectedCountries = syncHeroSmsFallbackSelectionOrderFromSelect({
+ options.forEach((option) => {
+ const countryCode = normalizeFiveSimCountryCode(option.value, '');
+ if (!countryCode) {
+ return;
+ }
+ const item = document.createElement('button');
+ item.type = 'button';
+ item.className = 'header-dropdown-item hero-sms-country-menu-item';
+ const active = selectedSet.has(countryCode);
+ const orderIndex = active ? selectedOrder.indexOf(countryCode) + 1 : 0;
+ const label = String(option.textContent || '').trim() || countryCode;
+ item.classList.toggle('is-active', active);
+ const labelText = document.createElement('span');
+ labelText.className = 'hero-sms-country-menu-item-label';
+ labelText.textContent = label;
+ const badge = document.createElement('span');
+ badge.className = 'hero-sms-country-menu-item-badge';
+ badge.textContent = active ? `✓ ${orderIndex}` : '';
+ item.appendChild(labelText);
+ item.appendChild(badge);
+ item.dataset.searchText = `${label} ${countryCode} ${fiveSimCountrySearchTextByCode.get(countryCode) || ''}`;
+ item.addEventListener('click', () => {
+ option.selected = !option.selected;
+ syncFiveSimCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: true,
+ });
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+ });
+ fiveSimCountryMenu.appendChild(item);
+ });
+
+ applyFiveSimCountryMenuFilter(fiveSimCountryMenuSearchKeyword);
+ updateFiveSimCountryMenuSummary(
+ selectedOrder.map((code) => ({
+ id: code,
+ code,
+ label: getFiveSimCountryLabelByCode(code),
+ }))
+ );
+}
+
+function syncFiveSimCountrySelectionOrderFromSelect(options = {}) {
+ const countrySelect = selectFiveSimCountry;
+ const selectionLimit = Math.max(1, Math.floor(Number(options.maxSelection) || HERO_SMS_COUNTRY_SELECTION_MAX));
+ const enforceMax = options.enforceMax !== false;
+ const ensureDefault = options.ensureDefault !== false;
+ const showLimitToast = Boolean(options.showLimitToast);
+
+ if (!countrySelect) {
+ fiveSimCountrySelectionOrder = [];
+ renderFiveSimCountryFallbackOrder([]);
+ renderFiveSimCountryChoiceButtons();
+ return [];
+ }
+
+ const selectedCodes = Array.from(countrySelect.options || [])
+ .filter((option) => option.selected)
+ .map((option) => normalizeFiveSimCountryCode(option.value, ''))
+ .filter(Boolean);
+ const selectedSet = new Set(selectedCodes);
+
+ let nextOrder = fiveSimCountrySelectionOrder.filter((code) => selectedSet.has(code));
+ selectedCodes.forEach((code) => {
+ if (!nextOrder.includes(code)) {
+ nextOrder.push(code);
+ }
+ });
+
+ if (ensureDefault && !nextOrder.length) {
+ const defaultCode = normalizeFiveSimCountryCode(countrySelect.value || DEFAULT_FIVE_SIM_COUNTRY_ORDER[0], '');
+ nextOrder = [defaultCode];
+ }
+
+ if (enforceMax && nextOrder.length > selectionLimit) {
+ const droppedCount = nextOrder.length - selectionLimit;
+ nextOrder = nextOrder.slice(0, selectionLimit);
+ if (showLimitToast && droppedCount > 0 && typeof showToast === 'function') {
+ showToast(`接码国家最多选择 ${selectionLimit} 个，已保留前 ${selectionLimit} 个。`, 'warn', 2200);
+ }
+ }
+
+ const nextOrderSet = new Set(nextOrder);
+ Array.from(countrySelect.options || []).forEach((option) => {
+ option.selected = nextOrderSet.has(normalizeFiveSimCountryCode(option.value, ''));
+ });
+
+ fiveSimCountrySelectionOrder = nextOrder;
+ const selectedCountries = fiveSimCountrySelectionOrder.map((code) => ({
+ id: code,
+ code,
+ label: getFiveSimCountryLabelByCode(code),
+ }));
+ renderFiveSimCountryFallbackOrder(selectedCountries);
+ renderFiveSimCountryChoiceButtons();
+ return selectedCountries;
+}
+
+function applyFiveSimCountrySelection(countries = [], options = {}) {
+ const includePrimary = Boolean(options.includePrimary);
+ const sourceCountries = includePrimary
+ ? countries
+ : normalizeFiveSimCountryFallbackList(countries);
+ const normalized = normalizeFiveSimCountryFallbackList(sourceCountries)
+ .slice(0, HERO_SMS_COUNTRY_SELECTION_MAX);
+ const selectedCodes = normalized
+ .map((entry) => normalizeFiveSimCountryCode(entry.code || entry.id, ''))
+ .filter(Boolean);
+
+ if (selectFiveSimCountry) {
+ const selectedSet = new Set(selectedCodes);
+ Array.from(selectFiveSimCountry.options || []).forEach((option) => {
+ option.selected = selectedSet.has(normalizeFiveSimCountryCode(option.value, ''));
+ });
+ }
+ fiveSimCountrySelectionOrder = [...selectedCodes];
+ return syncFiveSimCountrySelectionOrderFromSelect({
enforceMax: true,
- ensureDefault: true,
+ ensureDefault: false,
showLimitToast: false,
});
- const candidates = selectedCountries.length
- ? selectedCountries
- : [getSelectedHeroSmsCountryOption()];
+}
+
+function getSelectedFiveSimCountries() {
+ const selectedCountries = syncFiveSimCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+ return selectedCountries;
+}
+
+function removeHeroSmsCountryFromOrder(countryId) {
+ const countrySelect = selectHeroSmsCountry || selectHeroSmsCountryFallback;
+ const normalizedId = String(Math.floor(Number(countryId)) || '');
+ if (!countrySelect || !normalizedId) {
+ return;
+ }
+ const option = Array.from(countrySelect.options || [])
+ .find((item) => String(item.value || '') === normalizedId);
+ if (!option) {
+ return;
+ }
+ option.selected = false;
+ syncHeroSmsFallbackSelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+ updateHeroSmsPlatformDisplay();
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+}
+
+function removeFiveSimCountryFromOrder(countryCode = '') {
+ if (!selectFiveSimCountry) {
+ return;
+ }
+ const normalizedCode = normalizeFiveSimCountryCode(countryCode, '');
+ if (!normalizedCode) {
+ return;
+ }
+ const option = Array.from(selectFiveSimCountry.options || [])
+ .find((item) => normalizeFiveSimCountryCode(item.value, '') === normalizedCode);
+ if (!option) {
+ return;
+ }
+ option.selected = false;
+ syncFiveSimCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+ updateHeroSmsPlatformDisplay();
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+}
+
+async function loadFiveSimCountries() {
+ if (!selectFiveSimCountry) {
+ return;
+ }
+
+ const previousSelectionOrder = [...fiveSimCountrySelectionOrder];
+ const previousSelectedCodes = previousSelectionOrder.length
+ ? previousSelectionOrder
+ : Array.from(selectFiveSimCountry.options || [])
+ .filter((option) => option.selected)
+ .map((option) => normalizeFiveSimCountryCode(option.value, ''))
+ .filter(Boolean);
+
+ const applyOptions = (optionItems = []) => {
+ selectFiveSimCountry.innerHTML = '';
+ optionItems.forEach((entry) => {
+ const option = document.createElement('option');
+ option.value = String(entry.code);
+ option.textContent = entry.label;
+ selectFiveSimCountry.appendChild(option);
+ });
+ };
+
+ try {
+ const controller = new AbortController();
+ const timeoutId = setTimeout(() => controller.abort(), 10000);
+ const response = await fetch('https://5sim.net/v1/guest/countries', {
+ signal: controller.signal,
+ cache: 'no-store',
+ });
+ clearTimeout(timeoutId);
+ if (!response.ok) {
+ throw new Error(`HTTP ${response.status}`);
+ }
+ const payload = await response.json();
+ const optionItems = parseFiveSimCountriesPayload(payload);
+ if (!optionItems.length) {
+ throw new Error('empty country list');
+ }
+ fiveSimCountrySearchTextByCode.clear();
+ optionItems.forEach((entry) => {
+ fiveSimCountrySearchTextByCode.set(String(entry.code), String(entry.searchText || '').trim());
+ });
+ applyOptions(optionItems);
+ } catch (error) {
+ console.warn('Failed to load 5sim countries:', error);
+ const fallbackItems = FIVE_SIM_FALLBACK_COUNTRY_ITEMS.map((item) => {
+ const code = normalizeFiveSimCountryCode(item.code, '');
+ const option = {
+ code,
+ isoCode: String(item.iso || '').trim().toUpperCase(),
+ text_en: String(item.text_en || code).trim(),
+ };
+ const label = buildFiveSimCountryDisplayLabel(option);
+ return {
+ id: code,
+ code,
+ isoCode: option.isoCode,
+ label,
+ searchText: buildFiveSimCountrySearchText(option, label, code),
+ };
+ }).filter((entry) => entry.code);
+ if (!fallbackItems.some((entry) => entry.code === 'thailand')) {
+ fallbackItems.unshift({
+ id: 'thailand',
+ code: 'thailand',
+ isoCode: 'TH',
+ label: '泰国 (Thailand) [TH]',
+ searchText: '泰国 Thailand TH thailand',
+ });
+ }
+ fiveSimCountrySearchTextByCode.clear();
+ fallbackItems.forEach((entry) => {
+ fiveSimCountrySearchTextByCode.set(String(entry.code), String(entry.searchText || '').trim());
+ });
+ applyOptions(fallbackItems);
+ if (typeof showToast === 'function') {
+ showToast(`5sim 国家列表加载失败：${normalizeHeroSmsFetchErrorMessage(error)}（已切换为内置国家列表）`, 'warn', 2800);
+ }
+ }
+
+ const availableCodes = new Set(Array.from(selectFiveSimCountry.options || []).map((option) => String(option.value || '').trim()));
+ const normalizedSelectedCodes = previousSelectedCodes
+ .map((code) => normalizeFiveSimCountryCode(code, ''))
+ .filter((code) => availableCodes.has(code));
+ fiveSimCountrySelectionOrder = normalizedSelectedCodes;
+ const selectedSet = new Set(normalizedSelectedCodes);
+ Array.from(selectFiveSimCountry.options || []).forEach((option) => {
+ option.selected = selectedSet.has(normalizeFiveSimCountryCode(option.value, ''));
+ });
+ syncFiveSimCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+}
+
+function getNexSmsCountryLabelById(countryId) {
+ const normalizedId = normalizeNexSmsCountryIdValue(countryId, -1);
+ if (normalizedId < 0 || !selectNexSmsCountry) {
+ return '';
+ }
+ const matched = Array.from(selectNexSmsCountry.options || [])
+ .find((option) => normalizeNexSmsCountryIdValue(option.value, -1) === normalizedId);
+ return normalizeNexSmsCountryLabel(matched?.textContent || '', `Country #${normalizedId}`);
+}
+
+function renderNexSmsCountryFallbackOrder(countries = []) {
+ if (!displayNexSmsCountryFallbackOrder) {
+ return;
+ }
+ const normalized = normalizeNexSmsCountryFallbackList(countries);
+ displayNexSmsCountryFallbackOrder.textContent = '';
+ if (!normalized.length) {
+ displayNexSmsCountryFallbackOrder.textContent = '未设置';
+ return;
+ }
+ normalized.forEach((country, index) => {
+ const chip = document.createElement('span');
+ chip.className = 'country-order-chip';
+ const label = document.createElement('span');
+ label.className = 'country-order-chip-label';
+ label.textContent = `${index + 1}. ${country.label}`;
+ const removeBtn = document.createElement('button');
+ removeBtn.type = 'button';
+ removeBtn.className = 'country-order-remove';
+ removeBtn.title = `移除 ${country.label}`;
+ removeBtn.setAttribute('aria-label', `移除 ${country.label}`);
+ removeBtn.textContent = '×';
+ removeBtn.addEventListener('click', (event) => {
+ event.preventDefault();
+ event.stopPropagation();
+ removeNexSmsCountryFromOrder(country.id);
+ });
+ chip.appendChild(label);
+ chip.appendChild(removeBtn);
+ displayNexSmsCountryFallbackOrder.appendChild(chip);
+ if (index < normalized.length - 1) {
+ const separator = document.createElement('span');
+ separator.className = 'country-order-separator';
+ separator.textContent = '→';
+ displayNexSmsCountryFallbackOrder.appendChild(separator);
+ }
+ });
+}
+
+function setNexSmsCountryMenuOpen(open) {
+ const nextOpen = Boolean(open);
+ if (btnNexSmsCountryMenu) {
+ btnNexSmsCountryMenu.setAttribute('aria-expanded', String(nextOpen));
+ }
+ if (nexSmsCountryMenu) {
+ nexSmsCountryMenu.hidden = !nextOpen;
+ if (nextOpen) {
+ const searchInput = nexSmsCountryMenu.querySelector('.hero-sms-country-menu-search-input');
+ if (searchInput) {
+ nexSmsCountryMenuSearchKeyword = '';
+ searchInput.value = '';
+ applyNexSmsCountryMenuFilter('');
+ setTimeout(() => {
+ searchInput.focus();
+ searchInput.select();
+ }, 0);
+ }
+ }
+ }
+}
+
+function applyNexSmsCountryMenuFilter(keyword = '') {
+ if (!nexSmsCountryMenu) {
+ return;
+ }
+ const normalizedKeyword = String(keyword || '').trim().toLowerCase();
+ const items = Array.from(nexSmsCountryMenu.querySelectorAll('.hero-sms-country-menu-item'));
+ let visibleCount = 0;
+ items.forEach((item) => {
+ const haystack = String(item.dataset.searchText || '').toLowerCase();
+ const visible = !normalizedKeyword || haystack.includes(normalizedKeyword);
+ item.hidden = !visible;
+ if (visible) {
+ visibleCount += 1;
+ }
+ });
+
+ let empty = nexSmsCountryMenu.querySelector('.hero-sms-country-menu-empty');
+ if (visibleCount === 0) {
+ if (!empty) {
+ empty = document.createElement('span');
+ empty.className = 'data-value hero-sms-country-menu-empty';
+ empty.textContent = '没有匹配国家';
+ nexSmsCountryMenu.appendChild(empty);
+ }
+ } else if (empty) {
+ empty.remove();
+ }
+}
+
+function updateNexSmsCountryMenuSummary(selectedCountries = []) {
+ if (!btnNexSmsCountryMenu) {
+ return;
+ }
+ const normalized = normalizeNexSmsCountryFallbackList(selectedCountries);
+ if (!normalized.length) {
+ btnNexSmsCountryMenu.textContent = `未选择 (0/${HERO_SMS_COUNTRY_SELECTION_MAX})`;
+ return;
+ }
+ const labels = normalized.map((country) => country.label);
+ btnNexSmsCountryMenu.textContent = `${labels.join(' / ')} (${normalized.length}/${HERO_SMS_COUNTRY_SELECTION_MAX})`;
+}
+
+function renderNexSmsCountryChoiceButtons() {
+ if (!nexSmsCountryMenu || !selectNexSmsCountry) {
+ return;
+ }
+ const options = Array.from(selectNexSmsCountry.options || []);
+ const selectedOrder = [...nexSmsCountrySelectionOrder];
+ const selectedSet = new Set(selectedOrder.map((id) => String(id)));
+
+ nexSmsCountryMenu.innerHTML = '';
+ const searchWrap = document.createElement('div');
+ searchWrap.className = 'hero-sms-country-menu-search';
+ const searchInput = document.createElement('input');
+ searchInput.type = 'search';
+ searchInput.className = 'data-input mono hero-sms-country-menu-search-input';
+ searchInput.placeholder = '搜索国家（名称/ID）';
+ searchInput.value = nexSmsCountryMenuSearchKeyword;
+ searchInput.addEventListener('input', () => {
+ nexSmsCountryMenuSearchKeyword = String(searchInput.value || '').trim();
+ applyNexSmsCountryMenuFilter(nexSmsCountryMenuSearchKeyword);
+ });
+ searchWrap.appendChild(searchInput);
+ nexSmsCountryMenu.appendChild(searchWrap);
+
+ if (!options.length) {
+ const empty = document.createElement('span');
+ empty.className = 'data-value hero-sms-country-menu-empty';
+ empty.textContent = '暂无国家选项';
+ nexSmsCountryMenu.appendChild(empty);
+ updateNexSmsCountryMenuSummary([]);
+ return;
+ }
+
+ options.forEach((option) => {
+ const countryId = normalizeNexSmsCountryIdValue(option.value, -1);
+ if (countryId < 0) {
+ return;
+ }
+ const item = document.createElement('button');
+ item.type = 'button';
+ item.className = 'header-dropdown-item hero-sms-country-menu-item';
+ const active = selectedSet.has(String(countryId));
+ const orderIndex = active
+ ? selectedOrder.findIndex((id) => String(id) === String(countryId)) + 1
+ : 0;
+ const label = String(option.textContent || '').trim() || `Country #${countryId}`;
+ item.classList.toggle('is-active', active);
+ const labelText = document.createElement('span');
+ labelText.className = 'hero-sms-country-menu-item-label';
+ labelText.textContent = label;
+ const badge = document.createElement('span');
+ badge.className = 'hero-sms-country-menu-item-badge';
+ badge.textContent = active ? `✓ ${orderIndex}` : '';
+ item.appendChild(labelText);
+ item.appendChild(badge);
+ item.dataset.searchText = `${label} ${countryId} ${nexSmsCountrySearchTextById.get(String(countryId)) || ''}`;
+ item.addEventListener('click', () => {
+ option.selected = !option.selected;
+ syncNexSmsCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: true,
+ });
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+ });
+ nexSmsCountryMenu.appendChild(item);
+ });
+
+ applyNexSmsCountryMenuFilter(nexSmsCountryMenuSearchKeyword);
+ updateNexSmsCountryMenuSummary(
+ selectedOrder.map((id) => ({
+ id,
+ label: getNexSmsCountryLabelById(id),
+ }))
+ );
+}
+
+function syncNexSmsCountrySelectionOrderFromSelect(options = {}) {
+ const countrySelect = selectNexSmsCountry;
+ const selectionLimit = Math.max(1, Math.floor(Number(options.maxSelection) || HERO_SMS_COUNTRY_SELECTION_MAX));
+ const enforceMax = options.enforceMax !== false;
+ const ensureDefault = options.ensureDefault !== false;
+ const showLimitToast = Boolean(options.showLimitToast);
+
+ if (!countrySelect) {
+ nexSmsCountrySelectionOrder = [];
+ renderNexSmsCountryFallbackOrder([]);
+ renderNexSmsCountryChoiceButtons();
+ return [];
+ }
+
+ const selectedIds = Array.from(countrySelect.options || [])
+ .filter((option) => option.selected)
+ .map((option) => normalizeNexSmsCountryIdValue(option.value, -1))
+ .filter((id) => id >= 0);
+ const selectedSet = new Set(selectedIds.map((id) => String(id)));
+
+ let nextOrder = nexSmsCountrySelectionOrder.filter((id) => selectedSet.has(String(id)));
+ selectedIds.forEach((id) => {
+ if (!nextOrder.some((entry) => String(entry) === String(id))) {
+ nextOrder.push(id);
+ }
+ });
+
+ if (ensureDefault && !nextOrder.length) {
+ const fallbackId = normalizeNexSmsCountryIdValue(countrySelect.value || DEFAULT_NEX_SMS_COUNTRY_ORDER[0], -1);
+ nextOrder = [fallbackId];
+ }
+
+ if (enforceMax && nextOrder.length > selectionLimit) {
+ const droppedCount = nextOrder.length - selectionLimit;
+ nextOrder = nextOrder.slice(0, selectionLimit);
+ if (showLimitToast && droppedCount > 0 && typeof showToast === 'function') {
+ showToast(`接码国家最多选择 ${selectionLimit} 个，已保留前 ${selectionLimit} 个。`, 'warn', 2200);
+ }
+ }
+
+ const nextOrderSet = new Set(nextOrder.map((id) => String(id)));
+ Array.from(countrySelect.options || []).forEach((option) => {
+ option.selected = nextOrderSet.has(String(normalizeNexSmsCountryIdValue(option.value, -1)));
+ });
+
+ nexSmsCountrySelectionOrder = nextOrder;
+ const selectedCountries = nexSmsCountrySelectionOrder.map((id) => ({
+ id,
+ label: getNexSmsCountryLabelById(id),
+ }));
+ renderNexSmsCountryFallbackOrder(selectedCountries);
+ renderNexSmsCountryChoiceButtons();
+ return selectedCountries;
+}
+
+function applyNexSmsCountrySelection(countries = [], options = {}) {
+ const includePrimary = Boolean(options.includePrimary);
+ const sourceCountries = includePrimary
+ ? countries
+ : normalizeNexSmsCountryFallbackList(countries);
+ const normalized = normalizeNexSmsCountryFallbackList(sourceCountries)
+ .slice(0, HERO_SMS_COUNTRY_SELECTION_MAX);
+ const selectedIds = normalized
+ .map((entry) => normalizeNexSmsCountryIdValue(entry.id, -1))
+ .filter((id) => id >= 0);
+
+ if (selectNexSmsCountry) {
+ const selectedSet = new Set(selectedIds.map((id) => String(id)));
+ Array.from(selectNexSmsCountry.options || []).forEach((option) => {
+ option.selected = selectedSet.has(String(normalizeNexSmsCountryIdValue(option.value, -1)));
+ });
+ }
+ nexSmsCountrySelectionOrder = [...selectedIds];
+ return syncNexSmsCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+}
+
+function getSelectedNexSmsCountries() {
+ return syncNexSmsCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+}
+
+function removeNexSmsCountryFromOrder(countryId) {
+ if (!selectNexSmsCountry) {
+ return;
+ }
+ const normalizedId = normalizeNexSmsCountryIdValue(countryId, -1);
+ if (normalizedId < 0) {
+ return;
+ }
+ const option = Array.from(selectNexSmsCountry.options || [])
+ .find((item) => normalizeNexSmsCountryIdValue(item.value, -1) === normalizedId);
+ if (!option) {
+ return;
+ }
+ option.selected = false;
+ syncNexSmsCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+ updateHeroSmsPlatformDisplay();
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+}
+
+async function loadNexSmsCountries(options = {}) {
+ const silent = Boolean(options?.silent);
+ if (!selectNexSmsCountry) {
+ return;
+ }
+ const previousSelectionOrder = [...nexSmsCountrySelectionOrder];
+ const previousSelectedIds = previousSelectionOrder.length
+ ? previousSelectionOrder
+ : Array.from(selectNexSmsCountry.options || [])
+ .filter((option) => option.selected)
+ .map((option) => normalizeNexSmsCountryIdValue(option.value, -1))
+ .filter((id) => id >= 0);
+
+ const applyOptions = (optionItems = []) => {
+ selectNexSmsCountry.innerHTML = '';
+ optionItems.forEach((entry) => {
+ const option = document.createElement('option');
+ option.value = String(entry.id);
+ option.textContent = entry.label;
+ selectNexSmsCountry.appendChild(option);
+ });
+ };
+
+ try {
+ const apiKey = String(inputNexSmsApiKey?.value || latestState?.nexSmsApiKey || '').trim();
+ const url = new URL('/api/countries', 'https://api.nexsms.net');
+ if (apiKey) {
+ url.searchParams.set('apiKey', apiKey);
+ }
+ const controller = new AbortController();
+ const timeoutId = setTimeout(() => controller.abort(), 10000);
+ const response = await fetch(url.toString(), {
+ signal: controller.signal,
+ cache: 'no-store',
+ });
+ clearTimeout(timeoutId);
+ if (!response.ok) {
+ throw new Error(`HTTP ${response.status}`);
+ }
+ const payload = await response.json();
+ const countries = Array.isArray(payload?.data) ? payload.data : [];
+ const optionItems = countries
+ .map((item) => {
+ const id = normalizeNexSmsCountryIdValue(item?.id, -1);
+ const name = String(item?.name || '').trim();
+ if (id < 0 || !name) {
+ return null;
+ }
+ const label = `${name} (#${id})`;
+ return {
+ id,
+ label,
+ searchText: `${name} ${id}`.toLowerCase(),
+ };
+ })
+ .filter(Boolean)
+ .sort((left, right) => left.id - right.id);
+ if (!optionItems.length) {
+ throw new Error('empty country list');
+ }
+ nexSmsCountrySearchTextById.clear();
+ optionItems.forEach((entry) => {
+ nexSmsCountrySearchTextById.set(String(entry.id), String(entry.searchText || '').trim());
+ });
+ applyOptions(optionItems);
+ } catch (error) {
+ console.warn('Failed to load NexSMS countries:', error);
+ const fallbackItems = NEX_SMS_FALLBACK_COUNTRY_ITEMS
+ .map((item) => {
+ const id = normalizeNexSmsCountryIdValue(item.id, -1);
+ const name = String(item.name || '').trim();
+ if (id < 0 || !name) {
+ return null;
+ }
+ return {
+ id,
+ label: `${name} (#${id})`,
+ searchText: `${name} ${id}`.toLowerCase(),
+ };
+ })
+ .filter(Boolean);
+ if (!fallbackItems.some((entry) => entry.id === DEFAULT_NEX_SMS_COUNTRY_ORDER[0])) {
+ fallbackItems.unshift({
+ id: DEFAULT_NEX_SMS_COUNTRY_ORDER[0],
+ label: `Country #${DEFAULT_NEX_SMS_COUNTRY_ORDER[0]}`,
+ searchText: `country ${DEFAULT_NEX_SMS_COUNTRY_ORDER[0]}`,
+ });
+ }
+ nexSmsCountrySearchTextById.clear();
+ fallbackItems.forEach((entry) => {
+ nexSmsCountrySearchTextById.set(String(entry.id), String(entry.searchText || '').trim());
+ });
+ applyOptions(fallbackItems);
+ if (!silent && typeof showToast === 'function') {
+ showToast(`NexSMS 国家列表加载失败：${normalizeHeroSmsFetchErrorMessage(error)}（已切换为内置国家列表）`, 'warn', 2800);
+ }
+ }
+
+ const availableIds = new Set(Array.from(selectNexSmsCountry.options || []).map((option) => String(option.value || '').trim()));
+ const normalizedSelectedIds = previousSelectedIds
+ .map((id) => String(normalizeNexSmsCountryIdValue(id, -1)))
+ .filter((id) => availableIds.has(id))
+ .map((id) => Number(id));
+ nexSmsCountrySelectionOrder = normalizedSelectedIds;
+ const selectedSet = new Set(normalizedSelectedIds.map((id) => String(id)));
+ Array.from(selectNexSmsCountry.options || []).forEach((option) => {
+ option.selected = selectedSet.has(String(normalizeNexSmsCountryIdValue(option.value, -1)));
+ });
+ syncNexSmsCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+}
+
+async function previewNexSmsPriceTiers() {
+ if (!displayHeroSmsPriceTiers) {
+ return;
+ }
+ const countryIds = (
+ typeof getSelectedNexSmsCountries === 'function'
+ ? getSelectedNexSmsCountries()
+ : normalizeNexSmsCountryFallbackList(
+ Array.isArray(latestState?.nexSmsCountryOrder) ? latestState.nexSmsCountryOrder : []
+ )
+ )
+ .map((country) => normalizeNexSmsCountryIdValue(country.id, -1))
+ .filter((id) => id >= 0);
+ const serviceCode = normalizeNexSmsServiceCodeValue(
+ inputNexSmsServiceCode?.value || latestState?.nexSmsServiceCode || DEFAULT_NEX_SMS_SERVICE_CODE
+ );
const maxPriceText = normalizeHeroSmsMaxPriceValue(inputHeroSmsMaxPrice?.value || '');
const maxPrice = maxPriceText ? Number(maxPriceText) : null;
- const apiKey = String(inputHeroSmsApiKey?.value || '').trim();
+ const apiKey = String(inputNexSmsApiKey?.value || '').trim();
displayHeroSmsPriceTiers.textContent = '查询中...';
if (rowHeroSmsPriceTiers) {
rowHeroSmsPriceTiers.style.display = '';
}
-
- const previews = [];
if (!apiKey) {
- displayHeroSmsPriceTiers.textContent = '请先填写接码 API Key，再查询价格';
- if (rowHeroSmsPriceTiers) {
- rowHeroSmsPriceTiers.style.display = '';
- }
+ displayHeroSmsPriceTiers.textContent = '请先填写 NexSMS API Key，再查询价格';
return;
}
- for (const country of candidates) {
- const countryId = normalizeHeroSmsCountryId(country.id);
- const countryLabel = normalizeHeroSmsCountryLabel(
- country.label || getHeroSmsCountryLabelById(countryId),
- `Country #${countryId}`
- );
+ if (!countryIds.length) {
+ displayHeroSmsPriceTiers.textContent = '请先选择至少 1 个国家，再查询价格';
+ return;
+ }
+
+ const previews = [];
+ for (const countryId of countryIds) {
+ const countryLabel = getNexSmsCountryLabelById(countryId) || `Country #${countryId}`;
try {
- const url = new URL('https://hero-sms.com/stubs/handler_api.php');
- url.searchParams.set('action', 'getPrices');
- url.searchParams.set('service', 'dr');
- url.searchParams.set('country', String(countryId));
- if (apiKey) {
- url.searchParams.set('api_key', apiKey);
- }
- const response = await fetch(url.toString());
- const rawText = await response.text();
- let payload = rawText;
- try {
- payload = rawText ? JSON.parse(rawText) : '';
- } catch {
- payload = rawText;
- }
-
- if (!response.ok) {
- previews.push(`${countryLabel}: ${summarizeHeroSmsPreviewError(payload, response.status)}`);
+ const url = new URL('/api/getCountryByService', 'https://api.nexsms.net');
+ url.searchParams.set('apiKey', apiKey);
+ url.searchParams.set('serviceCode', serviceCode);
+ url.searchParams.set('countryId', String(countryId));
+ const response = await fetch(url.toString(), { cache: 'no-store' });
+ const payload = await response.json().catch(() => ({}));
+ if (!response.ok || Number(payload?.code) !== 0) {
+ previews.push(`${countryLabel}: ${describeNexSmsPreviewPayload(payload) || `HTTP ${response.status}`}`);
continue;
}
-
- const priceEntries = collectHeroSmsPriceEntriesForPreview(payload, [])
- .filter((entry) => Number.isFinite(Number(entry.cost)) && Number(entry.cost) > 0);
- const inStockPrices = Array.from(new Set(
- priceEntries
- .filter((entry) => entry.inStock)
- .map((entry) => Math.round(Number(entry.cost) * 10000) / 10000)
- )).sort((left, right) => left - right);
- const allPrices = Array.from(new Set(
- priceEntries.map((entry) => Math.round(Number(entry.cost) * 10000) / 10000)
- )).sort((left, right) => left - right);
- if (!inStockPrices.length) {
- if (allPrices.length) {
- const lowestKnown = formatHeroSmsPriceForPreview(allPrices[0]) || String(allPrices[0]);
- previews.push(`${countryLabel}: 最低 ${lowestKnown}（库存为 0，当前无可用号源）`);
- continue;
- }
- const reason = summarizeHeroSmsPreviewError(payload, response.status);
- previews.push(`${countryLabel}: ${reason || '无可用价格'}`);
+ const data = payload?.data || {};
+ const tierEntries = data?.priceMap && typeof data.priceMap === 'object'
+ ? Object.entries(data.priceMap)
+ .map(([price, count]) => {
+ const numericPrice = Number(price);
+ const numericCount = Number(count);
+ if (!Number.isFinite(numericPrice) || numericPrice <= 0) {
+ return null;
+ }
+ return {
+ price: Math.round(numericPrice * 10000) / 10000,
+ count: Number.isFinite(numericCount) ? Math.max(0, Math.floor(numericCount)) : null,
+ };
+ })
+ .filter(Boolean)
+ : [];
+ const availablePrices = tierEntries
+ .filter((entry) => entry.count === null || entry.count > 0)
+ .map((entry) => entry.price);
+ const uniqueSorted = Array.from(new Set(availablePrices)).sort((left, right) => left - right);
+ const fallbackMin = Number(data?.minPrice);
+ const lowest = uniqueSorted.length
+ ? uniqueSorted[0]
+ : (Number.isFinite(fallbackMin) && fallbackMin > 0 ? Math.round(fallbackMin * 10000) / 10000 : null);
+ if (!Number.isFinite(lowest)) {
+ previews.push(`${countryLabel}: 暂无可用号源`);
continue;
}
- const lowest = inStockPrices[0];
- const lowestText = formatHeroSmsPriceForPreview(lowest) || String(lowest);
+ const tierText = formatPriceTiersForPreview(tierEntries, { maxPrice });
if (Number.isFinite(maxPrice) && maxPrice > 0 && lowest > maxPrice) {
- previews.push(`${countryLabel}: 最低 ${lowestText}（高于上限 ${formatHeroSmsPriceForPreview(maxPrice) || maxPrice}）`);
+ previews.push(`${countryLabel}: 最低 ${lowest}（高于上限 ${maxPrice}）${tierText ? `；档位：${tierText}` : ''}`);
} else {
- previews.push(`${countryLabel}: 最低 ${lowestText}`);
+ previews.push(`${countryLabel}: 最低 ${lowest}${tierText ? `；档位：${tierText}` : ''}`);
+ }
+ } catch (error) {
+ previews.push(`${countryLabel}: 查询失败（${normalizeHeroSmsFetchErrorMessage(error)}）`);
+ }
+ }
+ displayHeroSmsPriceTiers.textContent = previews.join('\n') || '未获取';
+}
+
+async function buildNexSmsPricePreviewLines(options = {}) {
+ const countryIds = (
+ typeof getSelectedNexSmsCountries === 'function'
+ ? getSelectedNexSmsCountries()
+ : normalizeNexSmsCountryFallbackList(
+ Array.isArray(latestState?.nexSmsCountryOrder) ? latestState.nexSmsCountryOrder : []
+ )
+ )
+ .map((country) => normalizeNexSmsCountryIdValue(country.id, -1))
+ .filter((id) => id >= 0);
+ const serviceCode = normalizeNexSmsServiceCodeValue(
+ inputNexSmsServiceCode?.value || latestState?.nexSmsServiceCode || DEFAULT_NEX_SMS_SERVICE_CODE
+ );
+ const maxPriceText = normalizeHeroSmsMaxPriceValue(inputHeroSmsMaxPrice?.value || '');
+ const maxPrice = maxPriceText ? Number(maxPriceText) : null;
+ const apiKey = String(inputNexSmsApiKey?.value || '').trim();
+ const providerLabel = String(options?.providerLabel || 'NexSMS').trim();
+
+ if (!apiKey) {
+ return [`${providerLabel}: 请先填写 NexSMS API Key`];
+ }
+ if (!countryIds.length) {
+ return [`${providerLabel}: 请先选择至少 1 个国家`];
+ }
+
+ const previews = [];
+ for (const countryId of countryIds) {
+ const countryLabel = getNexSmsCountryLabelById(countryId) || `Country #${countryId}`;
+ try {
+ const url = new URL('/api/getCountryByService', 'https://api.nexsms.net');
+ url.searchParams.set('apiKey', apiKey);
+ url.searchParams.set('serviceCode', serviceCode);
+ url.searchParams.set('countryId', String(countryId));
+ const response = await fetch(url.toString(), { cache: 'no-store' });
+ const payload = await response.json().catch(() => ({}));
+ if (!response.ok || Number(payload?.code) !== 0) {
+ previews.push(`${countryLabel}: ${describeNexSmsPreviewPayload(payload) || `HTTP ${response.status}`}`);
+ continue;
+ }
+ const data = payload?.data || {};
+ const tierEntries = data?.priceMap && typeof data.priceMap === 'object'
+ ? Object.entries(data.priceMap)
+ .map(([price, count]) => {
+ const numericPrice = Number(price);
+ const numericCount = Number(count);
+ if (!Number.isFinite(numericPrice) || numericPrice <= 0) {
+ return null;
+ }
+ return {
+ price: Math.round(numericPrice * 10000) / 10000,
+ count: Number.isFinite(numericCount) ? Math.max(0, Math.floor(numericCount)) : null,
+ };
+ })
+ .filter(Boolean)
+ : [];
+ const availablePrices = tierEntries
+ .filter((entry) => entry.count === null || entry.count > 0)
+ .map((entry) => entry.price);
+ const uniqueSorted = Array.from(new Set(availablePrices)).sort((left, right) => left - right);
+ const fallbackMin = Number(data?.minPrice);
+ const lowest = uniqueSorted.length
+ ? uniqueSorted[0]
+ : (Number.isFinite(fallbackMin) && fallbackMin > 0 ? Math.round(fallbackMin * 10000) / 10000 : null);
+ if (!Number.isFinite(lowest)) {
+ previews.push(`${countryLabel}: 暂无可用号源`);
+ continue;
+ }
+ const tierText = formatPriceTiersForPreview(tierEntries, { maxPrice });
+ if (Number.isFinite(maxPrice) && maxPrice > 0 && lowest > maxPrice) {
+ previews.push(`${countryLabel}: 最低 ${lowest}（高于上限 ${maxPrice}）${tierText ? `；档位：${tierText}` : ''}`);
+ } else {
+ previews.push(`${countryLabel}: 最低 ${lowest}${tierText ? `；档位：${tierText}` : ''}`);
}
} catch (error) {
previews.push(`${countryLabel}: 查询失败（${normalizeHeroSmsFetchErrorMessage(error)}）`);
}
}
+ if (!previews.length) {
+ previews.push('未获取');
+ }
+ return [`${providerLabel}:`, ...previews];
+}
+
+async function previewFiveSimPriceTiers() {
+ if (!displayHeroSmsPriceTiers) {
+ return;
+ }
+ const countryCodes = (
+ typeof getSelectedFiveSimCountries === 'function'
+ ? getSelectedFiveSimCountries()
+ : normalizeFiveSimCountryFallbackList(
+ Array.isArray(latestState?.fiveSimCountryOrder) ? latestState.fiveSimCountryOrder : []
+ )
+ )
+ .map((country) => normalizeFiveSimCountryCode(country.code || country.id, ''))
+ .filter(Boolean);
+ const product = normalizeFiveSimProductValue(
+ inputFiveSimProduct?.value || latestState?.fiveSimProduct || DEFAULT_FIVE_SIM_PRODUCT
+ );
+ const maxPriceText = normalizeHeroSmsMaxPriceValue(inputHeroSmsMaxPrice?.value || '');
+ const maxPrice = maxPriceText ? Number(maxPriceText) : null;
+
+ displayHeroSmsPriceTiers.textContent = '查询中...';
+ if (rowHeroSmsPriceTiers) {
+ rowHeroSmsPriceTiers.style.display = '';
+ }
+ if (!countryCodes.length) {
+ displayHeroSmsPriceTiers.textContent = '请先选择至少 1 个国家，再查询价格';
+ return;
+ }
+
+ const collectPriceEntries = (payload, entries = []) => {
+ if (Array.isArray(payload)) {
+ payload.forEach((entry) => collectPriceEntries(entry, entries));
+ return entries;
+ }
+ if (!payload || typeof payload !== 'object') {
+ return entries;
+ }
+ const cost = Number(payload.cost);
+ const count = Number(payload.count);
+ if (Number.isFinite(cost) && cost > 0) {
+ entries.push({
+ cost: Math.round(cost * 10000) / 10000,
+ count: Number.isFinite(count) ? count : 0,
+ });
+ }
+ Object.entries(payload).forEach(([key, value]) => {
+ const keyedPrice = Number(key);
+ if (!Number.isFinite(keyedPrice) || keyedPrice <= 0) {
+ return;
+ }
+ if (value && typeof value === 'object') {
+ const keyedCount = Number(value.count);
+ entries.push({
+ cost: Math.round(keyedPrice * 10000) / 10000,
+ count: Number.isFinite(keyedCount) ? keyedCount : 0,
+ });
+ return;
+ }
+ const numericCount = Number(value);
+ entries.push({
+ cost: Math.round(keyedPrice * 10000) / 10000,
+ count: Number.isFinite(numericCount) ? numericCount : 0,
+ });
+ });
+ Object.values(payload).forEach((entry) => collectPriceEntries(entry, entries));
+ return entries;
+ };
+
+ const previews = [];
+ for (const countryCode of countryCodes) {
+ const countryLabel = getFiveSimCountryLabelByCode(countryCode) || countryCode;
+ try {
+ const url = new URL('https://5sim.net/v1/guest/prices');
+ url.searchParams.set('country', countryCode);
+ url.searchParams.set('product', product);
+ const response = await fetch(url.toString(), { cache: 'no-store' });
+ const payload = await response.json().catch(() => ({}));
+ if (!response.ok) {
+ previews.push(`${countryLabel}: HTTP ${response.status}`);
+ continue;
+ }
+ const productRoot = payload?.[product] || payload;
+ const countryRoot = productRoot?.[countryCode] || productRoot;
+ const tierEntries = collectPriceEntries(countryRoot, [])
+ .filter((entry) => Number.isFinite(entry.cost) && entry.cost > 0)
+ .map((entry) => ({
+ price: entry.cost,
+ count: Number.isFinite(entry.count) ? Math.max(0, Math.floor(entry.count)) : null,
+ }));
+ const prices = tierEntries
+ .filter((entry) => entry.count === null || entry.count > 0)
+ .map((entry) => entry.price);
+ const uniqueSorted = Array.from(new Set(prices)).sort((left, right) => left - right);
+ if (!uniqueSorted.length) {
+ previews.push(`${countryLabel}: 暂无可用号源`);
+ continue;
+ }
+ const lowest = uniqueSorted[0];
+ const tierText = formatPriceTiersForPreview(tierEntries, { maxPrice });
+ if (Number.isFinite(maxPrice) && maxPrice > 0 && lowest > maxPrice) {
+ previews.push(`${countryLabel}: 最低 ${lowest}（高于上限 ${maxPrice}）${tierText ? `；档位：${tierText}` : ''}`);
+ } else {
+ previews.push(`${countryLabel}: 最低 ${lowest}${tierText ? `；档位：${tierText}` : ''}`);
+ }
+ } catch (error) {
+ previews.push(`${countryLabel}: 查询失败（${normalizeHeroSmsFetchErrorMessage(error)}）`);
+ }
+ }
+ displayHeroSmsPriceTiers.textContent = previews.join('\n') || '未获取';
+}
+
+async function buildFiveSimPricePreviewLines(options = {}) {
+ const countryCodes = (
+ typeof getSelectedFiveSimCountries === 'function'
+ ? getSelectedFiveSimCountries()
+ : normalizeFiveSimCountryFallbackList(
+ Array.isArray(latestState?.fiveSimCountryOrder) ? latestState.fiveSimCountryOrder : []
+ )
+ )
+ .map((country) => normalizeFiveSimCountryCode(country.code || country.id, ''))
+ .filter(Boolean);
+ const product = normalizeFiveSimProductValue(
+ inputFiveSimProduct?.value || latestState?.fiveSimProduct || DEFAULT_FIVE_SIM_PRODUCT
+ );
+ const maxPriceText = normalizeHeroSmsMaxPriceValue(inputHeroSmsMaxPrice?.value || '');
+ const maxPrice = maxPriceText ? Number(maxPriceText) : null;
+ const providerLabel = String(options?.providerLabel || '5sim').trim();
+
+ if (!countryCodes.length) {
+ return [`${providerLabel}: 请先选择至少 1 个国家`];
+ }
+
+ const collectPriceEntries = (payload, entries = []) => {
+ if (Array.isArray(payload)) {
+ payload.forEach((entry) => collectPriceEntries(entry, entries));
+ return entries;
+ }
+ if (!payload || typeof payload !== 'object') {
+ return entries;
+ }
+ const cost = Number(payload.cost);
+ const count = Number(payload.count);
+ if (Number.isFinite(cost) && cost > 0) {
+ entries.push({
+ cost: Math.round(cost * 10000) / 10000,
+ count: Number.isFinite(count) ? count : 0,
+ });
+ }
+ Object.entries(payload).forEach(([key, value]) => {
+ const keyedPrice = Number(key);
+ if (!Number.isFinite(keyedPrice) || keyedPrice <= 0) {
+ return;
+ }
+ if (value && typeof value === 'object') {
+ const keyedCount = Number(value.count);
+ entries.push({
+ cost: Math.round(keyedPrice * 10000) / 10000,
+ count: Number.isFinite(keyedCount) ? keyedCount : 0,
+ });
+ return;
+ }
+ const numericCount = Number(value);
+ entries.push({
+ cost: Math.round(keyedPrice * 10000) / 10000,
+ count: Number.isFinite(numericCount) ? numericCount : 0,
+ });
+ });
+ Object.values(payload).forEach((entry) => collectPriceEntries(entry, entries));
+ return entries;
+ };
+
+ const previews = [];
+ for (const countryCode of countryCodes) {
+ const countryLabel = getFiveSimCountryLabelByCode(countryCode) || countryCode;
+ try {
+ const url = new URL('https://5sim.net/v1/guest/prices');
+ url.searchParams.set('country', countryCode);
+ url.searchParams.set('product', product);
+ const response = await fetch(url.toString(), { cache: 'no-store' });
+ const payload = await response.json().catch(() => ({}));
+ if (!response.ok) {
+ previews.push(`${countryLabel}: HTTP ${response.status}`);
+ continue;
+ }
+ const productRoot = payload?.[product] || payload;
+ const countryRoot = productRoot?.[countryCode] || productRoot;
+ const tierEntries = collectPriceEntries(countryRoot, [])
+ .filter((entry) => Number.isFinite(entry.cost) && entry.cost > 0)
+ .map((entry) => ({
+ price: entry.cost,
+ count: Number.isFinite(entry.count) ? Math.max(0, Math.floor(entry.count)) : null,
+ }));
+ const prices = tierEntries
+ .filter((entry) => entry.count === null || entry.count > 0)
+ .map((entry) => entry.price);
+ const uniqueSorted = Array.from(new Set(prices)).sort((left, right) => left - right);
+ if (!uniqueSorted.length) {
+ previews.push(`${countryLabel}: 暂无可用号源`);
+ continue;
+ }
+ const lowest = uniqueSorted[0];
+ const tierText = formatPriceTiersForPreview(tierEntries, { maxPrice });
+ if (Number.isFinite(maxPrice) && maxPrice > 0 && lowest > maxPrice) {
+ previews.push(`${countryLabel}: 最低 ${lowest}（高于上限 ${maxPrice}）${tierText ? `；档位：${tierText}` : ''}`);
+ } else {
+ previews.push(`${countryLabel}: 最低 ${lowest}${tierText ? `；档位：${tierText}` : ''}`);
+ }
+ } catch (error) {
+ previews.push(`${countryLabel}: 查询失败（${normalizeHeroSmsFetchErrorMessage(error)}）`);
+ }
+ }
+
+ if (!previews.length) {
+ previews.push('未获取');
+ }
+ return [`${providerLabel}:`, ...previews];
+}
+
+async function previewHeroSmsPriceTiers() {
+ const normalizeProvider = typeof normalizePhoneSmsProviderValue === 'function'
+ ? normalizePhoneSmsProviderValue
+ : ((value = '') => {
+ const normalized = String(value || '').trim().toLowerCase();
+ if (normalized === '5sim') return '5sim';
+ if (normalized === 'nexsms') return 'nexsms';
+ return 'hero-sms';
+ });
+ const fiveSimProviderValue = typeof PHONE_SMS_PROVIDER_FIVE_SIM !== 'undefined' ? PHONE_SMS_PROVIDER_FIVE_SIM : '5sim';
+ const nexSmsProviderValue = typeof PHONE_SMS_PROVIDER_NEXSMS !== 'undefined' ? PHONE_SMS_PROVIDER_NEXSMS : 'nexsms';
+ const heroProviderValue = typeof PHONE_SMS_PROVIDER_HERO !== 'undefined' ? PHONE_SMS_PROVIDER_HERO : 'hero-sms';
+ const defaultProviderValue = typeof DEFAULT_PHONE_SMS_PROVIDER !== 'undefined' ? DEFAULT_PHONE_SMS_PROVIDER : 'hero-sms';
+ const activeProvider = typeof getSelectedPhoneSmsProvider === 'function'
+ ? getSelectedPhoneSmsProvider()
+ : normalizeProvider(selectPhoneSmsProvider?.value || defaultProviderValue);
+ displayHeroSmsPriceTiers.textContent = '查询中...';
+ if (rowHeroSmsPriceTiers) {
+ rowHeroSmsPriceTiers.style.display = '';
+ }
+ if (!displayHeroSmsPriceTiers) {
+ return;
+ }
+
+ const selectedProviderOrder = (
+ typeof getSelectedPhoneSmsProviderOrder === 'function'
+ ? getSelectedPhoneSmsProviderOrder()
+ : normalizePhoneSmsProviderOrderValue(phoneSmsProviderOrderSelection, [])
+ );
+ const providerOrder = selectedProviderOrder.length
+ ? selectedProviderOrder
+ : [normalizeProvider(activeProvider)];
+
+ const previews = [];
+ for (const provider of providerOrder) {
+ if (provider === fiveSimProviderValue) {
+ const lines = await buildFiveSimPricePreviewLines({ providerLabel: '5sim' });
+ previews.push(...lines, '');
+ continue;
+ }
+ if (provider === nexSmsProviderValue) {
+ const lines = await buildNexSmsPricePreviewLines({ providerLabel: 'NexSMS' });
+ previews.push(...lines, '');
+ continue;
+ }
+ if (provider !== heroProviderValue) {
+ continue;
+ }
+
+ const selectedCountries = syncHeroSmsFallbackSelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+ const candidates = selectedCountries
+ .map((country) => ({
+ id: normalizeHeroSmsCountryId(country?.id, 0),
+ label: normalizeHeroSmsCountryLabel(country?.label, ''),
+ }))
+ .filter((country) => country.id > 0);
+ const maxPriceText = normalizeHeroSmsMaxPriceValue(inputHeroSmsMaxPrice?.value || '');
+ const maxPrice = maxPriceText ? Number(maxPriceText) : null;
+ const apiKey = String(inputHeroSmsApiKey?.value || '').trim();
+
+ const heroLines = ['HeroSMS:'];
+ if (!apiKey) {
+ heroLines.push('请先填写接码 API Key');
+ previews.push(...heroLines, '');
+ continue;
+ }
+ if (!candidates.length) {
+ heroLines.push('请先选择至少 1 个国家');
+ previews.push(...heroLines, '');
+ continue;
+ }
+ for (const country of candidates) {
+ const countryId = normalizeHeroSmsCountryId(country.id, 0);
+ if (countryId <= 0) {
+ continue;
+ }
+ const countryLabel = normalizeHeroSmsCountryLabel(
+ country.label || getHeroSmsCountryLabelById(countryId),
+ `Country #${countryId}`
+ );
+ try {
+ const parsedPayloads = [];
+ const failedPriceActions = [];
+ const fetchPriceAction = async (action) => {
+ const url = new URL('https://hero-sms.com/stubs/handler_api.php');
+ url.searchParams.set('action', action);
+ url.searchParams.set('service', 'dr');
+ url.searchParams.set('country', String(countryId));
+ if (action === 'getPricesExtended') {
+ url.searchParams.set('freePrice', 'true');
+ }
+ if (apiKey) {
+ url.searchParams.set('api_key', apiKey);
+ }
+ const response = await fetch(url.toString(), { cache: 'no-store' });
+ const rawText = await response.text();
+ let payload = rawText;
+ try {
+ payload = rawText ? JSON.parse(rawText) : '';
+ } catch {
+ payload = rawText;
+ }
+ if (!response.ok) {
+ const reason = summarizeHeroSmsPreviewError(payload, response.status);
+ failedPriceActions.push(`${action}: ${reason}`);
+ return;
+ }
+ parsedPayloads.push(payload);
+ };
+
+ const fetchTopCountriesPayload = async () => {
+ const url = new URL('https://hero-sms.com/stubs/handler_api.php');
+ url.searchParams.set('action', 'getTopCountriesByService');
+ url.searchParams.set('service', 'dr');
+ url.searchParams.set('freePrice', 'true');
+ if (apiKey) {
+ url.searchParams.set('api_key', apiKey);
+ }
+ const response = await fetch(url.toString(), { cache: 'no-store' });
+ const rawText = await response.text();
+ let payload = rawText;
+ try {
+ payload = rawText ? JSON.parse(rawText) : '';
+ } catch {
+ payload = rawText;
+ }
+ if (!response.ok) {
+ const reason = summarizeHeroSmsPreviewError(payload, response.status);
+ failedPriceActions.push(`getTopCountriesByService: ${reason}`);
+ return null;
+ }
+ return payload;
+ };
+
+ const fetchVerificationPricesPayload = async () => {
+ const url = new URL('https://hero-sms.com/stubs/handler_api.php');
+ url.searchParams.set('action', 'getPricesVerification');
+ url.searchParams.set('service', 'dr');
+ url.searchParams.set('country', String(countryId));
+ if (apiKey) {
+ url.searchParams.set('api_key', apiKey);
+ }
+ const response = await fetch(url.toString(), { cache: 'no-store' });
+ const rawText = await response.text();
+ let payload = rawText;
+ try {
+ payload = rawText ? JSON.parse(rawText) : '';
+ } catch {
+ payload = rawText;
+ }
+ if (!response.ok) {
+ const reason = summarizeHeroSmsPreviewError(payload, response.status);
+ failedPriceActions.push(`getPricesVerification: ${reason}`);
+ return null;
+ }
+ return payload;
+ };
+
+ await fetchPriceAction('getPricesExtended');
+ await fetchPriceAction('getPrices');
+ // Additional visibility probe: some regions expose richer tier maps on getPricesForVerification.
+ await fetchPriceAction('getPricesForVerification');
+ const [topCountriesPayload, verificationPayload] = await Promise.all([
+ fetchTopCountriesPayload(),
+ fetchVerificationPricesPayload(),
+ ]);
+
+ const priceEntries = parsedPayloads
+ .flatMap((payload) => collectHeroSmsPriceEntriesForPreview(payload, []))
+ .concat(
+ collectHeroSmsPriceEntriesFromTopCountriesPayload(topCountriesPayload, countryId, []),
+ collectHeroSmsPriceEntriesFromVerificationPayload(verificationPayload, countryId, 'dr', [])
+ )
+ .filter((entry) => Number.isFinite(Number(entry.cost)) && Number(entry.cost) > 0);
+ const tierStockByPrice = new Map();
+ for (const entry of priceEntries) {
+ const cost = Math.round(Number(entry.cost) * 10000) / 10000;
+ if (!Number.isFinite(cost) || cost <= 0) {
+ continue;
+ }
+ const stockCount = Number.isFinite(Number(entry.stockCount)) ? Math.max(0, Number(entry.stockCount)) : 0;
+ const previous = tierStockByPrice.get(cost);
+ tierStockByPrice.set(cost, Number.isFinite(previous) ? Math.max(previous, stockCount) : stockCount);
+ }
+ const allPrices = Array.from(tierStockByPrice.keys()).sort((left, right) => left - right);
+ const inStockPrices = allPrices.filter((price) => Number(tierStockByPrice.get(price)) > 0);
+ const tierEntries = allPrices.map((price) => ({
+ price,
+ count: Math.max(0, Number(tierStockByPrice.get(price)) || 0),
+ }));
+ const withinLimitInStockPrices = Number.isFinite(maxPrice) && maxPrice > 0
+ ? inStockPrices.filter((price) => price <= maxPrice)
+ : inStockPrices;
+ const tierPreviewText = formatPriceTiersWithZeroStockForPreview(tierEntries, { maxPrice });
+ if (!inStockPrices.length) {
+ if (allPrices.length) {
+ const lowestKnown = formatHeroSmsPriceForPreview(allPrices[0]) || String(allPrices[0]);
+ heroLines.push(`${countryLabel}: 全档位均无库存（最低标价 ${lowestKnown}）${tierPreviewText ? `；档位：${tierPreviewText}` : ''}`);
+ continue;
+ }
+ if (failedPriceActions.length) {
+ heroLines.push(`${countryLabel}: ${failedPriceActions.join(' | ')}`);
+ continue;
+ }
+ heroLines.push(`${countryLabel}: 无可用价格`);
+ continue;
+ }
+ if (Number.isFinite(maxPrice) && maxPrice > 0 && !withinLimitInStockPrices.length) {
+ const lowestInStockText = formatHeroSmsPriceForPreview(inStockPrices[0]) || String(inStockPrices[0]);
+ heroLines.push(`${countryLabel}: 上限内无可用号源（上限 ${formatHeroSmsPriceForPreview(maxPrice) || maxPrice}，最低可用 ${lowestInStockText}）${tierPreviewText ? `；档位：${tierPreviewText}` : ''}`);
+ } else {
+ const lowestWithinLimit = withinLimitInStockPrices[0];
+ const lowestText = formatHeroSmsPriceForPreview(lowestWithinLimit) || String(lowestWithinLimit);
+ heroLines.push(`${countryLabel}: 上限内最低 ${lowestText}${tierPreviewText ? `；档位：${tierPreviewText}` : ''}`);
+ }
+ } catch (error) {
+ heroLines.push(`${countryLabel}: 查询失败（${normalizeHeroSmsFetchErrorMessage(error)}）`);
+ }
+ }
+ if (heroLines.length === 1) {
+ heroLines.push('未获取');
+ }
+ previews.push(...heroLines, '');
+ }
+
+ while (previews.length && previews[previews.length - 1] === '') {
+ previews.pop();
+ }
displayHeroSmsPriceTiers.textContent = previews.join('\n') || '未获取';
}
@@ -3663,6 +6362,26 @@ function updateAccountRunHistorySettingsUI() {
function updatePhoneVerificationSettingsUI() {
const enabled = Boolean(inputPhoneVerificationEnabled?.checked);
const showSettings = enabled && phoneVerificationSectionExpanded;
+ const normalizeProvider = typeof normalizePhoneSmsProviderValue === 'function'
+ ? normalizePhoneSmsProviderValue
+ : ((value = '') => {
+ const normalized = String(value || '').trim().toLowerCase();
+ if (normalized === '5sim') return '5sim';
+ if (normalized === 'nexsms') return 'nexsms';
+ return 'hero-sms';
+ });
+ const heroProviderValue = typeof PHONE_SMS_PROVIDER_HERO !== 'undefined' ? PHONE_SMS_PROVIDER_HERO : 'hero-sms';
+ const fiveSimProviderValue = typeof PHONE_SMS_PROVIDER_FIVE_SIM !== 'undefined' ? PHONE_SMS_PROVIDER_FIVE_SIM : '5sim';
+ const nexSmsProviderValue = typeof PHONE_SMS_PROVIDER_NEXSMS !== 'undefined' ? PHONE_SMS_PROVIDER_NEXSMS : 'nexsms';
+ const providerOrderForDisplay = resolveNormalizedProviderOrderForRuntime(latestState || {});
+ const provider = providerOrderForDisplay[0] || (
+ typeof getSelectedPhoneSmsProvider === 'function'
+ ? getSelectedPhoneSmsProvider()
+ : normalizeProvider(selectPhoneSmsProvider?.value || latestState?.phoneSmsProvider || heroProviderValue)
+ );
+ const heroProvider = provider === heroProviderValue;
+ const fiveSimProvider = provider === fiveSimProviderValue;
+ const nexSmsProvider = provider === nexSmsProviderValue;
if (rowPhoneVerificationEnabled) {
rowPhoneVerificationEnabled.style.display = '';
}
@@ -3678,16 +6397,24 @@ function updatePhoneVerificationSettingsUI() {
rowPhoneVerificationFold.style.display = showSettings ? '' : 'none';
}
- const phoneVerificationRows = [
+ if (rowPhoneSmsProvider) {
+ rowPhoneSmsProvider.style.display = showSettings ? '' : 'none';
+ }
+ if (rowPhoneSmsProviderOrder) {
+ rowPhoneSmsProviderOrder.style.display = showSettings ? '' : 'none';
+ }
+ if (rowPhoneSmsProviderOrderActions) {
+ rowPhoneSmsProviderOrderActions.style.display = showSettings ? '' : 'none';
+ }
+ const alwaysRows = [
typeof rowHeroSmsPlatform !== 'undefined' ? rowHeroSmsPlatform : null,
- typeof rowHeroSmsCountry !== 'undefined' ? rowHeroSmsCountry : null,
- typeof rowHeroSmsCountryFallback !== 'undefined' ? rowHeroSmsCountryFallback : null,
typeof rowHeroSmsAcquirePriority !== 'undefined' ? rowHeroSmsAcquirePriority : null,
- typeof rowHeroSmsApiKey !== 'undefined' ? rowHeroSmsApiKey : null,
typeof rowHeroSmsMaxPrice !== 'undefined' ? rowHeroSmsMaxPrice : null,
typeof rowHeroSmsRuntimePair !== 'undefined' ? rowHeroSmsRuntimePair : null,
typeof rowHeroSmsCurrentNumber !== 'undefined' ? rowHeroSmsCurrentNumber : null,
+ typeof rowHeroSmsCurrentCountdown !== 'undefined' ? rowHeroSmsCurrentCountdown : null,
typeof rowHeroSmsCurrentCode !== 'undefined' ? rowHeroSmsCurrentCode : null,
+ typeof rowHeroSmsPreferredActivation !== 'undefined' ? rowHeroSmsPreferredActivation : null,
typeof rowPhoneCodeSettingsGroup !== 'undefined' ? rowPhoneCodeSettingsGroup : null,
typeof rowPhoneVerificationResendCount !== 'undefined' ? rowPhoneVerificationResendCount : null,
typeof rowPhoneReplacementLimit !== 'undefined' ? rowPhoneReplacementLimit : null,
@@ -3696,12 +6423,55 @@ function updatePhoneVerificationSettingsUI() {
typeof rowPhoneCodePollIntervalSeconds !== 'undefined' ? rowPhoneCodePollIntervalSeconds : null,
typeof rowPhoneCodePollMaxRounds !== 'undefined' ? rowPhoneCodePollMaxRounds : null,
];
- phoneVerificationRows.forEach((row) => {
- if (!row) {
- return;
+ alwaysRows.forEach((row) => {
+ if (row) {
+ row.style.display = showSettings ? '' : 'none';
}
- row.style.display = showSettings ? '' : 'none';
});
+ const heroRows = [
+ typeof rowHeroSmsCountry !== 'undefined' ? rowHeroSmsCountry : null,
+ typeof rowHeroSmsCountryFallback !== 'undefined' ? rowHeroSmsCountryFallback : null,
+ typeof rowHeroSmsApiKey !== 'undefined' ? rowHeroSmsApiKey : null,
+ ];
+ heroRows.forEach((row) => {
+ if (row) {
+ row.style.display = (showSettings && heroProvider) ? '' : 'none';
+ }
+ });
+ const fiveSimRows = [
+ typeof rowFiveSimApiKey !== 'undefined' ? rowFiveSimApiKey : null,
+ typeof rowFiveSimCountry !== 'undefined' ? rowFiveSimCountry : null,
+ typeof rowFiveSimCountryFallback !== 'undefined' ? rowFiveSimCountryFallback : null,
+ typeof rowFiveSimOperator !== 'undefined' ? rowFiveSimOperator : null,
+ typeof rowFiveSimProduct !== 'undefined' ? rowFiveSimProduct : null,
+ ];
+ fiveSimRows.forEach((row) => {
+ if (row) {
+ row.style.display = (showSettings && fiveSimProvider) ? '' : 'none';
+ }
+ });
+ const nexSmsRows = [
+ typeof rowNexSmsApiKey !== 'undefined' ? rowNexSmsApiKey : null,
+ typeof rowNexSmsCountry !== 'undefined' ? rowNexSmsCountry : null,
+ typeof rowNexSmsCountryFallback !== 'undefined' ? rowNexSmsCountryFallback : null,
+ typeof rowNexSmsServiceCode !== 'undefined' ? rowNexSmsServiceCode : null,
+ ];
+ nexSmsRows.forEach((row) => {
+ if (row) {
+ row.style.display = (showSettings && nexSmsProvider) ? '' : 'none';
+ }
+ });
+ if (
+ showSettings
+ && typeof normalizePhoneSmsProviderOrderValue === 'function'
+ && typeof updatePhoneSmsProviderOrderSummary === 'function'
+ ) {
+ const displayOrder = normalizePhoneSmsProviderOrderValue(
+ Array.isArray(phoneSmsProviderOrderSelection) ? phoneSmsProviderOrderSelection : [],
+ []
+ );
+ updatePhoneSmsProviderOrderSummary(displayOrder);
+ }
if (!showSettings && typeof rowHeroSmsPriceTiers !== 'undefined' && rowHeroSmsPriceTiers) {
rowHeroSmsPriceTiers.style.display = 'none';
}
@@ -3839,6 +6609,12 @@ async function saveSettings(options = {}) {
}
}
+async function persistCurrentSettingsForAction() {
+ clearTimeout(settingsAutoSaveTimer);
+ await waitForSettingsSaveIdle();
+ await saveSettings({ silent: true, force: true });
+}
+
function applyAutoRunStatus(payload = currentAutoRun) {
syncAutoRunState(payload);
const runLabel = getAutoRunLabel(currentAutoRun);
@@ -4026,6 +6802,14 @@ function applySettingsState(state) {
const resolveIpProxyPoolTargetCount = (value) => (typeof normalizeIpProxyPoolTargetCount === 'function'
? normalizeIpProxyPoolTargetCount(value || '', 20)
: String(value || '20').trim() || '20');
+ const resolveIpProxyAutoSyncEnabled = (value) => Boolean(value);
+ const resolveIpProxyAutoSyncIntervalMinutes = (value) => {
+ const numeric = Number.parseInt(String(value ?? '').trim(), 10);
+ if (!Number.isFinite(numeric)) {
+ return 15;
+ }
+ return Math.max(1, Math.min(1440, numeric));
+ };
syncLatestState(state);
syncAutoRunState(state);
renderStepStatuses(latestState);
@@ -4089,6 +6873,14 @@ function applySettingsState(state) {
if (typeof inputIpProxyPoolTargetCount !== 'undefined' && inputIpProxyPoolTargetCount) {
inputIpProxyPoolTargetCount.value = activeIpProxyProfile.poolTargetCount;
}
+ if (typeof inputIpProxyAutoSyncEnabled !== 'undefined' && inputIpProxyAutoSyncEnabled) {
+ inputIpProxyAutoSyncEnabled.checked = resolveIpProxyAutoSyncEnabled(state?.ipProxyAutoSyncEnabled);
+ }
+ if (typeof inputIpProxyAutoSyncIntervalMinutes !== 'undefined' && inputIpProxyAutoSyncIntervalMinutes) {
+ inputIpProxyAutoSyncIntervalMinutes.value = String(
+ resolveIpProxyAutoSyncIntervalMinutes(state?.ipProxyAutoSyncIntervalMinutes)
+ );
+ }
if (typeof inputIpProxyHost !== 'undefined' && inputIpProxyHost) {
inputIpProxyHost.value = activeIpProxyProfile.host;
}
@@ -4206,7 +6998,7 @@ function applySettingsState(state) {
inputAutoDelayEnabled.checked = Boolean(state?.autoRunDelayEnabled);
inputAutoDelayMinutes.value = String(normalizeAutoDelayMinutes(state?.autoRunDelayMinutes));
inputAutoStepDelaySeconds.value = formatAutoStepDelayInputValue(state?.autoStepDelaySeconds);
- if (inputOAuthFlowTimeoutEnabled) {
+ if (typeof inputOAuthFlowTimeoutEnabled !== 'undefined' && inputOAuthFlowTimeoutEnabled) {
inputOAuthFlowTimeoutEnabled.checked = state?.oauthFlowTimeoutEnabled !== undefined
? Boolean(state.oauthFlowTimeoutEnabled)
: true;
@@ -4224,19 +7016,52 @@ function applySettingsState(state) {
? Boolean(state.phoneVerificationEnabled)
: DEFAULT_PHONE_VERIFICATION_ENABLED;
}
+ if (typeof applyPhoneSmsProviderOrderSelection === 'function') {
+ const restoredProviderOrder = Array.isArray(state?.phoneSmsProviderOrder)
+ ? state.phoneSmsProviderOrder
+ : [];
+ applyPhoneSmsProviderOrderSelection(
+ restoredProviderOrder,
+ { ensureDefault: false, syncProvider: false }
+ );
+ }
+ if (typeof selectPhoneSmsProvider !== 'undefined' && selectPhoneSmsProvider) {
+ const nextProvider = normalizePhoneSmsProviderValue(state?.phoneSmsProvider || DEFAULT_PHONE_SMS_PROVIDER);
+ selectPhoneSmsProvider.value = nextProvider;
+ }
if (inputHeroSmsApiKey) {
inputHeroSmsApiKey.value = state?.heroSmsApiKey || '';
}
+ if (typeof inputFiveSimApiKey !== 'undefined' && inputFiveSimApiKey) {
+ inputFiveSimApiKey.value = String(state?.fiveSimApiKey || '');
+ }
+ if (typeof inputFiveSimOperator !== 'undefined' && inputFiveSimOperator) {
+ inputFiveSimOperator.value = normalizeFiveSimOperatorValue(state?.fiveSimOperator || DEFAULT_FIVE_SIM_OPERATOR);
+ }
+ if (typeof inputFiveSimProduct !== 'undefined' && inputFiveSimProduct) {
+ inputFiveSimProduct.value = normalizeFiveSimProductValue(state?.fiveSimProduct || DEFAULT_FIVE_SIM_PRODUCT);
+ }
+ if (typeof inputNexSmsApiKey !== 'undefined' && inputNexSmsApiKey) {
+ inputNexSmsApiKey.value = String(state?.nexSmsApiKey || '');
+ }
+ if (typeof inputNexSmsServiceCode !== 'undefined' && inputNexSmsServiceCode) {
+ inputNexSmsServiceCode.value = normalizeNexSmsServiceCodeValue(
+ state?.nexSmsServiceCode || DEFAULT_NEX_SMS_SERVICE_CODE
+ );
+ }
if (typeof inputHeroSmsReuseEnabled !== 'undefined' && inputHeroSmsReuseEnabled) {
inputHeroSmsReuseEnabled.checked = normalizeHeroSmsReuseEnabledValue(state?.heroSmsReuseEnabled);
}
if (typeof selectHeroSmsAcquirePriority !== 'undefined' && selectHeroSmsAcquirePriority) {
selectHeroSmsAcquirePriority.value = normalizeHeroSmsAcquirePriority(state?.heroSmsAcquirePriority);
}
- if (inputHeroSmsMaxPrice) {
+ if (typeof inputHeroSmsMaxPrice !== 'undefined' && inputHeroSmsMaxPrice) {
inputHeroSmsMaxPrice.value = normalizeHeroSmsMaxPriceValue(state?.heroSmsMaxPrice || '');
}
- if (inputPhoneReplacementLimit) {
+ if (typeof inputHeroSmsPreferredPrice !== 'undefined' && inputHeroSmsPreferredPrice) {
+ inputHeroSmsPreferredPrice.value = normalizeHeroSmsMaxPriceValue(state?.heroSmsPreferredPrice || '');
+ }
+ if (typeof inputPhoneReplacementLimit !== 'undefined' && inputPhoneReplacementLimit) {
inputPhoneReplacementLimit.value = String(
normalizePhoneVerificationReplacementLimit(
state?.phoneVerificationReplacementLimit,
@@ -4267,29 +7092,79 @@ function applySettingsState(state) {
normalizePhoneCodePollMaxRoundsValue(state?.phoneCodePollMaxRounds, DEFAULT_PHONE_CODE_POLL_MAX_ROUNDS)
);
}
- if (typeof applyHeroSmsFallbackSelection === 'function') {
- const primaryCountry = {
- id: normalizeHeroSmsCountryId(state?.heroSmsCountryId),
- label: normalizeHeroSmsCountryLabel(state?.heroSmsCountryLabel),
- };
+ const normalizeProvider = typeof normalizePhoneSmsProviderValue === 'function'
+ ? normalizePhoneSmsProviderValue
+ : ((value = '') => {
+ const normalized = String(value || '').trim().toLowerCase();
+ if (normalized === '5sim') return '5sim';
+ if (normalized === 'nexsms') return 'nexsms';
+ return 'hero-sms';
+ });
+ const providerOrderForRestore = typeof resolveNormalizedProviderOrderForRuntime === 'function'
+ ? resolveNormalizedProviderOrderForRuntime(state || {})
+ : [normalizeProvider(
+ state?.phoneSmsProvider
+ || (typeof DEFAULT_PHONE_SMS_PROVIDER !== 'undefined' ? DEFAULT_PHONE_SMS_PROVIDER : 'hero-sms')
+ )];
+ const activeProvider = providerOrderForRestore[0] || normalizeProvider(
+ state?.phoneSmsProvider
+ || (typeof DEFAULT_PHONE_SMS_PROVIDER !== 'undefined' ? DEFAULT_PHONE_SMS_PROVIDER : 'hero-sms')
+ );
+ const fiveSimProviderValue = typeof PHONE_SMS_PROVIDER_FIVE_SIM !== 'undefined'
+ ? PHONE_SMS_PROVIDER_FIVE_SIM
+ : '5sim';
+ const nexSmsProviderValue = typeof PHONE_SMS_PROVIDER_NEXSMS !== 'undefined'
+ ? PHONE_SMS_PROVIDER_NEXSMS
+ : 'nexsms';
+ if (activeProvider === fiveSimProviderValue) {
+ if (typeof applyFiveSimCountrySelection === 'function') {
+ applyFiveSimCountrySelection(
+ Array.isArray(state?.fiveSimCountryOrder) ? state.fiveSimCountryOrder : []
+ );
+ }
+ } else if (activeProvider === nexSmsProviderValue) {
+ if (typeof applyNexSmsCountrySelection === 'function') {
+ applyNexSmsCountrySelection(
+ Array.isArray(state?.nexSmsCountryOrder) ? state.nexSmsCountryOrder : []
+ );
+ }
+ } else if (typeof applyHeroSmsFallbackSelection === 'function') {
+ const primaryCountryId = normalizeHeroSmsCountryId(state?.heroSmsCountryId, 0);
+ const primaryCountries = primaryCountryId > 0
+ ? [{
+ id: primaryCountryId,
+ label: normalizeHeroSmsCountryLabel(state?.heroSmsCountryLabel),
+ }]
+ : [];
applyHeroSmsFallbackSelection(
[
- primaryCountry,
- ...normalizeHeroSmsCountryFallbackList(state?.heroSmsCountryFallback || []),
+ ...primaryCountries,
+ ...normalizeHeroSmsCountryFallbackList(
+ Array.isArray(state?.heroSmsCountryFallback) ? state.heroSmsCountryFallback : []
+ ),
],
{ includePrimary: true }
);
- updateHeroSmsPlatformDisplay(getSelectedHeroSmsCountryOption().label);
} else if (selectHeroSmsCountry) {
- const restoredCountryId = String(normalizeHeroSmsCountryId(state?.heroSmsCountryId));
- if (Array.from(selectHeroSmsCountry.options).some((option) => option.value === restoredCountryId)) {
+ const restoredCountryId = String(normalizeHeroSmsCountryId(state?.heroSmsCountryId, 0));
+ const hasRestoredCountry = restoredCountryId !== '0'
+ && Array.from(selectHeroSmsCountry.options).some((option) => option.value === restoredCountryId);
+ if (hasRestoredCountry) {
selectHeroSmsCountry.value = restoredCountryId;
+ } else {
+ Array.from(selectHeroSmsCountry.options).forEach((option) => {
+ option.selected = false;
+ });
}
- updateHeroSmsPlatformDisplay(state?.heroSmsCountryLabel || getSelectedHeroSmsCountryOption().label);
}
+ updateHeroSmsPlatformDisplay();
if (typeof updateHeroSmsRuntimeDisplay === 'function') {
updateHeroSmsRuntimeDisplay(state);
}
+ if (state?.autoRunTotalRuns) {
+ inputRunCount.value = String(state.autoRunTotalRuns);
+ }
+
applyAutoRunStatus(state);
markSettingsDirty(false);
updateAutoDelayInputState();
@@ -7583,6 +10458,28 @@ inputIpProxyPoolTargetCount?.addEventListener('blur', () => {
saveSettings({ silent: true }).catch(() => {});
});
+inputIpProxyAutoSyncEnabled?.addEventListener('change', () => {
+ markSettingsDirty(true);
+ if (typeof updateIpProxyUI === 'function') {
+ updateIpProxyUI(latestState);
+ }
+ saveSettings({ silent: true }).catch(() => {});
+});
+
+inputIpProxyAutoSyncIntervalMinutes?.addEventListener('input', () => {
+ markSettingsDirty(true);
+ scheduleSettingsAutoSave();
+});
+
+inputIpProxyAutoSyncIntervalMinutes?.addEventListener('blur', () => {
+ const numeric = Number.parseInt(String(inputIpProxyAutoSyncIntervalMinutes.value || '').trim(), 10);
+ const normalized = Number.isFinite(numeric)
+ ? Math.max(1, Math.min(1440, numeric))
+ : 15;
+ inputIpProxyAutoSyncIntervalMinutes.value = String(normalized);
+ saveSettings({ silent: true }).catch(() => {});
+});
+
inputIpProxyPort?.addEventListener('input', () => {
markSettingsDirty(true);
scheduleSettingsAutoSave();
@@ -7789,6 +10686,48 @@ inputPhoneVerificationEnabled?.addEventListener('change', () => {
saveSettings({ silent: true }).catch(() => { });
});
+selectPhoneSmsProvider?.addEventListener('change', async () => {
+ if (selectPhoneSmsProvider) {
+ selectPhoneSmsProvider.value = normalizePhoneSmsProviderValue(selectPhoneSmsProvider.value);
+ }
+ if (selectPhoneSmsProvider?.value === PHONE_SMS_PROVIDER_FIVE_SIM) {
+ await loadFiveSimCountries().catch(() => { });
+ applyFiveSimCountrySelection(
+ Array.isArray(latestState?.fiveSimCountryOrder) ? latestState.fiveSimCountryOrder : []
+ );
+ } else if (selectPhoneSmsProvider?.value === PHONE_SMS_PROVIDER_NEXSMS) {
+ await loadNexSmsCountries().catch(() => { });
+ applyNexSmsCountrySelection(
+ Array.isArray(latestState?.nexSmsCountryOrder) ? latestState.nexSmsCountryOrder : []
+ );
+ } else {
+ await loadHeroSmsCountries().catch(() => { });
+ const nextPrimaryCountryId = normalizeHeroSmsCountryId(latestState?.heroSmsCountryId, 0);
+ const nextPrimaryCountries = nextPrimaryCountryId > 0
+ ? [{
+ id: nextPrimaryCountryId,
+ label: normalizeHeroSmsCountryLabel(latestState?.heroSmsCountryLabel),
+ }]
+ : [];
+ applyHeroSmsFallbackSelection(
+ [
+ ...nextPrimaryCountries,
+ ...normalizeHeroSmsCountryFallbackList(
+ Array.isArray(latestState?.heroSmsCountryFallback) ? latestState.heroSmsCountryFallback : []
+ ),
+ ],
+ { includePrimary: true }
+ );
+ }
+ updateHeroSmsPlatformDisplay();
+ updatePhoneVerificationSettingsUI();
+ if (rowHeroSmsPriceTiers) {
+ rowHeroSmsPriceTiers.style.display = 'none';
+ }
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+});
+
inputAccountRunHistoryHelperBaseUrl?.addEventListener('input', () => {
markSettingsDirty(true);
scheduleSettingsAutoSave();
@@ -7834,6 +10773,51 @@ inputHeroSmsApiKey?.addEventListener('blur', () => {
saveSettings({ silent: true }).catch(() => { });
});
+inputFiveSimApiKey?.addEventListener('input', () => {
+ markSettingsDirty(true);
+ scheduleSettingsAutoSave();
+});
+inputFiveSimApiKey?.addEventListener('blur', () => {
+ saveSettings({ silent: true }).catch(() => { });
+});
+
+inputFiveSimOperator?.addEventListener('input', () => {
+ markSettingsDirty(true);
+ scheduleSettingsAutoSave();
+});
+inputFiveSimOperator?.addEventListener('blur', () => {
+ inputFiveSimOperator.value = normalizeFiveSimOperatorValue(inputFiveSimOperator.value);
+ saveSettings({ silent: true }).catch(() => { });
+});
+
+inputFiveSimProduct?.addEventListener('input', () => {
+ markSettingsDirty(true);
+ scheduleSettingsAutoSave();
+});
+inputFiveSimProduct?.addEventListener('blur', () => {
+ inputFiveSimProduct.value = normalizeFiveSimProductValue(inputFiveSimProduct.value);
+ updateHeroSmsPlatformDisplay();
+ saveSettings({ silent: true }).catch(() => { });
+});
+
+inputNexSmsApiKey?.addEventListener('input', () => {
+ markSettingsDirty(true);
+ scheduleSettingsAutoSave();
+});
+inputNexSmsApiKey?.addEventListener('blur', () => {
+ saveSettings({ silent: true }).catch(() => { });
+});
+
+inputNexSmsServiceCode?.addEventListener('input', () => {
+ markSettingsDirty(true);
+ scheduleSettingsAutoSave();
+});
+inputNexSmsServiceCode?.addEventListener('blur', () => {
+ inputNexSmsServiceCode.value = normalizeNexSmsServiceCodeValue(inputNexSmsServiceCode.value);
+ updateHeroSmsPlatformDisplay();
+ saveSettings({ silent: true }).catch(() => { });
+});
+
inputHeroSmsReuseEnabled?.addEventListener('change', () => {
markSettingsDirty(true);
saveSettings({ silent: true }).catch(() => { });
@@ -7844,14 +10828,46 @@ selectHeroSmsAcquirePriority?.addEventListener('change', () => {
markSettingsDirty(true);
saveSettings({ silent: true }).catch(() => { });
});
+selectHeroSmsPreferredActivation?.addEventListener('change', () => {
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+});
inputHeroSmsMaxPrice?.addEventListener('input', () => {
markSettingsDirty(true);
- scheduleSettingsAutoSave();
});
inputHeroSmsMaxPrice?.addEventListener('blur', () => {
inputHeroSmsMaxPrice.value = normalizeHeroSmsMaxPriceValue(inputHeroSmsMaxPrice.value);
saveSettings({ silent: true }).catch(() => { });
});
+inputHeroSmsPreferredPrice?.addEventListener('input', () => {
+ markSettingsDirty(true);
+ scheduleSettingsAutoSave();
+});
+inputHeroSmsPreferredPrice?.addEventListener('blur', () => {
+ inputHeroSmsPreferredPrice.value = normalizeHeroSmsMaxPriceValue(inputHeroSmsPreferredPrice.value);
+ saveSettings({ silent: true }).catch(() => { });
+});
+
+selectFiveSimCountry?.addEventListener('change', () => {
+ syncFiveSimCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: true,
+ });
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+});
+
+selectNexSmsCountry?.addEventListener('change', () => {
+ syncNexSmsCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: true,
+ });
+ updateHeroSmsPlatformDisplay();
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+});
btnHeroSmsPricePreview?.addEventListener('click', async () => {
try {
@@ -7933,23 +10949,23 @@ inputPhoneCodePollMaxRounds?.addEventListener('blur', () => {
saveSettings({ silent: true }).catch(() => { });
});
selectHeroSmsCountry?.addEventListener('change', () => {
- const selectedCountries = syncHeroSmsFallbackSelectionOrderFromSelect({
+ syncHeroSmsFallbackSelectionOrderFromSelect({
enforceMax: true,
- ensureDefault: true,
+ ensureDefault: false,
showLimitToast: true,
});
- updateHeroSmsPlatformDisplay(selectedCountries[0]?.label || DEFAULT_HERO_SMS_COUNTRY_LABEL);
+ updateHeroSmsPlatformDisplay();
markSettingsDirty(true);
saveSettings({ silent: true }).catch(() => { });
});
selectHeroSmsCountryFallback?.addEventListener('change', () => {
- const selectedCountries = syncHeroSmsFallbackSelectionOrderFromSelect({
+ syncHeroSmsFallbackSelectionOrderFromSelect({
enforceMax: true,
- ensureDefault: true,
+ ensureDefault: false,
showLimitToast: true,
});
- updateHeroSmsPlatformDisplay(selectedCountries[0]?.label || DEFAULT_HERO_SMS_COUNTRY_LABEL);
+ updateHeroSmsPlatformDisplay();
markSettingsDirty(true);
saveSettings({ silent: true }).catch(() => { });
});
@@ -7964,21 +10980,111 @@ btnHeroSmsCountryClear?.addEventListener('click', () => {
if (!selectHeroSmsCountry) {
return;
}
- Array.from(selectHeroSmsCountry.options).forEach((option, index) => {
- option.selected = index === 0;
+ Array.from(selectHeroSmsCountry.options).forEach((option) => {
+ option.selected = false;
});
heroSmsCountryMenuSearchKeyword = '';
- const selectedCountries = syncHeroSmsFallbackSelectionOrderFromSelect({
+ syncHeroSmsFallbackSelectionOrderFromSelect({
enforceMax: true,
- ensureDefault: true,
+ ensureDefault: false,
showLimitToast: false,
});
- updateHeroSmsPlatformDisplay(selectedCountries[0]?.label || DEFAULT_HERO_SMS_COUNTRY_LABEL);
+ updateHeroSmsPlatformDisplay();
setHeroSmsCountryMenuOpen(false);
markSettingsDirty(true);
saveSettings({ silent: true }).catch(() => { });
if (typeof showToast === 'function') {
- showToast('已清空国家优先级并恢复默认国家。', 'info', 1800);
+ showToast('已清空国家优先级。', 'info', 1800);
+ }
+});
+
+btnFiveSimCountryMenu?.addEventListener('click', (event) => {
+ event.preventDefault();
+ const nextOpen = btnFiveSimCountryMenu.getAttribute('aria-expanded') !== 'true';
+ setFiveSimCountryMenuOpen(nextOpen);
+});
+
+btnFiveSimCountryClear?.addEventListener('click', () => {
+ if (!selectFiveSimCountry) {
+ return;
+ }
+ Array.from(selectFiveSimCountry.options).forEach((option) => {
+ option.selected = false;
+ });
+ fiveSimCountryMenuSearchKeyword = '';
+ syncFiveSimCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+ setFiveSimCountryMenuOpen(false);
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+ if (typeof showToast === 'function') {
+ showToast('已清空国家优先级。', 'info', 1800);
+ }
+});
+
+btnNexSmsCountryMenu?.addEventListener('click', (event) => {
+ event.preventDefault();
+ const nextOpen = btnNexSmsCountryMenu.getAttribute('aria-expanded') !== 'true';
+ setNexSmsCountryMenuOpen(nextOpen);
+});
+
+btnNexSmsCountryClear?.addEventListener('click', () => {
+ if (!selectNexSmsCountry) {
+ return;
+ }
+ Array.from(selectNexSmsCountry.options).forEach((option) => {
+ option.selected = false;
+ });
+ nexSmsCountryMenuSearchKeyword = '';
+ syncNexSmsCountrySelectionOrderFromSelect({
+ enforceMax: true,
+ ensureDefault: false,
+ showLimitToast: false,
+ });
+ updateHeroSmsPlatformDisplay();
+ setNexSmsCountryMenuOpen(false);
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+ if (typeof showToast === 'function') {
+ showToast('已清空国家优先级。', 'info', 1800);
+ }
+});
+
+btnPhoneSmsProviderOrderMenu?.addEventListener('click', (event) => {
+ event.preventDefault();
+ const nextOpen = btnPhoneSmsProviderOrderMenu.getAttribute('aria-expanded') !== 'true';
+ setPhoneSmsProviderOrderMenuOpen(nextOpen);
+});
+
+selectPhoneSmsProviderOrder?.addEventListener('change', () => {
+ const nextOrder = syncPhoneSmsProviderOrderFromSelect({
+ ensureDefault: false,
+ enforceMax: true,
+ syncProvider: false,
+ showLimitToast: true,
+ });
+ updatePhoneVerificationSettingsUI();
+ updateHeroSmsPlatformDisplay();
+ updatePhoneSmsProviderOrderSummary(nextOrder);
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+});
+
+btnPhoneSmsProviderOrderReset?.addEventListener('click', () => {
+ const nextOrder = clearPhoneSmsProviderOrderSelection({
+ syncProvider: false,
+ });
+ setPhoneSmsProviderOrderMenuOpen(false);
+ updatePhoneVerificationSettingsUI();
+ updateHeroSmsPlatformDisplay();
+ updatePhoneSmsProviderOrderSummary(nextOrder);
+ markSettingsDirty(true);
+ saveSettings({ silent: true }).catch(() => { });
+ if (typeof showToast === 'function') {
+ showToast('已清空服务商顺序。', 'info', 1800);
}
});
@@ -8146,6 +11252,8 @@ chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
|| message.payload.ipProxyAppliedExitDetecting !== undefined
|| message.payload.ipProxyAppliedExitError !== undefined
|| message.payload.ipProxyAppliedExitSource !== undefined
+ || message.payload.ipProxyAutoSyncEnabled !== undefined
+ || message.payload.ipProxyAutoSyncIntervalMinutes !== undefined
) {
const hasIpProxyConfigPayload = (
message.payload.ipProxyService !== undefined
@@ -8189,6 +11297,15 @@ chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
if (message.payload.ipProxyEnabled !== undefined) {
setIpProxyEnabled(Boolean(message.payload.ipProxyEnabled));
}
+ if (message.payload.ipProxyAutoSyncEnabled !== undefined && inputIpProxyAutoSyncEnabled) {
+ inputIpProxyAutoSyncEnabled.checked = Boolean(message.payload.ipProxyAutoSyncEnabled);
+ }
+ if (message.payload.ipProxyAutoSyncIntervalMinutes !== undefined && inputIpProxyAutoSyncIntervalMinutes) {
+ const numeric = Number.parseInt(String(message.payload.ipProxyAutoSyncIntervalMinutes ?? '').trim(), 10);
+ inputIpProxyAutoSyncIntervalMinutes.value = String(
+ Number.isFinite(numeric) ? Math.max(1, Math.min(1440, numeric)) : 15
+ );
+ }
if (message.payload.ipProxyApiUrl !== undefined && inputIpProxyApiUrl) {
inputIpProxyApiUrl.value = String(message.payload.ipProxyApiUrl || '').trim();
}
@@ -8371,7 +11488,7 @@ chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
if (message.payload.autoStepDelaySeconds !== undefined) {
inputAutoStepDelaySeconds.value = formatAutoStepDelayInputValue(message.payload.autoStepDelaySeconds);
}
- if (message.payload.oauthFlowTimeoutEnabled !== undefined && inputOAuthFlowTimeoutEnabled) {
+ if (message.payload.oauthFlowTimeoutEnabled !== undefined && typeof inputOAuthFlowTimeoutEnabled !== 'undefined' && inputOAuthFlowTimeoutEnabled) {
inputOAuthFlowTimeoutEnabled.checked = Boolean(message.payload.oauthFlowTimeoutEnabled);
}
if (
@@ -8395,16 +11512,44 @@ chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
if (message.payload.heroSmsApiKey !== undefined && inputHeroSmsApiKey) {
inputHeroSmsApiKey.value = message.payload.heroSmsApiKey || '';
}
+ if (message.payload.fiveSimApiKey !== undefined && inputFiveSimApiKey) {
+ inputFiveSimApiKey.value = String(message.payload.fiveSimApiKey || '').trim();
+ }
+ if (message.payload.nexSmsApiKey !== undefined && inputNexSmsApiKey) {
+ inputNexSmsApiKey.value = String(message.payload.nexSmsApiKey || '').trim();
+ }
+ if (message.payload.fiveSimCountryOrder !== undefined && typeof applyFiveSimCountrySelection === 'function') {
+ applyFiveSimCountrySelection(
+ Array.isArray(message.payload.fiveSimCountryOrder) ? message.payload.fiveSimCountryOrder : []
+ );
+ }
+ if (message.payload.nexSmsCountryOrder !== undefined && typeof applyNexSmsCountrySelection === 'function') {
+ applyNexSmsCountrySelection(
+ Array.isArray(message.payload.nexSmsCountryOrder) ? message.payload.nexSmsCountryOrder : []
+ );
+ }
+ if (message.payload.fiveSimOperator !== undefined && inputFiveSimOperator) {
+ inputFiveSimOperator.value = normalizeFiveSimOperatorValue(message.payload.fiveSimOperator);
+ }
+ if (message.payload.fiveSimProduct !== undefined && inputFiveSimProduct) {
+ inputFiveSimProduct.value = normalizeFiveSimProductValue(message.payload.fiveSimProduct);
+ }
+ if (message.payload.nexSmsServiceCode !== undefined && inputNexSmsServiceCode) {
+ inputNexSmsServiceCode.value = normalizeNexSmsServiceCodeValue(message.payload.nexSmsServiceCode);
+ }
if (message.payload.heroSmsReuseEnabled !== undefined && inputHeroSmsReuseEnabled) {
inputHeroSmsReuseEnabled.checked = normalizeHeroSmsReuseEnabledValue(message.payload.heroSmsReuseEnabled);
}
if (message.payload.heroSmsAcquirePriority !== undefined && selectHeroSmsAcquirePriority) {
selectHeroSmsAcquirePriority.value = normalizeHeroSmsAcquirePriority(message.payload.heroSmsAcquirePriority);
}
- if (message.payload.heroSmsMaxPrice !== undefined && inputHeroSmsMaxPrice) {
+ if (message.payload.heroSmsMaxPrice !== undefined && typeof inputHeroSmsMaxPrice !== 'undefined' && inputHeroSmsMaxPrice) {
inputHeroSmsMaxPrice.value = normalizeHeroSmsMaxPriceValue(message.payload.heroSmsMaxPrice);
}
- if (message.payload.phoneVerificationReplacementLimit !== undefined && inputPhoneReplacementLimit) {
+ if (message.payload.heroSmsPreferredPrice !== undefined && typeof inputHeroSmsPreferredPrice !== 'undefined' && inputHeroSmsPreferredPrice) {
+ inputHeroSmsPreferredPrice.value = normalizeHeroSmsMaxPriceValue(message.payload.heroSmsPreferredPrice);
+ }
+ if (message.payload.phoneVerificationReplacementLimit !== undefined && typeof inputPhoneReplacementLimit !== 'undefined' && inputPhoneReplacementLimit) {
inputPhoneReplacementLimit.value = String(
normalizePhoneVerificationReplacementLimit(
message.payload.phoneVerificationReplacementLimit,
@@ -8435,20 +11580,74 @@ chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
normalizePhoneCodePollMaxRoundsValue(message.payload.phoneCodePollMaxRounds, DEFAULT_PHONE_CODE_POLL_MAX_ROUNDS)
);
}
+ if (
+ message.payload.phoneSmsProvider !== undefined
+ || message.payload.phoneSmsProviderOrder !== undefined
+ ) {
+ const nextOrder = applyPhoneSmsProviderOrderSelection(
+ message.payload.phoneSmsProviderOrder !== undefined
+ ? message.payload.phoneSmsProviderOrder
+ : (Array.isArray(latestState?.phoneSmsProviderOrder)
+ ? latestState.phoneSmsProviderOrder
+ : []),
+ { ensureDefault: false, syncProvider: false }
+ );
+ if (selectPhoneSmsProvider) {
+ selectPhoneSmsProvider.value = normalizePhoneSmsProviderValue(
+ message.payload.phoneSmsProvider !== undefined
+ ? message.payload.phoneSmsProvider
+ : latestState?.phoneSmsProvider
+ );
+ }
+ updatePhoneSmsProviderOrderSummary(nextOrder);
+ updatePhoneVerificationSettingsUI();
+ }
if (message.payload.phoneVerificationEnabled !== undefined && inputPhoneVerificationEnabled) {
inputPhoneVerificationEnabled.checked = Boolean(message.payload.phoneVerificationEnabled);
updatePhoneVerificationSettingsUI();
}
- if (
+ const activePhoneSmsProvider = normalizePhoneSmsProviderValue(
+ message.payload.phoneSmsProvider !== undefined
+ ? message.payload.phoneSmsProvider
+ : latestState?.phoneSmsProvider
+ );
+ if (activePhoneSmsProvider === PHONE_SMS_PROVIDER_FIVE_SIM) {
+ if (
+ message.payload.fiveSimCountryOrder !== undefined
+ || message.payload.phoneSmsProvider !== undefined
+ || message.payload.phoneSmsProviderOrder !== undefined
+ ) {
+ applyFiveSimCountrySelection(
+ message.payload.fiveSimCountryOrder !== undefined
+ ? message.payload.fiveSimCountryOrder
+ : (Array.isArray(latestState?.fiveSimCountryOrder) ? latestState.fiveSimCountryOrder : [])
+ );
+ }
+ } else if (activePhoneSmsProvider === PHONE_SMS_PROVIDER_NEXSMS) {
+ if (
+ message.payload.nexSmsCountryOrder !== undefined
+ || message.payload.phoneSmsProvider !== undefined
+ || message.payload.phoneSmsProviderOrder !== undefined
+ ) {
+ applyNexSmsCountrySelection(
+ message.payload.nexSmsCountryOrder !== undefined
+ ? message.payload.nexSmsCountryOrder
+ : (Array.isArray(latestState?.nexSmsCountryOrder) ? latestState.nexSmsCountryOrder : [])
+ );
+ }
+ } else if (
message.payload.heroSmsCountryId !== undefined
|| message.payload.heroSmsCountryLabel !== undefined
|| message.payload.heroSmsCountryFallback !== undefined
+ || message.payload.phoneSmsProvider !== undefined
+ || message.payload.phoneSmsProviderOrder !== undefined
) {
const nextPrimary = {
id: normalizeHeroSmsCountryId(
message.payload.heroSmsCountryId !== undefined
? message.payload.heroSmsCountryId
- : latestState?.heroSmsCountryId
+ : latestState?.heroSmsCountryId,
+ 0
),
label: normalizeHeroSmsCountryLabel(
message.payload.heroSmsCountryLabel !== undefined
@@ -8461,19 +11660,35 @@ chrome.runtime.onMessage.addListener((message, _sender, sendResponse) => {
? message.payload.heroSmsCountryFallback
: latestState?.heroSmsCountryFallback
);
+ const nextPrimaryCountries = Number(nextPrimary.id) > 0 ? [nextPrimary] : [];
applyHeroSmsFallbackSelection(
- [nextPrimary, ...nextFallback],
+ [...nextPrimaryCountries, ...nextFallback],
{ includePrimary: true }
);
- updateHeroSmsPlatformDisplay(getSelectedHeroSmsCountryOption().label);
+ }
+ if (
+ message.payload.phoneSmsProvider !== undefined
+ || message.payload.phoneSmsProviderOrder !== undefined
+ || message.payload.fiveSimProduct !== undefined
+ || message.payload.nexSmsServiceCode !== undefined
+ ) {
+ updateHeroSmsPlatformDisplay();
}
if (
message.payload.currentPhoneActivation !== undefined
+ || message.payload.reusablePhoneActivation !== undefined
+ || message.payload.phoneReusableActivationPool !== undefined
+ || message.payload.phonePreferredActivation !== undefined
|| message.payload.currentPhoneVerificationCode !== undefined
+ || message.payload.currentPhoneVerificationCountdownEndsAt !== undefined
+ || message.payload.currentPhoneVerificationCountdownWindowIndex !== undefined
+ || message.payload.currentPhoneVerificationCountdownWindowTotal !== undefined
|| message.payload.heroSmsLastPriceTiers !== undefined
|| message.payload.heroSmsLastPriceCountryId !== undefined
|| message.payload.heroSmsLastPriceCountryLabel !== undefined
|| message.payload.heroSmsLastPriceUserLimit !== undefined
+ || message.payload.phoneSmsProvider !== undefined
+ || message.payload.phoneSmsProviderOrder !== undefined
) {
updateHeroSmsRuntimeDisplay({
...latestState,
@@ -8549,6 +11764,9 @@ btnTheme.addEventListener('click', () => {
document.addEventListener('click', (event) => {
const clickedInsideConfigMenu = Boolean(configMenuShell?.contains(event.target));
const clickedInsideCountryMenu = Boolean(heroSmsCountryMenuShell?.contains(event.target));
+ const clickedInsideFiveSimCountryMenu = Boolean(fiveSimCountryMenuShell?.contains(event.target));
+ const clickedInsideNexSmsCountryMenu = Boolean(nexSmsCountryMenuShell?.contains(event.target));
+ const clickedInsideProviderOrderMenu = Boolean(phoneSmsProviderOrderMenuShell?.contains(event.target));
if (configMenuOpen && !clickedInsideConfigMenu) {
closeConfigMenu();
@@ -8558,6 +11776,18 @@ document.addEventListener('click', (event) => {
if (countryMenuOpen && !clickedInsideCountryMenu) {
setHeroSmsCountryMenuOpen(false);
}
+ const fiveSimCountryMenuOpen = btnFiveSimCountryMenu?.getAttribute('aria-expanded') === 'true';
+ if (fiveSimCountryMenuOpen && !clickedInsideFiveSimCountryMenu) {
+ setFiveSimCountryMenuOpen(false);
+ }
+ const nexSmsCountryMenuOpen = btnNexSmsCountryMenu?.getAttribute('aria-expanded') === 'true';
+ if (nexSmsCountryMenuOpen && !clickedInsideNexSmsCountryMenu) {
+ setNexSmsCountryMenuOpen(false);
+ }
+ const providerOrderMenuOpen = btnPhoneSmsProviderOrderMenu?.getAttribute('aria-expanded') === 'true';
+ if (providerOrderMenuOpen && !clickedInsideProviderOrderMenu) {
+ setPhoneSmsProviderOrderMenuOpen(false);
+ }
});
document.addEventListener('keydown', (event) => {
@@ -8570,6 +11800,15 @@ document.addEventListener('keydown', (event) => {
if (btnHeroSmsCountryMenu?.getAttribute('aria-expanded') === 'true') {
setHeroSmsCountryMenuOpen(false);
}
+ if (btnFiveSimCountryMenu?.getAttribute('aria-expanded') === 'true') {
+ setFiveSimCountryMenuOpen(false);
+ }
+ if (btnNexSmsCountryMenu?.getAttribute('aria-expanded') === 'true') {
+ setNexSmsCountryMenuOpen(false);
+ }
+ if (btnPhoneSmsProviderOrderMenu?.getAttribute('aria-expanded') === 'true') {
+ setPhoneSmsProviderOrderMenuOpen(false);
+ }
});
window.addEventListener('resize', () => {
@@ -8593,6 +11832,7 @@ if (typeof initIpProxySectionExpandedState === 'function') {
initIpProxySectionExpandedState();
}
initPhoneVerificationSectionExpandedState();
+applyPhoneSmsProviderOrderSelection([], { ensureDefault: false, syncProvider: false });
updateSaveButtonState();
updateConfigMenuControls();
setLocalCpaStep9Mode(DEFAULT_LOCAL_CPA_STEP9_MODE);
@@ -8600,9 +11840,23 @@ setMail2925Mode(DEFAULT_MAIL_2925_MODE);
initializeReleaseInfo().catch((err) => {
console.error('Failed to initialize release info:', err);
});
-loadHeroSmsCountries().catch((err) => {
- console.error('Failed to load HeroSMS countries:', err);
-}).finally(() => {
+Promise.allSettled([
+ loadHeroSmsCountries(),
+ loadFiveSimCountries(),
+ loadNexSmsCountries({ silent: true }),
+]).then((results) => {
+ const heroResult = results[0];
+ const fiveSimResult = results[1];
+ const nexSmsResult = results[2];
+ if (heroResult?.status === 'rejected') {
+ console.error('Failed to load HeroSMS countries:', heroResult.reason);
+ }
+ if (fiveSimResult?.status === 'rejected') {
+ console.error('Failed to load 5sim countries:', fiveSimResult.reason);
+ }
+ if (nexSmsResult?.status === 'rejected') {
+ console.error('Failed to load NexSMS countries:', nexSmsResult.reason);
+ }
return restoreState().then(() => {
syncPasswordToggleLabel();
syncVpsUrlToggleLabel();
diff --git a/tests/auth-page-recovery.test.js b/tests/auth-page-recovery.test.js
index b48287d..d70dc68 100644
--- a/tests/auth-page-recovery.test.js
+++ b/tests/auth-page-recovery.test.js
@@ -42,7 +42,7 @@ function createRecoveryApi(state) {
isActionEnabled: (element) => Boolean(element) && !element.disabled && element.getAttribute('aria-disabled') !== 'true',
isVisibleElement: () => true,
log: () => {},
- routeErrorPattern: /405\s+method\s+not\s+allowed|route\s+error.*405/i,
+ routeErrorPattern: /405\s+method\s+not\s+allowed|route\s+error.*405|did\s+not\s+provide\s+an?\s+[`'"]?action|post\s+request\s+to\s+["']?\/email-verification/i,
simulateClick: () => {
state.clickCount += 1;
if (typeof state.onClick === 'function') {
@@ -103,6 +103,42 @@ test('auth page recovery detects route error retry page on email verification ro
assert.equal(snapshot.routeErrorMatched, true);
});
+test('auth page recovery detects email route missing-action retry page text', () => {
+ const state = {
+ clickCount: 0,
+ pageText: "Error: You made a POST request to \"/email-verification\" but did not provide an `action` for route \"EMAIL_VERIFICATION\"",
+ pathname: '/email-verification',
+ retryVisible: true,
+ title: '',
+ };
+ const api = createRecoveryApi(state);
+
+ const snapshot = api.getAuthTimeoutErrorPageState({
+ pathPatterns: [/\/email-verification(?:[/?#]|$)/i],
+ });
+
+ assert.equal(Boolean(snapshot), true);
+ assert.equal(snapshot.routeErrorMatched, true);
+});
+
+test('auth page recovery detects failed-to-fetch retry page on email verification route', () => {
+ const state = {
+ clickCount: 0,
+ pageText: 'Oops, an error occurred! Failed to fetch',
+ pathname: '/email-verification',
+ retryVisible: true,
+ title: 'Oops, an error occurred!',
+ };
+ const api = createRecoveryApi(state);
+
+ const snapshot = api.getAuthTimeoutErrorPageState({
+ pathPatterns: [/\/email-verification(?:[/?#]|$)/i],
+ });
+
+ assert.equal(Boolean(snapshot), true);
+ assert.equal(snapshot.fetchFailedMatched, true);
+});
+
test('auth page recovery clicks retry and waits until page recovers', async () => {
const state = {
clickCount: 0,
@@ -225,4 +261,3 @@ test('auth page recovery throws signup user already exists error without clickin
assert.equal(state.clickCount, 0);
});
-
diff --git a/tests/auto-run-add-phone-stop.test.js b/tests/auto-run-add-phone-stop.test.js
index d425121..7e644f5 100644
--- a/tests/auto-run-add-phone-stop.test.js
+++ b/tests/auto-run-add-phone-stop.test.js
@@ -169,6 +169,327 @@ test('auto-run controller skips add-phone failures to the next round instead of
assert.equal(runtime.state.autoRunSessionId, 0);
});
+test('auto-run controller treats phone-number supply exhaustion as round-fatal and skips same-round retries', async () => {
+ const events = {
+ logs: [],
+ broadcasts: [],
+ accountRecords: [],
+ runCalls: 0,
+ };
+
+ let currentState = {
+ stepStatuses: {},
+ vpsUrl: 'https://example.com/vps',
+ vpsPassword: 'secret',
+ customPassword: '',
+ autoRunSkipFailures: true,
+ autoRunFallbackThreadIntervalMinutes: 0,
+ autoRunDelayEnabled: false,
+ autoRunDelayMinutes: 30,
+ autoStepDelaySeconds: null,
+ mailProvider: '163',
+ emailGenerator: 'duck',
+ gmailBaseEmail: '',
+ mail2925BaseEmail: '',
+ emailPrefix: 'demo',
+ inbucketHost: '',
+ inbucketMailbox: '',
+ cloudflareDomain: '',
+ cloudflareDomains: [],
+ tabRegistry: {},
+ sourceLastUrls: {},
+ autoRunRoundSummaries: [],
+ };
+
+ const runtime = {
+ state: {
+ autoRunActive: false,
+ autoRunCurrentRun: 0,
+ autoRunTotalRuns: 1,
+ autoRunAttemptRun: 0,
+ autoRunSessionId: 0,
+ },
+ get() {
+ return { ...this.state };
+ },
+ set(updates = {}) {
+ this.state = { ...this.state, ...updates };
+ },
+ };
+
+ let sessionSeed = 0;
+
+ const controller = api.createAutoRunController({
+ addLog: async (message, level = 'info') => {
+ events.logs.push({ message, level });
+ },
+ appendAccountRunRecord: async (status, _state, reason) => {
+ events.accountRecords.push({ status, reason });
+ return { status, reason };
+ },
+ AUTO_RUN_MAX_RETRIES_PER_ROUND: 3,
+ AUTO_RUN_RETRY_DELAY_MS: 3000,
+ AUTO_RUN_TIMER_KIND_BEFORE_RETRY: 'before_retry',
+ AUTO_RUN_TIMER_KIND_BETWEEN_ROUNDS: 'between_rounds',
+ broadcastAutoRunStatus: async (phase, payload = {}) => {
+ events.broadcasts.push({ phase, ...payload });
+ currentState = {
+ ...currentState,
+ autoRunning: ['scheduled', 'running', 'waiting_step', 'waiting_email', 'retrying', 'waiting_interval'].includes(phase),
+ autoRunPhase: phase,
+ autoRunCurrentRun: payload.currentRun ?? runtime.state.autoRunCurrentRun,
+ autoRunTotalRuns: payload.totalRuns ?? runtime.state.autoRunTotalRuns,
+ autoRunAttemptRun: payload.attemptRun ?? runtime.state.autoRunAttemptRun,
+ autoRunSessionId: payload.sessionId ?? runtime.state.autoRunSessionId,
+ };
+ },
+ broadcastStopToContentScripts: async () => {},
+ cancelPendingCommands: () => {},
+ clearStopRequest: () => {},
+ createAutoRunSessionId: () => {
+ sessionSeed += 1;
+ return sessionSeed;
+ },
+ getAutoRunStatusPayload: (phase, payload = {}) => ({
+ autoRunning: ['scheduled', 'running', 'waiting_step', 'waiting_email', 'retrying', 'waiting_interval'].includes(phase),
+ autoRunPhase: phase,
+ autoRunCurrentRun: payload.currentRun ?? 0,
+ autoRunTotalRuns: payload.totalRuns ?? 1,
+ autoRunAttemptRun: payload.attemptRun ?? 0,
+ autoRunSessionId: payload.sessionId ?? 0,
+ }),
+ getErrorMessage: (error) => error?.message || String(error || ''),
+ getFirstUnfinishedStep: () => 1,
+ getPendingAutoRunTimerPlan: () => null,
+ getRunningSteps: () => [],
+ getState: async () => ({
+ ...currentState,
+ stepStatuses: { ...(currentState.stepStatuses || {}) },
+ tabRegistry: { ...(currentState.tabRegistry || {}) },
+ sourceLastUrls: { ...(currentState.sourceLastUrls || {}) },
+ }),
+ getStopRequested: () => false,
+ hasSavedProgress: () => false,
+ isAddPhoneAuthFailure: () => false,
+ isRestartCurrentAttemptError: () => false,
+ isStopError: (error) => (error?.message || String(error || '')) === '流程已被用户停止。',
+ launchAutoRunTimerPlan: async () => false,
+ normalizeAutoRunFallbackThreadIntervalMinutes: (value) => Math.max(0, Math.floor(Number(value) || 0)),
+ persistAutoRunTimerPlan: async () => ({}),
+ resetState: async () => {
+ currentState = {
+ ...currentState,
+ stepStatuses: {},
+ tabRegistry: {},
+ sourceLastUrls: {},
+ };
+ },
+ runAutoSequenceFromStep: async () => {
+ events.runCalls += 1;
+ if (events.runCalls === 1) {
+ throw new Error('HeroSMS no numbers available across 1 country candidate(s): Thailand: NO_NUMBERS.');
+ }
+ },
+ runtime,
+ setState: async (updates = {}) => {
+ currentState = {
+ ...currentState,
+ ...updates,
+ stepStatuses: updates.stepStatuses ? { ...updates.stepStatuses } : currentState.stepStatuses,
+ tabRegistry: updates.tabRegistry ? { ...updates.tabRegistry } : currentState.tabRegistry,
+ sourceLastUrls: updates.sourceLastUrls ? { ...updates.sourceLastUrls } : currentState.sourceLastUrls,
+ };
+ },
+ sleepWithStop: async () => {},
+ throwIfAutoRunSessionStopped: (sessionId) => {
+ if (sessionId && sessionId !== runtime.state.autoRunSessionId) {
+ throw new Error('流程已被用户停止。');
+ }
+ },
+ waitForRunningStepsToFinish: async () => currentState,
+ chrome: {
+ runtime: {
+ sendMessage() {
+ return Promise.resolve();
+ },
+ },
+ },
+ });
+
+ await controller.autoRunLoop(2, {
+ autoRunSkipFailures: true,
+ mode: 'restart',
+ });
+
+ assert.equal(events.runCalls, 2, 'number supply failure should fail current round and continue next round');
+ assert.equal(events.broadcasts.some(({ phase }) => phase === 'retrying'), false, 'number supply failure should not enter same-round retrying phase');
+ assert.equal(events.accountRecords.length, 1, 'number supply failure should persist one failed round record');
+ assert.equal(events.accountRecords[0].status, 'failed');
+ assert.match(events.accountRecords[0].reason, /NO_NUMBERS/i);
+ assert.ok(events.logs.some(({ message }) => /接码号池/.test(message)));
+ assert.equal(events.broadcasts.some(({ phase }) => phase === 'stopped'), false);
+ assert.equal(runtime.state.autoRunActive, false);
+ assert.equal(runtime.state.autoRunSessionId, 0);
+});
+
+test('auto-run controller keeps same-round retrying for step9 local replacement exhaustion errors', async () => {
+ const events = {
+ logs: [],
+ broadcasts: [],
+ accountRecords: [],
+ runCalls: 0,
+ };
+
+ let currentState = {
+ stepStatuses: {},
+ vpsUrl: 'https://example.com/vps',
+ vpsPassword: 'secret',
+ customPassword: '',
+ autoRunSkipFailures: true,
+ autoRunFallbackThreadIntervalMinutes: 0,
+ autoRunDelayEnabled: false,
+ autoRunDelayMinutes: 30,
+ autoStepDelaySeconds: null,
+ mailProvider: '163',
+ emailGenerator: 'duck',
+ gmailBaseEmail: '',
+ mail2925BaseEmail: '',
+ emailPrefix: 'demo',
+ inbucketHost: '',
+ inbucketMailbox: '',
+ cloudflareDomain: '',
+ cloudflareDomains: [],
+ tabRegistry: {},
+ sourceLastUrls: {},
+ autoRunRoundSummaries: [],
+ };
+
+ const runtime = {
+ state: {
+ autoRunActive: false,
+ autoRunCurrentRun: 0,
+ autoRunTotalRuns: 1,
+ autoRunAttemptRun: 0,
+ autoRunSessionId: 0,
+ },
+ get() {
+ return { ...this.state };
+ },
+ set(updates = {}) {
+ this.state = { ...this.state, ...updates };
+ },
+ };
+
+ let sessionSeed = 0;
+
+ const controller = api.createAutoRunController({
+ addLog: async (message, level = 'info') => {
+ events.logs.push({ message, level });
+ },
+ appendAccountRunRecord: async (status, _state, reason) => {
+ events.accountRecords.push({ status, reason });
+ return { status, reason };
+ },
+ AUTO_RUN_MAX_RETRIES_PER_ROUND: 3,
+ AUTO_RUN_RETRY_DELAY_MS: 3000,
+ AUTO_RUN_TIMER_KIND_BEFORE_RETRY: 'before_retry',
+ AUTO_RUN_TIMER_KIND_BETWEEN_ROUNDS: 'between_rounds',
+ broadcastAutoRunStatus: async (phase, payload = {}) => {
+ events.broadcasts.push({ phase, ...payload });
+ currentState = {
+ ...currentState,
+ autoRunning: ['scheduled', 'running', 'waiting_step', 'waiting_email', 'retrying', 'waiting_interval'].includes(phase),
+ autoRunPhase: phase,
+ autoRunCurrentRun: payload.currentRun ?? runtime.state.autoRunCurrentRun,
+ autoRunTotalRuns: payload.totalRuns ?? runtime.state.autoRunTotalRuns,
+ autoRunAttemptRun: payload.attemptRun ?? runtime.state.autoRunAttemptRun,
+ autoRunSessionId: payload.sessionId ?? runtime.state.autoRunSessionId,
+ };
+ },
+ broadcastStopToContentScripts: async () => {},
+ cancelPendingCommands: () => {},
+ clearStopRequest: () => {},
+ createAutoRunSessionId: () => {
+ sessionSeed += 1;
+ return sessionSeed;
+ },
+ getAutoRunStatusPayload: (phase, payload = {}) => ({
+ autoRunning: ['scheduled', 'running', 'waiting_step', 'waiting_email', 'retrying', 'waiting_interval'].includes(phase),
+ autoRunPhase: phase,
+ autoRunCurrentRun: payload.currentRun ?? 0,
+ autoRunTotalRuns: payload.totalRuns ?? 1,
+ autoRunAttemptRun: payload.attemptRun ?? 0,
+ autoRunSessionId: payload.sessionId ?? 0,
+ }),
+ getErrorMessage: (error) => error?.message || String(error || ''),
+ getFirstUnfinishedStep: () => 1,
+ getPendingAutoRunTimerPlan: () => null,
+ getRunningSteps: () => [],
+ getState: async () => ({
+ ...currentState,
+ stepStatuses: { ...(currentState.stepStatuses || {}) },
+ tabRegistry: { ...(currentState.tabRegistry || {}) },
+ sourceLastUrls: { ...(currentState.sourceLastUrls || {}) },
+ }),
+ getStopRequested: () => false,
+ hasSavedProgress: () => false,
+ isAddPhoneAuthFailure: () => false,
+ isRestartCurrentAttemptError: () => false,
+ isStopError: (error) => (error?.message || String(error || '')) === '流程已被用户停止。',
+ launchAutoRunTimerPlan: async () => false,
+ normalizeAutoRunFallbackThreadIntervalMinutes: (value) => Math.max(0, Math.floor(Number(value) || 0)),
+ persistAutoRunTimerPlan: async () => ({}),
+ resetState: async () => {
+ currentState = {
+ ...currentState,
+ stepStatuses: {},
+ tabRegistry: {},
+ sourceLastUrls: {},
+ };
+ },
+ runAutoSequenceFromStep: async () => {
+ events.runCalls += 1;
+ if (events.runCalls === 1) {
+ throw new Error('Step 9: phone verification did not succeed after 3 number replacements. Last reason: sms_timeout_after_2_windows.');
+ }
+ },
+ runtime,
+ setState: async (updates = {}) => {
+ currentState = {
+ ...currentState,
+ ...updates,
+ stepStatuses: updates.stepStatuses ? { ...updates.stepStatuses } : currentState.stepStatuses,
+ tabRegistry: updates.tabRegistry ? { ...updates.tabRegistry } : currentState.tabRegistry,
+ sourceLastUrls: updates.sourceLastUrls ? { ...updates.sourceLastUrls } : currentState.sourceLastUrls,
+ };
+ },
+ sleepWithStop: async () => {},
+ throwIfAutoRunSessionStopped: (sessionId) => {
+ if (sessionId && sessionId !== runtime.state.autoRunSessionId) {
+ throw new Error('流程已被用户停止。');
+ }
+ },
+ waitForRunningStepsToFinish: async () => currentState,
+ chrome: {
+ runtime: {
+ sendMessage() {
+ return Promise.resolve();
+ },
+ },
+ },
+ });
+
+ await controller.autoRunLoop(1, {
+ autoRunSkipFailures: true,
+ mode: 'restart',
+ });
+
+ assert.equal(events.runCalls, 2, 'step9 local replacement exhaustion should retry in same round before success');
+ assert.equal(events.broadcasts.some(({ phase }) => phase === 'retrying'), true, 'should enter retrying phase for same-round retry');
+ assert.equal(events.logs.some(({ message }) => /接码号池/.test(message)), false, 'should not be misclassified as global phone supply exhaustion');
+ assert.equal(events.accountRecords.length, 0, 'eventual same-round success should not persist failed round record');
+});
+
test('auto-run controller skips user_already_exists failures to the next round instead of retrying the same round', async () => {
const events = {
logs: [],
diff --git a/tests/auto-run-step6-restart.test.js b/tests/auto-run-step6-restart.test.js
index 82d98ca..71fee0e 100644
--- a/tests/auto-run-step6-restart.test.js
+++ b/tests/auto-run-step6-restart.test.js
@@ -67,6 +67,7 @@ function createHarness(options = {}) {
failureBudget = 1,
failureMessage = '认证失败: Request failed with status code 502',
authState = { state: 'password_page', url: 'https://auth.openai.com/log-in' },
+ customState = {},
} = options;
return new Function(`
@@ -97,8 +98,30 @@ async function getState() {
return {
stepStatuses: { 3: 'completed' },
mailProvider: '163',
+ ...${JSON.stringify(customState)},
};
}
+function getStepIdsForState() {
+ return [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+}
+function getStepDefinitionForState(step) {
+ const map = {
+ 1: { key: 'open-signup' },
+ 2: { key: 'prepare-email' },
+ 3: { key: 'fill-password' },
+ 4: { key: 'verify-email' },
+ 5: { key: 'profile-basic' },
+ 6: { key: 'profile-finish' },
+ 7: { key: 'auth-login' },
+ 8: { key: 'auth-email-code' },
+ 9: { key: 'confirm-oauth' },
+ 10: { key: 'platform-verify' },
+ };
+ return map[Number(step)] || null;
+}
+function getStepExecutionKeyForState(step, state = {}) {
+ return String(getStepDefinitionForState(step, state)?.key || '').trim();
+}
function isStopError(error) {
return (error?.message || String(error || '')) === '流程已被用户停止。';
}
@@ -246,3 +269,31 @@ test('auto-run stop errors after step 7 are rethrown immediately instead of rest
assert.deepStrictEqual(result.events.steps, [7, 8, 9]);
assert.ok(!result.events.logs.some(({ message }) => /回到步骤 7 重新开始授权流程/.test(message)));
});
+
+test('auto-run restarts from confirm-oauth step after transient step10 token_exchange_user_error', async () => {
+ const harness = createHarness({
+ failureStep: 10,
+ failureBudget: 1,
+ failureMessage: 'token exchange failed: status 400, body: { "error": { "message": "Invalid request. Please try again later.", "type": "invalid_request_error", "param": null, "code": "token_exchange_user_error" } }',
+ authState: { state: 'oauth_consent_page', url: 'https://auth.openai.com/sign-in-with-chatgpt/codex/consent' },
+ customState: {
+ panelMode: 'sub2api',
+ stepStatuses: { 3: 'completed' },
+ stepsVersion: 'ultra2.0',
+ visibleStep: 10,
+ contributionMode: false,
+ },
+ });
+
+ const events = await harness.run();
+
+ assert.deepStrictEqual(events.steps, [7, 8, 9, 10, 9, 10]);
+ assert.equal(events.invalidations.length, 1);
+ assert.deepStrictEqual(events.invalidations[0], {
+ step: 8,
+ options: {
+ logLabel: '步骤 10 报错后准备回到步骤 9 重试（第 1 次重开）',
+ },
+ });
+ assert.ok(events.logs.some(({ message }) => /回到步骤 9 重新开始授权流程/.test(message)));
+});
diff --git a/tests/background-account-history-settings.test.js b/tests/background-account-history-settings.test.js
index 8734d4a..91ff971 100644
--- a/tests/background-account-history-settings.test.js
+++ b/tests/background-account-history-settings.test.js
@@ -54,6 +54,12 @@ test('background account history settings are normalized independently from hotm
extractFunction('normalizeHotmailLocalBaseUrl'),
extractFunction('normalizeAccountRunHistoryHelperBaseUrl'),
extractFunction('normalizeVerificationResendCount'),
+ extractFunction('normalizePhoneSmsProvider'),
+ extractFunction('normalizePhoneSmsProviderOrder'),
+ extractFunction('normalizeFiveSimCountryCode'),
+ extractFunction('normalizeFiveSimCountryOrder'),
+ extractFunction('normalizeNexSmsCountryId'),
+ extractFunction('normalizeNexSmsCountryOrder'),
extractFunction('normalizePhoneVerificationReplacementLimit'),
extractFunction('normalizePhoneCodeWaitSeconds'),
extractFunction('normalizePhoneCodeTimeoutWindows'),
@@ -136,6 +142,7 @@ return {
assert.equal(api.normalizePersistentSettingValue('phoneCodePollMaxRounds', '18'), 18);
assert.equal(api.normalizePersistentSettingValue('heroSmsMaxPrice', '0.123456'), '0.1235');
assert.equal(api.normalizePersistentSettingValue('heroSmsMaxPrice', '0'), '');
+ assert.equal(api.normalizePersistentSettingValue('heroSmsCountryId', 0), 0);
assert.deepStrictEqual(
api.normalizePersistentSettingValue('heroSmsCountryFallback', [{ id: 16, label: 'United Kingdom' }, { id: 52 }]),
[{ id: 16, label: 'United Kingdom' }, { id: 52, label: 'Country #52' }]
@@ -172,4 +179,16 @@ return {
api.normalizePersistentSettingValue('codex2apiAdminKey', ' secret-key '),
'secret-key'
);
+ assert.deepStrictEqual(
+ api.normalizePersistentSettingValue('phoneSmsProviderOrder', []),
+ []
+ );
+ assert.deepStrictEqual(
+ api.normalizePersistentSettingValue('fiveSimCountryOrder', []),
+ []
+ );
+ assert.deepStrictEqual(
+ api.normalizePersistentSettingValue('nexSmsCountryOrder', []),
+ []
+ );
});
diff --git a/tests/background-auth-chain-guard.test.js b/tests/background-auth-chain-guard.test.js
index 9f251d2..f79d2f1 100644
--- a/tests/background-auth-chain-guard.test.js
+++ b/tests/background-auth-chain-guard.test.js
@@ -392,3 +392,97 @@ return {
}]);
assert.match(events.logs[0].message, /授权后链总超时已关闭/);
});
+
+test('executeStep retries fetch-network errors for step 4 with cooldown and bounded attempts', async () => {
+ const api = new Function(`
+const LOG_PREFIX = '[test]';
+const STOP_ERROR_MESSAGE = '流程已被用户停止。';
+const BROWSER_SWITCH_REQUIRED_ERROR_PREFIX = 'BROWSER_SWITCH_REQUIRED::';
+const AUTH_CHAIN_STEP_IDS = new Set([7, 8, 9, 10]);
+const STEP_FETCH_NETWORK_RETRY_POLICIES = new Map([[4, { maxAttempts: 3, cooldownMs: 1 }]]);
+let activeTopLevelAuthChainExecution = null;
+let stopRequested = false;
+const events = {
+ logs: [],
+ statusCalls: [],
+ registryCalls: [],
+ sleepCalls: [],
+};
+let runCount = 0;
+
+async function addLog(message, level = 'info') {
+ events.logs.push({ message, level });
+}
+async function setStepStatus(step, status) {
+ events.statusCalls.push({ step, status });
+}
+async function humanStepDelay() {}
+async function getState() {
+ return {
+ flowStartTime: null,
+ stepStatuses: {},
+ };
+}
+function getErrorMessage(error) {
+ return error?.message || String(error || '');
+}
+async function appendManualAccountRunRecordIfNeeded() {}
+function isTerminalSecurityBlockedError() {
+ return false;
+}
+async function handleCloudflareSecurityBlocked() {}
+function doesStepUseCompletionSignal() {
+ return false;
+}
+async function sleepWithStop(ms) {
+ events.sleepCalls.push(ms);
+}
+const stepRegistry = {
+ getStepDefinition(step) {
+ return { id: step, key: 'fetch-signup-code' };
+ },
+ async executeStep(step) {
+ events.registryCalls.push(step);
+ runCount += 1;
+ if (runCount < 3) {
+ throw new TypeError('Failed to fetch');
+ }
+ },
+};
+function getStepRegistryForState() {
+ return stepRegistry;
+}
+function getStepDefinitionForState(step) {
+ return { id: step, key: 'fetch-signup-code' };
+}
+
+${extractFunction('isStopError')}
+${extractFunction('isRetryableContentScriptTransportError')}
+${extractFunction('isStepFetchNetworkRetryableError')}
+${extractFunction('getStepFetchNetworkRetryPolicy')}
+${extractFunction('throwIfStopped')}
+${extractFunction('isAuthChainStep')}
+${extractFunction('acquireTopLevelAuthChainExecution')}
+${extractFunction('isBrowserSwitchRequiredError')}
+${extractFunction('getBrowserSwitchRequiredMessage')}
+${extractFunction('handleBrowserSwitchRequired')}
+${extractFunction('executeStep')}
+
+return {
+ executeStep,
+ snapshot() {
+ return events;
+ },
+};
+`)();
+
+ await api.executeStep(4);
+
+ const events = api.snapshot();
+ assert.deepStrictEqual(events.registryCalls, [4, 4, 4]);
+ assert.deepStrictEqual(events.sleepCalls, [1, 1]);
+ assert.equal(
+ events.logs.filter(({ message }) => message.includes('[NETWORK_FETCH_RETRY]')).length >= 3,
+ true
+ );
+});
diff --git a/tests/background-icloud-login-help.test.js b/tests/background-icloud-login-help.test.js
index f2eeb2e..488cb1d 100644
--- a/tests/background-icloud-login-help.test.js
+++ b/tests/background-icloud-login-help.test.js
@@ -19,8 +19,8 @@ test('icloud login helper distinguishes auth-required errors from transient cont
assert.match(
source,
- /if \(isIcloudTransientContextError\(err\)\) \{[\s\S]*iCloud 别名加载受网络\/上下文波动影响，请稍后重试。/m,
- 'withIcloudLoginHelp should surface transient-context copy instead of forcing login prompt'
+ /if \(isIcloudTransientContextError\(err\)\) \{[\s\S]*safeActionLabel[\s\S]*iCloud：\$\{safeActionLabel\}受网络\/上下文波动影响，请稍后重试。/m,
+ 'withIcloudLoginHelp should surface action-scoped transient-context copy instead of forcing login prompt'
);
assert.match(
diff --git a/tests/background-ip-proxy-core.test.js b/tests/background-ip-proxy-core.test.js
index b43627b..755bc52 100644
--- a/tests/background-ip-proxy-core.test.js
+++ b/tests/background-ip-proxy-core.test.js
@@ -30,6 +30,7 @@ ${providerSource}
const transformIpProxyAccountEntryByProvider = self.transformIpProxyAccountEntryByProvider;
${coreSource}
return {
+ applyExitRegionExpectation,
buildIpProxyPacScript,
getAccountModeProxyPoolFromState,
normalizeIpProxyAccountList,
@@ -133,3 +134,30 @@ test('IP proxy auto-switch threshold is clamped to the supported range', () => {
assert.equal(api.resolveIpProxyAutoSwitchThreshold({ ipProxyPoolTargetCount: '25' }), 25);
assert.equal(api.resolveIpProxyAutoSwitchThreshold({ ipProxyPoolTargetCount: '9999' }), 500);
});
+
+test('711 proxy region mismatch with missing auth challenge keeps routing as warning instead of hard failure', () => {
+ const api = loadIpProxyCore();
+
+ const status = api.applyExitRegionExpectation({
+ applied: true,
+ reason: 'applied',
+ provider: '711proxy',
+ hasAuth: true,
+ username: 'USER047152-zone-custom-region-US',
+ entrySource: 'fixed_account',
+ exitIp: '1.2.3.4',
+ exitRegion: 'BR',
+ authDiagnostics: 'auth(challenge=0,provided=0,isProxy=n/a,status=0,host=unknown)',
+ error: '',
+ warning: '',
+ }, 'US');
+
+ assert.equal(status.applied, true);
+ assert.equal(status.reason, 'applied_with_warning');
+ assert.equal(status.error, '');
+ assert.match(
+ String(status.warning || ''),
+ /地区校验未通过且未触发代理鉴权挑战，疑似匿名链路；先保留代理接管并给出强告警/
+ );
+ assert.match(String(status.warning || ''), /期望 US，实际 BR/);
+});
diff --git a/tests/background-platform-verify-codex2api.test.js b/tests/background-platform-verify-codex2api.test.js
index 44c8bcc..bf230a5 100644
--- a/tests/background-platform-verify-codex2api.test.js
+++ b/tests/background-platform-verify-codex2api.test.js
@@ -79,3 +79,120 @@ test('platform verify module supports codex2api protocol callback exchange', asy
globalThis.fetch = originalFetch;
}
});
+
+test('platform verify retries transient SUB2API oauth/token exchange errors before failing', async () => {
+ const source = fs.readFileSync('background/steps/platform-verify.js', 'utf8');
+ const api = new Function('self', `${source}; return self.MultiPageBackgroundStep10;`)({});
+
+ const logs = [];
+ const attempts = [];
+ let callCount = 0;
+ const executor = api.createStep10Executor({
+ addLog: async (message, level = 'info') => {
+ logs.push({ message, level });
+ },
+ chrome: {
+ tabs: {
+ update: async () => {},
+ },
+ },
+ closeConflictingTabsForSource: async () => {},
+ completeStepFromBackground: async () => {},
+ ensureContentScriptReadyOnTab: async () => {},
+ getPanelMode: () => 'sub2api',
+ getTabId: async () => 12,
+ isLocalhostOAuthCallbackUrl: (value) => String(value || '').includes('/auth/callback?code='),
+ isTabAlive: async () => true,
+ normalizeCodex2ApiUrl: (value) => value,
+ normalizeSub2ApiUrl: () => 'https://sub2api.example.com/admin/accounts',
+ rememberSourceLastUrl: async () => {},
+ reuseOrCreateTab: async () => 12,
+ sendToContentScript: async (_source, message) => {
+ attempts.push(message.type);
+ callCount += 1;
+ if (callCount === 1) {
+ return {
+ error: 'request failed: Post "https://auth.openai.com/oauth/token": unexpected EOF',
+ };
+ }
+ return { ok: true };
+ },
+ sendToContentScriptResilient: async () => ({}),
+ shouldBypassStep9ForLocalCpa: () => false,
+ SUB2API_STEP9_RESPONSE_TIMEOUT_MS: 120000,
+ });
+
+ await executor.executeStep10({
+ panelMode: 'sub2api',
+ localhostUrl: 'http://localhost:1455/auth/callback?code=callback-code&state=oauth-state',
+ sub2apiUrl: 'https://sub2api.example.com/admin/accounts',
+ sub2apiEmail: 'flow@example.com',
+ sub2apiPassword: 'secret',
+ sub2apiSessionId: 'session-123',
+ sub2apiOAuthState: 'oauth-state',
+ });
+
+ assert.equal(callCount, 2);
+ assert.deepStrictEqual(attempts, ['EXECUTE_STEP', 'EXECUTE_STEP']);
+ assert.equal(
+ logs.some((entry) => /临时网络波动/.test(entry.message) && entry.level === 'warn'),
+ true
+ );
+});
+
+test('platform verify retries transient SUB2API token_exchange_user_error before succeeding', async () => {
+ const source = fs.readFileSync('background/steps/platform-verify.js', 'utf8');
+ const api = new Function('self', `${source}; return self.MultiPageBackgroundStep10;`)({});
+
+ const logs = [];
+ let callCount = 0;
+ const executor = api.createStep10Executor({
+ addLog: async (message, level = 'info') => {
+ logs.push({ message, level });
+ },
+ chrome: {
+ tabs: {
+ update: async () => {},
+ },
+ },
+ closeConflictingTabsForSource: async () => {},
+ completeStepFromBackground: async () => {},
+ ensureContentScriptReadyOnTab: async () => {},
+ getPanelMode: () => 'sub2api',
+ getTabId: async () => 12,
+ isLocalhostOAuthCallbackUrl: (value) => String(value || '').includes('/auth/callback?code='),
+ isTabAlive: async () => true,
+ normalizeCodex2ApiUrl: (value) => value,
+ normalizeSub2ApiUrl: () => 'https://sub2api.example.com/admin/accounts',
+ rememberSourceLastUrl: async () => {},
+ reuseOrCreateTab: async () => 12,
+ sendToContentScript: async () => {
+ callCount += 1;
+ if (callCount === 1) {
+ return {
+ error: 'token exchange failed: status 400, body: { "error": { "message": "Invalid request. Please try again later.", "type": "invalid_request_error", "param": null, "code": "token_exchange_user_error" } }',
+ };
+ }
+ return { ok: true };
+ },
+ sendToContentScriptResilient: async () => ({}),
+ shouldBypassStep9ForLocalCpa: () => false,
+ SUB2API_STEP9_RESPONSE_TIMEOUT_MS: 120000,
+ });
+
+ await executor.executeStep10({
+ panelMode: 'sub2api',
+ localhostUrl: 'http://localhost:1455/auth/callback?code=callback-code&state=oauth-state',
+ sub2apiUrl: 'https://sub2api.example.com/admin/accounts',
+ sub2apiEmail: 'flow@example.com',
+ sub2apiPassword: 'secret',
+ sub2apiSessionId: 'session-123',
+ sub2apiOAuthState: 'oauth-state',
+ });
+
+ assert.equal(callCount, 2);
+ assert.equal(
+ logs.some((entry) => /临时网络波动/.test(entry.message) && entry.level === 'warn'),
+ true
+ );
+});
diff --git a/tests/background-step4-filter-window.test.js b/tests/background-step4-filter-window.test.js
index 6c4a389..a4a619a 100644
--- a/tests/background-step4-filter-window.test.js
+++ b/tests/background-step4-filter-window.test.js
@@ -45,7 +45,9 @@ test('step 4 passes a fixed 10-minute lookback window to 2925 mailbox polling',
reuseOrCreateTab: async (source, url) => {
tabReuses.push({ source, url });
},
+ sendToContentScript: async () => ({}),
sendToContentScriptResilient: async () => ({}),
+ isRetryableContentScriptTransportError: () => false,
shouldUseCustomRegistrationEmail: () => false,
STANDARD_MAIL_VERIFICATION_RESEND_INTERVAL_MS: 25000,
throwIfStopped: () => {},
@@ -100,7 +102,9 @@ test('step 4 does not request a fresh code first for Cloudflare temp mail', asyn
capturedOptions = options;
},
reuseOrCreateTab: async () => {},
+ sendToContentScript: async () => ({}),
sendToContentScriptResilient: async () => ({}),
+ isRetryableContentScriptTransportError: () => false,
shouldUseCustomRegistrationEmail: () => false,
STANDARD_MAIL_VERIFICATION_RESEND_INTERVAL_MS: 25000,
throwIfStopped: () => {},
@@ -151,7 +155,9 @@ test('step 4 checks iCloud session before polling iCloud mailbox', async () => {
resolved = true;
},
reuseOrCreateTab: async () => {},
+ sendToContentScript: async () => ({}),
sendToContentScriptResilient: async () => ({}),
+ isRetryableContentScriptTransportError: () => false,
shouldUseCustomRegistrationEmail: () => false,
STANDARD_MAIL_VERIFICATION_RESEND_INTERVAL_MS: 25000,
throwIfStopped: () => {},
@@ -197,10 +203,15 @@ test('step 4 forwards skipProfileStep when prepare stage already reached logged-
resolveCalls += 1;
},
reuseOrCreateTab: async () => {},
+ sendToContentScript: async () => ({
+ alreadyVerified: true,
+ skipProfileStep: true,
+ }),
sendToContentScriptResilient: async () => ({
alreadyVerified: true,
skipProfileStep: true,
}),
+ isRetryableContentScriptTransportError: () => false,
shouldUseCustomRegistrationEmail: () => false,
STANDARD_MAIL_VERIFICATION_RESEND_INTERVAL_MS: 25000,
throwIfStopped: () => {},
@@ -219,3 +230,73 @@ test('step 4 forwards skipProfileStep when prepare stage already reached logged-
]);
assert.equal(resolveCalls, 0);
});
+
+test('step 4 prepare retries transport by recovering retry page without replaying full prepare loop', async () => {
+ let sendToContentScriptCalls = 0;
+ let recoverCalls = 0;
+ let resolveCalls = 0;
+ const logs = [];
+
+ const executor = api.createStep4Executor({
+ addLog: async (message, level) => {
+ logs.push({ message, level: level || 'info' });
+ },
+ chrome: {
+ tabs: {
+ update: async () => {},
+ },
+ },
+ completeStepFromBackground: async () => {},
+ confirmCustomVerificationStepBypass: async () => {},
+ ensureMail2925MailboxSession: async () => {},
+ getMailConfig: () => ({
+ provider: '163',
+ label: '163 邮箱',
+ source: 'mail-163',
+ url: 'https://mail.163.com',
+ }),
+ getTabId: async () => 1,
+ HOTMAIL_PROVIDER: 'hotmail-api',
+ isTabAlive: async () => true,
+ LUCKMAIL_PROVIDER: 'luckmail-api',
+ CLOUDFLARE_TEMP_EMAIL_PROVIDER: 'cloudflare-temp-email',
+ resolveVerificationStep: async () => {
+ resolveCalls += 1;
+ },
+ reuseOrCreateTab: async () => {},
+ sendToContentScript: async (_source, message) => {
+ if (message.type !== 'PREPARE_SIGNUP_VERIFICATION') {
+ return {};
+ }
+ sendToContentScriptCalls += 1;
+ if (sendToContentScriptCalls === 1) {
+ throw new Error('Content script on signup-page did not respond in 30s. Try refreshing the tab and retry.');
+ }
+ return { ready: true };
+ },
+ sendToContentScriptResilient: async (_source, message) => {
+ if (message.type === 'RECOVER_AUTH_RETRY_PAGE') {
+ recoverCalls += 1;
+ return { recovered: true };
+ }
+ return {};
+ },
+ isRetryableContentScriptTransportError: (error) => /did not respond in \d+s/i.test(String(error?.message || error)),
+ shouldUseCustomRegistrationEmail: () => false,
+ STANDARD_MAIL_VERIFICATION_RESEND_INTERVAL_MS: 25000,
+ throwIfStopped: () => {},
+ });
+
+ await executor.executeStep4({
+ email: 'user@example.com',
+ password: 'secret',
+ });
+
+ assert.equal(sendToContentScriptCalls, 2);
+ assert.equal(recoverCalls, 1);
+ assert.equal(resolveCalls, 1);
+ assert.equal(
+ logs.some((entry) => /正在确认注册验证码页面是否就绪/.test(entry.message)),
+ true
+ );
+});
diff --git a/tests/icloud-mail-content.test.js b/tests/icloud-mail-content.test.js
index 269776b..29fecf4 100644
--- a/tests/icloud-mail-content.test.js
+++ b/tests/icloud-mail-content.test.js
@@ -193,3 +193,104 @@ return {
assert.equal(api.isThreadItemSelected(staleItem, api.buildItemSignature(selectedItem)), true);
assert.equal(api.isThreadItemSelected(staleItem, api.buildItemSignature(staleItem)), false);
});
+
+test('icloud poll session baseline is reused across calls and enables fallback after carry-over attempts', async () => {
+ const bundle = [
+ extractFunction('normalizeText'),
+ extractFunction('getThreadItemMetadata'),
+ extractFunction('buildItemSignature'),
+ extractFunction('extractVerificationCode'),
+ extractFunction('normalizePollSessionKey'),
+ extractFunction('getOrCreatePollSessionBaseline'),
+ extractFunction('persistPollSessionBaseline'),
+ extractFunction('handlePollEmail'),
+ ].join('\n');
+
+ const api = new Function(`
+const ICLOUD_POLL_SESSION_CACHE = new Map();
+function log() {}
+function throwIfStopped() {}
+async function sleep() {}
+async function waitForElement() { return true; }
+async function refreshInbox() { return true; }
+function normalizeThreadEntry(entry) {
+ return {
+ signature: String(entry.signature || ''),
+ sender: String(entry.sender || ''),
+ subject: String(entry.subject || ''),
+ preview: String(entry.preview || ''),
+ timestamp: String(entry.timestamp || ''),
+ ariaLabel: String(entry.ariaLabel || ''),
+ };
+}
+let currentThreadData = [];
+function setThreadData(next) {
+ currentThreadData = Array.isArray(next) ? next.map(normalizeThreadEntry) : [];
+}
+function collectThreadItems() {
+ return currentThreadData.map((entry) => ({
+ getAttribute(name) {
+ if (name === 'aria-label') return entry.ariaLabel || entry.signature;
+ return '';
+ },
+ querySelector(selector) {
+ if (selector === '.thread-participants') return { textContent: entry.sender };
+ if (selector === '.thread-subject') return { textContent: entry.subject };
+ if (selector === '.thread-preview') return { textContent: entry.preview };
+ if (selector === '.thread-timestamp') return { textContent: entry.timestamp };
+ return null;
+ },
+ }));
+}
+async function openMailItemAndRead(item) {
+ const meta = getThreadItemMetadata(item);
+ return {
+ sender: meta.sender,
+ recipients: '',
+ timestamp: meta.timestamp,
+ bodyText: meta.preview,
+ combinedText: meta.combinedText,
+ };
+}
+${bundle}
+return {
+ handlePollEmail,
+ setThreadData,
+};
+`)();
+
+ api.setThreadData([
+ { signature: 'old-1', sender: 'OpenAI', subject: '旧邮件', preview: 'no code', timestamp: '10:00', ariaLabel: 'old-1' },
+ ]);
+
+ await assert.rejects(
+ () => api.handlePollEmail(8, {
+ senderFilters: ['openai'],
+ subjectFilters: ['code'],
+ maxAttempts: 1,
+ intervalMs: 10,
+ excludeCodes: [],
+ sessionKey: 's-1',
+ }),
+ /仍未在 iCloud 邮箱中找到新的匹配邮件/
+ );
+
+ api.setThreadData([
+ { signature: 'old-1', sender: 'OpenAI', subject: '旧邮件', preview: 'no code', timestamp: '10:00', ariaLabel: 'old-1' },
+ { signature: 'old-2', sender: 'OpenAI', subject: '旧邮件2', preview: 'no code', timestamp: '10:01', ariaLabel: 'old-2' },
+ { signature: 'old-3', sender: 'OpenAI', subject: '旧邮件3', preview: 'no code', timestamp: '10:02', ariaLabel: 'old-3' },
+ { signature: 'old-4', sender: 'OpenAI', subject: '旧邮件4', preview: 'no code', timestamp: '10:03', ariaLabel: 'old-4' },
+ { signature: 'old-code', sender: 'OpenAI', subject: 'ChatGPT Log-in Code', preview: 'enter this code 556677', timestamp: '10:04', ariaLabel: 'old-code' },
+ ]);
+
+ const result = await api.handlePollEmail(8, {
+ senderFilters: ['openai'],
+ subjectFilters: ['code', 'login'],
+ maxAttempts: 1,
+ intervalMs: 10,
+ excludeCodes: [],
+ sessionKey: 's-1',
+ });
+
+ assert.equal(result.code, '556677');
+});
diff --git a/tests/phone-auth-country-match.test.js b/tests/phone-auth-country-match.test.js
index eeb115a..b9f73a5 100644
--- a/tests/phone-auth-country-match.test.js
+++ b/tests/phone-auth-country-match.test.js
@@ -6,19 +6,27 @@ const source = fs.readFileSync('content/phone-auth.js', 'utf8');
const globalScope = { navigator: { language: 'zh-CN' } };
const api = new Function('self', `${source}; return self.MultiPagePhoneAuth;`)(globalScope);
-function createFakeAddPhoneDom() {
+function createFakeAddPhoneDom(config = {}) {
const selectEvents = [];
const hiddenInputEvents = [];
let submitClicked = false;
- const options = [
- { value: 'US', textContent: '美国' },
- { value: 'TH', textContent: '泰国' },
- ];
+ const options = (
+ Array.isArray(config.options) && config.options.length
+ ? config.options
+ : [
+ { value: 'US', textContent: '美国', buttonText: '美国 (+1)' },
+ { value: 'TH', textContent: '泰国', buttonText: '泰国 (+66)' },
+ ]
+ ).map((entry) => ({
+ value: String(entry?.value || '').trim(),
+ textContent: String(entry?.textContent || '').trim(),
+ buttonText: String(entry?.buttonText || entry?.textContent || '').trim(),
+ }));
const select = {
options,
- selectedIndex: 0,
+ selectedIndex: Math.max(0, Math.min(options.length - 1, Number(config.selectedIndex) || 0)),
dispatchEvent(event) {
selectEvents.push(event?.type || '');
return true;
@@ -58,7 +66,7 @@ function createFakeAddPhoneDom() {
const selectValueNode = {
get textContent() {
- return select.value === 'TH' ? '泰国 (+66)' : '美国 (+1)';
+ return options[select.selectedIndex]?.buttonText || '';
},
};
@@ -199,3 +207,244 @@ test('phone auth matches english HeroSMS country labels against localized add-ph
Intl.DisplayNames = OriginalDisplayNames;
}
});
+
+test('phone auth keeps explicit international number and auto-selects country by dial code when label lookup fails', async () => {
+ const originalDocument = global.document;
+ const originalEvent = global.Event;
+ const originalLocation = global.location;
+ const OriginalDisplayNames = Intl.DisplayNames;
+
+ const dom = createFakeAddPhoneDom({
+ options: [
+ { value: 'CO', textContent: 'Colombia (+57)', buttonText: 'Colombia (+57)' },
+ { value: 'GB', textContent: 'United Kingdom (+44)', buttonText: 'United Kingdom (+44)' },
+ ],
+ selectedIndex: 0,
+ });
+ let phoneVerificationReady = false;
+
+ global.document = dom.document;
+ global.Event = class Event {
+ constructor(type) {
+ this.type = type;
+ }
+ };
+ global.location = { href: 'https://auth.openai.com/add-phone' };
+ Intl.DisplayNames = class DisplayNames {
+ of(regionCode) {
+ return regionCode;
+ }
+ };
+
+ try {
+ const helpers = api.createPhoneAuthHelpers({
+ fillInput: (element, value) => {
+ element.value = value;
+ },
+ getActionText: () => '',
+ getPageTextSnapshot: () => '',
+ getVerificationErrorText: () => '',
+ humanPause: async () => {},
+ isActionEnabled: () => true,
+ isAddPhonePageReady: () => true,
+ isConsentReady: () => false,
+ isPhoneVerificationPageReady: () => phoneVerificationReady,
+ isVisibleElement: () => true,
+ simulateClick: (element) => {
+ element.click?.();
+ phoneVerificationReady = true;
+ global.location.href = 'https://auth.openai.com/phone-verification';
+ },
+ sleep: async () => {},
+ throwIfStopped: () => {},
+ waitForElement: async () => null,
+ });
+
+ const result = await helpers.submitPhoneNumber({
+ countryLabel: 'Country #16',
+ phoneNumber: '+447999221823',
+ });
+
+ assert.equal(dom.select.value, 'GB');
+ assert.equal(dom.phoneInput.value, '7999221823');
+ assert.equal(dom.hiddenPhoneInput.value, '+447999221823');
+ assert.equal(dom.wasSubmitClicked(), true);
+ assert.deepStrictEqual(result, {
+ phoneVerificationPage: true,
+ displayedPhone: '',
+ url: 'https://auth.openai.com/phone-verification',
+ });
+ } finally {
+ global.document = originalDocument;
+ global.Event = originalEvent;
+ global.location = originalLocation;
+ Intl.DisplayNames = OriginalDisplayNames;
+ }
+});
+
+test('phone auth can auto-select country by dial code even when number has no plus prefix', async () => {
+ const originalDocument = global.document;
+ const originalEvent = global.Event;
+ const originalLocation = global.location;
+ const OriginalDisplayNames = Intl.DisplayNames;
+
+ const dom = createFakeAddPhoneDom({
+ options: [
+ { value: 'CO', textContent: 'Colombia (+57)', buttonText: 'Colombia (+57)' },
+ { value: 'GB', textContent: 'United Kingdom (+44)', buttonText: 'United Kingdom (+44)' },
+ ],
+ selectedIndex: 0,
+ });
+ let phoneVerificationReady = false;
+
+ global.document = dom.document;
+ global.Event = class Event {
+ constructor(type) {
+ this.type = type;
+ }
+ };
+ global.location = { href: 'https://auth.openai.com/add-phone' };
+ Intl.DisplayNames = class DisplayNames {
+ of(regionCode) {
+ return regionCode;
+ }
+ };
+
+ try {
+ const helpers = api.createPhoneAuthHelpers({
+ fillInput: (element, value) => {
+ element.value = value;
+ },
+ getActionText: () => '',
+ getPageTextSnapshot: () => '',
+ getVerificationErrorText: () => '',
+ humanPause: async () => {},
+ isActionEnabled: () => true,
+ isAddPhonePageReady: () => true,
+ isConsentReady: () => false,
+ isPhoneVerificationPageReady: () => phoneVerificationReady,
+ isVisibleElement: () => true,
+ simulateClick: (element) => {
+ element.click?.();
+ phoneVerificationReady = true;
+ global.location.href = 'https://auth.openai.com/phone-verification';
+ },
+ sleep: async () => {},
+ throwIfStopped: () => {},
+ waitForElement: async () => null,
+ });
+
+ const result = await helpers.submitPhoneNumber({
+ countryLabel: 'Country #16',
+ phoneNumber: '447999221823',
+ });
+
+ assert.equal(dom.select.value, 'GB');
+ assert.equal(dom.phoneInput.value, '7999221823');
+ assert.equal(dom.hiddenPhoneInput.value, '+447999221823');
+ assert.equal(dom.wasSubmitClicked(), true);
+ assert.deepStrictEqual(result, {
+ phoneVerificationPage: true,
+ displayedPhone: '',
+ url: 'https://auth.openai.com/phone-verification',
+ });
+ } finally {
+ global.document = originalDocument;
+ global.Event = originalEvent;
+ global.location = originalLocation;
+ Intl.DisplayNames = OriginalDisplayNames;
+ }
+});
+
+test('phone auth resend stops with PHONE_ROUTE_405_RECOVERY_FAILED instead of endless Try-again loop', async () => {
+ const originalDocument = global.document;
+ const originalLocation = global.location;
+ const originalWindow = global.window;
+
+ let retryClicks = 0;
+ const fakeRetryButton = {
+ getAttribute(name) {
+ if (name === 'data-dd-action-name') return 'Try again';
+ return '';
+ },
+ click() {
+ retryClicks += 1;
+ },
+ textContent: 'Try again',
+ };
+ const fakeResendButton = {
+ getAttribute(name) {
+ if (name === 'value') return 'resend';
+ return '';
+ },
+ textContent: 'Resend text message',
+ };
+ const fakePhoneForm = {
+ querySelectorAll(selector) {
+ if (selector === 'button, input[type="submit"], input[type="button"]') {
+ return [fakeResendButton, fakeRetryButton];
+ }
+ return [];
+ },
+ };
+
+ global.document = {
+ title: 'Route Error',
+ querySelector(selector) {
+ if (selector === 'button[data-dd-action-name="Try again"]') {
+ return fakeRetryButton;
+ }
+ if (selector === 'form[action*="/phone-verification" i]') {
+ return fakePhoneForm;
+ }
+ return null;
+ },
+ querySelectorAll(selector) {
+ if (selector === 'button, [role="button"], input[type="submit"], input[type="button"]') {
+ return [fakeRetryButton, fakeResendButton];
+ }
+ return [];
+ },
+ };
+ global.location = {
+ href: 'https://auth.openai.com/phone-verification',
+ pathname: '/phone-verification',
+ };
+ global.window = global;
+
+ const helpers = api.createPhoneAuthHelpers({
+ fillInput: () => {},
+ getActionText: (element) => String(element?.textContent || ''),
+ getPageTextSnapshot: () => (
+ 'Route Error (405 Method Not Allowed): You made a POST request to "/phone-verification" but did not provide an action.'
+ ),
+ getVerificationErrorText: () => '',
+ humanPause: async () => {},
+ isActionEnabled: () => true,
+ isAddPhonePageReady: () => false,
+ isConsentReady: () => false,
+ isPhoneVerificationPageReady: () => true,
+ isVisibleElement: () => true,
+ simulateClick: (element) => {
+ element?.click?.();
+ },
+ sleep: async () => {},
+ throwIfStopped: () => {},
+ waitForElement: async () => null,
+ });
+
+ try {
+ await assert.rejects(
+ () => helpers.resendPhoneVerificationCode(4000),
+ /PHONE_ROUTE_405_RECOVERY_FAILED::/i
+ );
+ assert.ok(
+ retryClicks > 0 && retryClicks <= 6,
+ `expected bounded retry clicks (1..6), got ${retryClicks}`
+ );
+ } finally {
+ global.document = originalDocument;
+ global.location = originalLocation;
+ global.window = originalWindow;
+ }
+});
diff --git a/tests/phone-verification-flow.test.js b/tests/phone-verification-flow.test.js
index 2170fa3..35a1f70 100644
--- a/tests/phone-verification-flow.test.js
+++ b/tests/phone-verification-flow.test.js
@@ -449,6 +449,30 @@ test('phone verification helper retries acquisition rounds when at least one cou
);
});
+test('phone verification helper fails fast when HeroSMS country list is empty', async () => {
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async () => {
+ throw new Error('Unexpected fetch when no countries are configured.');
+ },
+ getState: async () => ({ heroSmsApiKey: 'demo-key', heroSmsCountryId: 0, heroSmsCountryFallback: [] }),
+ sendToContentScriptResilient: async () => ({}),
+ setState: async () => {},
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ await assert.rejects(
+ helpers.requestPhoneActivation({
+ heroSmsApiKey: 'demo-key',
+ heroSmsCountryId: 0,
+ heroSmsCountryFallback: [],
+ }),
+ /HeroSMS countries are empty/i
+ );
+});
+
test('phone verification helper uses HeroSMS getStatusV2 after acquiring a number via getNumberV2', async () => {
const requests = [];
const stateUpdates = [];
@@ -549,40 +573,22 @@ test('phone verification helper uses HeroSMS getStatusV2 after acquiring a numbe
assert.equal(Array.isArray(stateUpdates[0]?.heroSmsLastPriceTiers), true);
assert.equal(stateUpdates[0]?.heroSmsLastPriceCountryId, 16);
assert.equal(stateUpdates[0]?.heroSmsLastPriceCountryLabel, 'United Kingdom');
- assert.deepStrictEqual(stateUpdates.slice(1), [
- {
- currentPhoneActivation: {
- activationId: '654321',
- phoneNumber: '447911123456',
- provider: 'hero-sms',
- serviceCode: 'dr',
- countryId: 16,
- successfulUses: 0,
- maxUses: 3,
- statusAction: 'getStatusV2',
- },
- currentPhoneVerificationCode: '',
- },
- {
- currentPhoneVerificationCode: '112233',
- },
- {
- reusablePhoneActivation: {
- activationId: '654321',
- phoneNumber: '447911123456',
- provider: 'hero-sms',
- serviceCode: 'dr',
- countryId: 16,
- successfulUses: 1,
- maxUses: 3,
- statusAction: 'getStatusV2',
- },
- },
- {
- currentPhoneActivation: null,
- currentPhoneVerificationCode: '',
- },
- ]);
+ assert.equal(
+ stateUpdates.some((entry) => entry?.currentPhoneActivation?.activationId === '654321'),
+ true
+ );
+ assert.equal(
+ stateUpdates.some((entry) => entry?.currentPhoneVerificationCode === '112233'),
+ true
+ );
+ assert.equal(
+ stateUpdates.some((entry) => entry?.reusablePhoneActivation?.activationId === '654321'),
+ true
+ );
+ assert.equal(
+ stateUpdates.some((entry) => entry?.currentPhoneActivation === null && entry?.currentPhoneVerificationCode === ''),
+ true
+ );
const actions = requests.map((url) => url.searchParams.get('action'));
assert.deepStrictEqual(actions, [
'getPrices',
@@ -811,6 +817,688 @@ test('phone verification helper falls back to plain getNumber when priced reques
assert.equal(requests[2].searchParams.get('fixedPrice'), null);
});
+test('phone verification helper acquires a number from 5sim with fallback countries', async () => {
+ const requests = [];
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url, options = {}) => {
+ const parsedUrl = new URL(url);
+ requests.push({
+ pathname: parsedUrl.pathname,
+ search: parsedUrl.searchParams,
+ headers: options?.headers || {},
+ });
+ if (parsedUrl.pathname === '/v1/user/buy/activation/thailand/any/openai') {
+ return {
+ ok: false,
+ status: 400,
+ text: async () => JSON.stringify({ message: 'no free phones' }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/guest/prices') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ openai: {
+ thailand: {
+ any: {
+ cost: 0.08,
+ count: 12,
+ },
+ },
+ },
+ }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/buy/activation/england/any/openai') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ id: 9876543,
+ phone: '+447911123456',
+ country: 'england',
+ country_name: 'England',
+ product: 'openai',
+ }),
+ };
+ }
+ throw new Error(`Unexpected 5sim request: ${parsedUrl.pathname}`);
+ },
+ getState: async () => ({
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['thailand', 'england'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ heroSmsMaxPrice: '0.1',
+ heroSmsReuseEnabled: true,
+ heroSmsActivationRetryRounds: 1,
+ }),
+ sendToContentScriptResilient: async () => ({}),
+ setState: async () => {},
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const activation = await helpers.requestPhoneActivation({
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['thailand', 'england'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ heroSmsMaxPrice: '0.1',
+ heroSmsReuseEnabled: true,
+ heroSmsActivationRetryRounds: 1,
+ });
+
+ assert.deepStrictEqual(activation, {
+ activationId: '9876543',
+ phoneNumber: '+447911123456',
+ provider: '5sim',
+ serviceCode: 'openai',
+ countryId: 'england',
+ countryCode: 'england',
+ countryLabel: 'England',
+ successfulUses: 0,
+ maxUses: 3,
+ });
+ assert.equal(requests.length, 4);
+ assert.equal(requests[0].pathname, '/v1/guest/prices');
+ assert.equal(requests[0].search.get('country'), 'thailand');
+ assert.equal(requests[0].search.get('product'), 'openai');
+ assert.equal(requests[1].pathname, '/v1/user/buy/activation/thailand/any/openai');
+ assert.equal(requests[1].search.get('maxPrice'), '0.08');
+ assert.equal(requests[1].search.get('reuse'), '1');
+ assert.equal(requests[1].headers.Authorization, 'Bearer five-token');
+ assert.equal(requests[2].pathname, '/v1/guest/prices');
+ assert.equal(requests[2].search.get('country'), 'england');
+ assert.equal(requests[2].search.get('product'), 'openai');
+ assert.equal(requests[3].pathname, '/v1/user/buy/activation/england/any/openai');
+});
+
+test('phone verification helper honors price-priority ordering for 5sim countries', async () => {
+ const requests = [];
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl.pathname + parsedUrl.search);
+ if (parsedUrl.pathname === '/v1/guest/prices') {
+ const country = parsedUrl.searchParams.get('country');
+ if (country === 'thailand') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ openai: {
+ thailand: { any: { cost: 0.2, count: 20 } },
+ },
+ }),
+ };
+ }
+ if (country === 'england') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ openai: {
+ england: { any: { cost: 0.05, count: 8 } },
+ },
+ }),
+ };
+ }
+ }
+ if (parsedUrl.pathname === '/v1/user/buy/activation/england/any/openai') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ id: 900001,
+ phone: '+447900100200',
+ country: 'england',
+ country_name: 'England',
+ product: 'openai',
+ }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/buy/activation/thailand/any/openai') {
+ return {
+ ok: false,
+ status: 400,
+ text: async () => JSON.stringify({ message: 'no free phones' }),
+ };
+ }
+ throw new Error(`Unexpected 5sim request: ${parsedUrl.pathname}`);
+ },
+ getState: async () => ({
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['thailand', 'england'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ heroSmsAcquirePriority: 'price',
+ heroSmsActivationRetryRounds: 1,
+ }),
+ sendToContentScriptResilient: async () => ({}),
+ setState: async () => {},
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const activation = await helpers.requestPhoneActivation({
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['thailand', 'england'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ heroSmsAcquirePriority: 'price',
+ heroSmsActivationRetryRounds: 1,
+ });
+
+ assert.equal(activation.countryCode, 'england');
+ const firstBuyPath = requests.find((entry) => entry.includes('/v1/user/buy/activation'));
+ assert.equal(firstBuyPath?.startsWith('/v1/user/buy/activation/england/any/openai'), true);
+});
+
+test('phone verification helper tries multiple 5sim price tiers within the same country before fallback', async () => {
+ const requests = [];
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl.pathname + parsedUrl.search);
+ if (parsedUrl.pathname === '/v1/guest/prices') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ openai: {
+ thailand: {
+ any: {
+ low: { cost: 0.05, count: 3 },
+ mid: { cost: 0.08, count: 2 },
+ },
+ },
+ },
+ }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/buy/activation/thailand/any/openai') {
+ const maxPrice = parsedUrl.searchParams.get('maxPrice');
+ if (maxPrice === '0.05') {
+ return {
+ ok: false,
+ status: 400,
+ text: async () => JSON.stringify({ message: 'no free phones' }),
+ };
+ }
+ if (maxPrice === '0.08') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ id: 800001,
+ phone: '+66951112233',
+ country: 'thailand',
+ country_name: 'Thailand',
+ product: 'openai',
+ }),
+ };
+ }
+ }
+ throw new Error(`Unexpected 5sim request: ${parsedUrl.pathname}${parsedUrl.search}`);
+ },
+ getState: async () => ({
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['thailand'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ heroSmsMaxPrice: '0.1',
+ heroSmsActivationRetryRounds: 1,
+ }),
+ sendToContentScriptResilient: async () => ({}),
+ setState: async () => {},
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const activation = await helpers.requestPhoneActivation({
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['thailand'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ heroSmsMaxPrice: '0.1',
+ heroSmsActivationRetryRounds: 1,
+ });
+
+ assert.equal(activation.countryCode, 'thailand');
+ assert.equal(activation.phoneNumber, '+66951112233');
+ const buyRequests = requests.filter((entry) => entry.startsWith('/v1/user/buy/activation/thailand/any/openai'));
+ assert.equal(buyRequests.length, 2);
+ assert.equal(buyRequests[0].includes('maxPrice=0.05'), true);
+ assert.equal(buyRequests[1].includes('maxPrice=0.08'), true);
+});
+
+test('phone verification helper polls and parses 5sim verification codes', async () => {
+ let checkCount = 0;
+ const statusUpdates = [];
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ if (parsedUrl.pathname !== '/v1/user/check/600001') {
+ throw new Error(`Unexpected 5sim request: ${parsedUrl.pathname}`);
+ }
+ checkCount += 1;
+ if (checkCount === 1) {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({ status: 'PENDING', sms: [] }),
+ };
+ }
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ status: 'RECEIVED',
+ sms: [{ text: 'Your OpenAI code is 246810' }],
+ }),
+ };
+ },
+ getState: async () => ({
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['thailand'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ }),
+ sendToContentScriptResilient: async () => ({}),
+ setState: async () => {},
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const code = await helpers.pollPhoneActivationCode(
+ {
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['thailand'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ },
+ {
+ activationId: '600001',
+ phoneNumber: '+66900000000',
+ provider: '5sim',
+ serviceCode: 'openai',
+ countryId: 'thailand',
+ countryCode: 'thailand',
+ maxUses: 1,
+ successfulUses: 0,
+ },
+ {
+ timeoutMs: 5000,
+ intervalMs: 1,
+ maxRounds: 5,
+ onStatus: async (payload) => {
+ statusUpdates.push(payload.statusText);
+ },
+ }
+ );
+
+ assert.equal(code, '246810');
+ assert.equal(checkCount, 2);
+ assert.deepStrictEqual(statusUpdates, ['PENDING']);
+});
+
+test('phone verification helper treats HeroSMS STATUS_WAIT_RETRY payload status as pending', async () => {
+ let pollCount = 0;
+ const statusUpdates = [];
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ const action = parsedUrl.searchParams.get('action');
+ if (action === 'getStatus') {
+ pollCount += 1;
+ if (pollCount === 1) {
+ return {
+ ok: true,
+ text: async () => 'STATUS_WAIT_RETRY:846171',
+ };
+ }
+ return {
+ ok: true,
+ text: async () => 'STATUS_OK:Your OpenAI code is 246810',
+ };
+ }
+ throw new Error(`Unexpected HeroSMS action: ${action}`);
+ },
+ getState: async () => ({
+ phoneSmsProvider: 'hero-sms',
+ heroSmsApiKey: 'demo-key',
+ heroSmsCountry: 52,
+ heroSmsServiceCode: 'dr',
+ heroSmsActivationRetryRounds: 1,
+ }),
+ sendToContentScriptResilient: async () => ({}),
+ setState: async () => {},
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const code = await helpers.pollPhoneActivationCode(
+ {
+ phoneSmsProvider: 'hero-sms',
+ heroSmsApiKey: 'demo-key',
+ heroSmsCountry: 52,
+ heroSmsServiceCode: 'dr',
+ heroSmsActivationRetryRounds: 1,
+ },
+ {
+ activationId: '123456',
+ phoneNumber: '66800000000',
+ provider: 'hero-sms',
+ serviceCode: 'dr',
+ countryId: 52,
+ successfulUses: 0,
+ maxUses: 1,
+ },
+ {
+ timeoutMs: 2000,
+ intervalMs: 1,
+ maxRounds: 5,
+ onStatus: async ({ statusText }) => {
+ statusUpdates.push(statusText);
+ },
+ }
+ );
+
+ assert.equal(code, '246810');
+ assert.equal(pollCount, 2);
+ assert.equal(statusUpdates[0], 'STATUS_WAIT_RETRY:846171');
+});
+
+test('phone verification helper reuses 5sim number via product-plus-number endpoint', async () => {
+ const requests = [];
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl.pathname);
+ if (parsedUrl.pathname !== '/v1/user/reuse/openai/447911123456') {
+ throw new Error(`Unexpected 5sim request: ${parsedUrl.pathname}`);
+ }
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ id: 700002,
+ phone: '+447911123456',
+ country: 'england',
+ country_name: 'England',
+ product: 'openai',
+ }),
+ };
+ },
+ getState: async () => ({
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['england'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ }),
+ sendToContentScriptResilient: async () => ({}),
+ setState: async () => {},
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const nextActivation = await helpers.reactivatePhoneActivation(
+ {
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['england'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ },
+ {
+ activationId: '600001',
+ phoneNumber: '+44 7911-123-456',
+ provider: '5sim',
+ serviceCode: 'openai',
+ countryId: 'england',
+ countryCode: 'england',
+ maxUses: 1,
+ successfulUses: 0,
+ }
+ );
+
+ assert.deepStrictEqual(nextActivation, {
+ activationId: '700002',
+ phoneNumber: '+447911123456',
+ provider: '5sim',
+ serviceCode: 'openai',
+ countryId: 'england',
+ countryCode: 'england',
+ countryLabel: 'England',
+ successfulUses: 0,
+ maxUses: 1,
+ });
+ assert.deepStrictEqual(requests, ['/v1/user/reuse/openai/447911123456']);
+});
+
+test('phone verification helper acquires a number from NexSMS with ordered fallback countries', async () => {
+ const requests = [];
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url, options = {}) => {
+ const parsedUrl = new URL(url);
+ const method = String(options?.method || 'GET').toUpperCase();
+ const body = options?.body ? JSON.parse(options.body) : null;
+ requests.push({
+ pathname: parsedUrl.pathname,
+ search: parsedUrl.searchParams,
+ method,
+ body,
+ });
+
+ if (parsedUrl.pathname === '/api/getCountryByService') {
+ const countryId = Number(parsedUrl.searchParams.get('countryId'));
+ if (countryId === 1) {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ code: 0,
+ data: {
+ countryId: 1,
+ countryName: 'Ukraine',
+ minPrice: 0.06,
+ priceMap: { '0.06': 1 },
+ },
+ }),
+ };
+ }
+ if (countryId === 6) {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ code: 0,
+ data: {
+ countryId: 6,
+ countryName: 'Indonesia',
+ minPrice: 0.05,
+ priceMap: { '0.05': 2 },
+ },
+ }),
+ };
+ }
+ }
+
+ if (parsedUrl.pathname === '/api/order/purchase') {
+ if (body?.countryId === 1) {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ code: 1001,
+ msg: 'NO_NUMBERS',
+ }),
+ };
+ }
+ if (body?.countryId === 6) {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ code: 0,
+ data: {
+ countryId: 6,
+ countryName: 'Indonesia',
+ serviceCode: 'ot',
+ phoneNumbers: ['+6281234567890'],
+ },
+ }),
+ };
+ }
+ }
+
+ throw new Error(`Unexpected NexSMS request: ${parsedUrl.pathname}`);
+ },
+ getState: async () => ({
+ phoneSmsProvider: 'nexsms',
+ nexSmsApiKey: 'nex-key',
+ nexSmsCountryOrder: [1, 6],
+ nexSmsServiceCode: 'ot',
+ heroSmsActivationRetryRounds: 1,
+ }),
+ sendToContentScriptResilient: async () => ({}),
+ setState: async () => {},
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const activation = await helpers.requestPhoneActivation({
+ phoneSmsProvider: 'nexsms',
+ nexSmsApiKey: 'nex-key',
+ nexSmsCountryOrder: [1, 6],
+ nexSmsServiceCode: 'ot',
+ heroSmsActivationRetryRounds: 1,
+ });
+
+ assert.deepStrictEqual(activation, {
+ activationId: '+6281234567890',
+ phoneNumber: '+6281234567890',
+ provider: 'nexsms',
+ serviceCode: 'ot',
+ countryId: 6,
+ countryLabel: 'Indonesia',
+ successfulUses: 0,
+ maxUses: 1,
+ });
+ assert.equal(requests[0].pathname, '/api/getCountryByService');
+ assert.equal(requests[0].search.get('apiKey'), 'nex-key');
+ assert.equal(requests[0].search.get('serviceCode'), 'ot');
+ assert.equal(requests[0].search.get('countryId'), '1');
+ assert.equal(requests[1].pathname, '/api/order/purchase');
+ assert.equal(requests[1].method, 'POST');
+ assert.equal(requests[1].body?.countryId, 1);
+ assert.equal(requests[2].pathname, '/api/getCountryByService');
+ assert.equal(requests[2].search.get('countryId'), '6');
+ assert.equal(requests[3].pathname, '/api/order/purchase');
+ assert.equal(requests[3].body?.countryId, 6);
+});
+
+test('phone verification helper polls and parses NexSMS verification codes', async () => {
+ let pollCount = 0;
+ const statusUpdates = [];
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ assert.equal(parsedUrl.pathname, '/api/sms/messages');
+ assert.equal(parsedUrl.searchParams.get('apiKey'), 'nex-key');
+ assert.equal(parsedUrl.searchParams.get('phoneNumber'), '+6281234567890');
+ assert.equal(parsedUrl.searchParams.get('format'), 'json_latest');
+ pollCount += 1;
+ if (pollCount === 1) {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({ code: 0, data: {} }),
+ };
+ }
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ code: 0,
+ data: {
+ code: '998877',
+ text: 'Your OpenAI code is 998877',
+ },
+ }),
+ };
+ },
+ getState: async () => ({
+ phoneSmsProvider: 'nexsms',
+ nexSmsApiKey: 'nex-key',
+ nexSmsCountryOrder: [6],
+ nexSmsServiceCode: 'ot',
+ }),
+ sendToContentScriptResilient: async () => ({}),
+ setState: async () => {},
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const code = await helpers.pollPhoneActivationCode(
+ {
+ phoneSmsProvider: 'nexsms',
+ nexSmsApiKey: 'nex-key',
+ nexSmsCountryOrder: [6],
+ nexSmsServiceCode: 'ot',
+ },
+ {
+ activationId: '+6281234567890',
+ phoneNumber: '+6281234567890',
+ provider: 'nexsms',
+ serviceCode: 'ot',
+ countryId: 6,
+ countryLabel: 'Indonesia',
+ successfulUses: 0,
+ maxUses: 1,
+ },
+ {
+ timeoutMs: 5000,
+ intervalMs: 1,
+ maxRounds: 5,
+ onStatus: async (payload) => {
+ statusUpdates.push(payload.statusText);
+ },
+ }
+ );
+
+ assert.equal(code, '998877');
+ assert.equal(pollCount, 2);
+ assert.equal(statusUpdates.length >= 1, true);
+});
+
test('phone verification helper completes add-phone flow, clears current activation, and stores reusable number state', async () => {
const requests = [];
const stateUpdates = [];
@@ -894,38 +1582,22 @@ test('phone verification helper completes add-phone flow, clears current activat
assert.equal(Array.isArray(stateUpdates[0]?.heroSmsLastPriceTiers), true);
assert.equal(stateUpdates[0]?.heroSmsLastPriceCountryId, 52);
assert.equal(stateUpdates[0]?.heroSmsLastPriceCountryLabel, 'Thailand');
- assert.deepStrictEqual(stateUpdates.slice(1), [
- {
- currentPhoneActivation: {
- activationId: '123456',
- phoneNumber: '66959916439',
- provider: 'hero-sms',
- serviceCode: 'dr',
- countryId: 52,
- successfulUses: 0,
- maxUses: 3,
- },
- currentPhoneVerificationCode: '',
- },
- {
- currentPhoneVerificationCode: '654321',
- },
- {
- reusablePhoneActivation: {
- activationId: '123456',
- phoneNumber: '66959916439',
- provider: 'hero-sms',
- serviceCode: 'dr',
- countryId: 52,
- successfulUses: 1,
- maxUses: 3,
- },
- },
- {
- currentPhoneActivation: null,
- currentPhoneVerificationCode: '',
- },
- ]);
+ assert.equal(
+ stateUpdates.some((entry) => entry?.currentPhoneActivation?.activationId === '123456'),
+ true
+ );
+ assert.equal(
+ stateUpdates.some((entry) => entry?.currentPhoneVerificationCode === '654321'),
+ true
+ );
+ assert.equal(
+ stateUpdates.some((entry) => entry?.reusablePhoneActivation?.activationId === '123456'),
+ true
+ );
+ assert.equal(
+ stateUpdates.some((entry) => entry?.currentPhoneActivation === null && entry?.currentPhoneVerificationCode === ''),
+ true
+ );
const actions = requests.map((url) => url.searchParams.get('action'));
assert.deepStrictEqual(actions, ['getPrices', 'getNumber', 'getStatus', 'setStatus']);
@@ -1638,11 +2310,347 @@ test('phone verification helper immediately replaces number when page says the p
'SUBMIT_PHONE_NUMBER',
'SUBMIT_PHONE_VERIFICATION_CODE',
'RETURN_TO_ADD_PHONE',
+ 'STEP8_GET_STATE',
+ 'RETURN_TO_ADD_PHONE',
'SUBMIT_PHONE_NUMBER',
'SUBMIT_PHONE_VERIFICATION_CODE',
]);
});
+test('phone verification helper treats phone_max_usage_exceeded as used-number and rotates immediately', async () => {
+ const requests = [];
+ const messages = [];
+ let currentState = {
+ heroSmsApiKey: 'demo-key',
+ verificationResendCount: 1,
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ };
+
+ const numbers = [
+ { activationId: '711111', phoneNumber: '66950001011' },
+ { activationId: '722222', phoneNumber: '66950001022' },
+ ];
+ let numberIndex = 0;
+ let submitCodeCount = 0;
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl);
+ const action = parsedUrl.searchParams.get('action');
+ const id = parsedUrl.searchParams.get('id');
+
+ if (action === 'getPrices') {
+ return {
+ ok: true,
+ text: async () => buildHeroSmsPricesPayload(),
+ };
+ }
+ if (action === 'getNumber') {
+ const nextNumber = numbers[numberIndex];
+ numberIndex += 1;
+ return {
+ ok: true,
+ text: async () => `ACCESS_NUMBER:${nextNumber.activationId}:${nextNumber.phoneNumber}`,
+ };
+ }
+ if (action === 'getStatus') {
+ return {
+ ok: true,
+ text: async () => 'STATUS_OK:654321',
+ };
+ }
+ if (action === 'setStatus') {
+ return {
+ ok: true,
+ text: async () => `STATUS_UPDATED:${id}`,
+ };
+ }
+ throw new Error(`Unexpected HeroSMS action: ${action}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ messages.push(message.type);
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'SUBMIT_PHONE_VERIFICATION_CODE') {
+ submitCodeCount += 1;
+ if (submitCodeCount === 1) {
+ return {
+ invalidCode: true,
+ errorText: 'An error occurred during authentication (phone_max_usage_exceeded). Please try again.',
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ return {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ };
+ }
+ if (message.type === 'RETURN_TO_ADD_PHONE') {
+ return {
+ addPhonePage: true,
+ url: 'https://auth.openai.com/add-phone',
+ };
+ }
+ if (message.type === 'RESEND_PHONE_VERIFICATION_CODE') {
+ throw new Error('should not resend for phone_max_usage_exceeded');
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const result = await helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ });
+
+ assert.deepStrictEqual(result, {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ });
+ assert.deepStrictEqual(messages, [
+ 'SUBMIT_PHONE_NUMBER',
+ 'SUBMIT_PHONE_VERIFICATION_CODE',
+ 'RETURN_TO_ADD_PHONE',
+ 'STEP8_GET_STATE',
+ 'RETURN_TO_ADD_PHONE',
+ 'SUBMIT_PHONE_NUMBER',
+ 'SUBMIT_PHONE_VERIFICATION_CODE',
+ ]);
+});
+
+test('phone verification helper rotates number when submitPhoneVerificationCode throws phone_max_usage_exceeded', async () => {
+ const requests = [];
+ const messages = [];
+ let currentState = {
+ heroSmsApiKey: 'demo-key',
+ verificationResendCount: 1,
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ };
+
+ const numbers = [
+ { activationId: '811111', phoneNumber: '66950002011' },
+ { activationId: '822222', phoneNumber: '66950002022' },
+ ];
+ let numberIndex = 0;
+ let submitCodeCount = 0;
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl);
+ const action = parsedUrl.searchParams.get('action');
+ const id = parsedUrl.searchParams.get('id');
+
+ if (action === 'getPrices') {
+ return {
+ ok: true,
+ text: async () => buildHeroSmsPricesPayload(),
+ };
+ }
+ if (action === 'getNumber') {
+ const nextNumber = numbers[numberIndex];
+ numberIndex += 1;
+ return {
+ ok: true,
+ text: async () => `ACCESS_NUMBER:${nextNumber.activationId}:${nextNumber.phoneNumber}`,
+ };
+ }
+ if (action === 'getStatus') {
+ return {
+ ok: true,
+ text: async () => 'STATUS_OK:654321',
+ };
+ }
+ if (action === 'setStatus') {
+ return {
+ ok: true,
+ text: async () => `STATUS_UPDATED:${id}`,
+ };
+ }
+ throw new Error(`Unexpected HeroSMS action: ${action}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ messages.push(message.type);
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'SUBMIT_PHONE_VERIFICATION_CODE') {
+ submitCodeCount += 1;
+ if (submitCodeCount === 1) {
+ return {
+ error: 'An error occurred during authentication (phone_max_usage_exceeded). Please try again.',
+ };
+ }
+ return {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ };
+ }
+ if (message.type === 'RETURN_TO_ADD_PHONE') {
+ return {
+ addPhonePage: true,
+ url: 'https://auth.openai.com/add-phone',
+ };
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const result = await helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ });
+
+ assert.deepStrictEqual(result, {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ });
+ assert.deepStrictEqual(messages, [
+ 'SUBMIT_PHONE_NUMBER',
+ 'SUBMIT_PHONE_VERIFICATION_CODE',
+ 'RETURN_TO_ADD_PHONE',
+ 'STEP8_GET_STATE',
+ 'RETURN_TO_ADD_PHONE',
+ 'SUBMIT_PHONE_NUMBER',
+ 'SUBMIT_PHONE_VERIFICATION_CODE',
+ ]);
+});
+
+test('phone verification helper replaces number when add-phone submission fails with country selection mismatch', async () => {
+ const requests = [];
+ const messages = [];
+ let currentState = {
+ heroSmsApiKey: 'demo-key',
+ heroSmsCountryId: 16,
+ heroSmsCountryLabel: 'United Kingdom',
+ verificationResendCount: 0,
+ phoneVerificationReplacementLimit: 2,
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ };
+
+ const numbers = [
+ { activationId: '611111', phoneNumber: '447999221823' },
+ { activationId: '622222', phoneNumber: '447777000111' },
+ ];
+ let numberIndex = 0;
+ let submitNumberCount = 0;
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl);
+ const action = parsedUrl.searchParams.get('action');
+ const id = parsedUrl.searchParams.get('id');
+ if (action === 'getPrices') {
+ return {
+ ok: true,
+ text: async () => buildHeroSmsPricesPayload({ country: '16', cost: 0.09 }),
+ };
+ }
+ if (action === 'getNumber') {
+ const nextNumber = numbers[numberIndex];
+ numberIndex += 1;
+ return {
+ ok: true,
+ text: async () => `ACCESS_NUMBER:${nextNumber.activationId}:${nextNumber.phoneNumber}`,
+ };
+ }
+ if (action === 'getStatus') {
+ return {
+ ok: true,
+ text: async () => 'STATUS_OK:654321',
+ };
+ }
+ if (action === 'setStatus') {
+ return {
+ ok: true,
+ text: async () => `STATUS_UPDATED:${id}`,
+ };
+ }
+ throw new Error(`Unexpected HeroSMS action: ${action}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ messages.push(message.type);
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ submitNumberCount += 1;
+ if (submitNumberCount === 1) {
+ throw new Error('Failed to select "Country #16" on the add-phone page.');
+ }
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'SUBMIT_PHONE_VERIFICATION_CODE') {
+ return {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ };
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const result = await helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ });
+
+ assert.deepStrictEqual(result, {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ });
+ assert.equal(messages.filter((type) => type === 'SUBMIT_PHONE_NUMBER').length, 2);
+ assert.equal(requests.filter((url) => url.searchParams.get('action') === 'getNumber').length, 2);
+});
+
test('phone verification helper reuses the same number up to three successful registrations', async () => {
const requests = [];
let currentState = {
@@ -1925,6 +2933,455 @@ test('phone verification helper replaces number immediately when resend is throt
assert.equal(messages.includes('RETURN_TO_ADD_PHONE'), true);
});
+test('phone verification helper replaces number immediately when phone-verification route is stuck on 405 retry page', async () => {
+ const requests = [];
+ const messages = [];
+ let resendCalls = 0;
+ let currentState = {
+ heroSmsApiKey: 'demo-key',
+ heroSmsCountryId: 52,
+ heroSmsCountryLabel: 'Thailand',
+ verificationResendCount: 0,
+ phoneVerificationReplacementLimit: 2,
+ phoneCodeWaitSeconds: 60,
+ phoneCodeTimeoutWindows: 2,
+ phoneCodePollIntervalSeconds: 1,
+ phoneCodePollMaxRounds: 1,
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ };
+
+ const numbers = [
+ { activationId: '910001', phoneNumber: '66952220001' },
+ { activationId: '910002', phoneNumber: '66952220002' },
+ ];
+ let numberIndex = 0;
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl);
+ const action = parsedUrl.searchParams.get('action');
+ const id = parsedUrl.searchParams.get('id');
+ if (action === 'getPrices') {
+ return { ok: true, text: async () => buildHeroSmsPricesPayload() };
+ }
+ if (action === 'getNumber') {
+ const nextNumber = numbers[numberIndex];
+ numberIndex += 1;
+ return { ok: true, text: async () => `ACCESS_NUMBER:${nextNumber.activationId}:${nextNumber.phoneNumber}` };
+ }
+ if (action === 'getStatus') {
+ if (id === '910001') {
+ return { ok: true, text: async () => 'STATUS_WAIT_CODE' };
+ }
+ return { ok: true, text: async () => 'STATUS_OK:654321' };
+ }
+ if (action === 'setStatus') {
+ return { ok: true, text: async () => `STATUS_UPDATED:${id}` };
+ }
+ throw new Error(`Unexpected HeroSMS action: ${action}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ messages.push(message.type);
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'RESEND_PHONE_VERIFICATION_CODE') {
+ resendCalls += 1;
+ throw new Error('PHONE_ROUTE_405_RECOVERY_FAILED::Phone verification route stayed on 405 after 3 retry click(s). URL: https://auth.openai.com/phone-verification');
+ }
+ if (message.type === 'RETURN_TO_ADD_PHONE') {
+ return {
+ addPhonePage: true,
+ url: 'https://auth.openai.com/add-phone',
+ };
+ }
+ if (message.type === 'SUBMIT_PHONE_VERIFICATION_CODE') {
+ return {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ };
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const result = await helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ });
+
+ assert.deepStrictEqual(result, {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ });
+ assert.equal(resendCalls, 1, 'resend should not loop endlessly on 405 route error');
+ assert.equal(messages.filter((type) => type === 'SUBMIT_PHONE_NUMBER').length, 2);
+ assert.equal(messages.includes('RETURN_TO_ADD_PHONE'), true);
+});
+
+test('phone verification helper skips page resend for 5sim timeouts and rotates number directly', async () => {
+ const requests = [];
+ const messages = [];
+ let currentState = {
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['indonesia'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ verificationResendCount: 0,
+ phoneVerificationReplacementLimit: 2,
+ phoneCodeWaitSeconds: 60,
+ phoneCodeTimeoutWindows: 2,
+ phoneCodePollIntervalSeconds: 1,
+ phoneCodePollMaxRounds: 1,
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ };
+
+ const numbers = [
+ { activationId: '500001', phoneNumber: '+628111111111' },
+ { activationId: '500002', phoneNumber: '+628222222222' },
+ ];
+ let numberIndex = 0;
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl.pathname);
+ if (parsedUrl.pathname === '/v1/user/buy/activation/indonesia/any/openai') {
+ const next = numbers[Math.min(numberIndex, numbers.length - 1)];
+ numberIndex += 1;
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ id: next.activationId,
+ phone: next.phoneNumber,
+ country: 'indonesia',
+ country_name: 'Indonesia',
+ product: 'openai',
+ }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/check/500001') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ status: 'RECEIVED',
+ sms: [],
+ }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/check/500002') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ status: 'RECEIVED',
+ sms: [{ text: 'OpenAI code 123456' }],
+ }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/cancel/500001') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({ status: 'CANCELED' }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/finish/500002') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({ status: 'FINISHED' }),
+ };
+ }
+ throw new Error(`Unexpected 5sim request: ${parsedUrl.pathname}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ messages.push(message.type);
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'RETURN_TO_ADD_PHONE') {
+ return {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ };
+ }
+ if (message.type === 'SUBMIT_PHONE_VERIFICATION_CODE') {
+ return {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ };
+ }
+ if (message.type === 'RESEND_PHONE_VERIFICATION_CODE') {
+ throw new Error('5sim flow should not trigger page resend.');
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const result = await helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ });
+
+ assert.deepStrictEqual(result, {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ });
+ assert.equal(messages.includes('RESEND_PHONE_VERIFICATION_CODE'), false);
+ assert.equal(messages.filter((type) => type === 'SUBMIT_PHONE_NUMBER').length, 2);
+ assert.equal(
+ requests.filter((pathname) => pathname === '/v1/user/check/500001').length,
+ 2,
+ 'first 5sim number should be polled across both timeout windows before replacement'
+ );
+});
+
+test('phone verification helper rotates number immediately when 5sim activation is missing (order not found)', async () => {
+ const requests = [];
+ let currentState = {
+ phoneSmsProvider: '5sim',
+ fiveSimApiKey: 'five-token',
+ fiveSimCountryOrder: ['indonesia'],
+ fiveSimOperator: 'any',
+ fiveSimProduct: 'openai',
+ verificationResendCount: 0,
+ phoneVerificationReplacementLimit: 2,
+ phoneCodeWaitSeconds: 60,
+ phoneCodeTimeoutWindows: 2,
+ phoneCodePollIntervalSeconds: 1,
+ phoneCodePollMaxRounds: 2,
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ };
+
+ const numbers = [
+ { activationId: '510001', phoneNumber: '+628111111111' },
+ { activationId: '510002', phoneNumber: '+628222222222' },
+ ];
+ let numberIndex = 0;
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl.pathname);
+ if (parsedUrl.pathname === '/v1/user/buy/activation/indonesia/any/openai') {
+ const next = numbers[Math.min(numberIndex, numbers.length - 1)];
+ numberIndex += 1;
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ id: next.activationId,
+ phone: next.phoneNumber,
+ country: 'indonesia',
+ country_name: 'Indonesia',
+ product: 'openai',
+ }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/check/510001') {
+ return {
+ ok: false,
+ status: 404,
+ text: async () => JSON.stringify({
+ status: 'error',
+ message: 'order not found',
+ }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/check/510002') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({
+ status: 'RECEIVED',
+ sms: [{ text: 'OpenAI code 123456' }],
+ }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/cancel/510001') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({ status: 'CANCELED' }),
+ };
+ }
+ if (parsedUrl.pathname === '/v1/user/finish/510002') {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify({ status: 'FINISHED' }),
+ };
+ }
+ throw new Error(`Unexpected 5sim request: ${parsedUrl.pathname}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'RETURN_TO_ADD_PHONE') {
+ return {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ };
+ }
+ if (message.type === 'SUBMIT_PHONE_VERIFICATION_CODE') {
+ return {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ };
+ }
+ if (message.type === 'RESEND_PHONE_VERIFICATION_CODE') {
+ throw new Error('order-not-found path should replace number before page resend.');
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const result = await helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ });
+
+ assert.deepStrictEqual(result, {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ });
+ assert.ok(requests.includes('/v1/user/check/510001'));
+ assert.ok(requests.includes('/v1/user/check/510002'));
+ assert.equal(
+ requests.filter((pathname) => pathname === '/v1/user/check/510001').length,
+ 1,
+ 'missing activation should trigger immediate number replacement instead of repeated polling'
+ );
+});
+
+test('phone verification helper propagates stop errors instead of swallowing resend failures', async () => {
+ const messages = [];
+ let currentState = {
+ heroSmsApiKey: 'demo-key',
+ heroSmsCountryId: 52,
+ heroSmsCountryLabel: 'Thailand',
+ verificationResendCount: 0,
+ phoneVerificationReplacementLimit: 3,
+ phoneCodeWaitSeconds: 60,
+ phoneCodeTimeoutWindows: 2,
+ phoneCodePollIntervalSeconds: 1,
+ phoneCodePollMaxRounds: 1,
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ };
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ const action = parsedUrl.searchParams.get('action');
+ if (action === 'getPrices') {
+ return { ok: true, text: async () => buildHeroSmsPricesPayload() };
+ }
+ if (action === 'getNumber') {
+ return { ok: true, text: async () => 'ACCESS_NUMBER:700001:66955550001' };
+ }
+ if (action === 'getStatus') {
+ return { ok: true, text: async () => 'STATUS_WAIT_CODE' };
+ }
+ if (action === 'setStatus') {
+ return { ok: true, text: async () => 'STATUS_UPDATED' };
+ }
+ throw new Error(`Unexpected HeroSMS action: ${action}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ messages.push(message.type);
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'RESEND_PHONE_VERIFICATION_CODE') {
+ throw new Error('流程已被用户停止。');
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ await assert.rejects(
+ helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ }),
+ /流程已被用户停止/
+ );
+
+ assert.equal(messages.filter((type) => type === 'SUBMIT_PHONE_NUMBER').length, 1);
+ assert.equal(messages.filter((type) => type === 'RESEND_PHONE_VERIFICATION_CODE').length, 1);
+ assert.equal(messages.includes('RETURN_TO_ADD_PHONE'), false);
+});
+
test('phone verification helper falls back to the next country after repeated sms timeout on the same country', async () => {
const requests = [];
let currentState = {
@@ -2044,5 +3501,612 @@ test('phone verification helper falls back to the next country after repeated sm
const getNumberCountries = requests
.filter((requestUrl) => requestUrl.searchParams.get('action') === 'getNumber')
.map((requestUrl) => requestUrl.searchParams.get('country'));
- assert.deepStrictEqual(getNumberCountries, ['52', '52', '16']);
+ assert.deepStrictEqual(getNumberCountries, ['52', '16']);
+});
+
+test('phone verification helper escalates HeroSMS price tier in the same country after sms timeout before changing country', async () => {
+ const requests = [];
+ let currentState = {
+ heroSmsApiKey: 'demo-key',
+ heroSmsCountryId: 52,
+ heroSmsCountryLabel: 'Thailand',
+ heroSmsCountryFallback: [{ id: 16, label: 'United Kingdom' }],
+ verificationResendCount: 0,
+ phoneVerificationReplacementLimit: 2,
+ phoneCodeWaitSeconds: 60,
+ phoneCodeTimeoutWindows: 1,
+ phoneCodePollIntervalSeconds: 1,
+ phoneCodePollMaxRounds: 1,
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ };
+
+ let thailandAcquireIndex = 0;
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl);
+ const action = parsedUrl.searchParams.get('action');
+ const id = parsedUrl.searchParams.get('id');
+ const country = parsedUrl.searchParams.get('country');
+ const maxPrice = parsedUrl.searchParams.get('maxPrice');
+
+ if (action === 'getPrices') {
+ if (country === '52') {
+ return {
+ ok: true,
+ text: async () => JSON.stringify({
+ 52: {
+ dr: {
+ starter: { cost: 0.05, count: 10 },
+ premium: { cost: 0.08, count: 10 },
+ },
+ },
+ }),
+ };
+ }
+ return {
+ ok: true,
+ text: async () => JSON.stringify({
+ [country]: {
+ dr: {
+ cost: 0.09,
+ count: 10,
+ },
+ },
+ }),
+ };
+ }
+
+ if (action === 'getNumber') {
+ if (country === '52') {
+ if (maxPrice === '0.05') {
+ thailandAcquireIndex += 1;
+ return {
+ ok: true,
+ text: async () => `ACCESS_NUMBER:52low${thailandAcquireIndex}:66950000${thailandAcquireIndex}`,
+ };
+ }
+ if (maxPrice === '0.08') {
+ return {
+ ok: true,
+ text: async () => 'ACCESS_NUMBER:52high1:66958888888',
+ };
+ }
+ }
+ if (country === '16') {
+ return {
+ ok: true,
+ text: async () => 'ACCESS_NUMBER:160001:447955001122',
+ };
+ }
+ }
+
+ if (action === 'getStatus') {
+ if (id === '52high1') {
+ return { ok: true, text: async () => 'STATUS_OK:112233' };
+ }
+ if (id === '160001') {
+ return { ok: true, text: async () => 'STATUS_OK:223344' };
+ }
+ return { ok: true, text: async () => 'STATUS_WAIT_CODE' };
+ }
+
+ if (action === 'setStatus') {
+ return { ok: true, text: async () => 'STATUS_UPDATED' };
+ }
+
+ throw new Error(`Unexpected HeroSMS action: ${action} @ country ${country || 'n/a'} @ maxPrice ${maxPrice || ''}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'RETURN_TO_ADD_PHONE') {
+ return {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ };
+ }
+ if (message.type === 'SUBMIT_PHONE_VERIFICATION_CODE') {
+ return {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ };
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const result = await helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ });
+
+ assert.deepStrictEqual(result, {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ });
+
+ const getNumberEntries = requests
+ .filter((requestUrl) => requestUrl.searchParams.get('action') === 'getNumber')
+ .map((requestUrl) => `${requestUrl.searchParams.get('country')}:${requestUrl.searchParams.get('maxPrice') || ''}`);
+ assert.deepStrictEqual(getNumberEntries, ['52:0.05', '52:0.08']);
+});
+
+test('phone verification helper parses currency-formatted HeroSMS tiers and retries higher tier in same country', async () => {
+ const requests = [];
+ let currentState = {
+ heroSmsApiKey: 'demo-key',
+ heroSmsCountryId: 52,
+ heroSmsCountryLabel: 'Thailand',
+ heroSmsCountryFallback: [{ id: 16, label: 'United Kingdom' }],
+ verificationResendCount: 0,
+ phoneVerificationReplacementLimit: 2,
+ phoneCodeWaitSeconds: 60,
+ phoneCodeTimeoutWindows: 1,
+ phoneCodePollIntervalSeconds: 1,
+ phoneCodePollMaxRounds: 1,
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ heroSmsMaxPrice: '0.12',
+ heroSmsAcquirePriority: 'price',
+ };
+
+ let thailandAcquireIndex = 0;
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl);
+ const action = parsedUrl.searchParams.get('action');
+ const id = parsedUrl.searchParams.get('id');
+ const country = parsedUrl.searchParams.get('country');
+ const maxPrice = parsedUrl.searchParams.get('maxPrice');
+
+ if (action === 'getPrices' || action === 'getPricesExtended') {
+ if (country === '52') {
+ return {
+ ok: true,
+ text: async () => JSON.stringify({
+ 52: {
+ dr: {
+ '$0.1183': { cost: '$0.1183', count: 925 },
+ '$0.1036': { cost: '$0.1036', count: 35 },
+ '$0.0942': { cost: '$0.0942', count: 25 },
+ '$0.0500': { cost: '$0.0500', count: 10 },
+ },
+ },
+ }),
+ };
+ }
+ return {
+ ok: true,
+ text: async () => JSON.stringify({
+ [country]: {
+ dr: {
+ cost: 0.09,
+ count: 10,
+ },
+ },
+ }),
+ };
+ }
+
+ if (action === 'getNumber') {
+ if (country === '52') {
+ if (maxPrice === '0.05') {
+ thailandAcquireIndex += 1;
+ return {
+ ok: true,
+ text: async () => `ACCESS_NUMBER:52low${thailandAcquireIndex}:66950000${thailandAcquireIndex}`,
+ };
+ }
+ if (maxPrice === '0.0942') {
+ return {
+ ok: true,
+ text: async () => 'ACCESS_NUMBER:52mid1:66954443322',
+ };
+ }
+ }
+ if (country === '16') {
+ return {
+ ok: true,
+ text: async () => 'ACCESS_NUMBER:160001:447955001122',
+ };
+ }
+ }
+
+ if (action === 'getStatus') {
+ if (id === '52mid1') {
+ return { ok: true, text: async () => 'STATUS_OK:998877' };
+ }
+ if (id === '160001') {
+ return { ok: true, text: async () => 'STATUS_OK:223344' };
+ }
+ return { ok: true, text: async () => 'STATUS_WAIT_CODE' };
+ }
+
+ if (action === 'setStatus') {
+ return { ok: true, text: async () => 'STATUS_UPDATED' };
+ }
+
+ throw new Error(`Unexpected HeroSMS action: ${action} @ country ${country || 'n/a'} @ maxPrice ${maxPrice || ''}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'RETURN_TO_ADD_PHONE') {
+ return {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ };
+ }
+ if (message.type === 'SUBMIT_PHONE_VERIFICATION_CODE') {
+ return {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ };
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const result = await helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ });
+
+ assert.deepStrictEqual(result, {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ });
+
+ const getNumberEntries = requests
+ .filter((requestUrl) => requestUrl.searchParams.get('action') === 'getNumber')
+ .map((requestUrl) => `${requestUrl.searchParams.get('country')}:${requestUrl.searchParams.get('maxPrice') || ''}`);
+ assert.deepStrictEqual(getNumberEntries, ['52:0.05', '52:0.0942']);
+});
+
+test('phone verification helper prefers manually selected activation before automatic reuse/new acquisition', async () => {
+ const requests = [];
+ let currentState = {
+ heroSmsApiKey: 'demo-key',
+ heroSmsCountryId: 52,
+ heroSmsCountryLabel: 'Thailand',
+ verificationResendCount: 0,
+ phoneVerificationReplacementLimit: 1,
+ phoneCodeWaitSeconds: 15,
+ phoneCodeTimeoutWindows: 1,
+ phoneCodePollIntervalSeconds: 1,
+ phoneCodePollMaxRounds: 1,
+ phonePreferredActivation: {
+ provider: 'hero-sms',
+ activationId: 'preferred-activation',
+ phoneNumber: '66951112233',
+ countryId: 52,
+ countryLabel: 'Thailand',
+ successfulUses: 0,
+ maxUses: 3,
+ },
+ reusablePhoneActivation: {
+ provider: 'hero-sms',
+ activationId: 'reusable-activation',
+ phoneNumber: '66959998888',
+ countryId: 52,
+ countryLabel: 'Thailand',
+ successfulUses: 0,
+ maxUses: 3,
+ },
+ currentPhoneActivation: null,
+ };
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl);
+ const action = parsedUrl.searchParams.get('action');
+ const id = parsedUrl.searchParams.get('id');
+ if (action === 'reactivate' && id === 'preferred-activation') {
+ return { ok: true, text: async () => 'ACCESS_READY' };
+ }
+ if (action === 'getStatus' && id === 'preferred-activation') {
+ return { ok: true, text: async () => 'STATUS_OK:556677' };
+ }
+ if (action === 'setStatus') {
+ return { ok: true, text: async () => 'STATUS_UPDATED' };
+ }
+ throw new Error(`Unexpected HeroSMS action: ${action} @ id ${id || 'n/a'}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'SUBMIT_PHONE_VERIFICATION_CODE') {
+ return {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ };
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const result = await helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ });
+
+ assert.deepStrictEqual(result, {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ });
+ const actionTrace = requests.map((requestUrl) => (
+ `${requestUrl.searchParams.get('action')}:${requestUrl.searchParams.get('id') || requestUrl.searchParams.get('country') || ''}`
+ ));
+ assert.equal(actionTrace.includes('reactivate:preferred-activation'), true);
+ assert.equal(actionTrace.some((item) => item.startsWith('reactivate:reusable-activation')), false);
+ assert.equal(actionTrace.some((item) => item.startsWith('getNumber:')), false);
+});
+
+test('phone verification helper retries with a new number after preferred activation timeout and updates runtime countdown state', async () => {
+ const requests = [];
+ const stateUpdates = [];
+ let currentState = {
+ heroSmsApiKey: 'demo-key',
+ heroSmsCountryId: 52,
+ heroSmsCountryLabel: 'Thailand',
+ verificationResendCount: 0,
+ phoneVerificationReplacementLimit: 2,
+ phoneCodeWaitSeconds: 15,
+ phoneCodeTimeoutWindows: 1,
+ phoneCodePollIntervalSeconds: 1,
+ phoneCodePollMaxRounds: 1,
+ phonePreferredActivation: {
+ provider: 'hero-sms',
+ activationId: 'preferred-activation',
+ phoneNumber: '66951112233',
+ countryId: 52,
+ countryLabel: 'Thailand',
+ successfulUses: 0,
+ maxUses: 3,
+ },
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ };
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async () => {},
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl);
+ const action = parsedUrl.searchParams.get('action');
+ const id = parsedUrl.searchParams.get('id');
+ const country = parsedUrl.searchParams.get('country');
+
+ if (action === 'reactivate' && id === 'preferred-activation') {
+ return { ok: true, text: async () => 'ACCESS_READY' };
+ }
+ if (action === 'getStatus') {
+ if (id === 'preferred-activation') {
+ return { ok: true, text: async () => 'STATUS_WAIT_CODE' };
+ }
+ if (id === 'new-activation') {
+ return { ok: true, text: async () => 'STATUS_OK:112233' };
+ }
+ }
+ if (action === 'setStatus') {
+ return { ok: true, text: async () => 'STATUS_UPDATED' };
+ }
+ if (action === 'getPrices') {
+ return {
+ ok: true,
+ text: async () => buildHeroSmsPricesPayload({ country: country || '52', cost: 0.08, count: 100 }),
+ };
+ }
+ if (action === 'getNumber') {
+ return {
+ ok: true,
+ text: async () => 'ACCESS_NUMBER:new-activation:66950000123',
+ };
+ }
+ throw new Error(`Unexpected HeroSMS action: ${action} @ id ${id || 'n/a'}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ if (message.type === 'SUBMIT_PHONE_NUMBER') {
+ return {
+ phoneVerificationPage: true,
+ url: 'https://auth.openai.com/phone-verification',
+ };
+ }
+ if (message.type === 'RETURN_TO_ADD_PHONE') {
+ return {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ };
+ }
+ if (message.type === 'SUBMIT_PHONE_VERIFICATION_CODE') {
+ return {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ };
+ }
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ stateUpdates.push(updates);
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const result = await helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ });
+
+ assert.deepStrictEqual(result, {
+ success: true,
+ consentReady: true,
+ url: 'https://auth.openai.com/authorize',
+ });
+
+ const reactivatePreferredCalls = requests.filter((requestUrl) => (
+ requestUrl.searchParams.get('action') === 'reactivate'
+ && requestUrl.searchParams.get('id') === 'preferred-activation'
+ ));
+ assert.equal(reactivatePreferredCalls.length, 1);
+
+ const getNumberCalls = requests.filter((requestUrl) => requestUrl.searchParams.get('action') === 'getNumber');
+ assert.equal(getNumberCalls.length, 1);
+ assert.equal(getNumberCalls[0].searchParams.get('country'), '52');
+
+ assert.equal(
+ stateUpdates.some((updates) => Number(updates.currentPhoneVerificationCountdownEndsAt) > 0),
+ true,
+ 'should expose countdown window start in runtime state'
+ );
+ assert.equal(
+ stateUpdates.some((updates) => Number(updates.currentPhoneVerificationCountdownEndsAt) === 0),
+ true,
+ 'should clear countdown window after step9 rotation/completion'
+ );
+});
+
+test('phone verification helper logs no-supply diagnostics with consecutive streak when all providers fail to acquire number', async () => {
+ const logs = [];
+ const requests = [];
+ let currentState = {
+ heroSmsApiKey: 'demo-key',
+ phoneSmsProvider: 'hero-sms',
+ phoneSmsProviderOrder: ['hero-sms'],
+ heroSmsCountryId: 52,
+ heroSmsCountryLabel: 'Thailand',
+ heroSmsCountryFallback: [],
+ heroSmsMaxPrice: '0.06',
+ currentPhoneActivation: null,
+ reusablePhoneActivation: null,
+ verificationResendCount: 0,
+ phoneVerificationReplacementLimit: 1,
+ };
+
+ const helpers = api.createPhoneVerificationHelpers({
+ addLog: async (message, level = 'info') => {
+ logs.push({ message, level });
+ },
+ ensureStep8SignupPageReady: async () => {},
+ fetchImpl: async (url) => {
+ const parsedUrl = new URL(url);
+ requests.push(parsedUrl);
+ const action = parsedUrl.searchParams.get('action');
+ if (action === 'getPrices') {
+ return {
+ ok: true,
+ text: async () => buildHeroSmsPricesPayload({ country: '52', cost: 0.05, count: 20 }),
+ };
+ }
+ if (action === 'getNumber' || action === 'getNumberV2') {
+ return {
+ ok: true,
+ text: async () => 'NO_NUMBERS',
+ };
+ }
+ throw new Error(`Unexpected HeroSMS action: ${action}`);
+ },
+ getOAuthFlowStepTimeoutMs: async (defaultTimeoutMs) => defaultTimeoutMs,
+ getState: async () => ({ ...currentState }),
+ sendToContentScriptResilient: async (_source, message) => {
+ throw new Error(`Unexpected content-script message: ${message.type}`);
+ },
+ setState: async (updates) => {
+ currentState = { ...currentState, ...updates };
+ },
+ sleepWithStop: async () => {},
+ throwIfStopped: () => {},
+ });
+
+ const runOnce = async () => assert.rejects(
+ helpers.completePhoneVerificationFlow(1, {
+ addPhonePage: true,
+ phoneVerificationPage: false,
+ url: 'https://auth.openai.com/add-phone',
+ }),
+ /all provider candidates failed to acquire number/i
+ );
+
+ await runOnce();
+ await runOnce();
+
+ const diagnosticsLogs = logs
+ .filter((entry) => String(entry.message || '').includes('Step 9 diagnostics: 无号连续失败'))
+ .map((entry) => String(entry.message || ''));
+
+ assert.equal(diagnosticsLogs.length >= 2, true);
+ assert.equal(diagnosticsLogs.some((message) => message.includes('无号连续失败 1 次')), true);
+ assert.equal(diagnosticsLogs.some((message) => message.includes('无号连续失败 2 次')), true);
+ assert.equal(
+ diagnosticsLogs.some((message) => message.includes('maxPrice=0.06')),
+ true
+ );
+ assert.equal(
+ diagnosticsLogs.some((message) => message.includes('国家数 HeroSMS=1, 5sim=0, NexSMS=0')),
+ true
+ );
+ assert.equal(currentState.phoneNoSupplyFailureStreak, 2);
+ assert.equal(requests.some((entry) => entry.searchParams.get('action') === 'getNumber'), true);
});
diff --git a/tests/sidepanel-phone-verification-settings.test.js b/tests/sidepanel-phone-verification-settings.test.js
index cd7c5c1..09380cb 100644
--- a/tests/sidepanel-phone-verification-settings.test.js
+++ b/tests/sidepanel-phone-verification-settings.test.js
@@ -59,6 +59,13 @@ test('sidepanel html exposes phone verification toggle and dedicated HeroSMS row
assert.match(html, /id="btn-toggle-phone-verification-section"/);
assert.match(html, /id="row-phone-verification-fold"/);
assert.match(html, /id="input-phone-verification-enabled"/);
+ assert.match(html, /id="row-phone-sms-provider"/);
+ assert.match(html, /id="select-phone-sms-provider"/);
+ assert.match(html, /id="row-phone-sms-provider-order"/);
+ assert.match(html, /id="select-phone-sms-provider-order"[^>]*multiple/);
+ assert.match(html, /id="btn-phone-sms-provider-order-menu"/);
+ assert.match(html, /id="row-phone-sms-provider-order-actions"/);
+ assert.match(html, /id="btn-phone-sms-provider-order-reset"/);
assert.match(html, /id="row-hero-sms-platform"/);
assert.match(html, /id="row-hero-sms-country"/);
assert.match(html, /id="row-hero-sms-country-fallback"/);
@@ -69,32 +76,83 @@ test('sidepanel html exposes phone verification toggle and dedicated HeroSMS row
assert.match(html, /id="row-hero-sms-api-key"/);
assert.match(html, /id="row-hero-sms-max-price"/);
assert.match(html, /id="row-hero-sms-current-number"/);
+ assert.match(html, /id="row-hero-sms-current-countdown"/);
assert.match(html, /id="row-hero-sms-price-tiers"/);
assert.match(html, /id="row-hero-sms-current-code"/);
+ assert.match(html, /id="row-hero-sms-preferred-activation"/);
+ assert.match(html, /id="select-hero-sms-preferred-activation"/);
assert.match(html, /id="row-phone-replacement-limit"/);
assert.match(html, /id="row-phone-verification-resend-count"/);
assert.match(html, /id="row-phone-code-wait-seconds"/);
assert.match(html, /id="row-phone-code-timeout-windows"/);
assert.match(html, /id="row-phone-code-poll-interval-seconds"/);
assert.match(html, /id="row-phone-code-poll-max-rounds"/);
- assert.match(html, /id="row-oauth-flow-timeout"/);
- assert.match(html, /id="input-oauth-flow-timeout-enabled"/);
- assert.match(html, /只取消 Step 7 后链总预算/);
+ assert.match(html, /id="row-five-sim-api-key"/);
+ assert.match(html, /id="input-five-sim-api-key"/);
+ assert.match(html, /id="row-five-sim-country"/);
+ assert.match(html, /id="select-five-sim-country"[^>]*multiple/);
+ assert.match(html, /id="row-five-sim-country-fallback"/);
+ assert.match(html, /id="row-five-sim-operator"/);
+ assert.match(html, /id="input-five-sim-operator"/);
+ assert.match(html, /id="row-five-sim-product"/);
+ assert.match(html, /id="input-five-sim-product"/);
+ assert.match(html, /