ssh2-sftp-client 7.1.0 → 7.2.0

package/README.md

@@ -61,9 +61,9 @@ an SFTP client for node.js, a wrapper around [SSH2](https://github.com/mscdex/ss
 
 Documentation on the methods and available options in the underlying modules can be found on the [SSH2](https://github.com/mscdex/ssh2) project pages.
 
-Current stable release is **v7.1.0**.
+Current stable release is **v7.2.0**.
 
-Code has been tested against Node versions 12.22.6, 14.17.6 and 16.10.0
+Code has been tested against Node versions 14.18.2, 16.13.1 and 17.2.0
 
 Node versions < 10.x are not supported.
 

package/README.org

@@ -9,9 +9,9 @@ convenience abstraction as well as a Promise based API.
 Documentation on the methods and available options in the underlying modules can
 be found on the [[https://github.com/mscdex/ssh2][SSH2]] project pages.
 
-Current stable release is *v7.1.0*.
+Current stable release is *v7.2.0*.
 
-Code has been tested against Node versions 12.22.6, 14.17.6 and 16.10.0
+Code has been tested against Node versions 14.18.2, 16.13.1 and 17.2.0
 
 Node versions < 10.x are not supported.
 

package/package.json

@@ -1,17 +1,13 @@
 {
   "name": "ssh2-sftp-client",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "ssh2 sftp client for node",
   "main": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/theophilusx/ssh2-sftp-client"
   },
-  "keywords": [
-    "sftp",
-    "nodejs",
-    "promises"
-  ],
+  "keywords": ["sftp", "nodejs", "promises"],
   "scripts": {
     "test": "mocha",
     "coverage": "nyc npm run test",
@@ -40,16 +36,16 @@
     "chai-subset": "^1.6.0",
     "checksum": "^1.0.0",
     "dotenv": "^10.0.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.3.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-mocha": "^9.0.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-unicorn": "^36.0.0",
+    "eslint-plugin-promise": "^5.2.0",
+    "eslint-plugin-unicorn": "^39.0.0",
     "mocha": "^9.1.2",
     "moment": "^2.29.1",
     "nyc": "^15.1.0",
-    "prettier": "^2.4.1",
+    "prettier": "^2.5.0",
     "through2": "^4.0.2",
     "winston": "^3.3.3"
   }

package/src/index.js

@@ -34,6 +34,7 @@ class SftpClient {
     this.remotePathSep = '/';
     this.remotePlatform = 'unix';
     this.debug = undefined;
+    this.tempListeners = {};
 
     this.client.on('close', () => {
       if (this.endCalled || this.closeHandled) {
@@ -150,6 +151,7 @@ class SftpClient {
       this.client.sftp((err, sftp) => {
         if (err) {
           this.debugMsg(`getSftpChannel: SFTP Channel Error: ${err.message}`);
+          this.client.end();
           reject(fmtError(err, 'getSftpChannel', err.code));
         } else {
           this.debugMsg('getSftpChannel: SFTP channel established');
@@ -308,7 +310,7 @@ class SftpClient {
           }
         });
       }).finally(() => {
-        removeTempListeners(this, 'stat');
+        removeTempListeners(this, '_stat');
       });
     };
 
@@ -549,9 +551,6 @@ class SftpClient {
    * Downloads a file at remotePath to localPath using parallel reads
    * for faster throughput.
    *
-   * See 'fastGet' at
-   * https://github.com/mscdex/ssh2-streams/blob/master/SFTPStream.md
-   *
    * @param {String} remotePath
    * @param {String} localPath
    * @param {Object} options
@@ -850,6 +849,14 @@ class SftpClient {
     try {
       haveConnection(this, 'mkdir');
       let rPath = await normalizeRemotePath(this, remotePath);
+      let targetExists = await this.exists(rPath);
+      if (targetExists && targetExists !== 'd') {
+        let error = new Error(`Bad path: ${rPath} already exists as a file`);
+        error.code = errorCode.badPath;
+        throw error;
+      } else if (targetExists) {
+        return `${rPath} already exists`;
+      }
       if (!recursive) {
         return await _mkdir(rPath);
       }

package/src/utils.js

@@ -58,7 +58,13 @@ function fmtError(err, name = 'sftp', eCode, retryCount) {
   return newError;
 }
 
-let tempListeners = [];
+function addToTempListenerList(obj, name, evt, fn) {
+  if (name in obj.tempListeners) {
+    obj.tempListeners[name].push([evt, fn]);
+  } else {
+    obj.tempListeners[name] = [[evt, fn]];
+  }
+}
 
 /**
  * Simple default error listener. Will reformat the error message and
@@ -83,7 +89,7 @@ function errorListener(client, name, reject) {
       }
     }
   };
-  tempListeners.push(['error', fn]);
+  addToTempListenerList(client, name, 'error', fn);
   return fn;
 }
 
@@ -104,7 +110,7 @@ function endListener(client, name, reject) {
       }
     }
   };
-  tempListeners.push(['end', fn]);
+  addToTempListenerList(client, name, 'end', fn);
   return fn;
 }
 
@@ -125,7 +131,7 @@ function closeListener(client, name, reject) {
       }
     }
   };
-  tempListeners.push(['close', fn]);
+  addToTempListenerList(client, name, 'close', fn);
   return fn;
 }
 
@@ -138,10 +144,12 @@ function addTempListeners(obj, name, reject) {
 
 function removeTempListeners(obj, name) {
   obj.debugMsg(`${name}: Removing temp event listeners`);
-  tempListeners.forEach(([e, fn]) => {
-    obj.client.removeListener(e, fn);
-  });
-  tempListeners = [];
+  if (name in obj.tempListeners) {
+    obj.tempListeners[name].forEach(([e, fn]) => {
+      obj.client.removeListener(e, fn);
+    });
+    obj.tempListeners = [];
+  }
 }
 
 /**
@@ -337,6 +345,7 @@ function sleep(ms) {
 
 module.exports = {
   fmtError,
+  addToTempListenerList,
   errorListener,
   endListener,
   closeListener,