@swimmingliu/autovpn 1.6.5 → 1.6.7

package/dist/templates/vmess_node.js

@@ -0,0 +1,27 @@
+const SUBSCRIPTION_PAYLOAD = `__MAIN_DATA__`;
+
+function buildRandomPayload() {
+  const randomBytes = new Uint8Array(Math.floor(Math.random() * 100));
+  crypto.getRandomValues(randomBytes);
+  return String.fromCharCode.apply(null, randomBytes);
+}
+
+async function handleSubscriptionRequest(request) {
+  try {
+    const url = new URL(request.url);
+    const secretToken = url.searchParams.get("serect_key");
+    const responsePayload = secretToken === "swimmingliu"
+      ? SUBSCRIPTION_PAYLOAD
+      : buildRandomPayload();
+    return new Response(btoa(responsePayload));
+  } catch (error) {
+    console.log(error);
+    return new Response(error.toString());
+  }
+}
+
+export default {
+  async fetch(request) {
+    return handleSubscriptionRequest(request);
+  },
+};

package/dist/web/renderer/i18n.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swimmingliu/autovpn",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "description": "npm wrapper for the AutoVPN headless CLI",
   "type": "module",
   "repository": {
@@ -14,16 +14,15 @@
   "files": [
     "bin/",
     "dist/",
-    "lib/",
     "README.md"
   ],
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json && node scripts/copy-web-assets.mjs",
+    "build": "node -e \"require('fs').rmSync('dist', { recursive: true, force: true })\" && tsc -p tsconfig.json && node scripts/copy-web-assets.mjs",
     "prepack": "npm run build",
-    "test": "npm run build && node --test test/*.test.mjs test/doctor/*.test.mjs test/parity/*.test.mjs test/jobs/*.test.mjs test/pipeline/*.test.mjs test/runtime/*.test.mjs test/server/*.test.mjs"
+    "test": "npm run build && node --test test/*.test.mjs test/doctor/*.test.mjs test/jobs/*.test.mjs test/pipeline/*.test.mjs test/runtime/*.test.mjs test/server/*.test.mjs"
   },
   "engines": {
     "node": ">=22.5.0"

package/dist/backend/python-backend.js

@@ -1,242 +0,0 @@
-import { spawn as defaultSpawn } from 'node:child_process';
-import { parseEventLine } from '../events/schema.js';
-import { mergeProjectEnv } from '../runtime/env.js';
-function pushOption(argv, name, value) {
-    if (value !== undefined && value !== '') {
-        argv.push(name, String(value));
-    }
-}
-function runArgs(options) {
-    const argv = ['run', '--project-root', options.projectRoot, '--output', options.output ?? 'jsonl'];
-    if (options.resumeLatest)
-        argv.push('--resume-latest');
-    if (options.skipDeploy)
-        argv.push('--skip-deploy');
-    if (options.skipVerify)
-        argv.push('--skip-verify');
-    pushOption(argv, '--event-log', options.eventLog);
-    pushOption(argv, '--human-log', options.humanLog);
-    return argv;
-}
-function retryArgs(options) {
-    const argv = [
-        'retry-stage',
-        '--project-root',
-        options.projectRoot,
-        '--artifact-dir',
-        options.artifactDir,
-        '--stage',
-        options.stage,
-        '--output',
-        options.output ?? 'jsonl'
-    ];
-    pushOption(argv, '--event-log', options.eventLog);
-    pushOption(argv, '--human-log', options.humanLog);
-    return argv;
-}
-function resumeArgs(options) {
-    const argv = [
-        'resume',
-        options.mode,
-        '--project-root',
-        options.projectRoot,
-        '--session',
-        options.session,
-        '--output',
-        options.output ?? 'jsonl'
-    ];
-    pushOption(argv, '--event-log', options.eventLog);
-    pushOption(argv, '--human-log', options.humanLog);
-    return argv;
-}
-async function* splitLines(stream) {
-    const queue = [];
-    let ended = false;
-    let pendingResolve;
-    let buffer = '';
-    stream.on('data', (chunk) => {
-        buffer += String(chunk);
-        const parts = buffer.split(/\r?\n/);
-        buffer = parts.pop() ?? '';
-        queue.push(...parts.filter((line) => line.trim()));
-        pendingResolve?.();
-        pendingResolve = undefined;
-    });
-    stream.on('end', () => {
-        if (buffer.trim())
-            queue.push(buffer);
-        ended = true;
-        pendingResolve?.();
-        pendingResolve = undefined;
-    });
-    while (!ended || queue.length) {
-        if (!queue.length) {
-            await new Promise((resolve) => {
-                pendingResolve = resolve;
-            });
-            continue;
-        }
-        yield queue.shift();
-    }
-}
-function waitForClose(child) {
-    return new Promise((resolve, reject) => {
-        child.once('error', reject);
-        child.once('close', (code, signal) => {
-            resolve({ code, signal });
-        });
-    });
-}
-function errorSummary(stderr) {
-    const summary = stderr.trim().split(/\r?\n/).filter(Boolean).slice(-3).join('\n');
-    return summary ? `: ${summary}` : '';
-}
-function parseJsonPayload(stdout) {
-    const line = stdout.split(/\r?\n/).find((candidate) => candidate.trim());
-    if (!line) {
-        throw new Error('Python backend returned empty JSON payload');
-    }
-    const payload = JSON.parse(line);
-    if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
-        throw new Error('Python backend JSON payload must be an object');
-    }
-    return payload;
-}
-function projectRootFromArgv(argv) {
-    const index = argv.indexOf('--project-root');
-    if (index >= 0 && argv[index + 1]) {
-        return argv[index + 1];
-    }
-    const inline = argv.find((item) => item.startsWith('--project-root='));
-    if (inline) {
-        return inline.slice('--project-root='.length) || undefined;
-    }
-    return undefined;
-}
-export class PythonBackend {
-    kind = 'python';
-    env;
-    cwd;
-    runForwarder;
-    resolvePythonCli;
-    spawn;
-    constructor(options = {}) {
-        this.env = options.env ?? process.env;
-        this.cwd = options.cwd ?? process.cwd();
-        this.runForwarder = options.runForwarder;
-        this.resolvePythonCli = options.resolvePythonCli;
-        this.spawn = options.spawn ?? defaultSpawn;
-    }
-    async executeCli(argv) {
-        const env = this.envForArgv(argv);
-        const forwarderOptions = { env, cwd: this.cwd };
-        if (this.runForwarder) {
-            return this.runForwarder(argv, forwarderOptions);
-        }
-        // @ts-expect-error Phase 1 runner remains plain ESM JavaScript.
-        const runner = await import('../../lib/runner.mjs');
-        return Number(await runner.runForwarder(argv, forwarderOptions));
-    }
-    run(options) {
-        return this.streamEvents(runArgs(options));
-    }
-    retryStage(options) {
-        return this.streamEvents(retryArgs(options));
-    }
-    resume(options) {
-        return this.streamEvents(resumeArgs(options));
-    }
-    async startDetached(options) {
-        const argv = runArgs(options);
-        argv.push('--detach');
-        argv.push('--json');
-        return this.captureJson(argv);
-    }
-    async stopJob(jobId, options = {}) {
-        const argv = jobId === 'latest'
-            ? ['stop']
-            : ['jobs', 'stop', jobId];
-        pushOption(argv, '--project-root', options.projectRoot);
-        pushOption(argv, '--timeout', options.timeout);
-        return this.captureJson(argv);
-    }
-    async readJob(jobId, options = {}) {
-        const argv = jobId === 'latest'
-            ? ['status', '--json']
-            : ['jobs', 'status', jobId, '--json'];
-        pushOption(argv, '--project-root', options.projectRoot);
-        return this.captureJson(argv);
-    }
-    async *readLogs(options) {
-        const argv = options.jobId
-            ? ['jobs', 'logs', options.jobId, '--project-root', options.projectRoot]
-            : ['logs', '--project-root', options.projectRoot];
-        if (options.format)
-            argv.push('--format', options.format);
-        pushOption(argv, '--tail', options.tail);
-        if (options.follow)
-            argv.push('--follow');
-        yield* this.streamLines(argv);
-    }
-    async *streamEvents(argv) {
-        for await (const line of this.streamLines(argv)) {
-            yield parseEventLine(line);
-        }
-    }
-    async *streamLines(argv) {
-        const env = this.envForArgv(argv);
-        const resolved = this.resolvePythonCli ? this.resolvePythonCli() : await this.defaultResolvePythonCli(env);
-        const child = this.spawn(resolved.command, [...resolved.args, ...argv], {
-            cwd: this.cwd,
-            env,
-            stdio: ['ignore', 'pipe', 'pipe']
-        });
-        let stderr = '';
-        child.stderr?.on('data', (chunk) => {
-            stderr += String(chunk);
-        });
-        const closePromise = waitForClose(child);
-        const stdout = child.stdout;
-        if (!stdout) {
-            throw new Error('Python backend did not expose stdout for event streaming');
-        }
-        for await (const line of splitLines(stdout)) {
-            yield line;
-        }
-        const { code, signal } = await closePromise;
-        if (code !== 0) {
-            throw new Error(`Python backend exited with ${signal ? `signal ${signal}` : `code ${code}`}${errorSummary(stderr)}`);
-        }
-    }
-    async captureJson(argv) {
-        const env = this.envForArgv(argv);
-        const resolved = this.resolvePythonCli ? this.resolvePythonCli() : await this.defaultResolvePythonCli(env);
-        const child = this.spawn(resolved.command, [...resolved.args, ...argv], {
-            cwd: this.cwd,
-            env,
-            stdio: ['ignore', 'pipe', 'pipe']
-        });
-        let stdout = '';
-        let stderr = '';
-        child.stdout?.on('data', (chunk) => {
-            stdout += String(chunk);
-        });
-        child.stderr?.on('data', (chunk) => {
-            stderr += String(chunk);
-        });
-        const { code, signal } = await waitForClose(child);
-        if (code !== 0) {
-            throw new Error(`Python backend exited with ${signal ? `signal ${signal}` : `code ${code}`}${errorSummary(stderr)}`);
-        }
-        return parseJsonPayload(stdout);
-    }
-    envForArgv(argv) {
-        const projectRoot = projectRootFromArgv(argv);
-        return projectRoot ? mergeProjectEnv(projectRoot, this.env) : this.env;
-    }
-    async defaultResolvePythonCli(env = this.env) {
-        // @ts-expect-error Phase 1 runner remains plain ESM JavaScript.
-        const runner = await import('../../lib/runner.mjs');
-        return runner.resolveOrInstallPythonCli({ env });
-    }
-}

