@zhangfengshun/dsh-remote-ssh 1.6.0 → 1.7.0

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 本文件的版本号与 `package.json` 的 `version` 保持一致。每个版本对应一个 Cordis Package 快照（`pkg-N`）。
 
+## [1.7.0] — SSH 连接复用（大幅加速）
+### 重大优化
+- **持久 SSH 会话池**：`ls`/`cat`/`write`/`grep`/`glob`/`mkdir`/`delete`/`move` 等文件操作不再每次新建 ssh 子进程（每次都要完整 TCP 握手 + 密钥交换 + 认证，超算/跳板机单次 2-10 秒）。改为维护一条常驻 `ssh <host> bash` 进程，所有命令复用它，用哨兵标记（sentinel）分隔输出、解析退出码。首次连接后，后续操作近乎瞬时。
+- **自动回退**：持久会话断开（网络中断、远端重启等）时自动清理并回退到一次性 `runRemote`，保证可靠性。
+- **空闲清理**：会话空闲超过 10 分钟自动断开，避免占着连接。插件卸载时全部清理。
+- `remote_ssh_exec` 与测试连接仍用一次性连接（保留 stdout/stderr 分离）。
+- Windows OpenSSH 不支持 ControlMaster（已验证），故采用此进程内会话池方案，不依赖 ControlMaster。
+
 ## [1.6.0] — 远程搜索与文件操作工具
 ### 新增
 - **内容搜索 `remote_ssh_grep`**：在远端递归搜索文件内容（`grep -rnIE`，扩展正则），支持 `include` 文件名过滤（如 `*.py`）、`ignoreCase` 忽略大小写、`maxResults` 限流（默认 200）。借鉴 dsh-remote / dsh-remote-ssh 的远程搜索，但用通用 GNU grep（超算/Linux 通用，不依赖 ripgrep）。

package/README.md

@@ -9,6 +9,7 @@
 | 能力 | 说明 |
 | --- | --- |
 | 🔌 远程连接 | SSH 连接超算 / 服务器，密钥认证（推荐）或密码认证（需本机 `sshpass`），内置「测试连接」；支持 `ProxyJump` 跳板机 |
+| ⚡ 连接复用 | 持久 SSH 会话池，文件操作复用同一条已认证连接，不再每次握手（首次后近乎瞬时） |
 | 📥 配置导入 | 一键从 `~/.ssh/config`（递归 `Include`）发现主机并批量导入连接配置 |
 | 🗂️ 远程文件 | 在 better-sidebar「远程文件」页签浏览 / 打开 / 编辑 / 保存远程文件；选中工作区后可双向同步 |
 | 💻 远程终端 | 在 better-sidebar「远程终端」页签打开 `ssh -tt` 集成终端，支持多终端并发 |
@@ -29,7 +30,7 @@ dsh plugin --profile <name> add /absolute/path/to/dsh-remote-ssh
 ### 发布后安装
 
 ```bash
-dsh plugin --profile <name> add @zhangfengshun/dsh-remote-ssh@1.6.0
+dsh plugin --profile <name> add @zhangfengshun/dsh-remote-ssh@1.7.0
 ```
 
 > ⚠️ 安装后需**重启 DSH** 才生效；后续仅修改 Client 半边时刷新浏览器即可。

package/lib/index.js

@@ -155,6 +155,121 @@ async function listSshConfigHosts() {
   return { ok: true, hosts: out };
 }
 
