@swimmingliu/autovpn 1.6.0 → 1.6.1

package/dist/server/runtime.js

@@ -1,8 +1,12 @@
+import fs from 'node:fs';
+import path from 'node:path';
 import { artifactLatest, artifactList } from '../artifacts/list.js';
 import { previewArtifact } from '../artifacts/preview.js';
 import { profilePayload, saveProfilePayload } from '../config/profile.js';
 import { startDetachedRetry as defaultStartDetachedRetry, startDetachedRun as defaultStartDetachedRun, stopManagedJob as defaultStopManagedJob } from '../jobs/commands.js';
 import { followLog as defaultFollowLog } from '../jobs/logs.js';
+import { latestJobId, loadJob } from '../jobs/read.js';
+import { resolveArtifactsRoot, resolveProfilePath } from '../runtime/paths.js';
 const DEPLOY_SECRET_KEYS = new Set([
     'cloudflare_api_token',
     'cloudflare_global_key',
@@ -99,10 +103,172 @@ function runEnv(options) {
         VPN_AUTOMATION_UPSTREAM_PROXY: proxyUrl
     };
 }
+function parsePositiveNumber(value, fallback) {
+    const parsed = Number.parseFloat(String(value ?? ''));
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+function terminalStateTtlMs(env) {
+    return parsePositiveNumber(env.AUTOVPN_SERVER_TERMINAL_STATE_TTL_SECONDS, 600) * 1000;
+}
+function historyRetentionMs(env) {
+    const raw = String(env.AUTOVPN_SERVER_HISTORY_RETENTION_DAYS ?? '').trim();
+    if (raw) {
+        const parsed = Number.parseFloat(raw);
+        if (Number.isFinite(parsed) && parsed <= 0)
+            return 0;
+        if (Number.isFinite(parsed) && parsed > 0)
+            return parsed * 24 * 60 * 60 * 1000;
+    }
+    return 7 * 24 * 60 * 60 * 1000;
+}
+function parseTimeMs(value) {
+    const time = Date.parse(String(value ?? '').replace(/\+00:00$/, 'Z'));
+    return Number.isFinite(time) ? time : 0;
+}
+function jobTerminalAt(job) {
+    return parseTimeMs(job.finished_at) || parseTimeMs(job.created_at) || parseTimeMs(job.updated_at);
+}
+function latestJob(projectRoot, env) {
+    try {
+        return loadJob(projectRoot, latestJobId(projectRoot, env), env);
+    }
+    catch {
+        return undefined;
+    }
+}
+function terminalRunStateFromLatestJob(job, nowMs, ttlMs) {
+    const status = String(job?.status ?? '');
+    if (status === 'running' || status === 'stopping')
+        return status;
+    if (!['success', 'failed', 'stopped'].includes(status))
+        return undefined;
+    const finishedAt = jobTerminalAt(job ?? {});
+    if (!finishedAt || nowMs - finishedAt > ttlMs)
+        return undefined;
+    return status === 'stopped' ? 'idle' : status;
+}
+function terminalRunStateFromArtifact(artifact, nowMs, ttlMs) {
+    const status = String(artifact?.run_status ?? '');
+    if (!['success', 'failed'].includes(status))
+        return undefined;
+    const artifactDir = String(artifact?.artifact_dir ?? '');
+    let updatedAt = 0;
+    try {
+        updatedAt = artifactDir ? fs.statSync(artifactDir).mtimeMs : 0;
+    }
+    catch {
+        updatedAt = 0;
+    }
+    if (!updatedAt || nowMs - updatedAt > ttlMs)
+        return undefined;
+    return status;
+}
+function jobsRoot(projectRoot, env) {
+    return path.join(path.dirname(resolveProfilePath(projectRoot, env)), 'jobs');
+}
+function safeRmDir(dirPath) {
+    try {
+        fs.rmSync(dirPath, { recursive: true, force: true });
+    }
+    catch {
+        // Cleanup is best-effort; serve startup and state loading must continue.
+    }
+}
+function pruneArtifacts(projectRoot, env, cutoffMs, activeArtifactDirs) {
+    const root = resolveArtifactsRoot(projectRoot, env);
+    if (!fs.existsSync(root))
+        return;
+    for (const name of fs.readdirSync(root)) {
+        const artifactDir = path.join(root, name);
+        let stat;
+        try {
+            stat = fs.statSync(artifactDir);
+        }
+        catch {
+            continue;
+        }
+        if (!stat.isDirectory() || activeArtifactDirs.has(path.resolve(artifactDir)))
+            continue;
+        if (stat.mtimeMs < cutoffMs) {
+            safeRmDir(artifactDir);
+        }
+    }
+}
+function pruneJobs(projectRoot, env, cutoffMs) {
+    const root = jobsRoot(projectRoot, env);
+    const activeArtifactDirs = new Set();
+    const indexPath = path.join(root, 'index.json');
+    if (!fs.existsSync(indexPath))
+        return activeArtifactDirs;
+    let index;
+    try {
+        index = JSON.parse(fs.readFileSync(indexPath, 'utf8'));
+    }
+    catch {
+        return activeArtifactDirs;
+    }
+    const kept = [];
+    for (const item of (index.jobs ?? [])) {
+        const jobId = String(item.job_id ?? '');
+        let job;
+        try {
+            job = loadJob(projectRoot, jobId, env);
+        }
+        catch {
+            continue;
+        }
+        const status = String(job.status ?? '');
+        const artifactDir = String(job.artifact_dir ?? '');
+        if (artifactDir && ['running', 'stopping'].includes(status)) {
+            activeArtifactDirs.add(path.resolve(artifactDir));
+        }
+        const keep = ['running', 'stopping'].includes(status) || (jobTerminalAt(job) || parseTimeMs(job.created_at)) >= cutoffMs;
+        if (keep) {
+            kept.push({
+                job_id: job.job_id,
+                status: job.status,
+                kind: job.kind,
+                created_at: job.created_at,
+                job_file: job.job_file
+            });
+        }
+        else {
+            safeRmDir(path.dirname(String(job.job_file ?? '')));
+        }
+    }
+    const latestId = kept.some((item) => item.job_id === index.latest_job_id)
+        ? String(index.latest_job_id ?? '')
+        : String(kept.at(-1)?.job_id ?? '');
+    try {
+        fs.mkdirSync(path.dirname(indexPath), { recursive: true });
+        fs.writeFileSync(indexPath, `${JSON.stringify({ schema_version: 1, latest_job_id: latestId, jobs: kept }, null, 2)}\n`, 'utf8');
+    }
+    catch {
+        // Best-effort cleanup.
+    }
+    return activeArtifactDirs;
+}
+function createHistoryPruner(options) {
+    let lastPrunedAt = 0;
+    return () => {
+        const env = options.env ?? process.env;
+        const retention = historyRetentionMs(env);
+        if (retention <= 0)
+            return;
+        const nowMs = (options.now ?? (() => new Date()))().getTime();
+        if (lastPrunedAt && nowMs - lastPrunedAt < 24 * 60 * 60 * 1000)
+            return;
+        lastPrunedAt = nowMs;
+        const cutoffMs = nowMs - retention;
+        const activeArtifactDirs = pruneJobs(options.projectRoot, env, cutoffMs);
+        pruneArtifacts(options.projectRoot, env, cutoffMs, activeArtifactDirs);
+    };
+}
 export function createServerRuntime(options) {
     let runState = 'idle';
     let activeJobId = '';
     let unsubscribeLogs;
+    const pruneHistory = createHistoryPruner(options);
     const subscribers = new Set();
     const startDetachedRun = options.startDetachedRun ?? defaultStartDetachedRun;
     const startDetachedRetry = options.startDetachedRetry ?? defaultStartDetachedRetry;
@@ -149,9 +315,34 @@ export function createServerRuntime(options) {
             }
         });
     }
