@swimmingliu/autovpn 2.1.0 → 2.1.2

package/dist/artifacts/preview.js

@@ -1,7 +1,12 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { isIsoAlpha2CountryCode } from '../pipeline/country-codes.js';
 import { redactText, safeDeployment } from '../runtime/redaction.js';
 const FINAL_NODE_FILES = ['vpn_node_emoji.txt', 'vpn_node_availability.txt', 'vpn_node_speedtest.txt'];
+// Postprocess decorates every node as `<flag> <CC> <vendor name>`. The country
+// code is only trusted in that exact position; a bare two-letter token inside a
+// vendor name is not a region.
+const LEADING_FLAG_COUNTRY_PATTERN = /^[\u{1F1E6}-\u{1F1FF}]{2}\s+([A-Z]{2})(?:\s|$)/u;
 function formatBytes(size) {
     if (size >= 1024 * 1024) {
         return `${(size / 1024 / 1024).toFixed(1)} MB`;
@@ -29,46 +34,87 @@ function fileInventory(artifactDir) {
         .map((item) => ({ name: path.basename(item), size: formatBytes(fs.statSync(item).size) }))
         .sort((left, right) => String(left.name).localeCompare(String(right.name)));
 }
-function decodeVmessRegion(link) {
+/**
+ * Decode one final-output line into the row the UI renders.
+ *
+ * Country comes from the decorated name, never from the address: the pipeline
+ * writes `<flag> <CC> <vendor name>`, so the prefix is authoritative and a name
+ * without one is unknown rather than a guess.
+ *
+ * A line that is not a decodable vmess link returns null, matching the desktop
+ * preview (`electron/lib/artifact-preview.js`): counting it would report a
+ * "node" the results table cannot show.
+ */
+export function parseFinalNode(link) {
     const value = link.trim();
     if (!value.startsWith('vmess://')) {
-        return 'OTHER';
+        return null;
     }
     let encoded = value.slice('vmess://'.length);
     encoded += '='.repeat((4 - (encoded.length % 4)) % 4);
     try {
         const payload = JSON.parse(Buffer.from(encoded, 'base64url').toString('utf8'));
-        const match = String(payload.ps ?? '').toUpperCase().match(/\b([A-Z]{2})\b/);
-        return match ? match[1] : 'OTHER';
+        const name = String(payload.ps ?? '');
+        const match = name.trim().toUpperCase().match(LEADING_FLAG_COUNTRY_PATTERN);
+        const regionCode = match && isIsoAlpha2CountryCode(match[1]) ? match[1] : 'OTHER';
+        return {
+            name,
+            address: String(payload.add ?? ''),
+            protocol: 'vmess',
+            path: String(payload.path ?? ''),
+            link: value,
+            regionCode
+        };
     }
     catch {
-        return 'OTHER';
+        return null;
     }
 }
-function safeNodeCounts(artifactDir) {
+function readFinalNodes(artifactDir) {
     const nodeSource = FINAL_NODE_FILES.find((name) => fs.existsSync(path.join(artifactDir, name))) ?? '';
     if (!nodeSource) {
-        return { node_source: '', final_node_count: 0, regions: [] };
+        return { nodeSource, rows: [] };
     }
     const lines = fs.readFileSync(path.join(artifactDir, nodeSource), 'utf8').split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+    const rows = lines.map((line) => parseFinalNode(line)).filter((row) => row !== null);
+    return { nodeSource, rows };
+}
+function regionCounts(rows) {
     const counts = new Map();
-    for (const line of lines) {
-        const region = decodeVmessRegion(line);
-        counts.set(region, (counts.get(region) ?? 0) + 1);
+    for (const row of rows) {
+        // The UI folds an undecorated name into US when it charts (buildRegionStats),
+        // so the summary must report the same number or the two disagree.
+        const regionCode = row.regionCode === 'OTHER' ? 'US' : row.regionCode;
+        counts.set(regionCode, (counts.get(regionCode) ?? 0) + 1);
     }
+    return [...counts.entries()]
+        .sort(([left], [right]) => left.localeCompare(right))
+        .map(([region_code, count]) => ({ region_code, count }));
+}
+function safeNodeCounts(rows, nodeSource) {
     return {
         node_source: nodeSource,
-        final_node_count: lines.length,
-        regions: [...counts.entries()].sort(([left], [right]) => left.localeCompare(right)).map(([region_code, count]) => ({ region_code, count }))
+        final_node_count: rows.length,
+        regions: regionCounts(rows)
     };
 }
-export function previewArtifact(artifactDir) {
+/**
+ * Preview one artifact directory.
+ *
+ * `includeNodeRows` is what the serve runtime asks for: the results page and
+ * the 国家分布 donut read those rows, and answering `nodeRows: []` left a
+ * browser session at 0 nodes and an empty donut on a complete artifact. The
+ * CLI's `artifact preview` keeps them out of its JSON so a 400-node artifact
+ * does not print every link.
+ */
+export function previewArtifact(artifactDir, options = {}) {
     const absolute = path.resolve(artifactDir);
     const resolved = fs.existsSync(absolute) ? fs.realpathSync(absolute) : absolute;
     if (!fs.existsSync(resolved) || !fs.statSync(resolved).isDirectory()) {
         return { ok: false, artifact_dir: resolved };
     }
     const report = loadJson(path.join(resolved, 'pipeline_report.json'));
+    const finalNodes = readFinalNodes(resolved);
     return {
         ok: true,
         artifact_dir: resolved,
@@ -80,6 +126,7 @@ export function previewArtifact(artifactDir) {
         retry_context: report.retry_context ?? {},
         error: redactText(String(report.error ?? '')),
         files: fileInventory(resolved),
-        safe_node_counts: safeNodeCounts(resolved)
+        safe_node_counts: safeNodeCounts(finalNodes.rows, finalNodes.nodeSource),
+        ...(options.includeNodeRows ? { nodeRows: finalNodes.rows } : {})
     };
 }

package/dist/config/profile.js

@@ -87,10 +87,9 @@ export function normalizeOfficialSources(sources) {
             mode: 'credential',
             official_site: String(config.official_site ?? '').trim() || brandSite(brand),
             enabled: config.enabled !== false,
-            // A round is now one cursor step over the fixed area list (one region by
-            // default), not a full sweep of every region. 200 / 50 preserves roughly
-            // the work the old 4 full sweeps did and matches the early-stop rule:
-            // 50 consecutive rounds with no genuinely new node.
+            // A round is one cursor step over the fixed area list, not a full sweep
+            // of every region. 200 rounds × the default 8 areas / 50 with no new
+            // node matches the documented defaults.
             max_iterations: wasCredential ? positiveInteger(config.max_iterations, 200) : 200,
             plateau_limit: wasCredential ? positiveInteger(config.plateau_limit, 50) : 50,
             areas_per_round: Math.min(64, positiveInteger(config.areas_per_round, 8)),

package/dist/pipeline/credential-source.js

@@ -151,9 +151,9 @@ export function resolveRoundPolicy(source) {
     };
 }
 /**
- * A round is one cursor step over the fixed area list, not a full sweep, so
- * the shipped budget is sized in rounds of one area each. 200 rounds × the
- * default 1 area is roughly the work the old 4 full sweeps performed.
+ * A round is one cursor step over the fixed area list, not a full sweep.
+ * 200 rounds × the default 8 areas covers the whole list many times over, and
+ * the plateau stop ends a channel the moment the server has nothing new left.
  */
 export const DEFAULT_MAX_ITERATIONS = 200;
 export const DEFAULT_PLATEAU_LIMIT = 50;

package/dist/pipeline/egress.js

@@ -65,7 +65,13 @@ export function resolveEgressPolicy(env = process.env) {
 }
 /** Status codes a vendor or its CDN uses when it stops serving this client. */
 const BLOCK_STATUS = new Set([403, 407, 429, 451, 503]);
-const BLOCK_BODY_PATTERN = /封禁|封鎖|封锁|禁止访问|禁止訪問|访问受限|訪問受限|您的IP|你的IP|IP\s*被|异常访问|異常訪問|请求过于频繁|請求過於頻繁|操作频繁|操作頻繁|too\s*many\s*requests|rate\s*limit|access\s*denied|forbidden|blocked|cf-browser-verification|just\s*a\s*moment|attention\s*required|captcha/i;
+/**
+ * Body wording a block page uses. Every phrase needs a ban context: an
+ * accelerator's marketing copy legitimately says "隐藏您的IP地址" (hide your
+ * IP), and a bare `您的IP` read that as a ban, emptied the official-site
+ * response, and made 蜜蜂's APK undiscoverable for the whole run.
+ */
+const BLOCK_BODY_PATTERN = /封禁|封鎖|封锁|禁止访问|禁止訪問|(?:访问|訪問)受限|异常访问|異常訪問|请求过于频繁|請求過於頻繁|操作频繁|操作頻繁|(?:您的|你的|当前|當前|该|該)?\s*IP\s*(?:地址|位址)?\s*(?:已)?\s*(?:被|遭)\s*(?:封|禁|鎖|锁|限制|拉黑)|(?:您的|你的|当前|當前)?\s*IP\s*(?:已被|被)\s*(?:封禁|封鎖|封锁|限制|禁止)|too\s*many\s*requests|rate\s*limit|access\s*denied|forbidden|you\s+have\s+been\s+blocked|cf-browser-verification|just\s*a\s*moment|attention\s*required|captcha/i;
 /** Classify a response or transport error for the switch decision. */
 export function classifyEgressFailure(input) {
     const status = Number(input.status ?? 0);

package/dist/server/runtime.js

@@ -66,7 +66,7 @@ function normalizeLatestArtifact(projectRoot, env) {
     if (!latest.ok || !latest.artifact_dir) {
         return undefined;
     }
-    const preview = previewArtifact(String(latest.artifact_dir));
+    const preview = previewArtifact(String(latest.artifact_dir), { includeNodeRows: true });
     const progress = readRunProgress(path.join(String(latest.artifact_dir), 'run.db'));
     return {
         ...latest,
@@ -75,7 +75,10 @@ function normalizeLatestArtifact(projectRoot, env) {
         // replace the authoritative totals that already exist in the run database.
         ...(progress ? { counts: { ...(preview.counts ?? {}), ...progress.counts }, source_counts: progress.source_counts, progress_snapshot: progress } : {}),
         outputFiles: (preview.files ?? []),
-        nodeRows: []
+        // The results page and the country donut read these rows. Answering with an
+        // empty array left a browser session at 0 nodes and an empty 国家分布 while
+        // the artifact held the full final list.
+        nodeRows: (preview.nodeRows ?? [])
     };
 }
 function parseJsonLine(line) {

package/dist/web/renderer/i18n.js

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

package/dist/web/renderer/views.js

@@ -1,9 +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 is one
-// cursor step over that brand's fixed area list (one region by default), so the
-// count is per platform and per region: 4/2 would fetch only a handful of nodes.
+// 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.
 export const SOURCE_ROUND_DEFAULTS = {
   max_iterations: 200,
   plateau_limit: 50,
@@ -929,7 +930,7 @@ function buildSettingsDrawerBody(section, draft, vm = null) {
                   <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 轮）；每轮是固定区域列表上的一个游标步，默认只取 1 个区域" data-drawer-source="${escapeHtml(name)}" data-drawer-key="max_iterations" value="${escapeHtml(source.max_iterations ?? SOURCE_ROUND_DEFAULTS.max_iterations)}" />
+                      <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>

package/package.json

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