ssh2-sftp-client 9.0.3 → 9.1.0

package/src/utils.js

@@ -28,6 +28,18 @@ function errorListener(client, name, reject) {
   return fn;
 }
 
+function globalListener(client, evt) {
+  return () => {
+    if (client.endCalled || client.errorHandled || client.closeHandled) {
+      // we are processing an expected event handled elsewhere
+      client.debugMsg(`Global ${evt} event: Ignoring expected and handled event`);
+    } else {
+      client.debugMsg(`Global ${evt} event: Handling unexpected event`);
+      client.sftp = undefined;
+    }
+  };
+}
+
 function endListener(client, name, reject) {
   const fn = function () {
     client.sftp = undefined;
@@ -239,10 +251,10 @@ async function normalizeRemotePath(client, aPath) {
   try {
     if (aPath.startsWith('..')) {
       const root = await client.realPath('..');
-      return root + client.remotePathSep + aPath.slice(3);
+      return `${root}/${aPath.slice(3)}`;
     } else if (aPath.startsWith('.')) {
       const root = await client.realPath('.');
-      return root + client.remotePathSep + aPath.slice(2);
+      return `${root}/${aPath.slice(2)}`;
     }
     return aPath;
   } catch (err) {
@@ -277,9 +289,13 @@ function haveConnection(client, name, reject) {
 function sleep(ms) {
   return new Promise((resolve, reject) => {
     try {
-      setTimeout(() => {
-        resolve(true);
-      }, ms);
+      if (isNaN(ms) || ms < 0) {
+        reject('Argument must be  anumber >= 0');
+      } else {
+        setTimeout(() => {
+          resolve(true);
+        }, ms);
+      }
     } catch (err) {
       reject(err);
     }
@@ -287,6 +303,7 @@ function sleep(ms) {
 }
 
 module.exports = {
+  globalListener,
   errorListener,
   endListener,
   closeListener,