pac-proxy-cli 1.2.0 → 1.2.1

package/lib/config-cli.js

@@ -10,6 +10,7 @@ import {
   getPacRules,
   setPacRules,
   getProxyConfig,
+  getSslocalConfig,
 } from './local-store.js';
 import { getSslocalCiphers } from './sslocal-manager.js';
 
@@ -135,6 +136,102 @@ export async function tryPushProxyToRunningServe() {
   return false;
 }
 
+/**
+ * 若本机已有 `pac-proxy serve` 在跑，对其发起 PUT /api/local/sslocal，与 Web「Shadowsocks」页保存一致（写盘、启停 sslocal、applyProxyService）。
+ * @returns {Promise<boolean>} 是否成功命中并同步
+ */
+export async function tryPushSslocalToRunningServe() {
+  const sslocal = getSslocalConfig();
+  const body = JSON.stringify(sslocal);
+  for (const port of getConsoleHttpPortsToProbe()) {
+    const ctrl = new AbortController();
+    const tid = setTimeout(() => ctrl.abort(), 800);
+    try {
+      const r = await fetch(`http://127.0.0.1:${port}/api/local/sslocal`, {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body,
+        signal: ctrl.signal,
+      });
+      if (r.ok) {
+        console.log('已向运行中的控制台同步 Shadowsocks (sslocal) 设置（与 Web 保存一致）。');
+        return true;
+      }
+    } catch {
+      /* 下一端口 */
+    } finally {
+      clearTimeout(tid);
+    }
+  }
+  return false;
+}
+
+/**
+ * 与 Web「Shadowsocks / sslocal」页字段一致的交互问答。
+ * @param {Record<string, unknown>} currentSslocal
+ */
+async function promptSslocalFields(currentSslocal) {
+  const sslocal = { ...currentSslocal };
+  sslocal.enabled = await confirm({
+    message: '是否启用内置代理客户端 (sslocal)',
+    default: !!sslocal.enabled,
+  });
+  if (!sslocal.enabled) {
+    return { ...currentSslocal, enabled: false };
+  }
+
+  const server = await input({
+    message: '服务器地址',
+    default: sslocal.server || '',
+  });
+  if ((server || '').trim()) sslocal.server = server.trim();
+
+  const sp = await input({
+    message: '服务器端口',
+    default: String(sslocal.serverPort ?? 8388),
+    validate: validatePortNum,
+  });
+  sslocal.serverPort = Number(sp);
+
+  const lp = await input({
+    message: '本地 SOCKS5 端口',
+    default: String(sslocal.localPort ?? 1080),
+    validate: validatePortNum,
+  });
+  sslocal.localPort = Number(lp);
+
+  const changePw = await confirm({
+    message: '是否修改密码？（否则保留已保存密码）',
+    default: false,
+  });
+  if (changePw) {
+    const pw = await password({ message: '密码', mask: '*' });
+    sslocal.password = pw || '';
+  }
+
+  const methods = getSslocalCiphers();
+  const methodChoices = methods.map((m) => ({ name: m, value: m }));
+  const currentMethod = methods.includes(sslocal.method) ? sslocal.method : methods[0];
+  sslocal.method = await select({
+    message: '加密方法',
+    choices: methodChoices,
+    default: currentMethod,
+  });
+
+  const to = await input({
+    message: '超时（秒）',
+    default: String(sslocal.timeout ?? 300),
+    validate: (v) => {
+      const n = Number((v || '').trim());
+      if (!Number.isInteger(n) || n < 1) return '请输入正整数';
+      return true;
+    },
+  });
+  sslocal.timeout = Number((to || '').trim());
+  sslocal.enabled = true;
+  return sslocal;
+}
+
 export async function runConfigProxyModeInteractive() {
   const proxy = getProxyConfig();
   /** @type {'direct'|'global'|'pac'|'mitm'} */
@@ -524,66 +621,12 @@ export async function runConfigInteractive() {
     default: proxy.applySystemProxy !== false,
   });
 