+    function restoreRunState(artifact) {
+        if (runState !== 'idle') {
+            return;
+        }
+        const env = options.env ?? process.env;
+        const job = latestJob(options.projectRoot, env);
+        if (job && ['running', 'stopping'].includes(String(job.status ?? ''))) {
+            runState = String(job.status);
+            activeJobId = String(job.job_id ?? '');
+            if (activeJobId && !unsubscribeLogs) {
+                followJob(activeJobId);
+            }
+            return;
+        }
+        const nowMs = (options.now ?? (() => new Date()))().getTime();
+        const ttlMs = terminalStateTtlMs(env);
+        runState = terminalRunStateFromLatestJob(job, nowMs, ttlMs)
+            ?? terminalRunStateFromArtifact(artifact, nowMs, ttlMs)
+            ?? 'idle';
+        if (runState !== 'running' && runState !== 'stopping') {
+            activeJobId = '';
+        }
+    }
     return {
         async loadState() {
+            pruneHistory();
             const artifact = normalizeLatestArtifact(options.projectRoot, options.env ?? process.env);
+            restoreRunState(artifact);
             const retries = artifactList(options.projectRoot, options.env ?? process.env);
             return {
                 profile: sanitizeProfileForServer(profilePayload(options.projectRoot, options.env)),

package/dist/server/web-adapter.js

@@ -25,7 +25,6 @@ export function renderWebAdapterScript(options = {}) {
       '.server-login-brand{display:flex;align-items:center;gap:14px;}',
       '.server-login-logo{width:54px;height:54px;object-fit:contain;border-radius:18px;}',
       '.server-login-title{margin:0;font-size:28px;font-weight:850;letter-spacing:0;}',
-      '.server-login-copy{margin:5px 0 0;color:var(--text-soft,#6d7794);line-height:1.5;}',
       '.server-login-form{display:grid;gap:14px;}',
       '.server-login-form input{width:100%;min-height:48px;border:1px solid var(--border,#dfe5f5);border-radius:14px;background:#fff;color:var(--text,#1e2746);padding:0 14px;outline:none;}',
       '.server-login-form input:focus{border-color:rgba(91,92,226,.45);box-shadow:0 0 0 4px rgba(91,92,226,.12);}',
@@ -47,6 +46,7 @@ export function renderWebAdapterScript(options = {}) {
 
   function showLoginPage(message = '', banned = false) {
     ensureLoginStyles();
+    document.title = 'AutoNetwork';
     let root = document.querySelector('[data-server-login]');
     if (!root) {
       root = document.createElement('section');
@@ -57,8 +57,7 @@ export function renderWebAdapterScript(options = {}) {
         '<div class="server-login-brand">',
         '<img class="server-login-logo" src="./assets/vpn-auto-logo-v2-minimal.svg" alt="" aria-hidden="true" />',
         '<div>',
-        '<h1 class="server-login-title">AutoVPN</h1>',
-        '<p class="server-login-copy">输入 serve 启动时打印的密码继续访问。</p>',
+        '<h1 class="server-login-title">AutoNetwork</h1>',
         '</div>',
         '</div>',
         '<form class="server-login-form" data-server-login-form>',
@@ -149,6 +148,7 @@ export function renderWebAdapterScript(options = {}) {
   }
 
   window.vpnAutomation = {
+    loadState: async () => state(),
     loadProfile: async () => {
       const payload = await state();
       return payload.profile || {};

package/dist/web/renderer/app.js

@@ -159,17 +159,43 @@ async function bootstrap() {
   }
 
   state.isDemo = false;
-  const loadedProfile = await window.vpnAutomation.loadProfile();
-  state.profile = loadedProfile;
-  state.savedProfile = structuredClone(loadedProfile);
+  const loadedState = window.vpnAutomation.loadState
+    ? await window.vpnAutomation.loadState()
+    : { profile: await window.vpnAutomation.loadProfile() };
+  hydrateInitialRuntimeState(loadedState);
   touchUpdate();
   await refreshQrCode();
-  await hydrateRetryArtifacts();
-  await hydrateLatestArtifact();
+  if (!loadedState?.retryArtifacts) {
+    await hydrateRetryArtifacts();
+  }
+  if (!loadedState?.artifact) {
+    await hydrateLatestArtifact();
+  }
   renderAll();
   state.unsubscribe = window.vpnAutomation.onPipelineEvent(handlePipelineEvent);
 }
 
+function hydrateInitialRuntimeState(loadedState = {}) {
+  const loadedProfile = loadedState.profile ?? {};
+  state.profile = loadedProfile;
+  state.savedProfile = structuredClone(loadedProfile);
+  const nextRunState = String(loadedState.runState ?? '');
+  if (['idle', 'running', 'stopping', 'failed', 'success'].includes(nextRunState)) {
+    state.runState = nextRunState;
+    state.runResult = nextRunState === 'idle' ? state.runResult : nextRunState;
+    state.runStartedAt = nextRunState === 'running' ? Date.now() : null;
+  }
+  if (loadedState.artifact) {
+    hydrateArtifactState(loadedState.artifact);
+  }
+  if (Array.isArray(loadedState.retryArtifacts)) {
+    hydrateRetryArtifactState(loadedState.retryArtifacts);
+  }
+  if (loadedState.deployment) {
+    state.deployment = loadedState.deployment;
+  }
+}
+
 function bindActions() {
   document.addEventListener('click', handleDocumentClick);
   document.addEventListener('input', handleDocumentInput);
@@ -264,6 +290,12 @@ function runTone() {
   if (state.runState === 'stopping') {
     return 'warning';
   }
+  if (state.runState === 'failed') {
+    return 'danger';
+  }
+  if (state.runState === 'success') {
+    return 'success';
+  }
   return 'neutral';
 }
 
@@ -882,7 +914,7 @@ async function exportLogs() {
 }
 
 async function runPipeline() {
-  if (state.runState !== 'idle' || !state.profile) {
+  if (resolveRunControlState(state.runState).isBusy || !state.profile) {
     return;
   }
 
@@ -939,7 +971,7 @@ async function runPipeline() {
 }
 
 async function retryStage() {
-  if (state.runState !== 'idle' || !state.profile || !state.selectedRetryArtifactDir || !state.selectedRetryStage) {
+  if (resolveRunControlState(state.runState).isBusy || !state.profile || !state.selectedRetryArtifactDir || !state.selectedRetryStage) {
     return;
   }
 
@@ -1065,10 +1097,10 @@ async function stopPipeline() {
 
 function finishRun(result = {}) {
   const messages = getMessages(state.language);
-  state.runState = 'idle';
   state.runStartedAt = null;
 
   if (result.stopped) {
+    state.runState = 'idle';
     state.runResult = 'stopped';
     touchUpdate();
     renderAll();
@@ -1078,6 +1110,7 @@ function finishRun(result = {}) {
   }
 
   if (result.ok) {
+    state.runState = 'success';
     state.runResult = 'success';
     touchUpdate();
     renderAll();
@@ -1086,6 +1119,7 @@ function finishRun(result = {}) {
     return;
   }
 
+  state.runState = 'failed';
   state.runResult = 'failed';
   touchUpdate();
   renderAll();
@@ -1101,7 +1135,7 @@ function handlePipelineEvent(event) {
   if (event.type === 'server_state') {
     const nextRunState = String(event.run_state ?? '');
     if (['idle', 'running', 'stopping', 'failed', 'success'].includes(nextRunState)) {
-      state.runState = nextRunState === 'success' ? 'idle' : nextRunState;
+      state.runState = nextRunState;
       if (['idle', 'failed', 'success'].includes(nextRunState)) {
         state.runStartedAt = null;
       }
@@ -1321,6 +1355,27 @@ async function hydrateArtifactPreview() {
   }
 }
 
+function hydrateArtifactState(result) {
+  if (!result?.artifact_dir) {
+    return;
+  }
+  state.artifactDir = result.artifact_dir;
+  state.counts = normalizeCounts(result.counts ?? {});
+  state.sourceCounts = normalizeSourceCounts(result.source_counts ?? {});
+  state.outputFiles = result.outputFiles ?? [];
+  state.nodeRows = result.nodeRows ?? [];
+  state.retryContext = result.retry_context ?? {};
+  state.deployment = result.deployment ?? state.deployment ?? {};
+  if (result.run_status === 'success') {
+    state.runResult = 'success';
+  } else if (result.run_status === 'failed') {
+    state.runResult = 'failed';
+  }
+  if (result.stage_status) {
+    state.stageStatus = result.stage_status;
+  }
+}
+
 async function hydrateLatestArtifact() {
   if (!window.vpnAutomation?.latestArtifact) {
     return;
@@ -1331,23 +1386,26 @@ async function hydrateLatestArtifact() {
     if (!result?.ok || !result.artifact_dir) {
       return;
     }
-    state.artifactDir = result.artifact_dir;
-    state.counts = normalizeCounts(result.counts ?? {});
-    state.sourceCounts = normalizeSourceCounts(result.source_counts ?? {});
-    state.outputFiles = result.outputFiles ?? [];
-    state.nodeRows = result.nodeRows ?? [];
-    state.retryContext = result.retry_context ?? {};
-    state.deployment = result.deployment ?? {};
-    state.runResult = result.run_status === 'success' ? 'success' : state.runResult;
-    if (result.stage_status) {
-      state.stageStatus = result.stage_status;
-    }
+    hydrateArtifactState(result);
     touchUpdate();
   } catch (error) {
     appendLog(formatMessage(getMessages(state.language).openFailed, { error: error.message }));
   }
 }
 
+function hydrateRetryArtifactState(items = []) {
+  state.retryArtifacts = items;
+  if (!state.selectedRetryArtifactDir) {
+    state.selectedRetryArtifactDir = state.retryArtifacts[0]?.artifact_dir ?? '';
+  }
+  const selectedArtifact = state.retryArtifacts.find((item) => item.artifact_dir === state.selectedRetryArtifactDir) ?? state.retryArtifacts[0];
+  const nextStage = selectedArtifact?.retryable_stages?.includes(state.selectedRetryStage)
+    ? state.selectedRetryStage
+    : resolveDefaultRetryStage(selectedArtifact);
+  state.selectedRetryArtifactDir = selectedArtifact?.artifact_dir ?? '';
+  state.selectedRetryStage = nextStage;
+}
+
 async function hydrateRetryArtifacts() {
   if (!window.vpnAutomation?.artifactList) {
     return;
@@ -1358,16 +1416,7 @@ async function hydrateRetryArtifacts() {
     if (!result?.ok) {
       return;
     }
-    state.retryArtifacts = result.items ?? [];
-    if (!state.selectedRetryArtifactDir) {
-      state.selectedRetryArtifactDir = state.retryArtifacts[0]?.artifact_dir ?? '';
-    }
-    const selectedArtifact = state.retryArtifacts.find((item) => item.artifact_dir === state.selectedRetryArtifactDir) ?? state.retryArtifacts[0];
-    const nextStage = selectedArtifact?.retryable_stages?.includes(state.selectedRetryStage)
-      ? state.selectedRetryStage
-      : resolveDefaultRetryStage(selectedArtifact);
-    state.selectedRetryArtifactDir = selectedArtifact?.artifact_dir ?? '';
-    state.selectedRetryStage = nextStage;
+    hydrateRetryArtifactState(result.items ?? []);
     touchUpdate();
   } catch (error) {
     appendLog(formatMessage(getMessages(state.language).openFailed, { error: error.message }));

package/dist/web/renderer/i18n.js

@@ -5,7 +5,7 @@ const ZH_MESSAGES = {
   locale: 'zh-CN',
   appTitle: 'AutoVPN',
   sidebarTitle: 'AutoVPN',
-  sidebarVersion: 'v.1.6.0',
+  sidebarVersion: 'v.1.6.1',
   brandSubtitle: '概览、运行、结果、订阅、日志、设置统一管理',
   languageLabel: '',
   saveButton: '保存配置',
@@ -58,7 +58,9 @@ const ZH_MESSAGES = {
   runStateLabels: {
     idle: '待运行',
     running: '运行中',
-    stopping: '停止中'
+    stopping: '停止中',
+    success: '已完成',
+    failed: '失败'
   },
   runResultLabels: {
     idle: '未开始',

package/dist/web/renderer/views.js

@@ -173,12 +173,19 @@ export function buildViewModel(state, messages, language) {
     currentStatusLabel: resolveCurrentStatusLabel(state, messages),
     currentTaskLabel: resolveCurrentTaskLabel(state, messages),
     runStateLabel: messages.runStateLabels[state.runState] ?? messages.runStateLabels.idle,
-    runStateTone: state.runState === 'running' ? 'success' : state.runState === 'stopping' ? 'warning' : 'neutral',
+    runStateTone: runStateTone(state.runState),
     settingsDrawer: state.settingsDrawer ?? null,
     modalTransform: state.modalTransform ?? ''
   };
 }
 
+function runStateTone(runState) {
+  if (runState === 'running' || runState === 'success') return 'success';
+  if (runState === 'stopping') return 'warning';
+  if (runState === 'failed') return 'danger';
+  return 'neutral';
+}
+
 export function buildSidebarNav(messages, activePage) {
   return PAGE_ORDER.map((page) => `
     <button

package/package.json

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