Add proxy support

Author: cgarnier

Diff for: README.md

@@ -26,6 +26,22 @@ var Ftp = new JSFtp({
 });
 ```
 
+Through a proxy:
+
+```javascript
+var Ftp = new JSFtp({
+    host: proxy.host,
+    port: ftp.port,
+    user: `${ftp.user}@${ftp.host} ${proxy.user}`,
+    pass: ftp.pass,
+    cwd: '/82844',
+    root: '/82844',
+    debugMode: true,
+    acct: proxy.pass
+})
+```
+
+
 jsftp gives you access to all the raw commands of the FTP protocol in form of
 methods in the `Ftp` object. It also provides several convenience methods for
 actions that require complex chains of commands (e.g. uploading and retrieving

Diff for: lib/jsftp.js

@@ -76,6 +76,7 @@ var Ftp = module.exports = function(cfg) {
   this.port = cfg.port || FTP_PORT;
   this.user = cfg.user || 'anonymous';
   this.pass = cfg.pass || '@anonymous';
+  this.acct = cfg.acct || ''
   // True if the server doesn't support the `stat` command. Since listing a
   // directory or retrieving file properties is quite a common operation, it is
   // more efficient to avoid the round-trip to the server.
@@ -234,7 +235,7 @@ Ftp.prototype.runCommand = function(action, callback) {
 
   var self = this;
   this.getFeatures(function() {
-    self.auth(self.user, self.pass, function() {
+    self.auth(self.user, self.pass, self.acct, function() {
       self.commandQueue.push(cmd);
       self.nextCmd();
     });
@@ -316,9 +317,8 @@ Ftp.prototype.getFeatures = function(callback) {
  * @param {String} pass Password
  * @param {Function} callback Follow-up function.
  */
-Ftp.prototype.auth = function(user, pass, callback) {
+Ftp.prototype.auth = function(user, pass, acct, callback) {
   var self = this;
-
   if (this.authenticating === true) {
     return callback(new Error('This client is already authenticating'));
   }
@@ -329,6 +329,9 @@ Ftp.prototype.auth = function(user, pass, callback) {
   if (!pass) {
     pass = '@anonymous';
   }
+  if (!acct) {
+    acct = ''
+  }
 
   this.authenticating = true;
   self.raw('user', user, function(err, res) {
@@ -338,19 +341,23 @@ Ftp.prototype.auth = function(user, pass, callback) {
       return;
     }
     self.raw('pass', pass, function(err, res) {
-      self.authenticating = false;
-
       if (err) {
+        self.authenticating = false;
         callback(err);
       } else if ([230, 202].indexOf(res.code) > -1) {
+        self.authenticating = false;
         self.authenticated = true;
         self.user = user;
         self.pass = pass;
         self.raw('type', 'I', function() {
           callback(undefined, res);
         });
       } else if (res.code === 332) {
-        self.raw('acct', ''); // ACCT not really supported
+        self.raw('acct', acct, function (err, res) {
+          self.authenticating = false;
+          self.authenticated = true;
+          callback(undefined, res)
+        }); // ACCT not really supported
       }
     });
   });

Diff for: npm-debug.log

@@ -0,0 +1,51 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/home/clement/.nvm/versions/node/v6.9.4/bin/node',
+1 verbose cli   '/home/clement/.nvm/versions/node/v6.9.4/bin/npm',
+1 verbose cli   'run',
+1 verbose cli   'test',
+1 verbose cli   '-',
+1 verbose cli   '-g',
+1 verbose cli   'test invalid password' ]
+2 info using [email protected]
+3 info using [email protected]
+4 verbose run-script [ 'pretest', 'test', 'posttest' ]
+5 info lifecycle [email protected]~pretest: [email protected]
+6 silly lifecycle [email protected]~pretest: no script for pretest, continuing
+7 info lifecycle [email protected]~test: [email protected]
+8 verbose lifecycle [email protected]~test: unsafe-perm in lifecycle true
+9 verbose lifecycle [email protected]~test: PATH: /home/clement/.nvm/versions/node/v6.9.4/lib/node_modules/npm/bin/node-gyp-bin:/home/clement/dev/jsftp/node_modules/.bin:/home/clement/.rvm/gems/ruby-1.8.7-head/bin:/home/clement/.rvm/gems/ruby-1.8.7-head@global/bin:/home/clement/.rvm/rubies/ruby-1.8.7-head/bin:/home/clement/bin:/home/clement/.local/bin:/home/clement/.nvm/versions/node/v6.9.4/bin:/home/clement/bin:/home/clement/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/lib/jvm/java-8-oracle/bin:/usr/lib/jvm/java-8-oracle/db/bin:/usr/lib/jvm/java-8-oracle/jre/bin:/home/clement/.rvm/bin:/snap/bin:/usr/lib/jvm/java-8-oracle/bin:/usr/lib/jvm/java-8-oracle/db/bin:/usr/lib/jvm/java-8-oracle/jre/bin:/home/clement/.rvm/bin:/home/clement/Android/Sdk/tools:/home/clement/Android/Sdk/platform-tools:/home/clement/.rvm/bin
+10 verbose lifecycle [email protected]~test: CWD: /home/clement/dev/jsftp
+11 silly lifecycle [email protected]~test: Args: [ '-c', 'mocha -R spec -t 5000 "-" "test invalid password"' ]
+12 silly lifecycle [email protected]~test: Returned: code: 1  signal: null
+13 info lifecycle [email protected]~test: Failed to exec test script
+14 verbose stack Error: [email protected] test: `mocha -R spec -t 5000 "-" "test invalid password"`
+14 verbose stack Exit status 1
+14 verbose stack     at EventEmitter.<anonymous> (/home/clement/.nvm/versions/node/v6.9.4/lib/node_modules/npm/lib/utils/lifecycle.js:255:16)
+14 verbose stack     at emitTwo (events.js:106:13)
+14 verbose stack     at EventEmitter.emit (events.js:191:7)
+14 verbose stack     at ChildProcess.<anonymous> (/home/clement/.nvm/versions/node/v6.9.4/lib/node_modules/npm/lib/utils/spawn.js:40:14)
+14 verbose stack     at emitTwo (events.js:106:13)
+14 verbose stack     at ChildProcess.emit (events.js:191:7)
+14 verbose stack     at maybeClose (internal/child_process.js:877:16)
+14 verbose stack     at Process.ChildProcess._handle.onexit (internal/child_process.js:226:5)
+15 verbose pkgid [email protected]
+16 verbose cwd /home/clement/dev/jsftp
+17 error Linux 4.4.0-75-generic
+18 error argv "/home/clement/.nvm/versions/node/v6.9.4/bin/node" "/home/clement/.nvm/versions/node/v6.9.4/bin/npm" "run" "test" "-" "-g" "test invalid password"
+19 error node v6.9.4
+20 error npm  v3.10.10
+21 error code ELIFECYCLE
+22 error [email protected] test: `mocha -R spec -t 5000 "-" "test invalid password"`
+22 error Exit status 1
+23 error Failed at the [email protected] test script 'mocha -R spec -t 5000 "-" "test invalid password"'.
+23 error Make sure you have the latest version of node.js and npm installed.
+23 error If you do, this is most likely a problem with the jsftp package,
+23 error not with npm itself.
+23 error Tell the author that this fails on your system:
+23 error     mocha -R spec -t 5000 "-" "test invalid password"
+23 error You can get information on how to open an issue for this project with:
+23 error     npm bugs jsftp
+23 error Or if that isn't available, you can get their info via:
+23 error     npm owner ls jsftp
+23 error There is likely additional logging output above.
+24 verbose exit [ 1, true ]

Diff for: package.json

@@ -36,7 +36,8 @@
     "mocha": "^3.2.0",
     "mocha-istanbul": "0.2.0",
     "rimraf": "^2.2.8",
-    "sinon": "^1.17.7"
+    "sinon": "^1.17.7",
+    "socksv5": "0.0.6"
   },
   "main": "lib/jsftp.js",
   "engines": {

Diff for: test/jsftp_test.js

@@ -78,6 +78,7 @@ describe('jsftp test suite', function() {
     ftp.auth(
       options.user,
       options.pass + '_invalid',
+      null,
       function(err, data) {
         assert.equal(err.code, 530);
         assert.equal(data, null);
@@ -554,7 +555,7 @@ describe('jsftp test suite', function() {
 
   it('test attach event handlers: connect', function(_next) {
     var clientOnConnect = function() {
-      client.auth(options.user, options.pass, next);
+      client.auth(options.user, options.pass, null, next);
     };
 
     var next = function(err) {