Use external ftp-response-parser module to parse responses

Author: sergi

lib/jsftp.js

@@ -10,7 +10,7 @@
 var Net = require("net");
 var EventEmitter = require("events").EventEmitter;
 var es = require("event-stream");
-var responseHandler = require("./response");
+var ResponseParser = require("ftp-response-parser");
 var Utils = require("./utils");
 var util = require("util");
 var fs = require("fs");
@@ -63,7 +63,7 @@ var Ftp = module.exports = function(cfg) {
   this.port = this.port || FTP_PORT;
   this.pending = []; // Pending requests
   this.cmdBuffer_ = [];
-  this.responseHandler = responseHandler();
+  this.resParser = new ResponseParser();
 
   // Generate generic methods from parameter names. they can easily be
   // overriden if we need special behavior. they accept any parameters given,
@@ -98,10 +98,7 @@ Ftp.prototype._createSocket = function(port, host, firstAction) {
 };
 
 Ftp.prototype._createStreams = function(socket) {
-  this.pipeline = es.pipeline(
-    socket,
-    es.split(),
-    es.mapSync(this.responseHandler));
+  this.pipeline = es.pipeline(socket, this.resParser);
 
   var self = this;
   this.pipeline.on('data', function(data) {
@@ -119,7 +116,7 @@ Ftp.prototype.parseResponse = function(data) {
     return;
 
   var next = this.cmdBuffer_[0][1];
-  if (Utils.isMark(data.code)) {
+  if (data.isMark) {
     // If we receive a Mark and it is not expected, we ignore
     // that command
     if (!next.expectsMark || next.expectsMark.marks.indexOf(data.code) === -1)
@@ -189,7 +186,6 @@ Ftp.prototype.execute = function(action, callback) {
 
 Ftp.prototype._executeCommand = function(action, callback) {
   var self = this;
-
   function executeCmd() {
     self.cmdBuffer_.push([action, callback]);
     self.nextCmd();
@@ -215,11 +211,8 @@ Ftp.prototype._executeCommand = function(action, callback) {
  * @param action {Array} Contains server response and client command info.
  */
 Ftp.prototype.parse = function(response, command) {
-  // In FTP every response code above 399 means error in some way.
-  // Since the RFC is not respected by many servers, we are going to
-  // overgeneralize and consider every value above 399 as an error.
   var err = null;
-  if (response.code > 399) {
+  if (response.isError) {
     err = new Error(response.text || "Unknown FTP error.");
     err.code = response.code;
   }
@@ -259,18 +252,15 @@ Ftp.prototype._parseFeats = function(features) {
 
 Ftp.prototype.getFeatures = function(callback) {
   var self = this;
-  if (!this.features)
-    this.raw.feat(function(err, response) {
-      self.features = err ? [] : self._parseFeats(response.text);
-      self.raw.syst(function(err, res) {
-        if (!err && res.code === 215)
-          self.system = res.text.toLowerCase();
-
-        callback(null, self.features);
-      });
+  this.raw.feat(function(err, response) {
+    self.features = err ? [] : self._parseFeats(response.text);
+    self.raw.syst(function(err, res) {
+      if (!err && res.code === 215)
+        self.system = res.text.toLowerCase();
+
+      callback(null, self.features);
     });
-  else
-    callback(null, self.features);
+  });
 };
 
 /**

lib/response.js

@@ -6,12 +6,6 @@ var RE_MULTI = /^(\d\d\d)-/;
 var RE_SERVER_RESPONSE = /^(\d\d\d)(.*)/;
 
 var Utils = module.exports = {
-  // Codes from 100 to 200 are FTP marks
-  isMark: function(code) {
-    code = parseInt(code, 10);
-    return code > 100 && code < 200;
-  },
-
   /**
    * Parse raw output of a file listing, trying in to clean up broken listings
    * in the process

lib/utils.js

@@ -145,7 +145,8 @@ describe("jsftp test suite", function() {
     };
     var data = {
       code: 150,
-      text: "150 File status okay; about to open data connection."
+      text: "150 File status okay; about to open data connection.",
+      isMark: true
     };
 
     ftp.cmdBuffer_ = [
@@ -163,7 +164,8 @@ describe("jsftp test suite", function() {
     var cb = sinon.spy();
     var data = {
       code: 150,
-      text: "150 File status okay; about to open data connection."
+      text: "150 File status okay; about to open data connection.",
+      isMark: true
     };
 
     ftp.cmdBuffer_ = [
@@ -195,16 +197,20 @@ describe("jsftp test suite", function() {
     };
     var data1 = {
       code: 150,
-      text: "150 File status okay; about to open data connection."
+      text: "150 File status okay; about to open data connection.",
+      isMark: true
     };
     var data2 = {
       code: 226,
-      text: "226 Transfer complete."
+      text: "226 Transfer complete.",
+      isMark: false
     };
 
     ftp.cmdBuffer_ = [
       ["retr fakefile.txt", cb],
-      ["list /", function() {}]
+      ["list /",
+        function() {}
+      ]
     ];
     ftp.parse = sinon.spy();
     ftp.ignoreCmdCode = 150;
@@ -230,19 +236,6 @@ describe("jsftp test suite", function() {
     });
   });
 
-  it("test getFeatures", function(next) {
-    ftp.getFeatures(function(err, feats) {
-      assert.ok(Array.isArray(feats));
-      assert.ok(Array.isArray(ftp.features));
-      assert.ok(ftp.system.length > 0);
-
-      var feat = ftp.features[0];
-      assert.ok(ftp.hasFeat(feat));
-      assert.equal(false, ftp.hasFeat("madeup-feat"));
-      next();
-    });
-  });
-
   it("test print working directory", function(next) {
     ftp.raw.pwd(function(err, res) {
       assert(!err, err);
@@ -689,7 +682,7 @@ drwxr-xr-x    2 0        0            4096 Apr 16  2011 denton\r\n\
       });
 
       ftp.ls(paths[1], function showFile(err, res1) {
-        assert.ok(!!err);
+        assert.ok( !! err);
         processed += 1;
         if (processed === 2) next();
       });