ssh-client-wrapper 2.4.0 → 2.5.0

package/lib/rsyncExec.js

@@ -7,7 +7,7 @@ const { glob } = require("glob");
 const { connect, retryWrapper, sshExec } = require("./sshExec.js");
 const { fork } = require("./fork.js");
 
-const { sshCmd, rsyncCmd, getSshOption } = require("./util.js");
+const { sshCmd, rsyncCmd, acceptableRsyncRetrunCodes, getSshOption } = require("./util.js");
 
 async function checkRsyncVersion (timeout) {
   const rt = {};
@@ -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, null, [12]), hostInfo);
+  return retryWrapper(fork.bind(null, hostInfo, rsyncCmd, args, timeout, null, acceptableRsyncRetrunCodes), 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, null, [12]), hostInfo);
+  return retryWrapper(fork.bind(null, hostInfo, rsyncCmd, args, timeout, null, acceptableRsyncRetrunCodes), hostInfo);
 }
 module.exports = {
   checkRsyncVersion,

package/lib/sshExec.js

@@ -260,10 +260,13 @@ async function retryWrapper (func, hostInfo, argMaxRetry, argDuration) {
       return rt;
     } catch (e) {
       if (!e.retryable) {
+        debug("unretryable error occurred!");
         throw e;
       }
       if (retryCount > maxRetry) {
         debug(`max retry count exceeded: ${retryCount}`);
+        e.retryCount = retryCount;
+        e.maxRetryCount = maxRetry;
         throw e;
       }
       retryCount++;

package/lib/util.js

@@ -6,6 +6,7 @@ const { setTimeout: setTimeoutPromise } = require("timers/promises");
 
 const sshCmd = "ssh";
 const rsyncCmd = "rsync";
+const acceptableRsyncRetrunCodes = [10, 11, 12, 13, 14];
 
 const rePwPrompt = /password:/;
 const rePhPrompt = /Enter passphrase for key/;
@@ -244,6 +245,7 @@ const watchDogTimer = (timeout, label, cb) => {
 module.exports = {
   sshCmd,
   rsyncCmd,
+  acceptableRsyncRetrunCodes,
   rePwPrompt,
   rePhPrompt,
   reNewHostPrompt,

package/package.json

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