@linxin666/dsh-ssh 0.4.5 → 0.4.7

package/lib/index.js

@@ -1452,6 +1452,24 @@ function fastGet(sftp, src, dst, concurrency, onProgress) {
 * to a pooled connection so an idle sweep never closes it, with per-tunnel
 * socket tracking and stop (single / alias-scoped / all).
 */
+/** Destroy one socket or channel stream, tolerating an already-dead peer. */
+function destroyQuietly(target) {
+	try {
+		target.destroy();
+	} catch {}
+}
+/**
+* Tear down one tunnel because the SSH link behind it is gone. Idempotent: the
+* tunnel registry is the guard, so a socket callback or a link-death hook that
+* arrives after a manual stop does nothing instead of tearing down twice, and
+* no teardown error can escape into the net connection handler — an exception
+* there terminates the whole host process.
+*/
+function abortTunnel(engine, id) {
+	try {
+		stopTunnel(engine, id);
+	} catch {}
+}
 /** Start a local port-forward tunnel (listens on 127.0.0.1 only). */
 async function startTunnel(engine, alias, options) {
 	if (!Number.isInteger(options.remotePort) || options.remotePort < 1 || options.remotePort > 65535) throw new Error("remotePort must be an integer in 1..65535");
@@ -1474,30 +1492,44 @@ async function startTunnel(engine, alias, options) {
 	const record = engine.pool.get(alias) ?? await acquire(engine, alias);
 	const client = record.client;
 	const sockets = /* @__PURE__ */ new Set();
+	const onLinkClosed = () => {
+		abortTunnel(engine, id);
+	};
+	const detachLink = () => {
+		client.off("close", onLinkClosed);
+	};
 	const server = createServer((socket) => {
 		sockets.add(socket);
 		socket.on("close", () => {
 			sockets.delete(socket);
 		});
-		client.forwardOut("127.0.0.1", 0, remoteHost, options.remotePort, (error, stream) => {
-			if (error !== void 0) {
-				socket.destroy();
-				return;
-			}
-			const destroy = () => {
-				try {
-					socket.destroy();
-				} catch {}
-				try {
-					stream.close();
-				} catch {}
-			};
-			stream.on("error", destroy);
-			socket.on("error", destroy);
-			stream.on("close", destroy);
-			socket.on("close", destroy);
-			stream.pipe(socket).pipe(stream);
-		});
+		if (record.broken) {
+			destroyQuietly(socket);
+			abortTunnel(engine, id);
+			return;
+		}
+		try {
+			client.forwardOut("127.0.0.1", 0, remoteHost, options.remotePort, (error, stream) => {
+				if (error !== void 0) {
+					destroyQuietly(socket);
+					return;
+				}
+				const destroy = () => {
+					destroyQuietly(socket);
+					try {
+						stream.close();
+					} catch {}
+				};
+				stream.on("error", destroy);
+				socket.on("error", destroy);
+				stream.on("close", destroy);
+				socket.on("close", destroy);
+				stream.pipe(socket).pipe(stream);
+			});
+		} catch {
+			destroyQuietly(socket);
+			abortTunnel(engine, id);
+		}
 	});
 	try {
 		await new Promise((resolve, reject) => {
@@ -1520,8 +1552,15 @@ async function startTunnel(engine, alias, options) {
 		server,
 		alias,
 		record,
-		sockets
+		sockets,
+		detachLink
 	});
+	client.once("close", onLinkClosed);
+	if (record.broken) {
+		info.state = "failed";
+		info.error = "ssh link closed while the tunnel was starting";
+		abortTunnel(engine, id);
+	}
 	return info;
 }
 /** All active tunnels. */
@@ -1534,11 +1573,12 @@ function stopTunnel(engine, id) {
 	if (tunnel === void 0) return false;
 	engine.tunnels.delete(id);
 	try {
-		tunnel.server.close();
+		tunnel.detachLink?.();
 	} catch {}
-	for (const socket of tunnel.sockets) try {
-		socket.destroy();
+	try {
+		tunnel.server.close();
 	} catch {}
+	for (const socket of tunnel.sockets) destroyQuietly(socket);
 	tunnel.sockets.clear();
 	if (![...engine.tunnels.values()].some((candidate) => candidate.record === tunnel.record)) if (engine.pool.get(tunnel.alias) === tunnel.record) disposeRecord(engine, tunnel.alias, tunnel.record);
 	else endRecordChain(tunnel.record);

package/lib/types/engine/tunnel.d.ts

@@ -14,6 +14,8 @@ export interface TunnelRecord {
     /** The pooled connection this tunnel pins; siblings on one alias may share it. */
     record: PoolRecord;
     sockets: Set<Socket>;
+    /** Detach the link-death hook startTunnel installs on the pooled client. */
+    detachLink?: () => void;
 }
 /** The engine slice the tunnel module needs (adds the tunnel registry). */
 export interface TunnelEngine extends PoolEngine {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-ssh",
   "description": "Remote SSH operations for the dsh web GUI: host config store (~/.dsh/dsh-ssh.json, import from ~/.ssh/config), a persistent ssh2 connection pool with jump-host support, exec / PTY web terminal / SFTP transfer / local port-forward tunnels / cluster execution, plus agent tools (ssh_list, ssh_exec, ssh_upload, ssh_download, ssh_tunnel, ssh_cluster). Hot-pluggable — mounted via ~/.dsh/cordis.patch.yml + a profile node_modules symlink, no dsh source changes.",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "icon": "icon.svg",
   "type": "module",
   "engines": {
@@ -14,10 +14,6 @@
       "types": "./lib/types/index.d.ts",
       "default": "./lib/index.js"
     },
-    "./invariant": {
-      "types": "./lib/types/invariant.d.ts",
-      "default": "./lib/invariant.js"
-    },
     "./client": {
       "types": "./lib/types/client/index.d.ts",
       "default": "./lib/client.js"
@@ -27,7 +23,7 @@
   },
   "dsh": {
     "engines": {
-      "dsh": ">=0.2.0-rc.2"
+      "dsh": ">=0.2.1-rc.2"
     },
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -43,33 +39,33 @@
     }
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.4",
+    "@deepseek-ai/schemastery": "^3.18.5",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/xterm": "^6.0.0",
     "ssh2": "^1.17.0",
     "ws": "^8.18.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh": ">=0.2.0-rc.2",
+    "@deepseek-ai/dsh": ">=0.2.1-rc.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-client-connection": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-locale": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-layout": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-sidebar": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-scope": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-timeout": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.2.0-rc.2",
+    "@deepseek-ai/cordis": "^4.0.5",
+    "@deepseek-ai/dsh-client-connection": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-client-locale": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-layout": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-sidebar": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-scope": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-timeout": "^0.2.1-rc.2",
+    "@deepseek-ai/dsh-tools": "^0.2.1-rc.2",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "^18.3.5",
@@ -99,10 +95,10 @@
     "url": "https://github.com/zhu1090093659/dsh-web.git"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.build.json && tsdown",
+    "build": "tsc -b tsconfig.build.json && tsdown",
     "bundle": "tsdown",
     "watch": "tsdown --watch",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsgo --noEmit",
     "test": "vitest run",
     "test:watch": "vitest"
   }

package/src/client/settings-binding.ts

@@ -66,7 +66,6 @@ const PENDING_SNAPSHOT: ConfigFormSnapshot<never> = {
   user: undefined,
   revision: undefined,
   writable: false,
-  mode: 'host',
 }
 
 /** Whether one Host namespace section carries a field this plugin's schema declares. */

package/src/engine/tunnel.ts

@@ -16,6 +16,8 @@ export interface TunnelRecord {
   /** The pooled connection this tunnel pins; siblings on one alias may share it. */
   record: PoolRecord
   sockets: Set<Socket>
+  /** Detach the link-death hook startTunnel installs on the pooled client. */
+  detachLink?: () => void
 }
 
 /** The engine slice the tunnel module needs (adds the tunnel registry). */
@@ -24,6 +26,22 @@ export interface TunnelEngine extends PoolEngine {
   nextTunnelId: number
 }
 
+/** Destroy one socket or channel stream, tolerating an already-dead peer. */
+function destroyQuietly(target: { destroy(): void }): void {
+  try { target.destroy() } catch { /* already closed */ }
+}
+
+/**
+ * Tear down one tunnel because the SSH link behind it is gone. Idempotent: the
+ * tunnel registry is the guard, so a socket callback or a link-death hook that
+ * arrives after a manual stop does nothing instead of tearing down twice, and
+ * no teardown error can escape into the net connection handler — an exception
+ * there terminates the whole host process.
+ */
+function abortTunnel(engine: TunnelEngine, id: string): void {
+  try { stopTunnel(engine, id) } catch { /* teardown already in progress */ }
+}
+
 /** Start a local port-forward tunnel (listens on 127.0.0.1 only). */
 export async function startTunnel(
   engine: TunnelEngine,
@@ -58,26 +76,47 @@ export async function startTunnel(
   const record = engine.pool.get(alias) ?? (await acquire(engine, alias))
   const client = record.client
   const sockets = new Set<Socket>()
+  // A tunnel whose SSH link died can only refuse what it is handed, so every
+  // path that learns the link is gone tears the tunnel down as well instead
+  // of leaving a listener alive on a connection that forwards nothing.
+  const onLinkClosed = (): void => { abortTunnel(engine, id) }
+  const detachLink = (): void => { client.off('close', onLinkClosed) }
   const server = createServer((socket) => {
     sockets.add(socket)
     socket.on('close', () => { sockets.delete(socket) })
-    client.forwardOut('127.0.0.1', 0, remoteHost, options.remotePort, (error, stream) => {
-      if (error !== undefined) {
-        socket.destroy()
-        return
-      }
-      // Both ends of the pipe can die independently; destroy the pair so an
-      // unhandled 'error' event can never crash the host process.
-      const destroy = (): void => {
-        try { socket.destroy() } catch { /* gone */ }
-        try { stream.close() } catch { /* gone */ }
-      }
-      stream.on('error', destroy)
-      socket.on('error', destroy)
-      stream.on('close', destroy)
-      socket.on('close', destroy)
-      stream.pipe(socket).pipe(stream)
-    })
+    // The link can die between taking the record above and this connection.
+    if (record.broken) {
+      destroyQuietly(socket)
+      abortTunnel(engine, id)
+      return
+    }
+    try {
+      client.forwardOut('127.0.0.1', 0, remoteHost, options.remotePort, (error, stream) => {
+        if (error !== undefined) {
+          // A refused remote channel is the remote service's answer, not a
+          // dead SSH link: the tunnel itself stays up for the next attempt.
+          destroyQuietly(socket)
+          return
+        }
+        // Both ends of the pipe can die independently; destroy the pair so an
+        // unhandled 'error' event can never crash the host process.
+        const destroy = (): void => {
+          destroyQuietly(socket)
+          try { stream.close() } catch { /* gone */ }
+        }
+        stream.on('error', destroy)
+        socket.on('error', destroy)
+        stream.on('close', destroy)
+        socket.on('close', destroy)
+        stream.pipe(socket).pipe(stream)
+      })
+    } catch {
+      // ssh2 reports 'Not connected' by throwing out of forwardOut rather than
+      // through the callback; an exception escaping this connection handler
+      // is an uncaught exception that takes the host process down with it.
+      destroyQuietly(socket)
+      abortTunnel(engine, id)
+    }
   })
   try {
     await new Promise<void>((resolve, reject) => {
@@ -96,7 +135,20 @@ export async function startTunnel(
   const address = server.address()
   info.localPort = typeof address === 'object' && address !== null ? address.port : 0
   info.state = 'forwarding'
-  engine.tunnels.set(id, { info, server, alias, record, sockets })
+  engine.tunnels.set(id, { info, server, alias, record, sockets, detachLink })
+  // A dead link must not keep a listener alive: without this hook the tunnel
+  // outlives its connection and every later local connection hits the dead
+  // forwardOut path above.
+  client.once('close', onLinkClosed)
+  if (record.broken) {
+    // A link that died while the listener was binding already emitted 'close',
+    // so the pool's broken flag is the only signal left for that window. The
+    // tunnel retires right away, and the start reports that instead of
+    // handing the caller a forwarding tunnel that no longer exists.
+    info.state = 'failed'
+    info.error = 'ssh link closed while the tunnel was starting'
+    abortTunnel(engine, id)
+  }
   return info
 }
 
@@ -110,9 +162,12 @@ export function stopTunnel(engine: TunnelEngine, id: string): boolean {
   const tunnel = engine.tunnels.get(id)
   if (tunnel === undefined) return false
   engine.tunnels.delete(id)
+  // Drop the link-death hook first: a stop is never the link's death, and a
+  // long-lived pooled client outlives many tunnels.
+  try { tunnel.detachLink?.() } catch { /* already detached */ }
   try { tunnel.server.close() } catch { /* already closed */ }
   for (const socket of tunnel.sockets) {
-    try { socket.destroy() } catch { /* already closed */ }
+    destroyQuietly(socket)
   }
   tunnel.sockets.clear()
   // Sibling tunnels on the same alias share the pinned connection: release it

package/lib/invariant.js

@@ -1,6 +0,0 @@
-//#region src/invariant.ts
-/** Invariant companion plugin (no assertions — nothing to check at runtime). */
-/** Provides no assertions: the ssh plugin owns no cross-package runtime invariants. */
-function apply() {}
-//#endregion
-export { apply };

package/lib/types/invariant.d.ts

@@ -1,3 +0,0 @@
-/** Invariant companion plugin (no assertions — nothing to check at runtime). */
-/** Provides no assertions: the ssh plugin owns no cross-package runtime invariants. */
-export declare function apply(): void;

package/src/invariant.ts

@@ -1,4 +0,0 @@
-/** Invariant companion plugin (no assertions — nothing to check at runtime). */
-
-/** Provides no assertions: the ssh plugin owns no cross-package runtime invariants. */
-export function apply(): void {}