@zhangfengshun/dsh-remote-ssh 2.1.1 → 2.1.2

package/lib/index.js

@@ -279,6 +279,9 @@ function sshArgv(p, remoteCmd, tty) {
   opts.push("-o", "ConnectTimeout=15");
   opts.push("-o", "ServerAliveInterval=30");
   opts.push("-o", "ServerAliveCountMax=3");
+  // 插件内部连接（文件读写/工具/同步）不需要端口转发；
+  // 清除 ssh config 里的 RemoteForward/LocalForward，避免端口被占时连接直接失败。
+  opts.push("-o", "ClearAllForwardings=yes");
   if (p.proxyJump) opts.push("-o", "ProxyJump=" + String(p.proxyJump));
   if (p.authMethod === "key" && p.keyPath) opts.push("-i", p.keyPath);
   const target = String(p.user || "") + "@" + String(p.host || "");
@@ -1348,7 +1351,8 @@ function apply(ctx, config) {
     "    const j = JSON.parse(fs.readFileSync(info, 'utf8'));",
     "    if (j.keyPath && j.keyPath !== '' && j.host && j.user) {",
     "      const port = j.port || 22;",
-    "      const args = ['-tt', '-o', 'StrictHostKeyChecking=no', '-p', String(port), '-i', j.keyPath, j.user + '@' + j.host];",
+    "      // ExitOnForwardFailure=no：ssh config 里的 RemoteForward 端口被占时终端仍能打开",
+    "      const args = ['-tt', '-o', 'StrictHostKeyChecking=no', '-o', 'ExitOnForwardFailure=no', '-p', String(port), '-i', j.keyPath, j.user + '@' + j.host];",
     "      if (j.proxyJump) { args.splice(2, 0, '-J', j.proxyJump); }",
     "      const ssh = spawn('ssh', args, { stdio: 'inherit' });",
     "      ssh.on('exit', function(c) { process.exit(c == null ? 0 : c); });",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangfengshun/dsh-remote-ssh",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "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",