-  sslocal.enabled = await confirm({
-    message: '是否启用内置代理客户端 (sslocal)',
-    default: !!sslocal.enabled,
-  });
-
-  if (sslocal.enabled) {
-    const server = await input({
-      message: '服务器地址',
-      default: sslocal.server || '',
-    });
-    if ((server || '').trim()) sslocal.server = server.trim();
-
-    const sp = await input({
-      message: '服务器端口',
-      default: String(sslocal.serverPort ?? 8388),
-      validate: validatePortNum,
-    });
-    sslocal.serverPort = Number(sp);
-
-    const lp = await input({
-      message: '本地 SOCKS5 端口',
-      default: String(sslocal.localPort ?? 1080),
-      validate: validatePortNum,
-    });
-    sslocal.localPort = Number(lp);
-
-    const changePw = await confirm({
-      message: '是否修改密码？（否则保留已保存密码）',
-      default: false,
-    });
-    if (changePw) {
-      const pw = await password({ message: '密码', mask: '*' });
-      sslocal.password = pw || '';
-    }
-
-    const methods = getSslocalCiphers();
-    const methodChoices = methods.map((m) => ({ name: m, value: m }));
-    const currentMethod = methods.includes(sslocal.method) ? sslocal.method : methods[0];
-    sslocal.method = await select({
-      message: '加密方法',
-      choices: methodChoices,
-      default: currentMethod,
-    });
-
-    const to = await input({
-      message: '超时（秒）',
-      default: String(sslocal.timeout ?? 300),
-      validate: (v) => {
-        const n = Number((v || '').trim());
-        if (!Number.isInteger(n) || n < 1) return '请输入正整数';
-        return true;
-      },
-    });
-    sslocal.timeout = Number((to || '').trim());
-  }
+  const nextSslocal = await promptSslocalFields(sslocal);
 
   cfg = {
     ...cfg,
     proxy: { ...cfg.proxy, ...proxy },
-    sslocal: { ...cfg.sslocal, ...sslocal, enabled: !!sslocal.enabled },
+    sslocal: nextSslocal,
   };
   saveConfig(cfg);
 
@@ -597,6 +640,22 @@ export async function runConfigInteractive() {
   printPathsHint(loadConfig());
 }
 
+/** 仅编辑 Shadowsocks (sslocal)，与 Web「Shadowsocks」页共用 config.json 字段与保存副作用。 */
+export async function runConfigShadowsocksInteractive() {
+  const cfg = loadConfig();
+  console.log('\nShadowsocks (sslocal) — 与 Web 控制台「代理客户端」页共用配置。\n');
+
+  const nextSslocal = await promptSslocalFields({ ...cfg.sslocal });
+  saveConfig({ ...cfg, sslocal: nextSslocal });
+
+  console.log('\n配置已保存。');
+  const pushed = await tryPushSslocalToRunningServe();
+  if (!pushed) {
+    console.log('未检测到运行中的控制台，sslocal 进程与上游代理未自动应用；可启动 pac-proxy serve 后重试本命令或在 Web 中保存。');
+  }
+  printPathsHint(loadConfig());
+}
+
 export async function runConfigInit() {
   console.log('\n首次配置向导（可随时用 pac-proxy config 再次编辑）。\n');
   printPathsHint(loadConfig());

package/lib/index.js

@@ -7,6 +7,7 @@ import {
   runConfigPrint,
   runConfigInteractive,
   runConfigInit,
+  runConfigShadowsocksInteractive,
   runPacImportFile,
   runPacRulesInteractive,
   runConfigProxyModeInteractive,
@@ -84,6 +85,19 @@ configCmd
     await runConfigProxyModeInteractive();
   });
 
+configCmd
+  .command('shadowsocks')
+  .alias('sslocal')
+  .description('交互式编辑 Shadowsocks (sslocal)，与 Web「代理客户端」页一致')
+  .action(async () => {
+    if (!process.stdin.isTTY) {
+      console.error('非交互终端无法使用。请使用: pac-proxy config --print');
+      process.exitCode = 1;
+      return;
+    }
+    await runConfigShadowsocksInteractive();
+  });
+
 configCmd
   .command('import')
   .description('从 JSON 文件合并导入 PAC 规则（与 Web 导入逻辑一致）')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pac-proxy-cli",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "node pac proxy and web control panel",
   "type": "module",
   "main": "lib/index.js",