ssh-client-wrapper 1.5.4 → 1.6.0

package/lib/sshExec.js

@@ -35,7 +35,7 @@ async function sshExec(hostInfo, cmd, outputCallback) {
       debug(`${cmd} not found but ignored`);
       return e.rt;
     }
-    throw e;
+    return e.rt;
   }
 }
 
@@ -234,12 +234,12 @@ async function ls(hostInfo, target, lsOpt = []) {
       throw e;
     }
   }
-
-  return outputArray
-    .join("\n")
-    .replace(/\n+/g, "\n")
-    .replace(/\n$/, "")
-    .split("\n");
+  return outputArray.length === 0 ? []
+    : outputArray
+      .join("\n")
+      .replace(/\n+/g, "\n")
+      .replace(/\n$/, "")
+      .split("\n");
 }
 
 /**

package/package.json

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

package/test/sshExec.js

@@ -18,7 +18,7 @@ const { sshExec, canConnect, disconnect, ls } = require("../lib/sshExec.js");
 
 //test helpers
 const hostInfo = require("./util/hostInfo.js");
-const { clearRemoteTestFiles, createRemoteFiles, nonExisting, remoteRoot } = require("./util/testFiles.js");
+const { clearRemoteTestFiles, createRemoteFiles, nonExisting, remoteRoot, remoteEmptyDir } = require("./util/testFiles.js");
 
 
 describe("test for ssh execution", function() {
@@ -129,5 +129,8 @@ describe("test for ssh execution", function() {
         return path.posix.join(remoteRoot, "hoge", e);
       }));
     });
+    it("should return empty array if specified target is empty directory", async ()=>{
+      expect(await ls(hostInfo, remoteEmptyDir)).to.be.an("array").that.is.empty;
+    });
   });
 });