pac-proxy-cli 1.0.3 → 1.1.0

package/lib/local-store.js

@@ -10,12 +10,21 @@ const DEFAULT_CONFIG = {
   proxy: {
     enabled: false,
     mode: 'pac',
-    upstream: '',
+    upstream: 'socks5://127.0.0.1:1080',
     httpPort: 5175,
     httpsPort: 5176,
     applySystemProxy: true,
   },
   pacRules: [],
+  sslocal: {
+    enabled: false,
+    server: '',
+    serverPort: 8388,
+    localPort: 1080,
+    password: '',
+    method: 'aes-256-gcm',
+    timeout: 300,
+  },
 };
 
 function getStoreDir() {
@@ -51,6 +60,7 @@ export function loadConfig() {
       mode,
       proxy: { ...DEFAULT_CONFIG.proxy, ...(data.proxy || {}) },
       pacRules: Array.isArray(data.pacRules) ? data.pacRules : DEFAULT_CONFIG.pacRules,
+      sslocal: { ...DEFAULT_CONFIG.sslocal, ...(data.sslocal || {}) },
     };
   } catch {
     return JSON.parse(JSON.stringify(DEFAULT_CONFIG));
@@ -92,7 +102,14 @@ export function getPacRules() {
 }
 
 export function setPacRules(rules) {
-  const list = Array.isArray(rules) ? rules : (rules?.rules ?? []);
+  const raw = Array.isArray(rules) ? rules : (rules?.rules ?? []);
+  const seen = new Set();
+  const list = raw.filter((r) => {
+    const key = (r.pattern || '').trim();
+    if (!key || seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
   const config = loadConfig();
   if (config.mode === 'remote') {
     saveRemoteConfig({ pacRules: list });
@@ -108,6 +125,9 @@ export function getProxyConfig() {
   const proxy = { ...DEFAULT_CONFIG.proxy, ...config.proxy };
   proxy.enabled = proxy.enabled === true || proxy.enabled === 'true';
   proxy.applySystemProxy = proxy.applySystemProxy !== false && proxy.applySystemProxy !== 'false';
+  if (!proxy.upstream || !proxy.upstream.trim()) {
+    proxy.upstream = DEFAULT_CONFIG.proxy.upstream;
+  }
   return proxy;
 }
 
@@ -120,3 +140,20 @@ export function setProxyConfig(proxy) {
   saveConfig(config);
   return config.proxy;
 }
+
+export function getSslocalConfig() {
+  const config = loadConfig();
+  return { ...DEFAULT_CONFIG.sslocal, ...(config.sslocal || {}) };
+}
+
+export function setSslocalConfig(sslocal) {
+  const config = loadConfig();
+  config.sslocal = { ...DEFAULT_CONFIG.sslocal, ...sslocal };
+  config.sslocal.enabled = config.sslocal.enabled === true || config.sslocal.enabled === 'true';
+  saveConfig(config);
+  return config.sslocal;
+}
+
+export function getSslocalConfigPath() {
+  return path.join(getStoreDir(), 'sslocal-config.json');
+}

package/lib/server.js

@@ -5,7 +5,7 @@ import dotenv from 'dotenv';
 import express from 'express';
 import cors from 'cors';
 import { createServer } from 'http';
-import { loadConfig, saveConfig, getPacRules, setPacRules, getProxyConfig, setProxyConfig } from './local-store.js';
+import { loadConfig, saveConfig, getPacRules, setPacRules, getProxyConfig, setProxyConfig, getSslocalConfig, setSslocalConfig } from './local-store.js';
 import { getRecords as getTrafficRecords } from './traffic-log.js';
 import { getCaptures } from './capture-log.js';
 import { getPort } from 'get-port-please';
@@ -13,6 +13,7 @@ import { startProxyServer, stopProxyServer, getProxyStatus } from './proxy-serve
 import { startMitmProxyServer, stopMitmProxyServer, getMitmProxyStatus, getCaCertPath, hasCaCert } from './mitm-proxy-server.js';
 import { setSystemProxy, clearSystemProxy } from './system-proxy.js';
 import { generatePacJs } from './pac-file.js';
+import { startSslocal, stopSslocal, getSslocalStatus } from './sslocal-manager.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const envDir = path.resolve(__dirname, '..');
@@ -25,6 +26,19 @@ let controlPanelPort = null;
 
 async function applyProxyService(proxyOverride) {
   const proxy = proxyOverride ?? getProxyConfig();
+  const sslocalCfg = getSslocalConfig();
+
+  // 若 sslocal 启用，先确保进程运行，并覆盖 upstream
+  if (sslocalCfg.enabled && sslocalCfg.server) {
+    try {
+      const status = getSslocalStatus();
+      if (!status.running) await startSslocal(sslocalCfg);
+      proxy.upstream = `socks5://127.0.0.1:${sslocalCfg.localPort || 1080}`;
+    } catch (e) {
+      console.error('sslocal 启动失败:', e.message);
+    }
+  }
+
   const isMitm = (proxy.mode || '') === 'mitm';
   const prevStatus = isMitm ? getMitmProxyStatus() : getProxyStatus();
   const wasProxyRunning = prevStatus.running === true;
@@ -226,9 +240,56 @@ export async function startServer(port) {
     res.sendFile(path.join(distPath, 'index.html'));
   });
 
+  // ---------- sslocal API ----------
+  app.get('/api/local/sslocal', (req, res) => {
+    try { res.json(getSslocalConfig()); }
+    catch (e) { res.status(500).json({ error: String(e.message) }); }
+  });
+
+  app.put('/api/local/sslocal', async (req, res) => {
+    try {
+      const cfg = setSslocalConfig(req.body);
+      // 若已启用且进程未运行则启动；若禁用则停止
+      if (cfg.enabled && cfg.server) {
+        const status = getSslocalStatus();
+        if (!status.running) await startSslocal(cfg);
+      } else if (!cfg.enabled) {
+        await stopSslocal();
+      }
+      res.json(cfg);
+    } catch (e) { res.status(500).json({ error: String(e.message) }); }
+  });
+
+  app.get('/api/local/sslocal-status', (req, res) => {
+    try { res.json(getSslocalStatus()); }
+    catch (e) { res.status(500).json({ running: false, pid: null, error: String(e.message), logs: [] }); }
+  });
+
+  app.post('/api/local/sslocal/start', async (req, res) => {
+    try {
+      const cfg = getSslocalConfig();
+      if (!cfg.server) return res.status(400).json({ error: '请先配置服务器地址' });
+      await startSslocal(cfg);
+      res.json(getSslocalStatus());
+    } catch (e) { res.status(500).json({ error: String(e.message) }); }
+  });
+
+  app.post('/api/local/sslocal/stop', async (req, res) => {
+    try {
+      await stopSslocal();
+      res.json({ ok: true });
+    } catch (e) { res.status(500).json({ error: String(e.message) }); }
+  });
+
   const actualPort = await getPort({ port, portRange: [port, port + 100] });
   const server = createServer(app);
 
+  // 进程退出时清理 sslocal 子进程
+  const cleanup = () => { stopSslocal().catch(() => {}); };
+  process.once('exit', cleanup);
+  process.once('SIGINT', () => { cleanup(); process.exit(0); });
+  process.once('SIGTERM', () => { cleanup(); process.exit(0); });
+
   server.listen(actualPort, '127.0.0.1', async () => {
     controlPanelPort = actualPort;
     console.log(`控制台已启动: http://127.0.0.1:${actualPort}`);

package/lib/sslocal-manager.js

@@ -0,0 +1,146 @@
+import { spawn } from 'child_process';
+import fs from 'fs';
+import net from 'net';
+import path from 'path';
+import { createRequire } from 'module';
+import { getSslocalConfigPath } from './local-store.js';
+
+const require = createRequire(import.meta.url);
+
+const LOG_MAX = 200;
+
+const PKG_MAP = {
+  'win32-x64':  'pac-proxy-sslocal-win32-x64',
+  'darwin-x64': 'pac-proxy-sslocal-darwin-x64',
+  'linux-x64':  'pac-proxy-sslocal-linux-x64',
+};
+
+let _proc = null;
+let _logs = [];
+let _lastError = null;
+
+function getBinaryPath() {
+  const key = `${process.platform}-${process.arch}`;
+  const pkgName = PKG_MAP[key];
+  if (pkgName) {
+    try {
+      const pkgDir = path.dirname(require.resolve(`${pkgName}/package.json`));
+      const bin = process.platform === 'win32' ? 'sslocal.exe' : 'sslocal';
+      const p = path.join(pkgDir, bin);
+      if (fs.existsSync(p)) return p;
+    } catch (_) {}
+  }
+  throw new Error(
+    `当前平台 ${process.platform}/${process.arch} 没有可用的 sslocal 二进制。\n` +
+    `请手动安装：npm install ${PKG_MAP[key] ?? '对应平台包'}`
+  );
+}
+
+function ensureExecutable(binPath) {
+  if (process.platform !== 'win32') {
+    try { fs.chmodSync(binPath, 0o755); } catch (_) {}
+  }
+}
+
+function pushLog(line) {
+  _logs.push(line);
+  if (_logs.length > LOG_MAX) _logs.shift();
+}
+
+function waitForPort(port, timeoutMs = 4000) {
+  return new Promise((resolve) => {
+    const deadline = Date.now() + timeoutMs;
+    function attempt() {
+      const sock = new net.Socket();
+      sock.setTimeout(300);
+      sock.connect(port, '127.0.0.1', () => {
+        sock.destroy();
+        resolve(true);
+      });
+      sock.on('error', () => {
+        sock.destroy();
+        if (Date.now() < deadline) setTimeout(attempt, 200);
+        else resolve(false);
+      });
+      sock.on('timeout', () => {
+        sock.destroy();
+        if (Date.now() < deadline) setTimeout(attempt, 200);
+        else resolve(false);
+      });
+    }
+    attempt();
+  });
+}
+
+export async function startSslocal(cfg) {
+  if (_proc) await stopSslocal();
+
+  const binPath = getBinaryPath();
+  if (!fs.existsSync(binPath)) {
+    throw new Error(`sslocal 二进制不存在: ${binPath}（当前平台: ${process.platform}）`);
+  }
+  ensureExecutable(binPath);
+
+  // 写入临时 config 文件
+  const configPath = getSslocalConfigPath();
+  const sslocalCfg = {
+    server: cfg.server,
+    server_port: Number(cfg.serverPort) || 8388,
+    local_address: '127.0.0.1',
+    local_port: Number(cfg.localPort) || 1080,
+    password: cfg.password,
+    method: cfg.method || 'aes-256-gcm',
+    timeout: Number(cfg.timeout) || 300,
+  };
+  fs.mkdirSync(path.dirname(configPath), { recursive: true });
+  fs.writeFileSync(configPath, JSON.stringify(sslocalCfg, null, 2), 'utf-8');
+
+  _logs = [];
+  _lastError = null;
+
+  _proc = spawn(binPath, ['-c', configPath], {
+    detached: false,
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+
+  _proc.stdout.on('data', (d) => {
+    String(d).split('\n').filter(Boolean).forEach(pushLog);
+  });
+  _proc.stderr.on('data', (d) => {
+    String(d).split('\n').filter(Boolean).forEach(pushLog);
+  });
+  _proc.on('exit', (code, signal) => {
+    _lastError = code !== 0 ? `进程退出 code=${code} signal=${signal}` : null;
+    _proc = null;
+  });
+  _proc.on('error', (e) => {
+    _lastError = e.message;
+    _proc = null;
+  });
+
+  const localPort = Number(cfg.localPort) || 1080;
+  const ready = await waitForPort(localPort);
+  if (!ready) {
+    const recentLogs = _logs.slice(-10).join('\n');
+    throw new Error(`sslocal 启动超时，端口 ${localPort} 未就绪。\n${recentLogs}`);
+  }
+}
+
+export async function stopSslocal() {
+  if (!_proc) return;
+  try {
+    _proc.kill('SIGTERM');
+    await new Promise((r) => setTimeout(r, 300));
+    if (_proc) _proc.kill('SIGKILL');
+  } catch (_) {}
+  _proc = null;
+}
+
+export function getSslocalStatus() {
+  return {
+    running: _proc !== null && !_proc.killed,
+    pid: _proc?.pid ?? null,
+    error: _lastError,
+    logs: [..._logs],
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pac-proxy-cli",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "node pac proxy and web control panel",
   "type": "module",
   "main": "lib/index.js",
@@ -16,7 +16,12 @@
   "scripts": {
     "dev": "node lib/index.js serve --port 5174",
     "build": "vite build",
-    "prepublishOnly": "pnpm run build"
+    "prepublishOnly": "npm run build"
+  },
+  "optionalDependencies": {
+    "pac-proxy-sslocal-win32-x64": "workspace:*",
+    "pac-proxy-sslocal-darwin-x64": "workspace:*",
+    "pac-proxy-sslocal-linux-x64": "workspace:*"
   },
   "dependencies": {
     "commander": "^12.0.0",