ssh2-sftp-client 2.4.0 → 2.5.0

package/README.md

@@ -1,6 +1,10 @@
 ## SSH2 SFTP Client
 a SFTP client for node.js, a wrapper for [ssh2](https://github.com/mscdex/ssh2)
 
+Additional documentation on the methods and available options can be found in
+the [ssh2](https://github.com/mscdex/ssh2) and
+[ssh2-streams](https://github.com/mscdex/ssh2-streams) documentation.
+
 ### Installation
 ```shell
 npm install ssh2-sftp-client
@@ -24,11 +28,57 @@ sftp.connect({
 });
 ```
 
+### Breaking Changes
+
+Due to some incompatibilities with stream handling which breaks this module when
+used with Node 10.x, some changes have been implemented that should enhance the
+interface, but which also break compatibility with previous versions. 
+
+#### Option Changes
+
+- The default encoding is null not utf8 as it was previously. This is consistent
+  with the defaults for the underlying SSH2 module.
+- The usedCompressed option has been removed. None of the shh2-steams methods
+  actually support this option. The 'compress' option can be set as part of the
+  connection options.  See [ssh2 client event](https://github.com/mscdex/ssh2#user-content-client-methods).
+- The separate explicit option arguments for encoding and useCompression for some methods
+  have been replaced with a single 'options' argument, which is an object that
+  can have the following properties (defaults shown). See the
+  [ssh2-streams](https://github.com/mscdex/ssh2-streams) documentation for an
+  explination of the opt8ons. 
+  
+```javascript
+    const defaults = {
+    highWaterMark: 32 * 1024,
+    debug: undefined,
+    concurrency: 64,
+    chunkSize: 32768,
+    step: undefined,
+    mode: 0o666,
+    autoClose: true,
+    encoding: null
+  };
+```
+
+#### Method Changes
+
+#### get(srcPath, dst, options)
+
+Used to retrieve a file from a remote SFTP server. 
+
+- srcPath: path to the file on the remote server
+- dst: Either a string, which will be used as the path to store the file on the
+  local system or a writable stream, which will be used as the destination for a
+  stream pipe. If undefined, the remote file will be read into a Buffer and
+  the buffer returned. 
+- options: Options for the get operation e.g. encoding. 
+
 ### Documentation
 the connection to server config pls see [ssh2 client event](https://github.com/mscdex/ssh2#user-content-client-methods).
 
 list of methods:
 all the methods will return a Promise;
+
 #### List
 Retrieves a directory listing.
 
@@ -54,10 +104,10 @@ group: // group ID
 ```
 
 #### Get
-Get a Chunk from remotePath. The encoding is passed to Node Stream (https://nodejs.org/api/stream.html) and it controls how the content is encoded. For example, when downloading binary data, 'null' should be passed (check node stream documentation). Default to 'utf8'.
+Get a `ReadableStream` from remotePath. The encoding is passed to Node Stream (https://nodejs.org/api/stream.html) and it controls how the content is encoded. For example, when downloading binary data, 'null' should be passed (check node stream documentation). Default to 'null'.
 
 ```javascript
-sftp.get(remoteFilePath, [useCompression], [encoding], [addtionalOptions]);
+sftp.get(remoteFilePath, [options]);
 ```
 
 #### FastGet
@@ -71,9 +121,9 @@ sftp.fastGet(remotePath, localPath, [options]);
 upload a file from `localPath` or `Buffer`, `Stream` data to `remoteFilePath`.The encoding is passed to Node Stream to control how the content is encoded. Default to 'utf8'.
 
 ```javascript
-sftp.put(localFilePath, remoteFilePath, [useCompression], [encoding], [addtionalOptions]);
-sftp.put(Buffer, remoteFilePath, [useCompression], [encoding], [addtionalOptions]);
-sftp.put(Stream, remoteFilePath, [useCompression], [encoding], [addtionalOptions]);
+sftp.put(localFilePath, remoteFilePath, [optons]);
+sftp.put(Buffer, remoteFilePath, [options]);
+sftp.put(Stream, remoteFilePath, [options]);
 ```
 
 #### FastPut
@@ -157,7 +207,21 @@ sftp.on('error', callbackFn)
 ### FAQ
 
 ### Log
+### V2.4.3
+    - merge #108, #110
+      - fix connect promise if connection ends
+
+### V2.4.2
+    - merge #105
+      - fix windows path
+
+### V2.4.1
+    - merge pr #99, #100
+      - bug fix
+
 #### V2.4.0
+Requires node.js v7.5.0 or above.
+
     - merge pr #97, thanks for @theophilusx
         - Remove emmitter.maxListener warnings
         - Upgraded ssh2 dependency from 0.5.5 to 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssh2-sftp-client",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "ssh2 sftp client for node",
   "main": "src/index.js",
   "repository": {
@@ -12,18 +12,20 @@
     "nodejs"
   ],
   "scripts": {
-    "test": "mocha test/index.js"
+    "test": "mocha"
   },
   "author": "见见",
   "email": "jyu213@gmail.com",
   "license": "MIT",
   "dependencies": {
-    "ssh2": "^0.6.1"
+    "concat-stream": "^2.0.0",
+    "ssh2": "^0.8.2"
   },
   "devDependencies": {
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
+    "checksum": "^0.1.1",
     "dotenv": "^6.1.0",
     "mocha": "^5.2.0"
   }

package/src/index.js

@@ -5,9 +5,12 @@
 'use strict';
 
 const Client = require('ssh2').Client;
-const osPath = require('path');
+const osPath = require('path').posix;
+const utils = require('./utils');
+const fs = require('fs');
+const concat = require('concat-stream');
 
-let SftpClient = function(){
+let SftpClient = function() {
   this.client = new Client();
 };
 
@@ -42,7 +45,7 @@ SftpClient.prototype.list = function(path) {
               accessTime: item.attrs.atime * 1000,
               rights: {
                 user: item.longname.substr(1, 3).replace(reg, ''),
-                group: item.longname.substr(4,3).replace(reg, ''),
+                group: item.longname.substr(4, 3).replace(reg, ''),
                 other: item.longname.substr(7, 3).replace(reg, '')
               },
               owner: item.attrs.uid,
@@ -81,10 +84,14 @@ SftpClient.prototype.exists = function(path) {
         if (err.code === 2) {
           resolve(false);
         } else {
-          reject(new Error(`Error listing ${dir}: code: ${err.code} ${err.message}`));          
+          reject(
+            new Error(`Error listing ${dir}: code: ${err.code} ${err.message}`)
+          );
         }
       } else {
-        let [type] = list.filter(item => item.filename === base).map(item => item.longname.substr(0, 1));
+        let [type] = list
+          .filter(item => item.filename === base)
+          .map(item => item.longname.substr(0, 1));
         if (type) {
           resolve(type);
         } else {
@@ -107,18 +114,18 @@ SftpClient.prototype.stat = function(remotePath) {
     let sftp = this.sftp;
 
     if (!sftp) {
-      return reject(Error('sftp connect error'));      
+      return reject(Error('sftp connect error'));
     }
-    sftp.stat(remotePath, function (err, stats) {
-      if (err){
+    sftp.stat(remotePath, function(err, stats) {
+      if (err) {
         reject(new Error(`Failed to stat ${remotePath}: ${err.message}`));
       } else {
-      // format similarly to sftp.list
+        // format similarly to sftp.list
         resolve({
           mode: stats.mode,
           permissions: stats.permissions,
           owner: stats.uid,
-          group: stats.guid,
+          group: stats.gid,
           size: stats.size,
           accessTime: stats.atime * 1000,
           modifyTime: stats.mtime * 1000
@@ -132,34 +139,53 @@ SftpClient.prototype.stat = function(remotePath) {
 /**
  * get file
  *
- * @param {String} path, path
- * @param {Object} useCompression, config options
- * @param {String} encoding. Encoding for the ReadStream, can be any value
- * supported by node streams. Use 'null' for binary
- * (https://nodejs.org/api/stream.html#stream_readable_setencoding_encoding)
- * @return {Promise} stream, readable stream
+ * If a dst argument is provided, it must be either a string, representing the
+ * local path to where the data will be put, a stream, in which case data is
+ * piped into the stream or undefined, in which case the data is returned as
+ * a Buffer object.
+ *
+ * @param {String} path, remote file path
+ * @param {string|stream|undefined} dst, data destination
+ * @param {Object} userOptions, options passed to get
+ *
+ * @return {Promise}
  */
-SftpClient.prototype.get = function(path, useCompression, encoding, otherOptions) {
-  let options = this.getOptions(useCompression, encoding, otherOptions);
-
+SftpClient.prototype.get = function(path, dst, options) {
   return new Promise((resolve, reject) => {
     let sftp = this.sftp;
 
     if (sftp) {
       try {
-        this.client.on('error', reject);
-       
-        let stream = sftp.createReadStream(path, options);
-        
-        stream.on('error', (err) => {
-          this.client.removeListener('error', reject);
-          return reject(new Error(`Failed get for ${path}: ${err.message}`));
-        });
-        stream.on('readable', () => {
-          this.client.removeListener('error', reject);
-          return resolve(stream);
+        let rdr = sftp.createReadStream(path, options);
+
+        rdr.on('error', err => {
+          return reject(new Error(`Failed to get ${path}: ${err.message}`));
         });
-      } catch(err) {
+
+        if (dst === undefined) {
+          // no dst specified, return buffer of data
+          let concatStream = concat(buff => {
+            return resolve(buff);
+          });
+          rdr.pipe(concatStream);
+        } else if (typeof dst === 'string') {
+          // dst local file path
+          let wtr = fs.createWriteStream(dst);
+          wtr.on('error', err => {
+            return reject(new Error(`Failed get for ${path}: ${err.message}`));
+          });
+          wtr.on('finish', () => {
+            return resolve(dst);
+          });
+          rdr.pipe(wtr);
+        } else {
+          // assume dst is a writeStream
+          dst.on('finish', () => {
+            return resolve(dst);
+          });
+          rdr.pipe(dst);
+        }
+      } catch (err) {
         this.client.removeListener('error', reject);
         return reject(new Error(`Failed get on ${path}: ${err.message}`));
       }
@@ -179,15 +205,14 @@ SftpClient.prototype.get = function(path, useCompression, encoding, otherOptions
  * @return {Promise} the result of downloading the file
  */
 SftpClient.prototype.fastGet = function(remotePath, localPath, options) {
-  options = options || {concurrency: 64, chunkSize: 32768};
   return new Promise((resolve, reject) => {
     let sftp = this.sftp;
 
     if (!sftp) {
-      return reject(Error('sftp connect error'));      
+      return reject(Error('sftp connect error'));
     }
-    sftp.fastGet(remotePath, localPath, options, function (err) {
-      if (err){
+    sftp.fastGet(remotePath, localPath, options, function(err) {
+      if (err) {
         reject(new Error(`Failed to get ${remotePath}: ${err.message}`));
       }
       resolve(`${remotePath} was successfully download to ${localPath}!`);
@@ -206,16 +231,19 @@ SftpClient.prototype.fastGet = function(remotePath, localPath, options) {
  * @return {Promise} the result of downloading the file
  */
 SftpClient.prototype.fastPut = function(localPath, remotePath, options) {
-  options = options || {};
   return new Promise((resolve, reject) => {
     let sftp = this.sftp;
 
     if (!sftp) {
-      return reject(new Error('sftp connect error'));      
+      return reject(new Error('sftp connect error'));
     }
-    sftp.fastPut(localPath, remotePath, options, function (err) {
+    sftp.fastPut(localPath, remotePath, options, function(err) {
       if (err) {
-        reject(new Error(`Failed to upload ${localPath} to ${remotePath}: ${err.message}`));
+        reject(
+          new Error(
+            `Failed to upload ${localPath} to ${remotePath}: ${err.message}`
+          )
+        );
       }
       resolve(`${localPath} was successfully uploaded to ${remotePath}!`);
     });
@@ -223,7 +251,6 @@ SftpClient.prototype.fastPut = function(localPath, remotePath, options) {
   });
 };
 
-
 /**
  * Create file
  *
@@ -233,17 +260,19 @@ SftpClient.prototype.fastPut = function(localPath, remotePath, options) {
  * @param  {String} encoding. Encoding for the WriteStream, can be any value supported by node streams.
  * @return {[type]}                [description]
  */
-SftpClient.prototype.put = function(input, remotePath, useCompression, encoding, otherOptions) {
-  let options = this.getOptions(useCompression, encoding, otherOptions);
-
+SftpClient.prototype.put = function(input, remotePath, options) {
   return new Promise((resolve, reject) => {
     let sftp = this.sftp;
 
     if (sftp) {
       if (typeof input === 'string') {
-        sftp.fastPut(input, remotePath, options, (err) => {
+        sftp.fastPut(input, remotePath, options, err => {
           if (err) {
-            return reject(new Error(`Failed to upload ${input} to ${remotePath}: ${err.message}`));
+            return reject(
+              new Error(
+                `Failed to upload ${input} to ${remotePath}: ${err.message}`
+              )
+            );
           }
           return resolve(`Uploaded ${input} to ${remotePath}`);
         });
@@ -252,13 +281,58 @@ SftpClient.prototype.put = function(input, remotePath, useCompression, encoding,
       let stream = sftp.createWriteStream(remotePath, options);
 
       stream.on('error', err => {
-        return reject(new Error(`Failed to upload data stream to ${remotePath}: ${err.message}`));
+        return reject(
+          new Error(
+            `Failed to upload data stream to ${remotePath}: ${err.message}`
+          )
+        );
+      });
+
+      stream.on('finish', () => {
+        return resolve(`Uploaded data stream to ${remotePath}`);
+      });
+
+      if (input instanceof Buffer) {
+        stream.end(input);
+        return false;
+      }
+      input.pipe(stream);
+    } else {
+      return reject(Error('sftp connect error'));
+    }
+  });
+};
+
+/**
+ * Append to file
+ *
+ * @param  {Buffer|stream} input
+ * @param  {String} remotePath,
+ * @param  {Object} options
+ * @return {[type]}                [description]
+ */
+SftpClient.prototype.append = function(input, remotePath, options) {
+  return new Promise((resolve, reject) => {
+    let sftp = this.sftp;
+
+    if (sftp) {
+      if (typeof input === 'string') {
+        throw new Error('Cannot append a file to another');
+      }
+      let stream = sftp.createWriteStream(remotePath, options);
+
+      stream.on('error', err => {
+        return reject(
+          new Error(
+            `Failed to upload data stream to ${remotePath}: ${err.message}`
+          )
+        );
       });
-      
-      stream.on('close', () => {
+
+      stream.on('finish', () => {
         return resolve(`Uploaded data stream to ${remotePath}`);
       });
-      
+
       if (input instanceof Buffer) {
         stream.end(input);
         return false;
@@ -270,13 +344,20 @@ SftpClient.prototype.put = function(input, remotePath, useCompression, encoding,
   });
 };
 
+/**
+ * @async
+ *
+ * Make a dirextory on remote server
+ *
+ * @param {string} path, remote directory path.
+ * @param {boolean} recursive, if true, recursively create directories
+ * @return {Promise}.
+ */
 SftpClient.prototype.mkdir = function(path, recursive = false) {
   let sftp = this.sftp;
 
   let doMkdir = p => {
     return new Promise((resolve, reject) => {
-
-
       if (!sftp) {
         return reject(new Error('sftp connect error'));
       }
@@ -293,27 +374,35 @@ SftpClient.prototype.mkdir = function(path, recursive = false) {
   if (!recursive) {
     return doMkdir(path);
   }
-  let mkdir = async p => {
-    try {
-      let {dir} = osPath.parse(p);
-      let type = await this.exists(dir);
-      if (!type) {
-        await mkdir(dir);
-      }
-      return doMkdir(p);
-    } catch (err) {
-      throw err;
-    }
+  let mkdir = p => {
+    let {dir} = osPath.parse(p);
+    return this.exists(dir)
+      .then(type => {
+        if (!type) {
+          return mkdir(dir);
+        }
+      })
+      .then(() => {
+        return doMkdir(p);
+      });
   };
   return mkdir(path);
 };
 
+/**
+ * @async
+ *
+ * Remove directory on remote server
+ *
+ * @param {string} path, path to directory to be removed
+ * @param {boolean} recursive, if true, remove direcories/files in target
+ * @return {Promise}..
+ */
 SftpClient.prototype.rmdir = function(path, recursive = false) {
   let sftp = this.sftp;
 
   let doRmdir = p => {
     return new Promise((resolve, reject) => {
-
       if (!sftp) {
         return reject(new Error('sftp connect error'));
       }
@@ -331,21 +420,27 @@ SftpClient.prototype.rmdir = function(path, recursive = false) {
     return doRmdir(path);
   }
 
-  let rmdir = async p => {
-    try {
-      let list = await this.list(p);
-      let files = list.filter(item => item.type === '-');
-      let dirs = list.filter(item => item.type === 'd');
-      for (let f of files) {
-        await this.delete(osPath.join(p, f.name));
-      }
-      for (let d of dirs) {
-        await rmdir(osPath.join(p, d.name));
-      }
-      return doRmdir(p);
-    } catch (err) {
-      throw err;
-    }
+  let rmdir = p => {
+    let list;
+    let files;
+    let dirs;
+    return this.list(p)
+      .then(res => {
+        list = res;
+        files = list.filter(item => item.type === '-');
+        dirs = list.filter(item => item.type === 'd');
+        return utils.forEachAsync(files, f => {
+          return this.delete(osPath.join(p, f.name));
+        });
+      })
+      .then(() => {
+        return utils.forEachAsync(dirs, d => {
+          return rmdir(osPath.join(p, d.name));
+        });
+      })
+      .then(() => {
+        return doRmdir(p);
+      });
   };
   return rmdir(path);
 };
@@ -357,16 +452,16 @@ SftpClient.prototype.rmdir = function(path, recursive = false) {
  *
  * @param {string} path - path to the file to delete
  * @return {Promise} with string 'Successfully deleeted file' once resolved
- * 
+ *
  */
 SftpClient.prototype.delete = function(path) {
   return new Promise((resolve, reject) => {
     let sftp = this.sftp;
 
     if (!sftp) {
-      return reject(new Error('sftp connect error'));      
+      return reject(new Error('sftp connect error'));
     }
-    sftp.unlink(path, (err) => {
+    sftp.unlink(path, err => {
       if (err) {
         reject(new Error(`Failed to delete file ${path}: ${err.message}`));
       }
@@ -385,18 +480,22 @@ SftpClient.prototype.delete = function(path) {
  * @param {string} remotePath - path to the new name.
  *
  * @return {Promise}
- * 
+ *
  */
 SftpClient.prototype.rename = function(srcPath, remotePath) {
   return new Promise((resolve, reject) => {
     let sftp = this.sftp;
 
     if (!sftp) {
-      return reject(new Error('sftp connect error'));      
+      return reject(new Error('sftp connect error'));
     }
-    sftp.rename(srcPath, remotePath, (err) => {
+    sftp.rename(srcPath, remotePath, err => {
       if (err) {
-        reject(new Error(`Failed to rename file ${srcPath} to ${remotePath}: ${err.message}`));
+        reject(
+          new Error(
+            `Failed to rename file ${srcPath} to ${remotePath}: ${err.message}`
+          )
+        );
       }
       resolve(`Successfully renamed ${srcPath} to ${remotePath}`);
     });
@@ -419,11 +518,13 @@ SftpClient.prototype.chmod = function(remotePath, mode) {
     let sftp = this.sftp;
 
     if (!sftp) {
-      return reject(new Error('sftp connect error'));      
+      return reject(new Error('sftp connect error'));
     }
-    sftp.chmod(remotePath, mode, (err) => {
+    sftp.chmod(remotePath, mode, err => {
       if (err) {
-        reject(new Error(`Failed to change mode for ${remotePath}: ${err.message}`));
+        reject(
+          new Error(`Failed to change mode for ${remotePath}: ${err.message}`)
+        );
       }
       resolve('Successfully change file mode');
     });
@@ -440,7 +541,7 @@ SftpClient.prototype.chmod = function(remotePath, mode) {
  * @param {string} connectMethod - ???
  *
  * @return {Promise} which will resolve to an sftp client object
- * 
+ *
  */
 SftpClient.prototype.connect = function(config, connectMethod) {
   connectMethod = connectMethod || 'on';
@@ -449,6 +550,7 @@ SftpClient.prototype.connect = function(config, connectMethod) {
     this.client[connectMethod]('ready', () => {
       this.client.sftp((err, sftp) => {
         this.client.removeListener('error', reject);
+        this.client.removeListener('end', reject);
         if (err) {
           reject(new Error(`Failed to connect to server: ${err.message}`));
         }
@@ -456,6 +558,7 @@ SftpClient.prototype.connect = function(config, connectMethod) {
         resolve(sftp);
       });
     })
+      .on('end', reject)
       .on('error', reject)
       .connect(config);
   });
@@ -465,33 +568,18 @@ SftpClient.prototype.connect = function(config, connectMethod) {
  * @async
  *
  * Close the SFTP connection
- * 
+ *
  */
 SftpClient.prototype.end = function() {
-  return new Promise((resolve) => {
+  return new Promise(resolve => {
     this.client.end();
     resolve();
   });
 };
 
-SftpClient.prototype.getOptions = function(useCompression, encoding, otherOptions) {
-  if(encoding === undefined){
-    encoding = 'utf8';
-  }
-  let options = Object.assign({}, otherOptions || {}, {encoding: encoding}, useCompression);
-  return options;
-};
-
 // add Event type support
 SftpClient.prototype.on = function(eventType, callback) {
   this.client.on(eventType, callback);
 };
 
-
 module.exports = SftpClient;
-
-// sftp = new SftpClient()
-// sftp.client.on('event')
-//
-// sftp.on('end', ()=>{})   => this.client.on('event', callback)
-// sftp.on('error', () => {})

package/src/utils.js

@@ -0,0 +1,10 @@
+var exports = module.exports;
+
+exports.forEachAsync = function(array, callback) {
+  return array.reduce((promise, item) => {
+    return promise.then((result) => {
+      return callback(item);
+    });
+  }, Promise.resolve());
+}
+