ssh-client-wrapper 2.8.0 → 2.10.0

package/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   testbed:
     image: naoso5/test-sshd

package/lib/index.js

@@ -23,7 +23,7 @@ const { isArrayOfString, sanityCheck } = require("./util.js");
  * @param {string | Function} hostInfo.password - password or function which return password
  * @param {string | Function} hostInfo.passphrase - passphrase or function which return passphrase of private key
  * @param {string} hostInfo.keyFile - private key filename
- * @param {boolean} hostInfo.noStrictHostkeyChecking - bypass host key checking if true
+ * @param {boolean} hostInfo.noStrictHostKeyChecking - bypass host key checking if true
  * @param {Integer} hostInfo.ControlPersist=180 - how long keep master connection after last client connection has been closed (sec).
  * @param {Integer} hostInfo.ConnectTimeout=60 - timeout used when connectiong to ths SSH server
  * @param {Integer} hostInfo.maxRetry=3 - max number of retry

package/lib/rsyncExec.js

@@ -1,5 +1,6 @@
 "use strict";
 const path = require("path");
+const fs = require("fs/promises");
 const debug = require("debug")("sshClientWrapper:debug:rsyncExec");
 const debugVerbose = require("debug")("sshClientWrapper:verbose:rsyncExec");
 const { glob } = require("glob");
@@ -116,6 +117,7 @@ async function recv (hostInfo, argSrc, dst, rsyncOpt, timeout) {
   if (await isNewRsync(hostInfo)) {
     args.unshift("--old-args");
   }
+  await fs.mkdir(dst, { recursive: true });
 
   debug(`recv ${src} to ${dst}`);
   debugVerbose(`recv: ${rsyncCmd} ${args.join(" ")}`);

package/lib/util.js

@@ -34,7 +34,7 @@ const hostInfoSchema = {
     user: { type: "string", pattern: "\\S+", transform: ["trim"] },
     port: { type: "number", minimum: 0, maximum: 65535 },
     keyFile: { type: "string", pattern: "\\S+", transform: ["trim"] },
-    noStrictHostkeyChecking: { type: "boolean" },
+    noStrictHostKeyChecking: { type: "boolean" },
     ControlPersist: { type: "number", minimum: 0, default: 180 },
     ConnectTimeout: { type: "number", minimum: 0 },
     ControlPersistDir: { type: "string", pattern: "\\S+", transform: ["trim"] },
@@ -190,7 +190,7 @@ const getSshOption = (hostInfo, withoutDestination) => {
     }
   }
 
-  if (hostInfo.noStrictHostkeyChecking) {
+  if (hostInfo.noStrictHostKeyChecking) {
     args.push("-oStrictHostKeyChecking=no");
   }
   const controlPersist = Number.isInteger(hostInfo.ControlPersist) && hostInfo.ControlPersist >= 0 ? hostInfo.ControlPersist : "180";

package/package.json

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

package/run_test_all.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 function cleanup(){
-  docker-compose rm --stop --force testbed
+  docker compose rm --stop --force testbed
 }
 
 trap cleanup EXIT
 set -e -o pipefail
 
-docker-compose up testbed -d
+docker compose up testbed -d
 export TEST_HOST=localhost
 export TEST_USER=testuser
 export TEST_PW=passw0rd
@@ -17,11 +17,11 @@ ssh-keygen -R '[localhost]:4100'
 npm run test
 echo local test success
 
-docker-compose run --build --rm tester
+docker compose run --build --rm tester
 echo test on latest ubuntu success
 
-docker-compose run --build --rm tester-bullseye
+docker compose run --build --rm tester-bullseye
 echo test on bullseye success
 
-docker-compose run --build --rm tester-buster
+docker compose run --build --rm tester-buster
 echo test on buster success

package/test/sanityCheck.js

@@ -78,21 +78,21 @@ describe("test for sanityCheck", () => {
   it("should just change type if string value specified for boolean member", () => {
     expect(sanityCheck({
       host,
-      noStrictHostkeyChecking: "true"
+      noStrictHostKeyChecking: "true"
     })).to.deep.equal({
       host,
       ...defaultValues,
-      noStrictHostkeyChecking: true
+      noStrictHostKeyChecking: true
     });
   });
   it("should just change type if number value specified for boolean member", () => {
     expect(sanityCheck({
       host,
-      noStrictHostkeyChecking: 0
+      noStrictHostKeyChecking: 0
     })).to.deep.equal({
       host,
       ...defaultValues,
-      noStrictHostkeyChecking: false
+      noStrictHostKeyChecking: false
     });
   });
   it("shold keep addtional properties", () => {