ssh-client-wrapper 3.1.3 → 3.1.4

package/lib/sshExec.js

@@ -138,7 +138,8 @@ async function existsMaster(hostInfo, argTimeout) {
     }
   }
 
-  return !/Control socket connect.*: No such file or directory/.test(output);
+  //"Connection refused" means that the socket is left but nobody listens (the master was killed, or it is exiting)
+  return !/Control socket connect.*: (No such file or directory|Connection refused)/.test(output);
 }
 
 /**
@@ -278,35 +279,36 @@ export async function connect(hostInfo, timeout = 60) {
 export async function disconnect(hostInfo) {
   debug("disconnect called");
 
-  if (await existsMaster(hostInfo)) {
-    const args = getSshOption(hostInfo);
-    args.push("-Oexit");
+  try {
+    if (await existsMaster(hostInfo)) {
+      const args = getSshOption(hostInfo);
+      args.push("-Oexit");
 
-    let output = "";
-    const cb = (e)=>{
-      output += e;
-    };
-    try {
-      debug(`disconnect: ${sshCmd} ${args.join(" ")}`);
-      await fork(hostInfo, sshCmd, args, 0, cb);
-    } catch (err) {
-      if (err.rt === 255) {
-        return;
-      }
-      if (/Control socket connect.*: No such file or directory/.test(output)) {
-        return;
+      let output = "";
+      const cb = (e)=>{
+        output += e;
+      };
+      try {
+        debug(`disconnect: ${sshCmd} ${args.join(" ")}`);
+        await fork(hostInfo, sshCmd, args, 0, cb);
+        debug(`disconnected from ${hostInfo.host}`);
+      } catch (err) {
+        //the master is already gone
+        const gone = err.rt === 255 || /Control socket connect.*: No such file or directory/.test(output);
+        if (!gone) {
+          throw err;
+        }
       }
-      throw err;
+    } else {
+      debug(`disconnect: master session to ${hostInfo.host} does not exist`);
+    }
+  } finally {
+    //the pty must be released even if the master is already gone. It keeps the process alive.
+    if (hostInfo.masterPty) {
+      debug("exit masterPty");
+      sendPty(hostInfo.masterPty, "exit \n", debugSendMasterPty, 228);
+      hostInfo.masterPty = null;
     }
-    debug(`disconnected from ${hostInfo.host}`);
-  } else {
-    debug(`disconnect: master session to ${hostInfo.host} does not exist`);
-  }
-
-  if (hostInfo.masterPty) {
-    debug("exit masterPty");
-    sendPty(hostInfo.masterPty, "exit \n", debugSendMasterPty, 228);
-    hostInfo.masterPty = null;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssh-client-wrapper",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "wrapper library for open ssh client and rsync",
   "keywords": [
     "ssh",