@swimmingliu/autovpn 2.2.1 → 2.2.3

package/dist/web/renderer/app.js

@@ -22,6 +22,7 @@ import {
   buildRunsStageProgressMarkup,
   buildSpeedTestDraft,
   buildSourceIterationDraft,
+  buildSourceLapEstimate,
   buildSidebarNav,
   buildViewModel,
   buildAccountPoolRecords,
@@ -119,6 +120,8 @@ const state = {
     sortBy: 'brand',
     busy: false,
     canSetExpiry: typeof window.vpnAutomation?.setAccountExpiry === 'function',
+    canRefreshExpiry: typeof window.vpnAutomation?.refreshAccountExpiry === 'function',
+    refreshingExpiry: false,
     expiryEditorId: null
   },
   isDemo: false,
@@ -655,6 +658,12 @@ function handleDocumentInput(event) {
         sourceDraft[sourceName][key] = Math.min(SOURCE_MAXIMUM_KEYS.get(key), sourceDraft[sourceName][key]);
       }
     }
+    // The row's estimate is derived from these inputs; refresh just that line
+    // so the caret in the number input is never replaced mid-edit.
+    if (key === 'max_laps' || key === 'dry_laps' || key === 'area_concurrency') {
+      const estimate = document.querySelector(`[data-source-estimate="${CSS.escape(sourceName)}"]`);
+      if (estimate) estimate.textContent = buildSourceLapEstimate(sourceDraft[sourceName], state.sourceCounts?.[sourceName]?.area_count);
+    }
     return;
   }
 
