@linxin666/dsh-ssh 0.1.15 → 0.1.16

package/lib/index.js

@@ -1352,23 +1352,24 @@ function connectClient(config) {
 	return new Promise((resolve, reject) => {
 		const client = new Client();
 		let settled = false;
-		client.once("ready", () => {
+		const fail = (error) => {
 			if (settled) return;
 			settled = true;
-			resolve(client);
-		});
-		client.once("error", (error) => {
+			try {
+				client.destroy();
+			} catch {}
+			reject(error instanceof Error ? error : new Error(String(error)));
+		};
+		client.once("ready", () => {
 			if (settled) return;
 			settled = true;
-			reject(error instanceof Error ? error : new Error(String(error)));
+			resolve(client);
 		});
+		client.on("error", fail);
 		try {
 			client.connect(config);
 		} catch (error) {
-			if (!settled) {
-				settled = true;
-				reject(error instanceof Error ? error : new Error(String(error)));
-			}
+			fail(error);
 		}
 	});
 }
@@ -1414,13 +1415,18 @@ async function connectChain(engine, entry) {
 			});
 		});
 	}
+	let target;
 	try {
+		target = await connectClient(buildConnectConfig(entry, sock));
 		return {
-			client: await connectClient(buildConnectConfig(entry, sock)),
+			client: target,
 			hops
 		};
 	} catch (error) {
 		for (const client of hops) client.end();
+		if (target !== void 0) try {
+			target.destroy();
+		} catch {}
 		throw error;
 	}
 }

package/lib/types/engine/connection-pool.d.ts

@@ -48,6 +48,8 @@ export interface PoolEngine {
 }
 /** Build the ssh2 connect config for one entry (key read from disk). */
 export declare function buildConnectConfig(entry: SshHostEntry, sock?: ConnectConfig['sock']): ConnectConfig;
+/** Connect one ssh2 client (resolve on ready, reject on error/close). */
+export declare function connectClient(config: ConnectConfig): Promise<Client>;
 /** Cap captured output at the configured byte budget (marks truncation). */
 export declare function appendOutput(target: {
     text: string;

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.1.15",
+  "version": "0.1.16",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"

package/src/engine/connection-pool.ts

@@ -88,27 +88,31 @@ export function buildConnectConfig(entry: SshHostEntry, sock?: ConnectConfig['so
 }
 
 /** Connect one ssh2 client (resolve on ready, reject on error/close). */
-function connectClient(config: ConnectConfig): Promise<Client> {
+export function connectClient(config: ConnectConfig): Promise<Client> {
   return new Promise((resolve, reject) => {
     const client = new Client()
     let settled = false
-    client.once('ready', () => {
+    const fail = (error: unknown): void => {
       if (settled) return
       settled = true
-      resolve(client)
-    })
-    client.once('error', (error) => {
+      try { client.destroy() } catch { /* already closed */ }
+      reject(error instanceof Error ? error : new Error(String(error)))
+    }
+    client.once('ready', () => {
       if (settled) return
       settled = true
-      reject(error instanceof Error ? error : new Error(String(error)))
+      resolve(client)
     })
+    // Keep an error listener attached after the handshake: when TCP connects
+    // but the handshake drops, ssh2 can emit a second 'error' after a single
+    // once-listener is gone, which would surface as an unhandled 'error' event.
+    // The settled guard turns later emissions into a no-op; other callers
+    // (like doAcquire) attach their own error listeners and all fire together.
+    client.on('error', fail)
     try {
       client.connect(config)
     } catch (error) {
-      if (!settled) {
-        settled = true
-        reject(error instanceof Error ? error : new Error(String(error)))
-      }
+      fail(error)
     }
   })
 }
@@ -159,11 +163,18 @@ export async function connectChain(engine: PoolEngine, entry: SshHostEntry): Pro
       })
     })
   }
+  let target: Client | undefined
   try {
-    const client = await connectClient(buildConnectConfig(entry, sock))
-    return { client, hops }
+    target = await connectClient(buildConnectConfig(entry, sock))
+    return { client: target, hops }
   } catch (error) {
     for (const client of hops) client.end()
+    // connectClient already destroys the failed target on its own failure
+    // path; destroy defensively only when a reference leaked through, and
+    // guard it so a second destroy is never an issue.
+    if (target !== undefined) {
+      try { target.destroy() } catch { /* already destroyed */ }
+    }
     throw error
   }
 }