@swimmingliu/autovpn 2.0.2 → 2.1.0

package/dist/server/web-adapter.js

@@ -172,6 +172,18 @@ export function renderWebAdapterScript(options = {}) {
       method: 'POST',
       body: JSON.stringify(payload || {})
     }),
+    // The H5 build reaches the same expiry editor the Electron preload
+    // exposes; without this the browser UI hides the affordance entirely.
+    // Accepts both shapes the renderer may use: (id, date) like the preload
+    // bridge, or ({id, expires_at}).
+    setAccountExpiry: async (idOrPayload, date) => request('/api/accounts/expiry', {
+      method: 'POST',
+      body: JSON.stringify(
+        idOrPayload && typeof idOrPayload === 'object'
+          ? idOrPayload
+          : { id: idOrPayload, expires_at: date }
+      )
+    }),
     accountsTemplate: async () => ({ ok: true, content: ${JSON.stringify(accountsTemplate())} }),
     runPipeline: async (options = {}) => request('/api/runs', {
       method: 'POST',

package/dist/web/renderer/app.js

@@ -9,8 +9,10 @@ import { renderAnalytics, clearAnalytics } from './analytics.bundle.js';
 import {
   addAvailabilityTargetDraft,
   applyAvailabilityTargetDraft,
+  applyNetworkDraft,
   applySourceIterationDraft,
   buildAvailabilityTargetDraft,
+  buildNetworkDraft,
   buildPageMarkup,
   buildDashboardMetricsMarkup,
   buildDashboardStateMarkup,
@@ -25,6 +27,7 @@ import {
   buildAccountPoolRecords,
   removeAvailabilityTargetDraft,
   resolveDashboardRunSummary,
+  SOURCE_ROUND_DEFAULTS,
   validateSourceDraft,
   classifyLogEntry,
   escapeHtml,
@@ -36,10 +39,10 @@ initializeAppearance();
 
 const demoProfile = {
   sources: {
-    leiting: { mode: 'credential', official_site: 'https://www.68123836.com', enabled: true, max_iterations: 4, plateau_limit: 2 },
-    heidong: { mode: 'credential', official_site: 'https://www.67986457.com', enabled: true, max_iterations: 4, plateau_limit: 2 },
-    mifeng: { mode: 'credential', official_site: 'https://www.86933221.com', enabled: true, max_iterations: 4, plateau_limit: 2 },
-    xuanfeng: { mode: 'credential', official_site: 'https://www.16863988.com', enabled: true, max_iterations: 4, plateau_limit: 2 }
+    leiting: { mode: 'credential', official_site: 'https://www.68123836.com', enabled: true, ...SOURCE_ROUND_DEFAULTS },
+    heidong: { mode: 'credential', official_site: 'https://www.67986457.com', enabled: true, ...SOURCE_ROUND_DEFAULTS },
+    mifeng: { mode: 'credential', official_site: 'https://www.86933221.com', enabled: true, ...SOURCE_ROUND_DEFAULTS },
+    xuanfeng: { mode: 'credential', official_site: 'https://www.16863988.com', enabled: true, ...SOURCE_ROUND_DEFAULTS }
   },
   speed_test: {
     min_download_mb_s: 1.0,
@@ -114,7 +117,9 @@ const state = {
     statusFilter: 'all',
     brandFilter: 'all',
     sortBy: 'brand',
-    busy: false
+    busy: false,
+    canSetExpiry: typeof window.vpnAutomation?.setAccountExpiry === 'function',
+    expiryEditorId: null
   },
   isDemo: false,
   runtime: document.body.dataset.runtime === 'web' ? 'web' : 'electron',
@@ -138,7 +143,8 @@ const state = {
   qr: createQrState(),
   runStartedAt: null,
   lastUpdateAt: null,
-  modalTransform: ''
+  modalTransform: '',
+  progressSnapshot: null
 };
 
 let settingsDrawerOpener = null;
@@ -197,7 +203,10 @@ function hydrateInitialRuntimeState(loadedState = {}) {
   const loadedProfile = loadedState.profile ?? {};
   state.activity = Array.isArray(loadedState.activity) ? loadedState.activity : [];
   state.activityUnavailable = Number(loadedState.activityUnavailable ?? 0);
-  state.profile = loadedProfile;
+  // An older profile has no [network] section. Seeding the displayed defaults
+  // here means saving any other drawer writes the section the pipeline reads
+  // instead of leaving it absent, and the network drawer opens on real values.
+  state.profile = { ...loadedProfile, network: buildNetworkDraft(loadedProfile.network) };
   state.savedProfile = structuredClone(loadedProfile);
   const nextRunState = String(loadedState.runState ?? '');
   if (['idle', 'running', 'stopping', 'failed', 'success'].includes(nextRunState)) {
@@ -222,11 +231,13 @@ function hydrateHistoricalEvents(events = []) {
   }
   const previousRunState = state.runState;
   const previousRunResult = state.runResult;
+  const snapshot = state.progressSnapshot;
   for (const event of events) {
     handlePipelineEvent(event, { historical: true });
   }
   state.runState = previousRunState;
   state.runResult = previousRunState === 'idle' ? previousRunResult : previousRunState;
+  if (snapshot) applyProgressSnapshot(snapshot);
 }
 
 function bindActions() {
@@ -639,6 +650,10 @@ function handleDocumentInput(event) {
         const floor = SOURCE_MINIMUM_ONE_KEYS.has(key) ? 1 : 0;
         sourceDraft[sourceName][key] = Math.max(floor, Math.trunc(parsed));
       }
+      // The area controls have a hard ceiling the backend also clamps to.
+      if (SOURCE_MAXIMUM_KEYS.has(key)) {
+        sourceDraft[sourceName][key] = Math.min(SOURCE_MAXIMUM_KEYS.get(key), sourceDraft[sourceName][key]);
+      }
     }
     return;
   }
@@ -790,6 +805,8 @@ const SOURCE_NUMERIC_KEYS = new Set([
   'max_iterations',
   'min_iterations',
   'plateau_limit',
+  'areas_per_round',
+  'area_concurrency',
   'max_runtime_seconds',
   'max_areas',
   'area_min',
@@ -799,7 +816,15 @@ const SOURCE_NUMERIC_KEYS = new Set([
 /** Of those, the ones the runner clamps to at least one. */
 const SOURCE_MINIMUM_ONE_KEYS = new Set([
   'max_iterations',
-  'plateau_limit'
+  'plateau_limit',
+  'areas_per_round',
+  'area_concurrency'
+]);
+
+/** Numeric source fields with a hard upper bound, matching the backend clamp. */
+const SOURCE_MAXIMUM_KEYS = new Map([
+  ['areas_per_round', 64],
+  ['area_concurrency', 16]
 ]);
 
 function resolveErrorMessage(error) {
@@ -1034,6 +1059,7 @@ function buildSettingsDraft(section) {
   if (section === 'speed_test') return buildSpeedTestDraft(state.profile.speed_test);
   if (section === 'availability_targets') return buildAvailabilityTargetDraft(state.profile.availability_targets);
   if (section === 'deploy') return buildDeployDraft(state.profile.deploy);
+  if (section === 'network') return buildNetworkDraft(state.profile.network);
   if (section === 'paths') return structuredClone(state.profile.paths);
   if (section === 'about') return { version: getMessages(state.language).sidebarVersion };
   return null;
@@ -1088,6 +1114,9 @@ async function saveSettingsDrawer() {
 
 async function hydrateAccountPool() {
   state.accountPool.status = 'loading';
+  // Re-detect each hydration: the preload bridge is fixed for the page, but a
+  // test harness or a future H5 adapter may attach it after bootstrap.
+  state.accountPool.canSetExpiry = typeof window.vpnAutomation?.setAccountExpiry === 'function';
   touchUpdate();
   renderAccountPoolPanelOnly();
   if (!window.vpnAutomation?.loadAccounts) {
@@ -1151,9 +1180,56 @@ async function handleAccountPoolAction(button) {
   }
   if (action === 'toggle') {
     await toggleAccountStatus(Number(button.dataset.accountId));
+    return;
+  }
+  if (action === 'expiry-edit') {
+    state.accountPool.expiryEditorId = Number(button.dataset.accountId);
+    renderAll();
+    queueMicrotask(() => document.querySelector(`[data-account-expiry-input="${CSS.escape(String(button.dataset.accountId))}"]`)?.focus());
+    return;
+  }
+  if (action === 'expiry-cancel') {
+    state.accountPool.expiryEditorId = null;
+    renderAll();
+    return;
+  }
+  if (action === 'expiry-save') {
+    const id = Number(button.dataset.accountId);
+    const input = document.querySelector(`[data-account-expiry-input="${CSS.escape(String(id))}"]`);
+    await setAccountExpiry(id, input?.value ?? '');
   }
 }
 
+async function setAccountExpiry(id, expiresAt) {
+  const account = (state.accountPool.accounts ?? []).find((item) => item.id === id);
+  // Feature-detected: the browser build has no preload bridge, so this path is
+  // never reachable there and the row hides the affordance.
+  if (!account || typeof window.vpnAutomation?.setAccountExpiry !== 'function') {
+    return;
+  }
+  const value = String(expiresAt ?? '').trim();
+  if (value && !/^\d{4}-\d{2}-\d{2}$/.test(value)) {
+    showToast({ tone: 'danger', message: '请选择有效的到期日期' });
+    return;
+  }
+  state.accountPool.busy = true;
+  renderAccountPoolPanelOnly();
+  try {
+    // Preload bridge signature: setAccountExpiry(id, 'YYYY-MM-DD'); '' clears it.
+    const result = await window.vpnAutomation.setAccountExpiry(id, value);
+    if (!result?.ok) {
+      throw new Error(result?.error || '操作失败');
+    }
+    state.accountPool.expiryEditorId = null;
+    showToast({ tone: 'success', message: value ? `${account.account_masked} 到期日已设为 ${value}` : `${account.account_masked} 到期日已清除` });
+  } catch (error) {
+    showToast({ tone: 'danger', message: resolveErrorMessage(error) });
+  } finally {
+    state.accountPool.busy = false;
+  }
+  await hydrateAccountPool();
+}
+
 async function downloadAccountsTemplate() {
   try {
     let content = '';
@@ -1288,6 +1364,9 @@ function resolveSettingsDraftPayload(section, draft) {
   if (section === 'deploy') {
     return sanitizeDeployDraft(draft);
   }
+  if (section === 'network') {
+    return applyNetworkDraft(draft);
+  }
   return structuredClone(draft);
 }
 
@@ -1554,7 +1633,24 @@ function finishRun(result = {}) {
   void hydrateRetryArtifacts();
 }
 
+function applyProgressSnapshot(snapshot) {
+  if (!snapshot?.counts || !snapshot.source_counts) return;
+  state.progressSnapshot = snapshot;
+  state.counts = normalizeCounts({ ...state.counts, ...snapshot.counts });
+  state.sourceCounts = normalizeSourceCounts(snapshot.source_counts);
+}
+
 function handlePipelineEvent(event, options = {}) {
+  handlePipelineEventDetails(event, options);
+  if (event.progress_snapshot && !options.historical
+    && (!event.progress_snapshot.artifact_dir || event.progress_snapshot.artifact_dir === state.artifactDir)) {
+    applyProgressSnapshot(event.progress_snapshot);
+    touchUpdate();
+    renderRuntimeOnly({ chrome: false });
+  }
+}
+
+function handlePipelineEventDetails(event, options = {}) {
   const historical = Boolean(options.historical);
   if (event.type === 'server_state') {
     const nextRunState = String(event.run_state ?? '');
@@ -1673,6 +1769,24 @@ function handlePipelineEvent(event, options = {}) {
     return;
   }
 
+  if (event.type === 'extract_platform_started') {
+    appendLog(`[extract] ${event.source_name} ${platformTag(event.platform)}开始提取，最多 ${event.requested_iterations ?? 0} 次，最少 ${event.min_iterations ?? 0} 次`, {
+      kind: 'stage',
+      stage: 'extract',
+      level: 'info'
+    });
+    return;
+  }
+
+  if (event.type === 'extract_platform_completed') {
+    appendLog(`[extract] ${event.source_name} ${platformTag(event.platform)}完成，成功 ${event.successful_iterations ?? 0} 次，失败 ${event.failed_iterations ?? 0} 次，原始节点 ${event.raw_links ?? 0} 个`, {
+      kind: 'stage',
+      stage: 'extract',
+      level: 'info'
+    });
+    return;
+  }
+
   if (event.type === 'extract_source_started') {
     appendLog(`[extract] ${event.source_name} 开始提取，最多 ${event.requested_iterations ?? 0} 次，最少 ${event.min_iterations ?? 0} 次`, {
       kind: 'stage',
@@ -1685,7 +1799,7 @@ function handlePipelineEvent(event, options = {}) {
   if (event.type === 'extract_request_result') {
     const status = event.success ? '成功' : '失败';
     const retry = event.will_retry ? '，将重试' : '';
-    appendLog(`[extract] ${event.source_name} #${event.iteration} ${event.via} ${status}${retry}`, {
+    appendLog(`[extract] ${event.source_name} ${platformTag(event.platform)}#${event.iteration} ${event.via} ${status}${retry}`, {
       kind: 'stage',
       stage: 'extract',
       level: event.success ? 'info' : 'warning'
@@ -1694,7 +1808,7 @@ function handlePipelineEvent(event, options = {}) {
   }
 
   if (event.type === 'extract_decrypt_result' && !event.success) {
-    appendLog(`[extract] ${event.source_name} #${event.iteration} 解密失败`, {
+    appendLog(`[extract] ${event.source_name} ${platformTag(event.platform)}#${event.iteration} 解密失败`, {
       kind: 'stage',
       stage: 'extract',
       level: 'error'
@@ -1703,7 +1817,7 @@ function handlePipelineEvent(event, options = {}) {
   }
 
   if (event.type === 'extract_source_completed') {
-    updateExtractMetrics({ source_name: event.source_name, total_links: event.raw_links });
+    if (!event.progress_snapshot && !(historical && state.progressSnapshot)) updateExtractMetrics({ source_name: event.source_name, total_links: event.raw_links });
     appendLog(`[extract] ${event.source_name} 完成，成功 ${event.successful_iterations ?? 0} 次，失败 ${event.failed_iterations ?? 0} 次，原始节点 ${event.raw_links ?? 0} 个`, {
       kind: 'stage',
       stage: 'extract',
@@ -1713,8 +1827,11 @@ function handlePipelineEvent(event, options = {}) {
   }
 
   if (event.type === 'extract_iteration') {
-    updateExtractMetrics(event);
-    appendLog(`[extract] ${event.source_name} #${event.iteration ?? 0} 新增 ${event.new_items ?? 0} 个，本次解析 ${event.extracted_links ?? 0} 个，累计 ${event.total_links ?? 0} 个`, {
+    if (!event.progress_snapshot && !(historical && state.progressSnapshot)) updateExtractMetrics(event);
+    // Android and iOS run the same round numbers independently, so a bare `#N`
+    // shows two identical lines. The tag only appears when the event carries a
+    // platform, which keeps older backends and the URL-mode stream unchanged.
+    appendLog(`[extract] ${event.source_name} ${platformTag(event.platform)}#${event.iteration ?? 0} 新增 ${event.new_items ?? 0} 个，本次解析 ${event.extracted_links ?? 0} 个，累计 ${event.total_links ?? 0} 个`, {
       kind: 'stage',
       stage: 'extract',
       level: 'info'
@@ -1723,6 +1840,7 @@ function handlePipelineEvent(event, options = {}) {
   }
 
   if (event.type === 'speedtest_result') {
+    if (event.progress_snapshot || (historical && state.progressSnapshot)) return;
     if (event.passed_threshold) {
       state.counts.speedtest_links = Number(state.counts.speedtest_links ?? 0) + 1;
     }
@@ -1732,6 +1850,7 @@ function handlePipelineEvent(event, options = {}) {
   }
 
   if (event.type === 'availability_link_result') {
+    if (event.progress_snapshot || (historical && state.progressSnapshot)) return;
     if (event.all_passed) {
       state.counts.availability_links = Number(state.counts.availability_links ?? 0) + 1;
     }
@@ -1770,6 +1889,7 @@ function normalizeStageStatuses(stageStatuses = {}) {
 }
 
 function resetRunScopedProgress() {
+  state.progressSnapshot = null;
   state.stageStatus = {};
   state.counts = {};
   state.sourceCounts = {};
@@ -1875,6 +1995,8 @@ function hydrateArtifactState(result) {
   state.artifactDir = result.artifact_dir;
   state.counts = normalizeCounts(result.counts ?? {});
   state.sourceCounts = normalizeSourceCounts(result.source_counts ?? {});
+  // Bounded log history cannot reconstruct metrics that predate its tail.
+  state.progressSnapshot = result.progress_snapshot ?? null;
   state.extractDedupedFingerprints = new Set();
   state.outputFiles = result.outputFiles ?? [];
   state.nodeRows = result.nodeRows ?? [];
@@ -1951,6 +2073,14 @@ function resolveDefaultRetryStage(artifact) {
   return failedStage || retryableStages.at(-1) || '';
 }
 
+// Both channels emit the same round numbers, so the log needs the channel on
+// the line. `[android] ` keeps the rest of the format untouched; an event with
+// no platform (older backend, URL-mode extract) renders exactly as before.
+function platformTag(platform) {
+  const value = String(platform ?? '').trim().toLowerCase();
+  return value === 'android' || value === 'ios' ? `[${value}] ` : '';
+}
+
 function appendLog(message, overrides = {}) {
   const logCenter = document.querySelector('#logCenterTable');
   if (logCenter) {

package/dist/web/renderer/i18n.js

@@ -5,7 +5,7 @@ const ZH_MESSAGES = {
   locale: 'zh-CN',
   appTitle: 'AutoVPN',
   sidebarTitle: 'AutoVPN',
-  sidebarVersion: 'v.2.0.2',
+  sidebarVersion: 'v.2.1.0',
   brandSubtitle: '概览、运行、结果、订阅、日志、设置统一管理',
   languageLabel: '',
   saveButton: '保存配置',

package/dist/web/renderer/styles.css

@@ -1390,6 +1390,8 @@ body[data-page="logs"] #logCenterTable {
 
 .source-credential-rounds {
   display: grid;
+  /* Four controls in a 232px column: two per line, so the labels stay readable
+     next to a 36px number input. */
   grid-template-columns: repeat(2, minmax(72px, 1fr));
   gap: 8px;
 }
@@ -1478,7 +1480,7 @@ body[data-page="logs"] #logCenterTable {
 }
 
 .settings-col-rounds {
-  width: 196px;
+  width: 232px;
 }
 
 .availability-col-url {
@@ -1704,13 +1706,40 @@ body[data-page="logs"] #logCenterTable {
 }
 
 .account-col-expiry {
-  width: 110px;
+  width: 178px;
 }
 
 .account-col-usage {
   width: 132px;
 }
 
+.account-expiry-value {
+  display: block;
+  font-size: 13px;
+}
+
+.account-expiry-value.unknown {
+  color: var(--text-soft);
+}
+
+.account-expiry-edit {
+  margin-top: 4px;
+}
+
+.account-expiry-editor {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 6px;
+  margin-top: 6px;
+}
+
+.account-expiry-editor input {
+  min-width: 132px;
+  padding-inline: 8px;
+  font-size: 12px;
+}
+
 .account-col-actions {
   width: 92px;
 }
@@ -2841,6 +2870,12 @@ body[data-page="logs"] #logCenterTable {
     min-height: 44px;
   }
 
+  /* The expiry editor sits in that same action cell at phone widths, so its
+     date input has to meet the same tap-target floor. */
+  .account-expiry-editor input {
+    min-height: 44px;
+  }
+
   .app-frame {
     display: block;
     height: auto;

package/dist/web/renderer/tables.js

@@ -8,8 +8,8 @@ const TABLES = {
   ],
   accounts: [
     ['account', '账号', 240, 160], ['brand', '加速器', 110, 90],
-    ['status', '状态', 160, 120], ['expiry', '到期', 150, 120],
-    ['usage', '使用', 180, 140], ['actions', '操作', 96, 80]
+    ['status', '状态', 150, 120], ['expiry', '到期', 180, 130],
+    ['usage', '使用', 150, 120], ['actions', '操作', 96, 80]
   ]
 };
 const initialized = new WeakSet();