package/lib/cache.mjs

@@ -1,14 +0,0 @@
-import os from 'node:os';
-import path from 'node:path';
-
-export function getCacheDir(env = process.env) {
-  const override = String(env.AUTOVPN_CACHE_DIR ?? '').trim();
-  if (override) {
-    return override;
-  }
-  return path.join(os.homedir(), '.cache', 'autovpn', 'npm-wrapper');
-}
-
-export function pythonBinName(platform = process.platform) {
-  return platform === 'win32' ? 'Scripts' : 'bin';
-}

package/lib/errors.mjs

@@ -1,11 +0,0 @@
-export class WrapperError extends Error {
-  constructor(message, options = {}) {
-    super(message);
-    this.name = 'WrapperError';
-    this.cause = options.cause;
-  }
-}
-
-export function isEnabled(value) {
-  return ['1', 'true', 'yes', 'on'].includes(String(value ?? '').trim().toLowerCase());
-}

package/lib/install-python-cli.mjs

@@ -1,63 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { spawnSync as defaultSpawnSync } from 'node:child_process';
-
-import { getCacheDir, pythonBinName } from './cache.mjs';
-import { isEnabled, WrapperError } from './errors.mjs';
-
-export function buildPipInstallArgs({ env = process.env, packageVersion }) {
-  const packageSpec = String(env.AUTOVPN_WHEEL_URL ?? '').trim()
-    || `${String(env.AUTOVPN_PYTHON_PACKAGE ?? 'vpn-subscription-automation').trim()}==${packageVersion}`;
-  const args = ['-m', 'pip', 'install'];
-  if (env.AUTOVPN_PIP_INDEX_URL) {
-    args.push('--index-url', String(env.AUTOVPN_PIP_INDEX_URL));
-  }
-  if (env.AUTOVPN_PIP_EXTRA_INDEX_URL) {
-    args.push('--extra-index-url', String(env.AUTOVPN_PIP_EXTRA_INDEX_URL));
-  }
-  args.push(packageSpec);
-  return args;
-}
-
-export function installPythonCli({
-  env = process.env,
-  packageVersion,
-  spawnSync = defaultSpawnSync,
-  cacheDir = getCacheDir(env),
-  platform = process.platform
-} = {}) {
-  if (isEnabled(env.AUTOVPN_NO_INSTALL)) {
-    throw new WrapperError('No compatible Python autovpn CLI found and AUTOVPN_NO_INSTALL is enabled.');
-  }
-  if (!packageVersion) {
-    throw new WrapperError('Cannot install Python AutoVPN backend without an npm package version.');
-  }
-
-  const venvDir = path.join(cacheDir, `python-${packageVersion}`);
-  const executable = platform === 'win32' ? 'autovpn.exe' : 'autovpn';
-  const cliPath = path.join(venvDir, pythonBinName(platform), executable);
-  const forceInstall = isEnabled(env.AUTOVPN_FORCE_INSTALL);
-
-  if (!forceInstall && fs.existsSync(cliPath)) {
-    return { command: cliPath, args: [], source: 'managed-venv' };
-  }
-
-  fs.mkdirSync(cacheDir, { recursive: true });
-  const pythonCommand = String(env.PYTHON ?? env.PYTHON3 ?? 'python3');
-  const venvResult = spawnSync(pythonCommand, ['-m', 'venv', venvDir], { stdio: 'inherit', env });
-  if (venvResult.status !== 0) {
-    throw new WrapperError(`Failed to create AutoVPN Python backend venv with ${pythonCommand}.`);
-  }
-
-  const pythonPath = path.join(venvDir, pythonBinName(platform), platform === 'win32' ? 'python.exe' : 'python');
-  const installResult = spawnSync(pythonPath, buildPipInstallArgs({ env, packageVersion }), { stdio: 'inherit', env });
-  if (installResult.status !== 0) {
-    throw new WrapperError('Failed to install AutoVPN Python backend into the wrapper-managed venv.');
-  }
-
-  if (!fs.existsSync(cliPath)) {
-    throw new WrapperError(`Installed Python backend did not provide autovpn at ${cliPath}.`);
-  }
-
-  return { command: cliPath, args: [], source: 'managed-venv' };
-}

