@swimmingliu/autovpn 1.5.1 → 1.5.3

package/dist/cli/main.js

@@ -47,6 +47,15 @@ async function resolvePackageVersion(options) {
 function hasFlag(argv, flag) {
     return argv.includes(flag);
 }
+function hasProxyFlag(argv) {
+    return argv.some((value) => value === '--proxy' || value.startsWith('--proxy='));
+}
+function isPipelineProxyCommand(argv) {
+    if (!hasProxyFlag(argv)) {
+        return false;
+    }
+    return argv[0] === 'run' || (argv[0] === 'resume' && argv[1] === 'pipeline');
+}
 function eventOutputFormat(argv) {
     return readOptionValue(argv, '--output') === 'human' ? 'human' : 'jsonl';
 }
@@ -229,6 +238,9 @@ export async function runCliShell(argv, options = {}) {
             });
             return pythonFallbackBackend.executeCli(fallbackArgv);
         };
+        if (isPipelineProxyCommand(normalizedArgv)) {
+            return runExplicitPythonFallback(normalizedArgv);
+        }
         const nativeResult = await runNativeCommand(normalizedArgv, {
             cwd,
             env,

package/dist/server/http.js

@@ -2,6 +2,7 @@ import http from 'node:http';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath, URL } from 'node:url';
+import QRCode from 'qrcode';
 import { renderWebAdapterScript } from './web-adapter.js';
 import { redactText } from '../runtime/redaction.js';
 const SENSITIVE_KEYS = new Set([
@@ -139,6 +140,20 @@ export async function createAutoVpnServer(options) {
                 writeJson(response, 200, await options.runtime.loadState());
                 return;
             }
+            if (request.method === 'POST' && url.pathname === '/api/profile') {
+                const body = await readJsonBody(request);
+                writeJson(response, 200, await options.runtime.saveProfile?.(body) ?? { ok: false, error: 'profile_save_unavailable' });
+                return;
+            }
+            if (request.method === 'POST' && url.pathname === '/api/qr') {
+                const body = await readJsonBody(request);
+                const text = String(body.text ?? '');
+                writeJson(response, 200, {
+                    ok: true,
+                    dataUrl: await QRCode.toDataURL(text, { margin: 1, width: 220 })
+                });
+                return;
+            }
             if (request.method === 'GET' && url.pathname === '/api/events') {
                 response.writeHead(200, {
                     'Content-Type': 'text/event-stream; charset=utf-8',
@@ -165,6 +180,14 @@ export async function createAutoVpnServer(options) {
                 writeJson(response, 200, await options.runtime.stopRun?.() ?? { ok: true, requested: false });
                 return;
             }
+            if (request.method === 'POST' && url.pathname === '/api/runs/retry-stage') {
+                const body = await readJsonBody(request);
+                writeJson(response, 202, await options.runtime.startRetry?.({
+                    artifactDir: String(body.artifactDir ?? ''),
+                    stage: String(body.stage ?? '')
+                }) ?? { ok: false, error: 'retry_stage_unavailable' });
+                return;
+            }
             if (request.method === 'GET' && !url.pathname.startsWith('/api/')) {
                 if (await serveRendererAsset(url, response)) {
                     return;

package/dist/server/runtime.js

@@ -1,7 +1,7 @@
 import { artifactLatest, artifactList } from '../artifacts/list.js';
 import { previewArtifact } from '../artifacts/preview.js';
-import { profilePayload } from '../config/profile.js';
-import { startDetachedRun as defaultStartDetachedRun, stopManagedJob as defaultStopManagedJob } from '../jobs/commands.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';
 const DEPLOY_SECRET_KEYS = new Set([
     'cloudflare_api_token',
@@ -30,6 +30,28 @@ export function sanitizeProfileForServer(profile) {
     }
     return safe;
 }
+function preserveRedactedSecrets(incoming, current) {
+    const merged = structuredClone(incoming ?? {});
+    const currentSources = (current.sources ?? {});
+    for (const [name, source] of Object.entries((merged.sources ?? {}))) {
+        const currentSource = currentSources[name] ?? {};
+        if (source && typeof source === 'object') {
+            for (const key of ['url', 'key']) {
+                if (source[key] === '<redacted>') {
+                    source[key] = currentSource[key] ?? '';
+                }
+            }
+        }
+    }
+    const deploy = (merged.deploy ?? {});
+    const currentDeploy = (current.deploy ?? {});
+    for (const key of DEPLOY_SECRET_KEYS) {
+        if (deploy[key] === '<redacted>') {
+            deploy[key] = currentDeploy[key] ?? '';
+        }
+    }
+    return merged;
+}
 function normalizeLatestArtifact(projectRoot, env) {
     const latest = artifactLatest(projectRoot, env);
     if (!latest.ok || !latest.artifact_dir) {
@@ -61,6 +83,7 @@ export function createServerRuntime(options) {
     let unsubscribeLogs;
     const subscribers = new Set();
     const startDetachedRun = options.startDetachedRun ?? defaultStartDetachedRun;
+    const startDetachedRetry = options.startDetachedRetry ?? defaultStartDetachedRetry;
     const stopManagedJob = options.stopManagedJob ?? defaultStopManagedJob;
     const followLog = options.followLog ?? defaultFollowLog;
     function publish(event) {
@@ -112,6 +135,14 @@ export function createServerRuntime(options) {
                 deployment: (artifact?.deployment ?? {})
             };
         },
+        async saveProfile(profile) {
+            const current = profilePayload(options.projectRoot, options.env);
+            const merged = preserveRedactedSecrets(profile, current);
+            return {
+                ok: true,
+                profile: sanitizeProfileForServer(saveProfilePayload(options.projectRoot, merged, options.env))
+            };
+        },
         async startRun(runOptions = {}) {
             if (runState === 'running' || runState === 'stopping') {
                 return { ok: false, error: 'run_already_active' };
@@ -131,6 +162,29 @@ export function createServerRuntime(options) {
             followJob(activeJobId);
             return { ok: true, runId: activeJobId, job_id: activeJobId, status: job.status ?? 'running' };
         },
+        async startRetry(retryOptions = {}) {
+            if (runState === 'running' || runState === 'stopping') {
+                return { ok: false, error: 'run_already_active' };
+            }
+            const artifactDir = String(retryOptions.artifactDir ?? '').trim();
+            const stage = String(retryOptions.stage ?? '').trim();
+            if (!artifactDir || !stage) {
+                return { ok: false, error: 'artifact_dir_and_stage_required' };
+            }
+            runState = 'running';
+            const job = await startDetachedRetry({
+                projectRoot: options.projectRoot,
+                artifactDir,
+                stage,
+                outputFormat: 'jsonl'
+            }, {
+                env: options.env,
+                cwd: options.projectRoot
+            });
+            activeJobId = String(job.job_id ?? '');
+            followJob(activeJobId);
+            return { ok: true, runId: activeJobId, job_id: activeJobId, status: job.status ?? 'running' };
+        },
         async stopRun() {
             if (runState !== 'running' || !activeJobId) {
                 return { ok: true, requested: false };

package/dist/server/web-adapter.js

@@ -35,7 +35,10 @@ export function renderWebAdapterScript() {
       const payload = await state();
       return payload.profile || {};
     },
-    saveProfile: async () => ({ ok: false, error: 'profile_save_unavailable_in_server_mode' }),
+    saveProfile: async (profile) => request('/api/profile', {
+      method: 'POST',
+      body: JSON.stringify(profile || {})
+    }),
     runPipeline: async (options = {}) => request('/api/runs', {
       method: 'POST',
       body: JSON.stringify({
@@ -50,7 +53,10 @@ export function renderWebAdapterScript() {
       return { ok: true };
     },
     openPath: async () => ({ ok: false, error: 'open_path_unavailable_in_browser' }),
-    generateQr: async () => ({ ok: false, dataUrl: '' }),
+    generateQr: async (text) => request('/api/qr', {
+      method: 'POST',
+      body: JSON.stringify({ text: String(text || '') })
+    }),
     previewArtifact: async () => {
       const payload = await state();
       return payload.artifact ? { ok: true, ...payload.artifact } : { ok: false };
@@ -63,7 +69,13 @@ export function renderWebAdapterScript() {
       const payload = await state();
       return { ok: true, items: payload.retryArtifacts || [] };
     },
-    retryStage: async () => ({ ok: false, error: 'retry_stage_unavailable_in_server_mode' }),
+    retryStage: async (options = {}) => request('/api/runs/retry-stage', {
+      method: 'POST',
+      body: JSON.stringify({
+        artifactDir: String(options.artifactDir || ''),
+        stage: String(options.stage || '')
+      })
+    }),
     copyText: async (text) => {
       await navigator.clipboard.writeText(String(text || ''));
       return { ok: true };

package/dist/web/renderer/i18n.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swimmingliu/autovpn",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "npm wrapper for the AutoVPN headless CLI",
   "type": "module",
   "repository": {
@@ -31,9 +31,11 @@
   "license": "AGPL-3.0-only",
   "devDependencies": {
     "@types/node": "^24.0.0",
+    "@types/qrcode": "^1.5.6",
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@iarna/toml": "^2.2.5"
+    "@iarna/toml": "^2.2.5",
+    "qrcode": "^1.5.4"
   }
 }