@swimmingliu/autovpn 2.0.2 → 2.0.3

package/dist/pipeline/run-store.js

@@ -76,6 +76,45 @@ export function readLatestStageStatuses(dbPath) {
         catch { /* malformed or locked databases are ignored */ }
     }
 }
+// Reports are written at stage boundaries. A running UI needs current totals,
+// and opening RunStore would migrate/write the database during observation.
+export function readRunProgress(dbPath) {
+    if (!fs.existsSync(dbPath))
+        return undefined;
+    let db;
+    try {
+        db = new DatabaseSync(dbPath, { readOnly: true });
+        db.exec('PRAGMA busy_timeout=5000; BEGIN');
+        const runId = db.prepare('SELECT run_id FROM runs ORDER BY run_id DESC LIMIT 1').get()?.run_id;
+        if (typeof runId !== 'number' && typeof runId !== 'bigint')
+            return undefined;
+        const raw = Number(db.prepare('SELECT COUNT(*) AS n FROM raw_observations WHERE run_id=?').get(runId)?.n ?? 0);
+        const deduped = Number(db.prepare('SELECT COUNT(*) AS n FROM pipeline_nodes WHERE run_id=?').get(runId)?.n ?? 0);
+        const speed = Number(db.prepare("SELECT COUNT(*) AS n FROM speed_results WHERE run_id=? AND status='speed_passed'").get(runId)?.n ?? 0);
+        const availability = Number(db.prepare("SELECT COUNT(*) AS n FROM availability_results WHERE run_id=? AND status='availability_passed'").get(runId)?.n ?? 0);
+        const sources = {};
+        const completeOwnership = Number(db.prepare('SELECT COUNT(*) AS n FROM pipeline_nodes WHERE run_id=? AND first_source IS NULL').get(runId)?.n ?? 0) === 0;
+        for (const row of db.prepare('SELECT source,COUNT(*) AS n FROM raw_observations WHERE run_id=? GROUP BY source ORDER BY MIN(observation_id)').all(runId)) {
+            if (typeof row.source === 'string')
+                sources[row.source] = { raw_links: Number(row.n), ...(completeOwnership ? { deduped_links: 0 } : {}) };
+        }
+        if (completeOwnership) {
+            for (const row of db.prepare('SELECT first_source AS source,COUNT(*) AS n FROM pipeline_nodes WHERE run_id=? AND first_source IS NOT NULL GROUP BY first_source').all(runId)) {
+                if (typeof row.source === 'string')
+                    sources[row.source] = { raw_links: sources[row.source]?.raw_links ?? 0, deduped_links: Number(row.n) };
+            }
+        }
+        db.exec('COMMIT');
+        return { counts: { raw_links: raw, deduped_links: deduped, speedtest_links: speed, availability_links: availability }, source_counts: sources };
+    }
+    catch {
+        // Legacy or incomplete databases retain the existing report/event path.
+        return undefined;
+    }
+    finally {
+        db?.close();
+    }
+}
 export class RunStore {
     db;
     statements = new Map();

package/dist/server/runtime.js

@@ -9,6 +9,7 @@ import { latestJobId, loadJob } from '../jobs/read.js';
 import { AccountStore } from '../pool/account-store.js';
 import { normalizeBrand } from '../pool/brands.js';
 import { parseAccountFile } from '../pool/csv.js';
+import { readRunProgress } from '../pipeline/run-store.js';
 import { resolveArtifactsRoot, resolveProfilePath } from '../runtime/paths.js';
 const DEPLOY_SECRET_KEYS = new Set([
     'cloudflare_api_token',
@@ -66,9 +67,13 @@ function normalizeLatestArtifact(projectRoot, env) {
         return undefined;
     }
     const preview = previewArtifact(String(latest.artifact_dir));
+    const progress = readRunProgress(path.join(String(latest.artifact_dir), 'run.db'));
     return {
         ...latest,
         ...preview,
+        // The report can still be empty mid-stage. Its display preview must not
+        // 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: []
     };
@@ -345,7 +350,16 @@ export function createServerRuntime(options) {
                             if (nextRunState) {
                                 runState = nextRunState;
                             }
-                            publish(event);
+                            // A follower can deliver old result lines after loadState. Send
+                            // absolute database totals so those lines cannot add twice.
+                            const metricEvent = typeof event === 'object' && event !== null && 'type' in event
+                                && ['extract_iteration', 'extract_source_completed', 'speedtest_result', 'availability_link_result'].includes(String(event.type));
+                            const job = metricEvent ? loadJob(options.projectRoot, jobId, options.env) : undefined;
+                            const artifactDir = String(job?.artifact_dir ?? '');
+                            const progress = artifactDir ? readRunProgress(path.join(artifactDir, 'run.db')) : undefined;
+                            publish(progress && typeof event === 'object'
+                                ? { ...event, progress_snapshot: { ...progress, artifact_dir: artifactDir } }
+                                : event);
                         }
                     }
                 }

package/dist/web/renderer/app.js

@@ -138,7 +138,8 @@ const state = {
   qr: createQrState(),
   runStartedAt: null,
   lastUpdateAt: null,
-  modalTransform: ''
+  modalTransform: '',
+  progressSnapshot: null
 };
 
 let settingsDrawerOpener = null;
@@ -222,11 +223,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() {
@@ -1554,7 +1557,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 ?? '');
@@ -1703,7 +1723,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,7 +1733,7 @@ function handlePipelineEvent(event, options = {}) {
   }
 
   if (event.type === 'extract_iteration') {
-    updateExtractMetrics(event);
+    if (!event.progress_snapshot && !(historical && state.progressSnapshot)) updateExtractMetrics(event);
     appendLog(`[extract] ${event.source_name} #${event.iteration ?? 0} 新增 ${event.new_items ?? 0} 个，本次解析 ${event.extracted_links ?? 0} 个，累计 ${event.total_links ?? 0} 个`, {
       kind: 'stage',
       stage: 'extract',
@@ -1723,6 +1743,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 +1753,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 +1792,7 @@ function normalizeStageStatuses(stageStatuses = {}) {
 }
 
 function resetRunScopedProgress() {
+  state.progressSnapshot = null;
   state.stageStatus = {};
   state.counts = {};
   state.sourceCounts = {};
@@ -1875,6 +1898,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 ?? [];

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.0.3',
   brandSubtitle: '概览、运行、结果、订阅、日志、设置统一管理',
   languageLabel: '',
   saveButton: '保存配置',

package/package.json

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