package/lib/runner.mjs

@@ -1,113 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import {
-  spawn as defaultSpawn,
-  spawnSync as defaultSpawnSync
-} from 'node:child_process';
-
-import { isEnabled, WrapperError } from './errors.mjs';
-import { installPythonCli } from './install-python-cli.mjs';
-
-const packageJsonPath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
-
-export function readPackageVersion() {
-  const payload = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-  return String(payload.version);
-}
-
-function normalizeVersionOutput(stdout) {
-  return String(stdout ?? '').trim();
-}
-
-export function versionMatches(stdout, packageVersion) {
-  return normalizeVersionOutput(stdout) === `autovpn ${packageVersion}`;
-}
-
-export function resolvePythonCli({
-  env = process.env,
-  packageVersion = readPackageVersion(),
-  spawnSync = defaultSpawnSync
-} = {}) {
-  if (isEnabled(env.AUTOVPN_NO_PYTHON)) {
-    throw new WrapperError('Python backend is disabled by AUTOVPN_NO_PYTHON.');
-  }
-
-  const explicit = String(env.AUTOVPN_PYTHON_CLI ?? '').trim();
-  if (explicit) {
-    return { command: explicit, args: [], source: 'AUTOVPN_PYTHON_CLI' };
-  }
-
-  const probe = spawnSync('autovpn', ['--version'], {
-    encoding: 'utf-8',
-    env: { ...env, AUTOVPN_WRAPPER_PROBE: '1' },
-    stdio: ['ignore', 'pipe', 'pipe']
-  });
-  if (probe.status === 0) {
-    if (versionMatches(probe.stdout, packageVersion) || isEnabled(env.AUTOVPN_ALLOW_VERSION_MISMATCH)) {
-      return { command: 'autovpn', args: [], source: 'PATH' };
-    }
-  }
-
-  throw new WrapperError(
-    `No compatible Python autovpn CLI found for version ${packageVersion}. Set AUTOVPN_PYTHON_CLI or allow the wrapper to install the backend.`
-  );
-}
-
-export function resolveOrInstallPythonCli({
-  env = process.env,
-  packageVersion = readPackageVersion(),
-  spawnSync = defaultSpawnSync,
-  installer = installPythonCli
-} = {}) {
-  try {
-    return resolvePythonCli({ env, packageVersion, spawnSync });
-  } catch (error) {
-    if (isEnabled(env.AUTOVPN_NO_PYTHON)) {
-      throw error;
-    }
-    return installer({ env, packageVersion, spawnSync });
-  }
-}
-
-export function runForwarder(argv = process.argv.slice(2), {
-  env = process.env,
-  cwd = process.cwd(),
-  packageVersion = readPackageVersion(),
-  spawn = defaultSpawn,
-  spawnSync = defaultSpawnSync,
-  installer = installPythonCli
-} = {}) {
-  const resolved = resolveOrInstallPythonCli({ env, packageVersion, spawnSync, installer });
-  const child = spawn(resolved.command, [...resolved.args, ...argv], {
-    cwd,
-    env,
-    stdio: 'inherit'
-  });
-
-  return new Promise((resolve, reject) => {
-    child.on('error', reject);
-    child.on('exit', (code, signal) => {
-      if (signal) {
-        resolve(1);
-        return;
-      }
-      resolve(typeof code === 'number' ? code : 1);
-    });
-  });
-}
-
-export async function main(argv = process.argv.slice(2), options = {}) {
-  const env = options.env ?? process.env;
-  if (isEnabled(env.AUTOVPN_WRAPPER_PROBE) && argv.length === 1 && argv[0] === '--version') {
-    return 42;
-  }
-
-  try {
-    return await runForwarder(argv, { ...options, env });
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    console.error(`autovpn npm wrapper error: ${message}`);
-    return 1;
-  }
-}