terminal-bridge-setup 2.6.1 → 2.7.0

package/bin/setup.mjs

@@ -131,16 +131,19 @@ function installProxyDeps() {
 function registerNativeHost() {
   step(3, STEPS, "注册 Native Messaging Host");
 
-  // macOS / Linux 路径不同
   const plat = platform();
+  if (plat === "win32") {
+    return registerNativeHostWindows();
+  }
+
+  // macOS / Linux 路径不同
   let destDir;
   if (plat === "darwin") {
     destDir = join(homedir(), "Library", "Application Support", "Google", "Chrome", "NativeMessagingHosts");
   } else if (plat === "linux") {
     destDir = join(homedir(), ".config", "google-chrome", "NativeMessagingHosts");
   } else {
-    console.log(c.yellow("  ⚠ Windows 平台需要手动配置 native host，跳过自动注册"));
-    console.log(c.dim("  参考：https://developer.chrome.com/docs/extensions/develop/concepts/native-messaging"));
+    console.log(c.yellow(`  ⚠ 不支持的平台 ${plat}，跳过 native host 注册`));
     return false;
   }
 
@@ -165,6 +168,55 @@ function registerNativeHost() {
   return true;
 }
 
+// Windows 注册：生成 host.bat + manifest，写注册表 HKCU
+// Chrome 在 Windows 上通过注册表找 native host：
+//   HKCU\Software\Google\Chrome\NativeMessagingHosts\com.wssniffer.host
+//   默认值 = manifest json 的绝对路径
+function registerNativeHostWindows() {
+  console.log(c.dim("  Windows 平台：写注册表方式注册"));
+
+  const nativeDir = join(INSTALL_DIR, "native");
+
+  // 1. 生成 host.bat（等价于 macOS 的 host.sh，用绝对路径调 node）
+  //    where node 拿 node 绝对路径
+  const whereRes = spawnSync("where", ["node"], { encoding: "utf8", shell: true });
+  const nodeBin = whereRes.status === 0 ? whereRes.stdout.trim().split(/\r?\n/)[0] : "node";
+  const hostBat = join(nativeDir, "host.bat");
+  // bat 里路径可能含空格（C:\Program Files\nodejs\node.exe），必须加引号
+  writeFileSync(hostBat, `@echo off\r\n"${nodeBin}" "${join(nativeDir, "host.js")}"\r\n`);
+  ok(`生成 host.bat → ${hostBat}`);
+
+  // 2. 生成 manifest json（allowed_origins 同 macOS/Linux）
+  const manifest = {
+    name: "com.wssniffer.host",
+    description: "Terminal bridge native messaging host",
+    path: hostBat,
+    type: "stdio",
+    allowed_origins: [`chrome-extension://${EXTENSION_ID}/`],
+  };
+  const manifestPath = join(nativeDir, "com.wssniffer.host.json");
+  writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
+  ok(`生成 manifest → ${manifestPath}`);
+
+  // 3. 写注册表 HKCU（用户级，不需要管理员权限）
+  const regKey = "HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\com.wssniffer.host";
+  const regRes = spawnSync("reg", ["add", regKey, "/ve", "/t", "REG_SZ", "/d", manifestPath, "/f"],
+    { stdio: "pipe", encoding: "utf8", shell: true });
+  if (regRes.status !== 0) {
+    fail(`注册表写入失败：${regRes.stderr || regRes.stdout}`);
+  }
+  ok(`已写注册表 ${regKey}`);
+  console.log(c.dim(`  → ${manifestPath}`));
+
+  // 4. 校验注册表
+  const verifyRes = spawnSync("reg", ["query", regKey, "/ve"], { encoding: "utf8", shell: true });
+  if (verifyRes.status !== 0 || !verifyRes.stdout.includes(manifestPath)) {
+    fail("注册表校验失败");
+  }
+  ok("注册表校验通过");
+  return true;
+}
+
 // ===================== 步骤 4：安装 skill =====================
 // 把 skill 释放到 ~/.agents/skills/jumpserver-term-bridge/
 // 这样 Agent（如 ZCode）能自动发现并触发，知道怎么调用桥接、怎么处理各种错误。
@@ -211,6 +263,7 @@ function guideLoadExtension() {
 
   // ① 打开 chrome://extensions
   //    macOS: open -a 指定 Chrome；open URL scheme 更可靠
+  //    Windows: start 命令走默认关联程序（chrome:// 会由默认浏览器处理）
   //    Linux: 直接给 google-chrome 传 URL
   let chromeOpened = false;
   try {
@@ -221,6 +274,9 @@ function guideLoadExtension() {
         spawnSync("open", ["chrome://extensions"], { stdio: "ignore" });
       }
       chromeOpened = true;
+    } else if (plat === "win32") {
+      spawnSync("cmd", ["/c", "start", "", "chrome://extensions"], { stdio: "ignore", shell: true });
+      chromeOpened = true;
     } else if (plat === "linux") {
       // 试几个常见的 Chrome 命令名
       for (const bin of ["google-chrome", "google-chrome-stable", "chromium", "chromium-browser"]) {
@@ -239,6 +295,9 @@ function guideLoadExtension() {
       // open <dir> 会用 Finder 打开，并选中该文件夹
       spawnSync("open", [extDir], { stdio: "ignore" });
       ok(`已在 Finder 打开 ${extDir}`);
+    } else if (plat === "win32") {
+      spawnSync("explorer", [extDir], { stdio: "ignore" });
+      ok(`已在资源管理器打开 ${extDir}`);
     } else if (plat === "linux") {
       spawnSync("xdg-open", [extDir], { stdio: "ignore" });
       ok(`已在文件管理器打开 ${extDir}`);
@@ -301,7 +360,10 @@ async function main() {
   console.log(`  ${c.cyan("•")} 两个绿灯亮，即可通过 Agent 发命令`);
   console.log("");
   console.log(c.dim(`文件位置：${INSTALL_DIR}`));
-  console.log(c.dim(`卸载：rm -rf ${INSTALL_DIR} && rm ~/Library/Application\\ Support/Google/Chrome/NativeMessagingHosts/com.wssniffer.host.json`));
+  const uninstallHint = platform() === "win32"
+    ? `卸载：rd /s /q ${INSTALL_DIR} && reg delete HKCU\\Software\\Google\\Chrome\\NativeMessagingHosts\\com.wssniffer.host /f`
+    : `卸载：rm -rf ${INSTALL_DIR} && rm ~/Library/Application\\ Support/Google/Chrome/NativeMessagingHosts/com.wssniffer.host.json`;
+  console.log(c.dim(uninstallHint));
   console.log("");
 }
 

package/files/native/host.js

@@ -59,15 +59,13 @@ function isProxyListening() {
 
 function readPid() {
   try {
-    const pid = parseInt(fs.readFileSync(PID_FILE, "utf8").trim(), 10);
-    return isNaN(pid) ? null : pid;
+    const raw = fs.readFileSync(PID_FILE, "utf8").trim();
+    if (!/^\d{1,10}$/.test(raw)) return null;  // 纯数字白名单
+    const pid = Number(raw);
+    return pid > 0 ? pid : null;
   } catch { return null; }
 }
 
-function writePid(pid) {
-  try { fs.writeFileSync(PID_FILE, String(pid)); } catch {}
-}
-
 function clearPid() {
   try { fs.unlinkSync(PID_FILE); } catch {}
 }
@@ -79,21 +77,6 @@ function isPidAlive(pid) {
   } catch { return false; }
 }
 
-// 通过端口找占用进程的 PID（PID 文件缺失时的回退方案）
-// 用 lsof -ti :port 拿监听该端口的进程 PID
-function findPidByPort(port) {
-  return new Promise((resolve) => {
-    const child = spawn("lsof", ["-ti", `-i:${port}`, "-sTCP:LISTEN"], { stdio: ["ignore", "pipe", "ignore"] });
-    let out = "";
-    child.stdout.on("data", (d) => { out += d.toString(); });
-    child.on("error", () => resolve(null));      // lsof 不存在或没权限
-    child.on("close", () => {
-      const pid = parseInt(out.trim().split("\n")[0], 10);
-      resolve(isNaN(pid) ? null : pid);
-    });
-  });
-}
-
 // ============== 命令处理 ==============
 async function startProxy() {
   // 已在运行？
@@ -117,7 +100,8 @@ async function startProxy() {
     });
     // unref 让父进程（host）可以不等子进程就退出
     child.unref();
-    writePid(child.pid);
+    // 先落一份 spawn 返回的数字 PID（非外部输入）；代理 listening 后会自写权威值
+    try { fs.writeFileSync(PID_FILE, String(child.pid)); } catch {}
     fs.writeFileSync(logFd, `\n[host] proxy started PID=${child.pid} at ${new Date().toISOString()}\n`);
 
     // 等一小段时间确认端口起来
@@ -135,40 +119,32 @@ async function startProxy() {
 
 function stopProxy() {
   return new Promise(async (resolve) => {
-    let pid = readPid();
-    let pidSource = pid ? "pid file" : null;
-
-    // PID 文件缺失 → 回退用 lsof 按端口找
+    const pid = readPid();
     if (!pid) {
+      // 没有PID 文件。代理启动时会自己写 PID（server.js listening 后落盘），
+      // 走到这里说明代理未通过正常途径启动——用端口状态兜底判断。
       const up = await isProxyListening();
-      if (!up) {
-        resolve({ ok: true, status: "stopped", msg: "proxy was not running" });
-        return;
-      }
-      pid = await findPidByPort(PROXY_PORT);
-      pidSource = pid ? "port lookup" : null;
-      if (!pid) {
-        resolve({ ok: false, status: "running", msg: "无法停止：代理在监听但找不到 PID（lsof 失败），请手动 kill" });
-        return;
-      }
+      resolve(up
+        ? { ok: false, status: "running", msg: "无法停止：PID 文件缺失，请手动停止占用 8787 端口的进程" }
+        : { ok: true, status: "stopped", msg: "proxy was not running" });
+      return;
     }
 
     try {
       process.kill(pid, "SIGTERM");
-      // 等 2s 确认退出
+      // 等 2s 确认退出（Windows 上 SIGTERM 即强制终止）
       setTimeout(async () => {
         if (isPidAlive(pid)) {
           try { process.kill(pid, "SIGKILL"); } catch {}
         }
         clearPid();
-        // 再确认端口确实释放了
         const stillUp = await isProxyListening();
         resolve({
           ok: !stillUp,
           status: stillUp ? "running" : "stopped",
           msg: stillUp
-            ? `SIGTERM+SIGKILL 已发（PID ${pid} via ${pidSource}）但端口仍被占用，可能有其他进程`
-            : `proxy stopped (PID ${pid} via ${pidSource})`,
+            ? "已发停止信号但端口仍被占用，可能有其他进程"
+            : "proxy stopped",
         });
       }, 2000);
     } catch (err) {

package/files/proxy/server.js

@@ -13,6 +13,11 @@
 
 import { WebSocketServer } from "ws";
 import { randomBytes } from "node:crypto";
+import { writeFileSync, unlinkSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+
+// PID 文件：native host「停止代理」时读取。代理自己在 listening 后写入。
+const PID_FILE = fileURLToPath(new URL("./.proxy.pid", import.meta.url));
 import {
   auditArthasCommand,
   isArthasCommand,
@@ -515,10 +520,19 @@ wss.on("listening", () => {
   const { address, port } = wss.address();
   console.log(TAG, `监听 ws://${address}:${port}/ssh`);
   console.log(TAG, "等待插件连接（role: extension）和 Agent 连接（发 run 请求）");
+
+  // 写 PID 文件：native host 的「停止代理」靠它找到本进程。
+  // 由代理自己写（而不是 host 代写）保证准确性——手动 node server.js
+  // 启动时也有 PID 文件可停。进程自己写自己的 process.pid，无注入面。
+  try {
+    writeFileSync(PID_FILE, String(process.pid));
+    console.log(TAG, `PID ${process.pid} → ${PID_FILE}`);
+  } catch {}
 });
 
 function shutdown() {
   console.error(TAG, "shutting down");
+  try { unlinkSync(PID_FILE); } catch {}
   wss.clients.forEach((c) => c.close(1001, "shutting down"));
   for (const [, entry] of pending) {
     clearTimeout(entry.timer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminal-bridge-setup",
-  "version": "2.6.1",
+  "version": "2.7.0",
   "description": "一次性安装器：释放终端桥接（JumpServer / Arthas）的本地代理 + Chrome 插件，并注册 native messaging host。让 Agent 能通过浏览器 xterm 终端执行命令并拿回输出。",
   "license": "MIT",
   "author": "encorearon",