terminal-bridge-setup 3.3.1 → 3.3.3

package/bin/setup.mjs

@@ -107,34 +107,46 @@ function releaseFiles() {
 
 // ===================== 步骤 2：装代理依赖 =====================
 function installProxyDeps() {
-  step(2, STEPS, "安装代理依赖 (ws)");
+  step(2, STEPS, "安装代理依赖 (ws + @msgpack/msgpack)");
 
-  // 如果 node_modules/ws 已存在（从包里带出来的），跳过
+  // 跳过条件：两个依赖都存在才跳过。只查 ws 会漏掉 @msgpack/msgpack——
+  // 旧版本装的 node_modules 只有 ws，升级后代理启动即 ERR_MODULE_NOT_FOUND
   const wsPath = join(INSTALL_DIR, "proxy", "node_modules", "ws");
-  if (existsSync(wsPath)) {
-    ok("依赖已存在，跳过");
+  const msgpackPath = join(INSTALL_DIR, "proxy", "node_modules", "@msgpack", "msgpack");
+  if (existsSync(wsPath) && existsSync(msgpackPath)) {
+    ok("依赖已存在（ws + @msgpack/msgpack），跳过");
     return;
   }
+  if (existsSync(wsPath) && !existsSync(msgpackPath)) {
+    console.log(c.yellow("  检测到 ws 存在但 @msgpack/msgpack 缺失（旧版本残留），补装"));
+  }
 
   const proxyDir = join(INSTALL_DIR, "proxy");
 
   // 支持 --registry 透传（国内网络/公司内网常用）
   // 用法：npx terminal-bridge-setup --registry=https://registry.npmmirror.com
   const registryArg = process.argv.find(a => a.startsWith("--registry="));
-  const npmArgs = ["install", "--no-audit", "--no-fund"];
+  const baseArgs = ["install", "--no-audit", "--no-fund"];
+  const runNpm = (args) => {
+    console.log(c.dim(`  运行 npm ${args.join(" ")} ...`));
+    return spawnSync("npm", args, { cwd: proxyDir, stdio: "inherit" });
+  };
+
+  let result;
   if (registryArg) {
-    npmArgs.push(registryArg);
     console.log(c.dim(`  使用 registry: ${registryArg.split("=")[1]}`));
+    result = runNpm([...baseArgs, registryArg]);
   } else {
-    npmArgs.push("--silent");
+    // 不加 --silent：私有源缺包/认证失败等真实错误必须可见，不能吞掉
+    result = runNpm(baseArgs);
+    if (result.status !== 0) {
+      // 内网镜像未同步/缺包是高频原因（verdaccio 同步延迟实测踩过），
+      // 自动用官方源兜底重试一次再判失败
+      console.log(c.yellow("  默认 registry 安装失败，用官方源 npmjs.org 重试..."));
+      result = runNpm([...baseArgs, "--registry=https://registry.npmjs.org"]);
+    }
   }
 
-  console.log(c.dim("  运行 npm install ..."));
-  const result = spawnSync("npm", npmArgs, {
-    cwd: proxyDir,
-    stdio: "inherit",
-  });
-
   if (result.status !== 0) {
     // 失败时给出明确的排查建议
     console.error("");
@@ -153,7 +165,13 @@ function installProxyDeps() {
     console.error("");
     fail("npm install 失败（见上方排查建议）");
   }
-  ok("依赖安装完成");
+  // 装完验证两个依赖真实落盘（防 npm 静默半装/registry 缺包）
+  if (!existsSync(wsPath) || !existsSync(msgpackPath)) {
+    console.error(c.red("  ✗ 依赖验证失败：ws 或 @msgpack/msgpack 未落盘"));
+    console.error(c.yellow(`  手动修复：cd "${join(INSTALL_DIR, "proxy")}" && npm install`));
+    fail("依赖安装不完整");
+  }
+  ok("依赖安装完成（已验证 ws + @msgpack/msgpack）");
 }
 
 // ===================== 步骤 3：注册 native host =====================

package/files/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "JumpServer 终端桥接",
-  "version": "3.3.1",
+  "version": "3.3.3",
   "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

@@ -13,7 +13,6 @@
 
 import { WebSocketServer } from "ws";
 import { randomBytes } from "node:crypto";
-import { decode as msgpackDecode } from "@msgpack/msgpack";
 import { writeFileSync, unlinkSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 
@@ -34,6 +33,17 @@ const PROBE_LOG = process.env.PROBE_LOG !== "0"; // 默认开探针日志
 
 const TAG = "[proxy]";
 
+// msgpack 只有 Yearning 结果解析用到，终端桥接（JumpServer/Arthas）不需要。
+// 按需动态加载：缺依赖时降级为告警 + Yearning 功能不可用，而不是整个代理
+// 启动崩溃（Windows 用户 npm install 缺包时曾把终端功能一起拖死，实测踩过）。
+let msgpackDecode = null;
+try {
+  ({ decode: msgpackDecode } = await import("@msgpack/msgpack"));
+} catch {
+  console.warn(TAG, "⚠ @msgpack/msgpack 未安装：Yearning 查询结果解析不可用（终端命令不受影响）");
+  console.warn(TAG, "⚠ 修复：cd ~/.terminal-bridge/proxy && npm install");
+}
+
 // ===================== 客户端管理 =====================
 // 一个端点两类客户端：插件（唯一）和 Agent（多个）。
 // 我们不严格区分谁连进来，靠消息 type 路由。
@@ -151,6 +161,7 @@ function feedYearningWaiters(payload) {
   const opcode = payload && payload.opcode;
   const data = payload && payload.data;
   if (opcode !== 2 || typeof data !== "string") return;
+  if (!msgpackDecode) return;  // msgpack 缺失时 Yearning 解析不可用（启动时已告警）
   let obj = null;
   try {
     obj = msgpackDecode(Buffer.from(data, "base64"));

package/package.json

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