ssh-client-wrapper 2.2.10 → 2.3.0

package/lib/fork.js

@@ -69,7 +69,7 @@ function createMasterPty (hostInfo) {
   hostInfo.masterPty = ptyProcess;
 }
 
-async function fork (hostInfo, cmd, args, timeout, outputCallback) {
+async function fork (hostInfo, cmd, args, timeout, outputCallback, retryableExitCodes = []) {
   return new Promise((resolve, reject) => {
     debug(`cmd=${cmd}: args=${args}`);
     const ptyProcess = spawn(cmd, args, nodePtyOpt);
@@ -119,6 +119,9 @@ async function fork (hostInfo, cmd, args, timeout, outputCallback) {
       }
       const err = new Error("exit with non-zero");
       err.rt = exitCode;
+      if (retryableExitCodes.includes(exitCode)) {
+        err.retryable = true;
+      }
       return reject(err);
     });
   });

package/lib/rsyncExec.js

@@ -79,7 +79,7 @@ async function send (hostInfo, argSrc, dst, rsyncOpt, timeout) {
   }
   debug(`send ${src} to ${hostInfo.host}:${dst}`);
   debugVerbose(`send: ${rsyncCmd} ${args.join(" ")}`);
-  return retryWrapper(fork.bind(null, hostInfo, rsyncCmd, args, timeout), hostInfo);
+  return retryWrapper(fork.bind(null, hostInfo, rsyncCmd, args, timeout, null, [12]), hostInfo);
 }
 
 /**
@@ -119,7 +119,7 @@ async function recv (hostInfo, argSrc, dst, rsyncOpt, timeout) {
 
   debug(`recv ${src} to ${dst}`);
   debugVerbose(`recv: ${rsyncCmd} ${args.join(" ")}`);
-  return retryWrapper(fork.bind(null, hostInfo, rsyncCmd, args, timeout), hostInfo);
+  return retryWrapper(fork.bind(null, hostInfo, rsyncCmd, args, timeout, null, [12]), hostInfo);
 }
 module.exports = {
   checkRsyncVersion,

package/package.json

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

package/run_test_all.sh

@@ -1,4 +1,12 @@
 #!/bin/bash
+
+function cleanup(){
+  docker-compose rm --stop --force testbed
+}
+
+trap cleanup EXIT
+set -e -o pipefail
+
 docker-compose up testbed -d
 export TEST_HOST=localhost
 export TEST_USER=testuser
@@ -7,27 +15,13 @@ export TEST_PORT=4000
 ssh-keygen -R '[localhost]:4000'
 
 npm run test
-if [ $? -ne 0 ];then
-  echo local test failed
-  exit 1
-fi
+echo local test success
 
 docker-compose run --build --rm tester
-if [ $? -ne 0 ];then
-  echo test on latest ubuntu failed
-  exit 2
-fi
+echo test on latest ubuntu success
 
 docker-compose run --build --rm tester-bullseye
-if [ $? -ne 0 ];then
-  echo test on bullseye failed
-  exit 3
-fi
+echo test on bullseye success
 
 docker-compose run --build --rm tester-buster
-if [ $? -ne 0 ];then
-  echo test on buster failed
-  exit 4
-fi
-
-docker-compose rm --stop --force testbed
+echo test on buster success