+/**
+ * 持久 SSH 会话：维护一条常驻 ssh <host> bash 进程，所有命令复用它，
+ * 避免每次操作都做完整 TCP 握手 + SSH 密钥交换 + 认证（超算/跳板机单次 2-10 秒）。
+ *
+ * 工作原理：向 bash 的 stdin 写入命令 + 哨兵标记 printf，从 stdout 读取直到哨兵出现，
+ * 哨兵后的数字即退出码。每条命令用 2>&1 合并 stderr（成功时 stderr 为空，不影响解析；
+ * 失败时错误信息在 stdout 中，退出码非 0）。带 stdin 的写操作用 heredoc。
+ */
+class CommandSession {
+  constructor(subprocess, profile) {
+    this.subprocess = subprocess;
+    this.profile = profile;
+    this.handle = null;
+    this.alive = false;
+    this.buf = "";
+    this.queue = [];
+    this.current = null;
+    this.sentinel = "DSHEOF" + Math.random().toString(36).slice(2, 14) + Math.random().toString(36).slice(2, 10) + "DSHEOF";
+    this.lastUsed = Date.now();
+    this.connectPromise = null;
+  }
+
+  async connect() {
+    if (this.alive && this.handle) return;
+    if (this.connectPromise) return this.connectPromise;
+    this.connectPromise = this._doConnect();
+    try { await this.connectPromise; } finally { this.connectPromise = null; }
+  }
+
+  async _doConnect() {
+    if (this.handle) { try { this.handle.terminate(); } catch (e) {} this.handle = null; }
+    this.alive = false;
+    this.buf = "";
+    this.current = null;
+    this.queue = [];
+    const argv = sshArgv(this.profile, "bash", false);
+    const h = this.subprocess.spawn({
+      argv: argv,
+      cwd: process.cwd(),
+      stdio: { stdin: "pipe", stdout: "pipe", stderr: "pipe" },
+      graceMs: 60000
+    });
+    this.handle = h;
+    h.stdout.on("data", (chunk) => {
+      this.buf += chunk.toString("utf8");
+      this._check();
+    });
+    const onEnd = () => {
+      this.alive = false;
+      if (this.current) { this.current.reject(new Error("ssh 会话已关闭")); this.current = null; }
+      while (this.queue.length) this.queue.shift().reject(new Error("ssh 会话已关闭"));
+    };
+    h.stdout.on("end", onEnd);
+    h.stdout.on("error", onEnd);
+    h.done.then(() => { this.alive = false; }, () => { this.alive = false; });
+    this.alive = true;
+    this.lastUsed = Date.now();
+  }
+
+  _check() {
+    if (!this.current) return;
+    const idx = this.buf.indexOf(this.sentinel);
+    if (idx < 0) return;
+    const before = this.buf.slice(0, idx);
+    const after = this.buf.slice(idx + this.sentinel.length);
+    const nl = after.indexOf("\n");
+    const codeStr = nl >= 0 ? after.slice(0, nl) : after;
+    const rest = nl >= 0 ? after.slice(nl + 1) : "";
+    this.buf = rest;
+    const exitCode = parseInt(codeStr, 10);
+    const cur = this.current;
+    this.current = null;
+    cur.resolve({ stdout: before, exitCode: isNaN(exitCode) ? -1 : exitCode });
+    this._next();
+  }
+
+  _next() {
+    if (this.current || !this.alive || this.queue.length === 0) return;
+    const item = this.queue.shift();
+    this.current = { resolve: item.resolve, reject: item.reject };
+    try {
+      let toWrite;
+      if (item.stdinData !== undefined && item.stdinData !== null) {
+        // 写操作：heredoc 传内容，不用 2>&1（cat > file 不产生 stdout）
+        const delim = "DSHW" + Math.random().toString(36).slice(2, 14);
+        toWrite = item.cmd + " <<'" + delim + "'\n" + String(item.stdinData) + "\n" + delim + "\nprintf '\\n" + this.sentinel + "%s\\n' $?\n";
+      } else {
+        // 读/列举/搜索：2>&1 合并 stderr（成功时 stderr 为空）
+        toWrite = "{ " + item.cmd + " ; } 2>&1\nprintf '\\n" + this.sentinel + "%s\\n' $?\n";
+      }
+      this.handle.stdin.write(toWrite);
+    } catch (e) {
+      this.current = null;
+      item.reject(e);
+      this._next();
+    }
+  }
+
+  async exec(cmd, stdinData) {
+    await this.connect();
+    this.lastUsed = Date.now();
+    return new Promise((resolve, reject) => {
+      this.queue.push({ cmd, stdinData, resolve, reject });
+      this._next();
+    });
+  }
+
+  close() {
+    this.alive = false;
+    if (this.current) { this.current.reject(new Error("session closed")); this.current = null; }
+    while (this.queue.length) this.queue.shift().reject(new Error("session closed"));
+    if (this.handle) { try { this.handle.terminate(); } catch (e) {} this.handle = null; }
+  }
+}
+
 function sshArgv(p, remoteCmd, tty) {
   const opts = ["ssh"];
   if (tty) opts.push("-tt");
@@ -214,10 +329,10 @@ async function runRemote(subprocess, p, remoteCmd, stdinData, maxBytes) {
   };
 }
 