@@ -807,6 +816,9 @@ const SOURCE_NUMERIC_KEYS = new Set([
   'plateau_limit',
   'areas_per_round',
   'area_concurrency',
+  'max_laps',
+  'dry_laps',
+  'min_laps',
   'max_runtime_seconds',
   'max_areas',
   'area_min',
@@ -818,7 +830,9 @@ const SOURCE_MINIMUM_ONE_KEYS = new Set([
   'max_iterations',
   'plateau_limit',
   'areas_per_round',
-  'area_concurrency'
+  'area_concurrency',
+  'max_laps',
+  'dry_laps'
 ]);
 
 /** Numeric source fields with a hard upper bound, matching the backend clamp. */
@@ -1055,7 +1069,7 @@ function buildSettingsDraft(section) {
     return null;
   }
 
-  if (section === 'sources') return buildSourceIterationDraft(state.profile.sources);
+  if (section === 'sources') return buildSourceIterationDraft(state.profile.sources, state.sourceCounts);
   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);
@@ -1117,6 +1131,7 @@ async function hydrateAccountPool() {
   // 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';
+  state.accountPool.canRefreshExpiry = typeof window.vpnAutomation?.refreshAccountExpiry === 'function';
   touchUpdate();
   renderAccountPoolPanelOnly();
   if (!window.vpnAutomation?.loadAccounts) {
@@ -1170,6 +1185,10 @@ async function handleAccountPoolAction(button) {
     );
     return;
   }
+  if (action === 'refresh-expiry') {
+    await refreshAccountExpiry();
+    return;
+  }
   if (action === 'upload') {
     document.querySelector('#accountPoolFile')?.click();
     return;
@@ -1200,6 +1219,46 @@ async function handleAccountPoolAction(button) {
   }
 }
 
+/**
+ * Log in to the pool to learn each account's real membership date.
+ *
+ * A run leases one account per brand, so a freshly imported pool keeps blank
+ * dates almost forever. This walks the active rows deliberately; the worker
+ * retires the lapsed and non-member ones, and the panel then shows the counts
+ * it actually changed rather than a generic success.
+ */
+async function refreshAccountExpiry() {
+  if (state.accountPool.refreshingExpiry || typeof window.vpnAutomation?.refreshAccountExpiry !== 'function') {
+    return;
+  }
+  state.accountPool.refreshingExpiry = true;
+  state.accountPool.busy = true;
+  renderAccountPoolPanelOnly();
+  try {
+    const result = await window.vpnAutomation.refreshAccountExpiry({});
+    if (result?.ok === false) {
+      throw new Error(result.error || '核对失败');
+    }
+    const checked = Number(result?.checked ?? 0);
+    const updated = Number(result?.updated ?? 0);
+    const expired = Number(result?.expired ?? 0);
+    const retired = Number(result?.retired ?? 0);
+    const failed = Number(result?.failed ?? 0);
+    showToast({
+      tone: failed > 0 ? 'warning' : 'success',
+      message: `核对 ${checked} 个账号：更新到期日 ${updated} 个，剔除 ${expired + retired} 个`
+        + `${failed > 0 ? `，${failed} 个未能登录` : ''}`,
+      durationMs: 5200
+    });
+  } catch (error) {
+    showToast({ tone: 'danger', message: resolveErrorMessage(error), durationMs: 5200 });
+  } finally {
+    state.accountPool.refreshingExpiry = false;
+    state.accountPool.busy = false;
+  }
+  await hydrateAccountPool();
+}
+
 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
@@ -1817,6 +1876,17 @@ function handlePipelineEventDetails(event, options = {}) {
   }
 
   if (event.type === 'extract_source_completed') {
+    // The frozen area list's length feeds the drawer's lap estimate; older
+    // artifacts have no area_count, so it stays optional everywhere.
+    if (event.source_name && Number(event.area_count) >= 1) {
+      state.sourceCounts = {
+        ...state.sourceCounts,
+        [event.source_name]: {
+          ...(state.sourceCounts[event.source_name] ?? {}),
+          area_count: Math.trunc(Number(event.area_count))
+        }
+      };
+    }
     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',

package/dist/web/renderer/i18n.js

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

package/dist/web/renderer/icons.js

@@ -19,6 +19,7 @@ const paths = {
   play: '<path d="m8 4 12 8-12 8z"/>',
   stop: '<rect x="5" y="5" width="14" height="14" rx="2"/>',
   check: '<path d="m5 12 4 4L19 6"/>',
+  shield: '<path d="M12 3l7 3v6c0 4.2-2.9 7.6-7 9-4.1-1.4-7-4.8-7-9V6z"/><path d="m9 12 2 2 4-4"/>',
   chevron: '<path d="m9 5 7 7-7 7"/>',
   sun: '<circle cx="12" cy="12" r="4"/><path d="M12 2v2m0 16v2M2 12h2m16 0h2M5 5l1.5 1.5m11 11L19 19M5 19l1.5-1.5m11-11L19 5"/>',
   moon: '<path d="M21 13A9 9 0 0 1 11 3 9 9 0 1 0 21 13Z"/>',

package/dist/web/renderer/styles.css

@@ -1390,8 +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. */
+  /* Three 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;
 }

package/dist/web/renderer/views.js

@@ -1,10 +1,10 @@
 import { buildStageModel, PAGE_INDEX, PAGE_ORDER, resolveRunControlState } from './state.js';
 import { icon } from './icons.js';
 
-// Defaults for a source row that has never stored a value. A round advances a
-// cursor over that brand's fixed area list and pulls `areas_per_round` ids, so
-// the count is per platform and per round: 4/2 would fetch only a handful of
-// nodes.
+// Legacy round defaults, kept for a row that carries no lap key. A round
+// advances a cursor over that brand's fixed area list and pulls
+// `areas_per_round` ids, so the count is per platform and per round. The drawer
+// no longer edits these; lap mode below is what it shows.
 export const SOURCE_ROUND_DEFAULTS = {
   max_iterations: 200,
   plateau_limit: 50,
@@ -17,6 +17,15 @@ export const SOURCE_ROUND_LIMITS = {
   areas_per_round: [1, 64],
   area_concurrency: [1, 16]
 };
+// Lap mode: one lap asks every area on the vendor's frozen list exactly once,
+// so the drawer only asks for laps and concurrency — no round/area conversion.
+export const SOURCE_LAP_DEFAULTS = {
+  max_laps: 50,
+  dry_laps: 13
+};
+// Used only to seed a legacy row and to estimate before the first run has
+// measured the list; the pipeline itself never reads this number.
+export const REFERENCE_AREA_COUNT = 31;
 export const NETWORK_DEFAULTS = {
   proxy_mode: 'proxy',
   proxy_url: 'http://127.0.0.1:7897'
@@ -742,6 +751,7 @@ export function buildAccountPoolPanel(vm) {
         </div>
         <div class="account-pool-actions">
           <button class="btn btn-secondary small icon-only" data-account-action="refresh" type="button" ${pool.busy ? 'disabled' : ''} aria-label="刷新账号池" title="刷新账号池">${icon('refresh')}</button>
+          ${pool.canRefreshExpiry ? `<button class="btn btn-secondary small" data-account-action="refresh-expiry" type="button" ${pool.busy ? 'disabled' : ''} title="逐个登录账号池，读取真实会员到期日；已过期和非会员账号会被停用并退出轮换">${icon('shield')}${pool.refreshingExpiry ? '核对中…' : '核对会员到期'}</button>` : ''}
           <button class="btn btn-secondary small icon-only" data-account-action="template" type="button" ${pool.busy ? 'disabled' : ''} aria-label="下载模板" title="下载模板">${icon('download')}</button>
           <button class="btn btn-primary small" data-account-action="upload" type="button" ${pool.busy ? 'disabled' : ''}>${icon('upload')}${pool.busy ? '导入中…' : '上传 CSV'}</button>
           <input id="accountPoolFile" data-account-file type="file" accept=".csv,.txt,text/csv,text/plain" hidden aria-hidden="true" tabindex="-1" />
@@ -870,6 +880,8 @@ const EMPTY_ACCOUNT_POOL = {
   // Feature-detected from the preload bridge. The H5/browser build has no
   // setAccountExpiry, so the row simply omits the affordance there.
   canSetExpiry: false,
+  canRefreshExpiry: false,
+  refreshingExpiry: false,
   expiryEditorId: null
 };
 
@@ -889,13 +901,13 @@ function buildSettingsDrawerBody(section, draft, vm = null) {
       <div class="source-drawer-settings">
         <div class="source-drawer-settings-copy">
           <strong>每个加速器只填官网</strong>
-          <span>密钥从 APK 自动发现，账号密码由账号池提供。Android 与 iOS 两个通道同时抓取；「轮数」由两端各自独立跑满，1000 就是 Android 1000 轮加 iOS 1000 轮，不是 500+500。</span>
+          <span>密钥从 APK 自动发现，账号密码由账号池提供。Android 与 iOS 两个通道同时抓取；「遍数」由两端各自独立跑满，50 遍就是 Android 50 遍加 iOS 50 遍，不是 25+25。</span>
         </div>
         <div class="source-drawer-settings-copy">
-          <span>每次运行先按该加速器的节点列表生成一份固定区域列表（去掉中国大陆与免费区域、去重、保持原顺序），运行中不再改变。每一轮用游标依次取出「每轮区域数」个区域（默认 8 个，取完回绕）；「区域并发」控制该轮这些区域请求同时发出的数量（默认 4）。31 个区域默认四轮即可覆盖一遍，轮数按各平台独立计算。</span>
+          <span>每次运行先按该加速器的节点列表生成一份固定区域列表（去掉中国大陆与免费区域、去重、保持原顺序），运行中不再改变。一遍 = 把该加速器全部区域各请求一次（实测 雷霆 30 / 黑洞 31 / 蜜蜂 31 / 旋风 26）；一遍就是一轮，双端各自计遍。「同时请求数」控制一遍内同时发出的请求数量（默认 4），每遍分 ceil(区域数 ÷ 同时请求数) 批依次发出。</span>
         </div>
         <div class="source-drawer-settings-copy">
-          <span>「早停」按连续无新增节点的轮数计数。是否为新节点按节点指纹判断（address / port / id / transport / host / path / tls / sni），并在 Android 与 iOS 之间统一去重：改名重复的节点、或另一端已经抓到的节点，都不会让计数归零。</span>
+          <span>「空转早停」按连续没有新增节点的遍数计数：连续几遍一个新节点都没有，就提前停止该通道。是否为新节点按节点指纹判断（address / port / id / transport / host / path / tls / sni），并在 Android 与 iOS 之间统一去重：改名重复的节点、或另一端已经抓到的节点，都不会让计数归零。</span>
         </div>
       </div>
       </details>
@@ -907,7 +919,7 @@ function buildSettingsDrawerBody(section, draft, vm = null) {
             <col class="settings-col-connection" />
             <col class="settings-col-rounds" />
           </colgroup>
-          <thead><tr><th>启用</th><th>加速器</th><th>官网</th><th>循环</th></tr></thead>
+          <thead><tr><th>启用</th><th>加速器</th><th>官网</th><th>抓取</th></tr></thead>
           <tbody>
             ${SOURCE_DISPLAY_ORDER.map((name) => {
               const source = sourceDraft[name];
@@ -926,26 +938,22 @@ function buildSettingsDrawerBody(section, draft, vm = null) {
                 <td data-field-label="官网">
                   <input aria-label="${label}：官网地址" inputmode="url" spellcheck="false" class="mono" data-drawer-source="${escapeHtml(name)}" data-drawer-key="official_site" placeholder="${escapeHtml(OFFICIAL_SITES[name] ?? '')}" value="${escapeHtml(source.official_site ?? '')}" />
                 </td>
-                <td data-field-label="循环">
+                <td data-field-label="抓取">
                   <div class="source-credential-rounds">
                     <label class="source-field">
-                      <span>轮数</span>
-                      <input type="number" min="1" step="1" inputmode="numeric" aria-label="${label}：抓取轮数" title="Android 与 iOS 各自独立跑满该轮数（1000 = 两端各 1000 轮）；每轮是固定区域列表上的一个游标步，按「每轮区域数」取区域" data-drawer-source="${escapeHtml(name)}" data-drawer-key="max_iterations" value="${escapeHtml(source.max_iterations ?? SOURCE_ROUND_DEFAULTS.max_iterations)}" />
-                    </label>
-                    <label class="source-field">
-                      <span>早停</span>
-                      <input type="number" min="1" step="1" inputmode="numeric" aria-label="${label}：连续空轮早停次数" title="连续多少轮没有真正新增节点就停止；节点指纹在双端之间统一去重" data-drawer-source="${escapeHtml(name)}" data-drawer-key="plateau_limit" value="${escapeHtml(source.plateau_limit ?? SOURCE_ROUND_DEFAULTS.plateau_limit)}" />
+                      <span>抓取遍数</span>
+                      <input type="number" min="1" step="1" inputmode="numeric" aria-label="${label}：抓取遍数" title="Android 与 iOS 各自独立跑满该遍数（50 = 两端各 50 遍）；一遍把该加速器全部区域各请求一次" data-drawer-source="${escapeHtml(name)}" data-drawer-key="max_laps" value="${escapeHtml(source.max_laps ?? SOURCE_LAP_DEFAULTS.max_laps)}" />
                     </label>
                     <label class="source-field">
-                      <span>每轮区域数</span>
-                      <input type="number" min="1" max="64" step="1" inputmode="numeric" aria-label="${label}：每轮区域数" title="每轮从固定区域列表按游标取出的区域数，列表在运行中不变；取完回绕" data-drawer-source="${escapeHtml(name)}" data-drawer-key="areas_per_round" value="${escapeHtml(source.areas_per_round ?? SOURCE_ROUND_DEFAULTS.areas_per_round)}" />
+                      <span>空转早停（遍）</span>
+                      <input type="number" min="1" step="1" inputmode="numeric" aria-label="${label}：空转早停（遍）" title="连续多少遍没有真正新增节点就停止该通道；节点指纹在双端之间统一去重" data-drawer-source="${escapeHtml(name)}" data-drawer-key="dry_laps" value="${escapeHtml(source.dry_laps ?? SOURCE_LAP_DEFAULTS.dry_laps)}" />
                     </label>
                     <label class="source-field">
-                      <span>区域并发</span>
-                      <input type="number" min="1" max="16" step="1" inputmode="numeric" aria-label="${label}：区域并发" title="该轮区域请求同时发出的数量" data-drawer-source="${escapeHtml(name)}" data-drawer-key="area_concurrency" value="${escapeHtml(source.area_concurrency ?? SOURCE_ROUND_DEFAULTS.area_concurrency)}" />
+                      <span>同时请求数</span>
+                      <input type="number" min="1" max="16" step="1" inputmode="numeric" aria-label="${label}：同时请求数" title="一遍内同时发出的区域请求数量；每遍分 ceil(区域数 ÷ 同时请求数) 批依次发出" data-drawer-source="${escapeHtml(name)}" data-drawer-key="area_concurrency" value="${escapeHtml(source.area_concurrency ?? SOURCE_ROUND_DEFAULTS.area_concurrency)}" />
                     </label>
                   </div>
-                  <span class="source-round-summary">双端各自计轮 · 每轮按固定区域列表推进</span>
+                  <span class="source-round-summary" data-source-estimate="${escapeHtml(name)}">${escapeHtml(buildSourceLapEstimate(source, vm?.sourceCounts?.[name]?.area_count))}</span>
                 </td>
               </tr>
             `;
@@ -1156,7 +1164,9 @@ function buildSourceRows(profile) {
     maxIterations: Number(source.max_iterations ?? SOURCE_ROUND_DEFAULTS.max_iterations),
     plateauLimit: Number(source.plateau_limit ?? SOURCE_ROUND_DEFAULTS.plateau_limit),
     areasPerRound: Number(source.areas_per_round ?? SOURCE_ROUND_DEFAULTS.areas_per_round),
-    areaConcurrency: Number(source.area_concurrency ?? SOURCE_ROUND_DEFAULTS.area_concurrency)
+    areaConcurrency: Number(source.area_concurrency ?? SOURCE_ROUND_DEFAULTS.area_concurrency),
+    maxLaps: Number(source.max_laps ?? SOURCE_LAP_DEFAULTS.max_laps),
+    dryLaps: Number(source.dry_laps ?? SOURCE_LAP_DEFAULTS.dry_laps)
   }));
 }
 
@@ -1215,8 +1225,74 @@ export function buildSpeedTestDraft(config = {}) {
   return structuredClone({ ...FALLBACK_PROFILE.speed_test, ...config });
 }
 
-export function buildSourceIterationDraft(sources = {}) {
+export function buildSourceIterationDraft(sources = {}, sourceCounts = {}) {
+  // Snapshot which rows actually stored a legacy budget BEFORE normalization
+  // fills every row with the legacy defaults; a fresh row must get the shipped
+  // lap defaults, not a conversion of numbers it never had. Aliases count too.
+  const storedLegacy = new Set();
+  // The stored caps themselves, keyed by canonical name. Normalization fills
+  // every row with the shipped legacy defaults, so converting from the
+  // normalized row would turn a URL row's stored 40 rounds into 200 and then
+  // save 200 back — the operator's number must come from the file.
+  const storedCaps = new Map();
+  for (const [name, source] of Object.entries(sources ?? {})) {
+    const canonical = LEGACY_SOURCE_ALIASES[name] ?? name;
+    if (hasStoredLapValue(source?.max_iterations) || hasStoredLapValue(source?.plateau_limit)) {
+      storedLegacy.add(canonical);
+      if (!storedCaps.has(canonical)) storedCaps.set(canonical, source);
+    }
+  }
   const normalized = normalizeOfficialSourceDraft(sources);
+  // Seeding is draft-only: opening the drawer converts nothing on disk, and
+  // 取消 writes nothing. Saving is the opt-in to lap mode; the estimate line
+  // shows the converted request counts before 保存 is pressed.
+  for (const [name, source] of Object.entries(normalized)) {
+    if (!SOURCE_DISPLAY_ORDER.includes(name)) continue;
+    const storedLaps = hasStoredLapValue(source.max_laps) ? coercePositiveInteger(source.max_laps, SOURCE_LAP_DEFAULTS.max_laps) : null;
+    const storedDry = hasStoredLapValue(source.dry_laps) ? coercePositiveInteger(source.dry_laps, SOURCE_LAP_DEFAULTS.dry_laps) : null;
+    if (storedLaps !== null || storedDry !== null) {
+      source.max_laps = storedLaps ?? SOURCE_LAP_DEFAULTS.max_laps;
+      // Same clamp as the conversion below: a profile written by an older
+      // build (or hand-edited) can already hold dry > max, and the drawer's
+      // validator refuses that pair — an untouched row must stay savable.
+      source.dry_laps = Math.min(source.max_laps, storedDry ?? SOURCE_LAP_DEFAULTS.dry_laps);
+      continue;
+    }
+    // Only a row that actually stored a legacy budget is converted; a fresh
+    // row gets the shipped lap defaults (50 / 13), not a conversion of the
+    // normalization-filled legacy defaults.
+    if (!storedLegacy.has(name)) {
+      source.max_laps = SOURCE_LAP_DEFAULTS.max_laps;
+      source.dry_laps = SOURCE_LAP_DEFAULTS.dry_laps;
+      continue;
+    }
+    // A legacy row is converted at the measured list length when a run has
+    // reported one, else the reference count (labelled 估算 in the drawer).
+    const areas = observedAreaCount(sourceCounts?.[name]?.area_count);
+    const stored = storedCaps.get(name) ?? {};
+    // The stored caps seed the lap estimate. A URL row's caps count URL
+    // fetches rather than route-loop rounds, so the conversion is an estimate
+    // for that row, which the drawer labels 估算.
+    const legacyIterations = coercePositiveInteger(stored.max_iterations, SOURCE_ROUND_DEFAULTS.max_iterations);
+    const legacyPlateau = coercePositiveInteger(stored.plateau_limit, SOURCE_ROUND_DEFAULTS.plateau_limit);
+    const legacyWidth = coerceBoundedInteger(stored.areas_per_round ?? source.areas_per_round, SOURCE_ROUND_DEFAULTS.areas_per_round, 1, 64);
+    // Saving opts the row into lap mode, so the stored budget is kept beside
+    // the lap keys: removing them later restores exactly these rounds. A row
+    // that never stored a budget keeps the normalization default.
+    if (stored.mode === 'credential') {
+      source.max_iterations = legacyIterations;
+      source.plateau_limit = legacyPlateau;
+    }
+    // The estimate uses the stored numbers even for a URL row: 3000 URL
+    // iterations at width 8 is the work that row used to do.
+    const seedIterations = coercePositiveInteger(stored.max_iterations, legacyIterations);
+    const seedPlateau = coercePositiveInteger(stored.plateau_limit, legacyPlateau);
+    source.max_laps = Math.max(1, Math.round((seedIterations * legacyWidth) / areas));
+    // A round-mode row may legitimately carry a plateau above its cap (the cap
+    // wins there). Converted to laps that pair would be refused by the drawer's
+    // own validator, so the seed clamps it: an untouched row must stay savable.
+    source.dry_laps = Math.min(source.max_laps, Math.max(1, Math.round((seedPlateau * legacyWidth) / areas)));
+  }
   const firstSource = Object.values(normalized)[0] ?? {};
   return {
     sources: normalized,
@@ -1227,6 +1303,33 @@ export function buildSourceIterationDraft(sources = {}) {
   };
 }
 
+/** A cleared input is '' — still an edit in progress, not an absent field. */
+function hasStoredLapValue(value) {
+  return value !== undefined && value !== null && value !== '';
+}
+
+/** The measured list length when a run reported one, else the reference count. */
+function observedAreaCount(value) {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) && parsed >= 1 ? Math.trunc(parsed) : REFERENCE_AREA_COUNT;
+}
+
+/**
+ * The row's derived request budget. Laps × areas is exact arithmetic, so the
+ * operator can check it by hand; waves use min(C, N) because a tiny debug list
+ * clamps the workers to its own length.
+ */
+export function buildSourceLapEstimate(source = {}, areaCount) {
+  const measured = Number.isFinite(Number(areaCount)) && Number(areaCount) >= 1;
+  const areas = observedAreaCount(areaCount);
+  const laps = coercePositiveInteger(source.max_laps, SOURCE_LAP_DEFAULTS.max_laps);
+  const dry = coercePositiveInteger(source.dry_laps, SOURCE_LAP_DEFAULTS.dry_laps);
+  const concurrency = coerceBoundedInteger(source.area_concurrency, SOURCE_ROUND_DEFAULTS.area_concurrency, 1, 16);
+  const waves = Math.ceil(areas / Math.min(concurrency, areas));
+  return `区域 ${areas}（${measured ? '实测' : '估算'}） · 最多 ${laps} 遍 × ${areas} 区域 = ${laps * areas} 次请求/端` +
+    ` · 并发 ${concurrency} → 每遍 ${waves} 批（约 ${waves} 秒/遍） · 早停 ${dry} 遍 = ${dry * areas} 次`;
+}
+
 export function buildAvailabilityTargetDraft(targets = {}) {
   return {
     targets: Object.entries(targets).map(([name, target]) => ({
@@ -1332,9 +1435,27 @@ export function validateSourceDraft(draft = {}) {
   }
   for (const [name, source] of Object.entries(sources)) {
     if (!SOURCE_DISPLAY_ORDER.includes(name)) continue;
+    for (const [key, label] of [
+      ['max_laps', '抓取遍数'],
+      ['dry_laps', '空转早停（遍）']
+    ]) {
+      const raw = source?.[key];
+      if (raw === undefined || raw === null || raw === '') continue;
+      const value = Number(raw);
+      if (!Number.isFinite(value) || value < 1 || Math.trunc(value) !== value) {
+        return `${SOURCE_NAMES[name] ?? name}：${label}至少为 1`;
+      }
+    }
+    const laps = Number(source?.max_laps);
+    const dry = Number(source?.dry_laps);
+    // More dry laps than total laps means the early stop could never fire;
+    // that is a typo, not a policy, so it is refused before save.
+    if (Number.isFinite(laps) && Number.isFinite(dry) && laps >= 1 && dry > laps) {
+      return `${SOURCE_NAMES[name] ?? name}：空转早停（遍）不能大于抓取遍数`;
+    }
     for (const [key, label, [, max]] of [
       ['areas_per_round', '每轮区域数', SOURCE_ROUND_LIMITS.areas_per_round],
-      ['area_concurrency', '区域并发', SOURCE_ROUND_LIMITS.area_concurrency]
+      ['area_concurrency', '同时请求数', SOURCE_ROUND_LIMITS.area_concurrency]
     ]) {
       const raw = source?.[key];
       if (raw === undefined || raw === null || raw === '') continue;
@@ -1508,6 +1629,9 @@ export function normalizeOfficialSourceDraft(sources = {}) {
           plateau_limit: existing.plateau_limit ?? source.plateau_limit,
           areas_per_round: existing.areas_per_round ?? source.areas_per_round,
           area_concurrency: existing.area_concurrency ?? source.area_concurrency,
+          max_laps: existing.max_laps ?? source.max_laps,
+          dry_laps: existing.dry_laps ?? source.dry_laps,
+          min_laps: existing.min_laps ?? source.min_laps,
           enabled: existing.enabled !== false || source.enabled !== false
         }
       : { ...source };
@@ -1515,6 +1639,11 @@ export function normalizeOfficialSourceDraft(sources = {}) {
   const vendorRows = Object.fromEntries(SOURCE_DISPLAY_ORDER.map((name) => {
     const source = collapsed[name] ?? {};
     const wasCredential = source.mode === 'credential';
+    // A lap row already carries the budget in the operator's own unit. Its
+    // legacy caps are kept verbatim so removing the lap keys later restores
+    // exactly the rounds that were stored, instead of the shipped default.
+    const hasLapKey = ['max_laps', 'dry_laps', 'min_laps'].some((key) => hasStoredLapValue(source[key]));
+    const keepLegacyCaps = wasCredential || hasLapKey;
     const normalized = {
       ...source,
       mode: 'credential',
@@ -1525,15 +1654,15 @@ export function normalizeOfficialSourceDraft(sources = {}) {
         ? (OFFICIAL_SITES[name] ?? '')
         : String(source.official_site).trim(),
       enabled: source.enabled !== false,
-      max_iterations: wasCredential ? coercePositiveInteger(source.max_iterations, SOURCE_ROUND_DEFAULTS.max_iterations) : SOURCE_ROUND_DEFAULTS.max_iterations,
-      plateau_limit: wasCredential ? coercePositiveInteger(source.plateau_limit, SOURCE_ROUND_DEFAULTS.plateau_limit) : SOURCE_ROUND_DEFAULTS.plateau_limit,
-      areas_per_round: wasCredential ? coerceBoundedInteger(source.areas_per_round, SOURCE_ROUND_DEFAULTS.areas_per_round, 1, 64) : SOURCE_ROUND_DEFAULTS.areas_per_round,
-      area_concurrency: wasCredential ? coerceBoundedInteger(source.area_concurrency, SOURCE_ROUND_DEFAULTS.area_concurrency, 1, 16) : SOURCE_ROUND_DEFAULTS.area_concurrency
+      max_iterations: keepLegacyCaps ? coercePositiveInteger(source.max_iterations, SOURCE_ROUND_DEFAULTS.max_iterations) : SOURCE_ROUND_DEFAULTS.max_iterations,
+      plateau_limit: keepLegacyCaps ? coercePositiveInteger(source.plateau_limit, SOURCE_ROUND_DEFAULTS.plateau_limit) : SOURCE_ROUND_DEFAULTS.plateau_limit,
+      areas_per_round: keepLegacyCaps ? coerceBoundedInteger(source.areas_per_round, SOURCE_ROUND_DEFAULTS.areas_per_round, 1, 64) : SOURCE_ROUND_DEFAULTS.areas_per_round,
+      area_concurrency: keepLegacyCaps ? coerceBoundedInteger(source.area_concurrency, SOURCE_ROUND_DEFAULTS.area_concurrency, 1, 16) : SOURCE_ROUND_DEFAULTS.area_concurrency
     };
     for (const field of OBSOLETE_SOURCE_FIELDS) delete normalized[field];
     // A URL-mode floor is the same mismatch as its URL-mode cap: 10 URL fetches
     // are not 10 route-loop rounds, so it goes with the rest of the old shape.
-    if (!wasCredential) delete normalized.min_iterations;
+    if (!wasCredential && !hasLapKey) delete normalized.min_iterations;
     return [name, normalized];
   }));
   return { ...vendorRows, ...extras };

package/dist/web/renderer/workspace.css

@@ -103,14 +103,43 @@ input, select, textarea { min-height: 36px; padding-inline: 10px; border-radius:
    margins and list markers out of chart captions and legend rows. */
 .dashboard-analytics p { margin: 0; }
 .dashboard-analytics ul { list-style: none; margin: 0; padding: 0; }
-.analytics-distributions { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 16px; }
+/* One card per row: a distribution's legend is always wider than its ring, so
+   side-by-side cards forced the country list into a narrow column and left the
+   two cards at different heights. Full width lets the chips flow sideways. */
+.analytics-distributions { display: grid; grid-template-columns: minmax(0, 1fr); gap: 16px; align-items: start; }
+/* Before the first run neither card has a legend to flow, so two full-width
+   cards would be two empty bands. Side by side and short until data arrives. */
+.analytics-distributions:has(.chart-empty) { grid-template-columns: repeat(2, minmax(0, 1fr)); }
+.analytics-distribution { position: relative; overflow: hidden; isolation: isolate; }
+/* The card's own light: a wash behind the ring tinted by the focused country,
+   so hovering a chip moves the light and the arc as one object. */
+.analytics-aura { position: absolute; inset: 0; z-index: -1; pointer-events: none; transition: background 320ms cubic-bezier(.16, 1, .3, 1); }
 .analytics-distribution h3, .analytics-heading h3 { font-size: 14px; font-weight: 600; margin: 0 0 16px; }
-.distribution-layout { display: grid; grid-template-columns: minmax(128px, .85fr) minmax(0, 1.15fr); align-items: center; gap: 20px; }
-.analytics-distribution [data-donut-legend] { min-height: 44px; color: var(--text); font-size: 13px; border: 0; background: transparent; }
-.analytics-distribution [data-donut-legend]:hover, .analytics-distribution [data-donut-legend]:focus-visible { background: var(--surface-muted); }
-.distribution-share { color: var(--text-soft); margin-left: 10px; font-size: 12px; }
-.chart-empty { min-height: 176px; display: flex; align-items: center; justify-content: center; gap: 20px; color: var(--text-soft); font-size: 13px; }
-.empty-donut { width: 130px; height: 130px; border: 22px solid var(--surface-muted); border-radius: 50%; }
+.analytics-count { font-size: 12px; color: var(--text-soft); }
+.analytics-count strong { color: var(--text); font-size: 13px; font-weight: 700; font-variant-numeric: tabular-nums; }
+/* Ring left, chips flowing right. A country list is the long side: one
+   full-width row per country stretched the panel to the length of the list
+   instead of the height of the ring. */
+.distribution-layout { display: grid; grid-template-columns: 184px minmax(0, 1fr); align-items: center; gap: 26px; }
+.distribution-plot { max-width: 184px; }
+.distribution-plot svg { filter: drop-shadow(0 10px 22px rgb(29 39 71 / 16%)); }
+:root[data-theme="dark"] .distribution-plot svg { filter: drop-shadow(0 10px 26px rgb(0 0 0 / 45%)); }
+.ring-readout { display: grid; justify-items: center; gap: 3px; }
+.ring-value { font-size: 30px; font-weight: 750; letter-spacing: -.02em; line-height: 1.05; font-variant-numeric: tabular-nums; }
+.ring-caption { display: inline-flex; align-items: center; gap: 5px; font-size: 12px; color: var(--text-soft); white-space: nowrap; }
+.distribution-chips { display: flex; flex-wrap: wrap; align-content: flex-start; gap: 7px 8px; margin: 0; padding: 0; list-style: none; }
+/* Chips drive the ring's focus, so they carry the same 44px target as every
+   other control; the flow layout keeps that height from stretching the card. */
+.distribution-chip { display: inline-flex; align-items: center; gap: 6px; min-height: 44px; padding: 6px 12px; border: 1px solid var(--border); border-radius: 999px; background: var(--surface); color: var(--text); font-size: 12.5px; font-weight: 550; line-height: 1.1; cursor: pointer; box-shadow: 0 1px 2px rgb(25 30 55 / 4%); }
+.distribution-chip:hover, .distribution-chip:focus-visible { border-color: var(--chip-color, var(--accent)); background: color-mix(in srgb, var(--chip-color, var(--accent)) 10%, var(--surface)); outline: none; }
+.distribution-chip.is-active { border-color: var(--chip-color, var(--accent)); background: color-mix(in srgb, var(--chip-color, var(--accent)) 14%, var(--surface)); box-shadow: 0 4px 14px color-mix(in srgb, var(--chip-color, var(--accent)) 26%, transparent); }
+.distribution-dot { width: 8px; height: 8px; flex: none; border-radius: 50%; }
+.distribution-flag { font-size: 13px; line-height: 1; }
+.distribution-name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.distribution-value { font-variant-numeric: tabular-nums; font-weight: 750; }
+.distribution-share { color: var(--text-soft); font-size: 11.5px; font-weight: 600; font-variant-numeric: tabular-nums; }
+.chart-empty { min-height: 104px; display: flex; align-items: center; justify-content: center; gap: 16px; color: var(--text-soft); font-size: 13px; }
+.empty-donut { width: 76px; height: 76px; border: 13px solid var(--surface-muted); border-radius: 50%; }
 .analytics-heading { display: flex; align-items: center; justify-content: space-between; gap: 12px; margin-bottom: 14px; }
 .analytics-heading h3 { margin-bottom: 0; }
 .analytics-heading > span { font-size: 12px; color: var(--text-soft); }
@@ -313,7 +342,7 @@ body[data-page="logs"] #logsWorkspace > .panel { grid-template-rows: auto minmax
   .metric-card:nth-child(3) { border-left: 0; }
 }
 @media (max-width: 960px) {
-  .analytics-distributions { grid-template-columns: 1fr; }
+  .analytics-distributions, .analytics-distributions:has(.chart-empty) { grid-template-columns: 1fr; }
   .sidebar-toggle { display: none; }
   .btn, .btn.small, .btn.icon-only, .icon-btn, .theme-choice, input, select, textarea { min-height: 44px; }
   .btn.icon-only, .icon-btn { width: 44px; min-width: 44px; height: 44px; }
@@ -322,7 +351,10 @@ body[data-page="logs"] #logsWorkspace > .panel { grid-template-rows: auto minmax
   .column-options > summary { min-height: 44px; }
 }
 @media (max-width: 720px) {
-  .distribution-layout { grid-template-columns: 120px minmax(0, 1fr); gap: 10px; }
+  .distribution-layout { grid-template-columns: minmax(0, 1fr); gap: 16px; justify-items: center; }
+  .distribution-plot { max-width: 156px; }
+  .distribution-chips { justify-content: center; }
+  .ring-value { font-size: 26px; }
   .analytics-distribution [data-donut-legend] { padding-inline: 6px; }
   .account-pool-table-wrap { max-height: none; }
   .sidebar-nav { grid-template-columns: repeat(5, minmax(0, 1fr)); }
@@ -384,3 +416,12 @@ body[data-page="logs"] #logsWorkspace > .panel { grid-template-rows: auto minmax
 @media (prefers-reduced-motion: reduce) {
   *, *::before, *::after { transition: none !important; scroll-behavior: auto !important; }
 }
+/* Stacked share bar: one row split by value, for lists too short to fill a ring. */
+.share-track { display: flex; gap: 3px; height: 20px; border-radius: 999px; overflow: hidden; background: var(--surface-muted); box-shadow: inset 0 1px 2px rgb(25 30 55 / 6%); }
+.share-segment { display: block; min-width: 4px; transform-origin: left center; background: linear-gradient(180deg, color-mix(in srgb, var(--segment-color) 82%, #fff) 0%, var(--segment-color) 100%); transition: opacity 200ms ease, filter 200ms ease; }
+.share-segment.is-dimmed { opacity: .34; }
+.share-segment.is-active { filter: saturate(1.15) brightness(1.06); }
+.share-chips { margin-top: 14px; }
+.calendar-stats { display: flex; flex-wrap: wrap; gap: 8px; margin-bottom: 14px; }
+.calendar-stat { display: inline-flex; align-items: baseline; gap: 5px; padding: 5px 11px; border: 1px solid var(--border); border-radius: 999px; background: var(--surface-soft); font-size: 12px; color: var(--text-soft); }
+.calendar-stat strong { color: var(--text); font-size: 14px; font-weight: 750; font-variant-numeric: tabular-nums; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swimmingliu/autovpn",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "npm wrapper for the AutoVPN headless CLI",
   "type": "module",
   "repository": {