terminal-bridge-setup 3.3.0 → 3.3.1

package/bin/setup.mjs

@@ -42,6 +42,33 @@ const step = (n, total, msg) => console.log(`\n${c.bold(c.cyan(`[${n}/${total}]`
 const STEPS = 5;
 
 // ===================== 步骤 1：释放文件 =====================
+// 升级安装前停掉旧代理实例：读 .proxy.pid 杀进程（跨平台 process.kill）。
+// 不停的话旧实例一直占 8787，新代理启动即 EADDRINUSE 异常退出（Windows 实测踩过）
+function stopOldProxy() {
+  const pidFile = join(INSTALL_DIR, "proxy", ".proxy.pid");
+  if (!existsSync(pidFile)) return;
+  let pid;
+  try {
+    pid = Number(String(readFileSync(pidFile, "utf8")).trim());
+  } catch { return; }
+  if (!Number.isInteger(pid) || pid <= 0) return;
+  try {
+    process.kill(pid, "SIGTERM");
+    console.log(c.yellow(`  已停止旧代理实例 (pid ${pid})`));
+    // 给旧进程一点退出时间，避免端口未释放
+    const deadline = Date.now() + 2000;
+    while (Date.now() < deadline) {
+      try { process.kill(pid, 0); Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100); }
+      catch { break; }  // 进程已退出
+    }
+  } catch (err) {
+    // ESRCH=进程不存在（正常）；EPERM=权限不足（尽力而为，不阻断安装）
+    if (err.code !== "ESRCH") {
+      console.log(c.yellow(`  旧代理 (pid ${pid}) 停止失败（${err.code || err.message}），如新代理启动报端口占用请手动结束 node 进程`));
+    }
+  }
+}
+
 function releaseFiles() {
   step(1, STEPS, `释放文件到 ${c.dim(INSTALL_DIR)}`);
 
@@ -54,10 +81,12 @@ function releaseFiles() {
   if (existsSync(INSTALL_DIR)) {
     if (isForce) {
       console.log(c.yellow("  已存在 ~/.terminal-bridge/，--force 模式：覆盖"));
+      stopOldProxy();
       rmSync(INSTALL_DIR, { recursive: true, force: true });
     } else {
       // 不强制覆盖时，仍然更新文件（保留 .proxy.pid/.proxy.log 等运行时产物）
       console.log(c.yellow("  ~/.terminal-bridge/ 已存在，将更新文件（运行时产物保留）"));
+      stopOldProxy();
     }
   }
 

package/files/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "JumpServer 终端桥接",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "终端桥接：JumpServer / Arthas / Yearning，让 Agent 能通过浏览器执行命令、收结果与查数据",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtsnqR6PcFUueZwYria79tVbstvjk+tM7PpvIXILm5xbd6bAdjDIhzg3lsnKioVfvxjfvT+s6vJsiOYa9ojVZyJMFc5m/05TYqr770ovYwQmz0e88fmiy6dUoSulbtKvBCSLbN6OOL7u+ul8ixLZ/HautxSmou/eNgAFPmhE+4UueE7wfCqcgMYvjLvEzlqTVumMW+5LKw9YsRk6WhHPghY1a3MVUn3eQOWXBtQTEUy3wBM3v4wHxLwDeinVOR4f/P87IlUNo84C5DeimoFit0qCj3K04hS8MIYCLCYZc3v9ftRJDJBkAoah6Eaqj7JajbS3KvLR1ctOYfDhubgmURQIDAQAB",
   "permissions": ["debugger", "tabs", "alarms", "webNavigation", "nativeMessaging", "scripting", "downloads", "storage"],

package/files/proxy/server.js

@@ -917,6 +917,17 @@ function finalizeOutput(entry) {
 
 // ===================== WebSocket 服务 =====================
 const wss = new WebSocketServer({ host: HOST, port: PORT });
+// 绑定失败（典型：升级安装时旧代理实例还在占端口）必须给出可读原因再退出，
+// 否则 Windows 上表现为"node 抛异常退出"，用户无从下手
+wss.on("error", (err) => {
+  if (err && err.code === "EADDRINUSE") {
+    console.error(TAG, `端口 ${PORT} 已被占用：很可能有一个旧代理实例还在运行。`);
+    console.error(TAG, "请先停止旧代理（插件 popup「停止代理」，或任务管理器结束对应 node 进程）后重试。");
+  } else {
+    console.error(TAG, "代理启动失败:", err && (err.stack || err.message || err));
+  }
+  process.exit(1);
+});
 
 wss.on("connection", (ws, req) => {
   const url = req.url || "/ssh";

package/package.json

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