-async function remoteListDir(subprocess, p, path) {
+async function remoteListDir(runner, p, path) {
   const target = path || p.remoteRoot || "~";
   const script = "cd " + shellQuotePath(target) + " 2>/dev/null || { echo '__DSH_ERR__ cannot cd'; exit 1; }; find . -maxdepth 1 -mindepth 1 -printf '%Y\\t%f\\t%s\\n' 2>/dev/null | sort";
-  const r = await runRemote(subprocess, p, script, undefined, MAX_BYTES);
+  const r = await runner(p, script, undefined, MAX_BYTES);
   if (!r.ok) return { ok: false, error: (r.error || r.stderr || "").trim() || "读取目录失败" };
   const entries = [];
   const lines = String(r.stdout || "").split("\n");
@@ -236,9 +351,9 @@ async function remoteListDir(subprocess, p, path) {
   return { ok: true, path: target, entries: entries };
 }
 
-async function remoteReadFile(subprocess, p, path) {
+async function remoteReadFile(runner, p, path) {
   if (!path) return { ok: false, error: "path 为必填项" };
-  const r = await runRemote(subprocess, p, "base64 -w0 " + shellQuotePath(path), undefined, MAX_BYTES);
+  const r = await runner(p, "base64 -w0 " + shellQuotePath(path), undefined, MAX_BYTES);
   if (!r.ok) return r;
   let text = "";
   let binary = false;
@@ -253,10 +368,10 @@ async function remoteReadFile(subprocess, p, path) {
   return { ok: true, path: path, content: text, binary: binary, truncated: r.truncated };
 }
 
-async function remoteWriteFile(subprocess, p, path, content) {
+async function remoteWriteFile(runner, p, path, content) {
   if (!path) return { ok: false, error: "path 为必填项" };
   const c = content !== undefined ? String(content) : "";
-  return await runRemote(subprocess, p, "cat > " + shellQuotePath(path), c, MAX_BYTES);
+  return await runner(p, "cat > " + shellQuotePath(path), c, MAX_BYTES);
 }
 
 /**
@@ -264,7 +379,7 @@ async function remoteWriteFile(subprocess, p, path, content) {
  * 但用通用的 GNU grep（超算/Linux 通用），不依赖 ripgrep。
  * exit 1 = 无匹配（ok，空结果）；exit 0 = 有匹配；exit 2 = 出错。
  */
-async function remoteGrep(subprocess, p, pattern, path, opts) {
+async function remoteGrep(runner, p, pattern, path, opts) {
   opts = opts || {};
   const target = path || p.remoteRoot || "~";
   const parts = ["grep", "-rnIE"];
@@ -272,7 +387,7 @@ async function remoteGrep(subprocess, p, pattern, path, opts) {
   if (opts.include) parts.push("--include=" + String(opts.include));
   parts.push("--", shellQuote(pattern), shellQuotePath(target));
   const cmd = parts.join(" ");
-  const r = await runRemote(subprocess, p, cmd, undefined, MAX_BYTES);
+  const r = await runner(p, cmd, undefined, MAX_BYTES);
   if (r.exitCode === 1 || (r.ok && !r.stdout)) {
     return { ok: true, pattern: pattern, path: target, matches: [], truncated: false, error: "" };
   }
@@ -304,14 +419,14 @@ async function remoteGrep(subprocess, p, pattern, path, opts) {
  * 在远端按 glob 模式查找文件（find -name）。find 已递归；pattern 为 basename 通配
  * （如 .py 后缀），自动剥离前导双星号-斜杠与星号-斜杠以适配 POSIX find -name。
  */
-async function remoteGlob(subprocess, p, pattern, path, opts) {
+async function remoteGlob(runner, p, pattern, path, opts) {
   opts = opts || {};
   const target = path || p.remoteRoot || "~";
   let pat = String(pattern || "").trim();
   pat = pat.replace(/^(\*\*\/|\*\/)+/, "");
   const max = parseInt(String(opts.maxResults || 500), 10) || 500;
   const cmd = "find " + shellQuotePath(target) + " -name " + shellQuote(pat) + " -printf '%p\\n' 2>/dev/null | sort | head -n " + max;
-  const r = await runRemote(subprocess, p, cmd, undefined, MAX_BYTES);
+  const r = await runner(p, cmd, undefined, MAX_BYTES);
   const files = String(r.stdout || "").split("\n").filter(function (s) { return !!s; });
   return { ok: true, pattern: pattern, path: target, files: files, truncated: !!r.truncated, error: "" };
 }
@@ -530,6 +645,40 @@ function apply(ctx, config) {
   const terminals = new Map();
   let nextTerminalId = 1;
 
+  // ---- 持久 SSH 会话池（连接复用，避免每次操作都做完整 SSH 握手）----
+  const sessions = new Map(); // profileKey -> CommandSession
+  const SESSION_IDLE_MS = 10 * 60 * 1000;
+  function profileKey(p) {
+    return String(p.id) + "|" + String(p.host) + ":" + String(p.port || 22) + "|" + String(p.user || "");
+  }
+  function getSession(p) {
+    const key = profileKey(p);
+    let s = sessions.get(key);
+    if (!s) { s = new CommandSession(subprocess, p); sessions.set(key, s); }
+    return s;
+  }
+  /** 池化执行：复用持久会话，失败时回退到一次性 runRemote。 */
+  async function runPooled(p, cmd, stdinData, maxBytes) {
+    try {
+      const s = getSession(p);
+      const r = await s.exec(cmd, stdinData);
+      return { ok: r.exitCode === 0, exitCode: r.exitCode, stdout: r.stdout, stderr: "", error: r.exitCode !== 0 ? String(r.stdout).trim().slice(0, 500) : "", truncated: false };
+    } catch (e) {
+      // 会话挂了 —— 清理并回退到一次性连接
+      const key = profileKey(p);
+      const old = sessions.get(key);
+      if (old) { old.close(); sessions.delete(key); }
+      return runRemote(subprocess, p, cmd, stdinData, maxBytes);
+    }
+  }
+  // 定期清理空闲会话
+  const idleTimer = setInterval(function () {
+    const now = Date.now();
+    for (const [key, s] of sessions) {
+      if (now - s.lastUsed > SESSION_IDLE_MS) { s.close(); sessions.delete(key); }
+    }
+  }, 60 * 1000);
+
   // ---- settings 持久化 ----
   let settingsFace = {
     read: () => ({ profiles: [], workspaces: [] }),
@@ -728,45 +877,45 @@ function apply(ctx, config) {
     listDir: async (args) => {
       const p = resolveProfile(args);
       if (!p) return { ok: false, error: "需要 profileId 或 host+user" };
-      return await remoteListDir(subprocess, p, args && args.path);
+      return await remoteListDir(runPooled, p, args && args.path);
     },
     readFile: async (args) => {
       const p = resolveProfile(args);
       if (!p) return { ok: false, error: "需要 profileId 或 host+user" };
-      return await remoteReadFile(subprocess, p, args && args.path);
+      return await remoteReadFile(runPooled, p, args && args.path);
     },
     writeFile: async (args) => {
       const p = resolveProfile(args);
       if (!p) return { ok: false, error: "需要 profileId 或 host+user" };
-      return await remoteWriteFile(subprocess, p, args && args.path, args && args.content);
+      return await remoteWriteFile(runPooled, p, args && args.path, args && args.content);
     },
     grep: async (args) => {
       const p = resolveProfile(args);
       if (!p) return { ok: false, error: "需要 profileId 或 host+user" };
-      return await remoteGrep(subprocess, p, args && args.pattern, args && args.path, args || {});
+      return await remoteGrep(runPooled, p, args && args.pattern, args && args.path, args || {});
     },
     glob: async (args) => {
       const p = resolveProfile(args);
       if (!p) return { ok: false, error: "需要 profileId 或 host+user" };
-      return await remoteGlob(subprocess, p, args && args.pattern, args && args.path, args || {});
+      return await remoteGlob(runPooled, p, args && args.pattern, args && args.path, args || {});
     },
     mkdir: async (args) => {
       const p = resolveProfile(args);
       if (!p) return { ok: false, error: "需要 profileId 或 host+user" };
       if (!args || !args.path) return { ok: false, error: "path 为必填项" };
-      return await runRemote(subprocess, p, "mkdir -p " + shellQuotePath(args.path), undefined, undefined);
+      return await runPooled(p, "mkdir -p " + shellQuotePath(args.path), undefined, undefined);
     },
     deleteFile: async (args) => {
       const p = resolveProfile(args);
       if (!p) return { ok: false, error: "需要 profileId 或 host+user" };
       if (!args || !args.path) return { ok: false, error: "path 为必填项" };
-      return await runRemote(subprocess, p, "rm -rf " + shellQuotePath(args.path), undefined, undefined);
+      return await runPooled(p, "rm -rf " + shellQuotePath(args.path), undefined, undefined);
     },
     move: async (args) => {
       const p = resolveProfile(args);
       if (!p) return { ok: false, error: "需要 profileId 或 host+user" };
       if (!args || !args.src || !args.dst) return { ok: false, error: "src 和 dst 为必填项" };
-      return await runRemote(subprocess, p, "mv " + shellQuotePath(args.src) + " " + shellQuotePath(args.dst), undefined, undefined);
+      return await runPooled(p, "mv " + shellQuotePath(args.src) + " " + shellQuotePath(args.dst), undefined, undefined);
     },
     /** 远端 → 本地镜像（按工作区）。 */
     syncDown: async (args) => {
@@ -934,7 +1083,7 @@ function apply(ctx, config) {
     execute: async function (args, exec) {
       const tc = toolContext(args, exec);
       if (!tc.profile) return { ok: false, path: "", entries: [], error: "需要 profileId 或 host+user（当前会话非远程工作区时必填）" };
-      const r = await remoteListDir(subprocess, tc.profile, resolveRemotePath(args.path, tc.remotePath));
+      const r = await remoteListDir(runPooled, tc.profile, resolveRemotePath(args.path, tc.remotePath));
       return { ok: !!r.ok, path: r.path || "", entries: r.entries || [], error: r.error || "" };
     }
   });
@@ -959,7 +1108,7 @@ function apply(ctx, config) {
     execute: async function (args, exec) {
       const tc = toolContext(args, exec);
       if (!tc.profile) return { ok: false, path: "", content: "", binary: false, truncated: false, error: "需要 profileId 或 host+user（当前会话非远程工作区时必填）" };
-      const r = await remoteReadFile(subprocess, tc.profile, resolveRemotePath(args.path, tc.remotePath));
+      const r = await remoteReadFile(runPooled, tc.profile, resolveRemotePath(args.path, tc.remotePath));
       return { ok: !!r.ok, path: r.path || "", content: r.content || "", binary: !!r.binary, truncated: !!r.truncated, error: r.error || "" };
     }
   });
@@ -978,7 +1127,7 @@ function apply(ctx, config) {
     execute: async function (args, exec) {
       const tc = toolContext(args, exec);
       if (!tc.profile) return normExec({ ok: false, error: "需要 profileId 或 host+user（当前会话非远程工作区时必填）" });
-      return normExec(await remoteWriteFile(subprocess, tc.profile, resolveRemotePath(args.path, tc.remotePath), args.content));
+      return normExec(await remoteWriteFile(runPooled, tc.profile, resolveRemotePath(args.path, tc.remotePath), args.content));
     }
   });
 
@@ -1059,7 +1208,7 @@ function apply(ctx, config) {
       const tc = toolContext(args, exec);
       if (!tc.profile) return { ok: false, pattern: "", path: "", matches: [], truncated: false, error: "需要 profileId 或 host+user（当前会话非远程工作区时必填）" };
       if (!args.pattern) return { ok: false, pattern: "", path: "", matches: [], truncated: false, error: "pattern 为必填项" };
-      const r = await remoteGrep(subprocess, tc.profile, args.pattern, resolveRemotePath(args.path, tc.remotePath), args);
+      const r = await remoteGrep(runPooled, tc.profile, args.pattern, resolveRemotePath(args.path, tc.remotePath), args);
       return { ok: !!r.ok, pattern: r.pattern || args.pattern, path: r.path || "", matches: r.matches || [], truncated: !!r.truncated, error: r.error || "" };
     }
   });
@@ -1095,7 +1244,7 @@ function apply(ctx, config) {
       const tc = toolContext(args, exec);
       if (!tc.profile) return { ok: false, pattern: "", path: "", files: [], truncated: false, error: "需要 profileId 或 host+user（当前会话非远程工作区时必填）" };
       if (!args.pattern) return { ok: false, pattern: "", path: "", files: [], truncated: false, error: "pattern 为必填项" };
-      const r = await remoteGlob(subprocess, tc.profile, args.pattern, resolveRemotePath(args.path, tc.remotePath), args);
+      const r = await remoteGlob(runPooled, tc.profile, args.pattern, resolveRemotePath(args.path, tc.remotePath), args);
       return { ok: !!r.ok, pattern: r.pattern || args.pattern, path: r.path || "", files: r.files || [], truncated: !!r.truncated, error: r.error || "" };
     }
   });
@@ -1111,7 +1260,7 @@ function apply(ctx, config) {
       if (!tc.profile) return normExec({ ok: false, error: "需要 profileId 或 host+user（当前会话非远程工作区时必填）" });
       if (!args.path) return normExec({ ok: false, error: "path 为必填项" });
       let cmd = "mkdir -p " + shellQuotePath(resolveRemotePath(args.path, tc.remotePath));
-      return normExec(await runRemote(subprocess, tc.profile, cmd, undefined, undefined));
+      return normExec(await runPooled(tc.profile, cmd, undefined, undefined));
     }
   });
 
@@ -1126,7 +1275,7 @@ function apply(ctx, config) {
       if (!tc.profile) return normExec({ ok: false, error: "需要 profileId 或 host+user（当前会话非远程工作区时必填）" });
       if (!args.path) return normExec({ ok: false, error: "path 为必填项" });
       let cmd = "rm -rf " + shellQuotePath(resolveRemotePath(args.path, tc.remotePath));
-      return normExec(await runRemote(subprocess, tc.profile, cmd, undefined, undefined));
+      return normExec(await runPooled(tc.profile, cmd, undefined, undefined));
     }
   });
 
@@ -1144,12 +1293,15 @@ function apply(ctx, config) {
       if (!tc.profile) return normExec({ ok: false, error: "需要 profileId 或 host+user（当前会话非远程工作区时必填）" });
       if (!args.src || !args.dst) return normExec({ ok: false, error: "src 和 dst 为必填项" });
       let cmd = "mv " + shellQuotePath(resolveRemotePath(args.src, tc.remotePath)) + " " + shellQuotePath(resolveRemotePath(args.dst, tc.remotePath));
-      return normExec(await runRemote(subprocess, tc.profile, cmd, undefined, undefined));
+      return normExec(await runPooled(tc.profile, cmd, undefined, undefined));
     }
   });
 
   // ---- 清理 ----
   ctx.effect(() => () => {
+    clearInterval(idleTimer);
+    sessions.forEach(function (s) { try { s.close(); } catch (e) {} });
+    sessions.clear();
     terminals.forEach(function (s) { try { s.handle.terminate(); } catch (e) {} });
     terminals.clear();
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangfengshun/dsh-remote-ssh",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "DSH web plugin: VSCode Remote-SSH-like remote development (SSH to supercomputers/servers, remote workspace, file explorer, integrated terminal), integrated with dsh-better-sidebar and DSH settings.",
   "keywords": [
     "dsh",