chore: version specific fixes

Ensure the data socket that the server connects to from the PORT command is the same IP as the current command socket.

* fix: add error handling to additional connection commands

.circleci/config.yml

@@ -26,7 +26,7 @@ base-build: &base-build
         command: npm run verify:js
     - run:
         name: Test
-        command: npm run test:once
+        command: npm run test:unit:once
 
 jobs:
   test_node_10:
@@ -60,10 +60,15 @@ jobs:
       - <<: *create-cache-file
       - restore_cache:
           <<: *package-json-cache
+      - run:
+          name: Update NPM
+          command: |
+            npm install npm@5
+            npm install semantic-release@11
       - deploy:
           name: Semantic Release
           command: |
-            npm run semantic-release
+            npm run semantic-release || true
 
 workflows:
   version: 2

README.md

@@ -51,7 +51,7 @@
 // Quick start
 
 const FtpSrv = require('ftp-srv');
-const ftpServer = new FtpSrv({ options ... });
+const ftpServer = new FtpSrv('ftp://0.0.0.0:9876', { options ... });
 
 ftpServer.on('login', (data, resolve, reject) => { ... });
 ...
@@ -62,7 +62,7 @@ ftpServer.listen()
 
 ## API
 
-### `new FtpSrv({options})`
+### `new FtpSrv(url, [{options}])`
 #### url
 [URL string](https://nodejs.org/api/url.html#url_url_strings_and_url_objects) indicating the protocol, hostname, and port to listen on for connections.
 Supported protocols:
@@ -72,47 +72,45 @@ Supported protocols:
 _Note:_ The hostname must be the external IP address to accept external connections. `0.0.0.0` will listen on any available hosts for server and passive connections.  
 __Default:__ `"ftp://127.0.0.1:21"`
 
-#### `pasv_url`
+#### options
+
+##### `pasv_url`
 The hostname to provide a client when attempting a passive connection (`PASV`). This defaults to the provided `url` hostname.
 
 _Note:_ If set to `0.0.0.0`, this will automatically resolve to the external IP of the box.  
 __Default:__ `"127.0.0.1"`
 
-#### `pasv_min`
-Tne starting port to accept passive connections.  
-__Default:__ `1024`
+##### `pasv_range`
+A starting port (eg `8000`) or a range (eg `"8000-9000"`) to accept passive connections.  
+This range is then queried for an available port to use when required.  
+__Default:__ `22`
 
-#### `pasv_max`
-The ending port to accept passive connections.  
-The range is then queried for an available port to use when required.  
-__Default:__ `65535`
-
-#### `greeting`
+##### `greeting`
 A human readable array of lines or string to send when a client connects.  
 __Default:__ `null`
 
-#### `tls`
+##### `tls`
 Node [TLS secure context object](https://nodejs.org/api/tls.html#tls_tls_createsecurecontext_options) used for implicit (`ftps` protocol) or explicit (`AUTH TLS`) connections.  
 __Default:__ `false`
 
-#### `anonymous`
+##### `anonymous`
 If true, will allow clients to authenticate using the username `anonymous`, not requiring a password from the user.  
 Can also set as a string which allows users to authenticate using the username provided.  
 The `login` event is then sent with the provided username and `@anonymous` as the password.  
 __Default:__ `false`
 
-#### `blacklist`
+##### `blacklist`
 Array of commands that are not allowed.  
 Response code `502` is sent to clients sending one of these commands.  
 __Example:__ `['RMD', 'RNFR', 'RNTO']` will not allow users to delete directories or rename any files.  
 __Default:__ `[]`
 
-#### `whitelist`
+##### `whitelist`
 Array of commands that are only allowed.  
 Response code `502` is sent to clients sending any other command.  
 __Default:__ `[]`
 
-#### `file_format`
+##### `file_format`
 Sets the format to use for file stat queries such as `LIST`.  
 __Default:__ `"ls"`  
 __Allowable values:__
@@ -121,7 +119,7 @@ __Allowable values:__
   - `function () {}` A custom function returning a format or promise for one.
     - Only one argument is passed in: a node [file stat](https://nodejs.org/api/fs.html#fs_class_fs_stats) object with additional file `name` parameter
 
-#### `log`
+##### `log`
 A [bunyan logger](https://github.com/trentm/node-bunyan) instance. Created by default.
 
 ## CLI
@@ -262,52 +260,52 @@ class MyFileSystem extends FileSystem {
 Custom file systems can implement the following variables depending on the developers needs:
 
 ### Methods
-#### [`currentDirectory()`](src/fs.js#L40)
+#### [`currentDirectory()`](src/fs.js#L29)
 Returns a string of the current working directory  
 __Used in:__ `PWD`
 
-#### [`get(fileName)`](src/fs.js#L44)
+#### [`get(fileName)`](src/fs.js#L33)
 Returns a file stat object of file or directory  
 __Used in:__ `LIST`, `NLST`, `STAT`, `SIZE`, `RNFR`, `MDTM`
 
-#### [`list(path)`](src/fs.js#L50)
+#### [`list(path)`](src/fs.js#L39)
 Returns array of file and directory stat objects  
 __Used in:__ `LIST`, `NLST`, `STAT`
 
-#### [`chdir(path)`](src/fs.js#L67)
+#### [`chdir(path)`](src/fs.js#L56)
 Returns new directory relative to current directory  
 __Used in:__ `CWD`, `CDUP`
 
-#### [`mkdir(path)`](src/fs.js#L114)
+#### [`mkdir(path)`](src/fs.js#L96)
 Returns a path to a newly created directory  
 __Used in:__ `MKD`
 
-#### [`write(fileName, {append, start})`](src/fs.js#L79)
+#### [`write(fileName, {append, start})`](src/fs.js#L68)
 Returns a writable stream  
 Options:  
  `append` if true, append to existing file  
  `start` if set, specifies the byte offset to write to  
 __Used in:__ `STOR`, `APPE`
 
-#### [`read(fileName, {start})`](src/fs.js#L90)
+#### [`read(fileName, {start})`](src/fs.js#L75)
 Returns a readable stream  
 Options:  
  `start` if set, specifies the byte offset to read from  
 __Used in:__ `RETR`
 
-#### [`delete(path)`](src/fs.js#L105)
+#### [`delete(path)`](src/fs.js#L87)
 Delete a file or directory  
 __Used in:__ `DELE`
 
-#### [`rename(from, to)`](src/fs.js#L120)
+#### [`rename(from, to)`](src/fs.js#L102)
 Renames a file or directory  
 __Used in:__ `RNFR`, `RNTO`
 
-#### [`chmod(path)`](src/fs.js#L126)
+#### [`chmod(path)`](src/fs.js#L108)
 Modifies a file or directory's permissions  
 __Used in:__ `SITE CHMOD`
 
-#### [`getUniqueName()`](src/fs.js#L131)
+#### [`getUniqueName()`](src/fs.js#L113)
 Returns a unique file name to write to  
 __Used in:__ `STOU`
 
@@ -328,7 +326,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 - [TimLuq](https://github.com/TimLuq)
 - [edin-mg](https://github.com/edin-m)
 - [DiegoRBaquero](https://github.com/DiegoRBaquero)
-- [Johnnyrook777](https://github.com/Johnnyrook777)
 
 <!--[RM_LICENSE]-->
 ## License

bin/index.js

@@ -19,8 +19,7 @@ function setupYargs() {
     })
     .option('username', {
       describe: 'Blank for anonymous',
-      type: 'string',
-      default: ''
+      type: 'string'
     })
     .option('password', {
       describe: 'Password for given username',
@@ -37,20 +36,6 @@ function setupYargs() {
       boolean: true,
       default: false
     })
-    .option('pasv_url', {
-      describe: 'URL to provide for passive connections',
-      type: 'string'
-    })
-    .option('pasv_min', {
-      describe: 'Starting point to use when creating passive connections',
-      type: 'number',
-      default: 1024
-    })
-    .option('pasv_max', {
-      describe: 'Ending port to use when creating passive connections',
-      type: 'number',
-      default: 65535
-    })
     .parse();
 }
 
@@ -61,18 +46,15 @@ function setupState(_args) {
     if (_args._ && _args._.length > 0) {
       _state.url = _args._[0];
     }
-    _state.pasv_url = _args.pasv_url;
-    _state.pasv_min = _args.pasv_min;
-    _state.pasv_max = _args.pasv_max;
     _state.anonymous = _args.username === '';
   }
 
   function setupRoot() {
     const dirPath = _args.root;
     if (dirPath) {
-      _state.root = dirPath;
-    } else {
       _state.root = process.cwd();
+    } else {
+      _state.root = dirPath;
     }
   }
 
@@ -123,11 +105,7 @@ function startFtpServer(_state) {
     return reject(new errors.GeneralError('Invalid username or password', 401));
   }
 
-  const ftpServer = new FtpSrv({
-    url: _state.url,
-    pasv_url: _state.pasv_url,
-    pasv_min: _state.pasv_min,
-    pasv_max: _state.pasv_max,
+  const ftpServer = new FtpSrv(_state.url, {
     anonymous: _state.anonymous,
     blacklist: _state.blacklist
   });

changelog/v2_to_v3_migation.md

@@ -1,44 +0,0 @@
-# Migration Guide - v2 to v3
-
-The `FtpServer` constructor has been changed to only take one object option. Combining the two just made sense.
-
-### From:
-
-```js
-const server = new FtpServer('ftp://0.0.0.0:21');
-```
-
-### To:
-
-```js
-const server = new FtpServer({
-  url: 'ftp://0.0.0.0:21'
-});
-```
-
-----
-
-The `pasv_range` option has been changed to separate integer variables: `pasv_min`, `pasv_max`.
-
-### From:
-
-```js
-const server = new FtpServer(..., {
-  pasv_range: '1000-2000'
-});
-```
-
-### To:
-
-```js
-const server = new FtpServer({
-  pasv_min: 1000,
-  pasv_max: 2000
-})
-```
-
-----
-
-The default passive port range has been changed to `1024` - `65535`
-
-----

config/verify/.eslintrc

@@ -136,7 +136,7 @@
     "comma-dangle": 1,
     "new-cap": 2,
     "new-parens": 2,
-    "arrow-parens": [2, "always"],
+    "arrow-parens": [2, "as-needed"],
     "no-array-constructor": 2,
     "array-callback-return": 1,
     "no-extra-parens": 2,

ftp-srv.d.ts

@@ -59,21 +59,18 @@ export class FtpConnection extends EventEmitter {
 }
 
 export interface FtpServerOptions {
-    url?: string,
-    pasv_min?: number,
-    pasv_max?: number,
-    pasv_url?: string,
+    pasv_range?: number | string,
     greeting?: string | string[],
-    tls?: tls.SecureContextOptions | false,
+    tls?: tls.SecureContext | false,
     anonymous?: boolean,
     blacklist?: Array<string>,
     whitelist?: Array<string>,
     file_format?: (stat: Stats) => string | Promise<string> | "ls" | "ep",
-    log?: any,
+	log?: any
 }
 
 export class FtpServer extends EventEmitter {
-    constructor(options?: FtpServerOptions);
+    constructor(url: string, options?: FtpServerOptions);
 
     readonly isTLS: boolean;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ftp-srv",
-  "version": "0.0.0-development",
+  "version": "2.19.6",
   "description": "Modern, extensible FTP Server",
   "keywords": [
     "ftp",
@@ -28,14 +28,16 @@
     "pre-release": "npm run verify",
     "commitmsg": "cz-customizable-ghooks",
     "dev": "cross-env NODE_ENV=development npm run verify:watch",
-    "prepush": "npm run verify && npm run test:once --silent",
+    "prepush": "npm-run-all verify test:unit:once --silent",
     "semantic-release": "semantic-release",
     "start": "npm run dev",
-    "test": "cross-env NODE_ENV=test mocha --opts config/testUnit/mocha.opts -w",
-    "test:once": "cross-env NODE_ENV=test mocha --opts config/testUnit/mocha.opts",
+    "test": "npm run test:unit",
+    "test:unit": "cross-env NODE_ENV=test mocha --opts config/testUnit/mocha.opts -w",
+    "test:unit:once": "cross-env NODE_ENV=test mocha --opts config/testUnit/mocha.opts",
     "verify": "npm run verify:js --silent",
     "verify:js": "eslint -c config/verify/.eslintrc \"src/**/*.js\" \"test/**/*.js\" \"config/**/*.js\" && echo ✅ verify:js success",
-    "verify:js:fix": "eslint --fix -c config/verify/.eslintrc \"src/**/*.js\" \"test/**/*.js\" \"config/**/*.js\" && echo ✅ verify:js:fix success"
+    "verify:js:fix": "eslint --fix -c config/verify/.eslintrc \"src/**/*.js\" \"test/**/*.js\" \"config/**/*.js\" && echo ✅ verify:js:fix success",
+    "verify:watch": "npm run verify:js:watch --silent"
   },
   "release": {
     "verifyConditions": "condition-circle"
@@ -75,8 +77,9 @@
     "mocha": "^5.2.0",
     "mocha-junit-reporter": "1.13.0",
     "mocha-multi-reporters": "1.1.5",
+    "npm-run-all": "^4.1.3",
     "rimraf": "2.6.1",
-    "semantic-release": "^15.10.6",
+    "semantic-release": "^11.0.2",
     "sinon": "^2.3.5"
   },
   "engines": {

src/commands/index.js

@@ -3,30 +3,25 @@ const Promise = require('bluebird');
 
 const REGISTRY = require('./registry');
 
-const CMD_FLAG_REGEX = new RegExp(/^-(\w{1})$/);
-
 class FtpCommands {
   constructor(connection) {
     this.connection = connection;
     this.previousCommand = {};
-    this.blacklist = _.get(this.connection, 'server.options.blacklist', []).map((cmd) => _.upperCase(cmd));
-    this.whitelist = _.get(this.connection, 'server.options.whitelist', []).map((cmd) => _.upperCase(cmd));
+    this.blacklist = _.get(this.connection, 'server.options.blacklist', []).map(cmd => _.upperCase(cmd));
+    this.whitelist = _.get(this.connection, 'server.options.whitelist', []).map(cmd => _.upperCase(cmd));
   }
 
   parse(message) {
     const strippedMessage = message.replace(/"/g, '');
-    let [directive, ...args] = strippedMessage.split(' ');
-    directive = _.chain(directive).trim().toUpper().value();
-
-    const parseCommandFlags = !['RETR', 'SIZE', 'STOR'].includes(directive);
+    const [directive, ...args] = strippedMessage.split(' ');
     const params = args.reduce(({arg, flags}, param) => {
-      if (parseCommandFlags && CMD_FLAG_REGEX.test(param)) flags.push(param);
+      if (/^-{1,2}[a-zA-Z0-9_]+/.test(param)) flags.push(param);
       else arg.push(param);
       return {arg, flags};
     }, {arg: [], flags: []});
 
     const command = {
-      directive,
+      directive: _.chain(directive).trim().toUpper().value(),
       arg: params.arg.length ? params.arg.join(' ') : null,
       flags: params.flags,
       raw: message

src/commands/registration/abor.js

@@ -2,12 +2,12 @@ module.exports = {
   directive: 'ABOR',
   handler: function () {
     return this.connector.waitForConnection()
-    .then((socket) => {
+    .then(socket => {
       return this.reply(426, {socket})
+      .then(() => this.connector.end())
       .then(() => this.reply(226));
     })
-    .catch(() => this.reply(225))
-    .finally(() => this.connector.end());
+    .catch(() => this.reply(225));
   },
   syntax: '{{cmd}}',
   description: 'Abort an active file transfer'

src/commands/registration/auth.js

@@ -20,17 +20,17 @@ module.exports = {
 };
 
 function handleTLS() {
-  if (!this.server.options.tls) return this.reply(502);
+  if (!this.server._tls) return this.reply(502);
   if (this.secure) return this.reply(202);
 
   return this.reply(234)
   .then(() => {
-    const secureContext = tls.createSecureContext(this.server.options.tls);
+    const secureContext = tls.createSecureContext(this.server._tls);
     const secureSocket = new tls.TLSSocket(this.commandSocket, {
       isServer: true,
       secureContext
     });
-    ['data', 'timeout', 'end', 'close', 'drain', 'error'].forEach((event) => {
+    ['data', 'timeout', 'end', 'close', 'drain', 'error'].forEach(event => {
       function forwardEvent() {
         this.emit.apply(this, arguments);
       }

src/commands/registration/cwd.js

@@ -7,12 +7,12 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.chdir) return this.reply(402, 'Not supported by file system');
 
-    return Promise.try(() => this.fs.chdir(command.arg))
-    .then((cwd) => {
+    return Promise.resolve(this.fs.chdir(command.arg))
+    .then(cwd => {
       const path = cwd ? `"${escapePath(cwd)}"` : undefined;
       return this.reply(250, path);
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/dele.js

@@ -6,11 +6,11 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.delete) return this.reply(402, 'Not supported by file system');
 
-    return Promise.try(() => this.fs.delete(command.arg))
+    return Promise.resolve(this.fs.delete(command.arg))
     .then(() => {
       return this.reply(250);
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/eprt.js

@@ -8,14 +8,18 @@ const FAMILY = {
 
 module.exports = {
   directive: 'EPRT',
-  handler: function ({command} = {}) {
+  handler: function ({log, command} = {}) {
     const [, protocol, ip, port] = _.chain(command).get('arg', '').split('|').value();
     const family = FAMILY[protocol];
     if (!family) return this.reply(504, 'Unknown network protocol');
 
     this.connector = new ActiveConnector(this);
     return this.connector.setupConnection(ip, port, family)
-    .then(() => this.reply(200));
+    .then(() => this.reply(200))
+    .catch((err) => {
+      log.error(err);
+      return this.reply(err.code || 425, err.message);
+    });
   },
   syntax: '{{cmd}} |<protocol>|<address>|<port>|',
   description: 'Specifies an address and port to which the server should connect'

src/commands/registration/epsv.js

@@ -2,13 +2,17 @@ const PassiveConnector = require('../../connector/passive');
 
 module.exports = {
   directive: 'EPSV',
-  handler: function () {
+  handler: function ({log}) {
     this.connector = new PassiveConnector(this);
     return this.connector.setupServer()
-    .then((server) => {
+    .then(server => {
       const {port} = server.address();
 
       return this.reply(229, `EPSV OK (|||${port}|)`);
+    })
+    .catch((err) => {
+      log.error(err);
+      return this.reply(err.code || 425, err.message);
     });
   },
   syntax: '{{cmd}} [<protocol>]',

src/commands/registration/feat.js

@@ -11,7 +11,7 @@ module.exports = {
         return feats;
       }, ['UTF8'])
       .sort()
-      .map((feat) => ({
+      .map(feat => ({
         message: ` ${feat}`,
         raw: true
       }));

src/commands/registration/help.js

@@ -12,7 +12,7 @@ module.exports = {
       const reply = _.concat([syntax.replace('{{cmd}}', directive), description]);
       return this.reply(214, ...reply);
     } else {
-      const supportedCommands = _.chunk(Object.keys(registry), 5).map((chunk) => chunk.join('\t'));
+      const supportedCommands = _.chunk(Object.keys(registry), 5).map(chunk => chunk.join('\t'));
       return this.reply(211, 'Supported commands:', ...supportedCommands, 'Use "HELP [command]" for syntax help.');
     }
   },

src/commands/registration/list.js

@@ -16,33 +16,33 @@ module.exports = {
     const path = command.arg || '.';
     return this.connector.waitForConnection()
     .tap(() => this.commandSocket.pause())
-    .then(() => Promise.try(() => this.fs.get(path)))
-    .then((stat) => stat.isDirectory() ? Promise.try(() => this.fs.list(path)) : [stat])
-    .then((files) => {
-      const getFileMessage = (file) => {
+    .then(() => Promise.resolve(this.fs.get(path)))
+    .then(stat => stat.isDirectory() ? Promise.resolve(this.fs.list(path)) : [stat])
+    .then(files => {
+      const getFileMessage = file => {
         if (simple) return file.name;
         return getFileStat(file, _.get(this, 'server.options.file_format', 'ls'));
       };
 
-      return Promise.try(() => files.map((file) => {
+      const fileList = files.map(file => {
         const message = getFileMessage(file);
         return {
           raw: true,
           message,
           socket: this.connector.socket
         };
-      }));
+      });
+      return this.reply(150)
+      .then(() => {
+        if (fileList.length) return this.reply({}, ...fileList);
+      });
     })
-    .tap(() => this.reply(150))
-    .then((fileList) => {
-      if (fileList.length) return this.reply({}, ...fileList);
-    })
-    .tap(() => this.reply(226))
-    .catch(Promise.TimeoutError, (err) => {
+    .then(() => this.reply(226))
+    .catch(Promise.TimeoutError, err => {
       log.error(err);
       return this.reply(425, 'No connection established');
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       return this.reply(451, err.message || 'No directory');
     })

src/commands/registration/mdtm.js

@@ -7,12 +7,12 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.get) return this.reply(402, 'Not supported by file system');
 
-    return Promise.try(() => this.fs.get(command.arg))
-    .then((fileStat) => {
+    return Promise.resolve(this.fs.get(command.arg))
+    .then(fileStat => {
       const modificationTime = moment.utc(fileStat.mtime).format('YYYYMMDDHHmmss.SSS');
       return this.reply(213, modificationTime);
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/mkd.js

@@ -7,12 +7,12 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.mkdir) return this.reply(402, 'Not supported by file system');
 
-    return Promise.try(() => this.fs.mkdir(command.arg))
-    .then((dir) => {
+    return Promise.resolve(this.fs.mkdir(command.arg))
+    .then(dir => {
       const path = dir ? `"${escapePath(dir)}"` : undefined;
       return this.reply(257, path);
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/pass.js

@@ -12,7 +12,7 @@ module.exports = {
     .then(() => {
       return this.reply(230);
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       return this.reply(530, err.message || 'Authentication failed');
     });

src/commands/registration/pasv.js

@@ -5,7 +5,7 @@ module.exports = {
   handler: function () {
     this.connector = new PassiveConnector(this);
     return this.connector.setupServer()
-    .then((server) => {
+    .then(server => {
       const address = this.server.options.pasv_url;
       const {port} = server.address();
       const host = address.replace(/\./g, ',');
@@ -13,6 +13,10 @@ module.exports = {
       const portByte2 = port % 256;
 
       return this.reply(227, `PASV OK (${host},${portByte1},${portByte2})`);
+    })
+    .catch((err) => {
+      log.error(err);
+      return this.reply(err.code || 425, err.message);
     });
   },
   syntax: '{{cmd}}',

src/commands/registration/port.js

@@ -10,11 +10,15 @@ module.exports = {
     if (rawConnection.length !== 6) return this.reply(425);
 
     const ip = rawConnection.slice(0, 4).join('.');
-    const portBytes = rawConnection.slice(4).map((p) => parseInt(p));
+    const portBytes = rawConnection.slice(4).map(p => parseInt(p));
     const port = portBytes[0] * 256 + portBytes[1];
 
     return this.connector.setupConnection(ip, port)
-    .then(() => this.reply(200));
+    .then(() => this.reply(200))
+    .catch((err) => {
+      log.error(err);
+      return this.reply(err.code || 425, err.message);
+    });
   },
   syntax: '{{cmd}} <x>,<x>,<x>,<x>,<y>,<y>',
   description: 'Specifies an address and port to which the server should connect'

src/commands/registration/pwd.js

@@ -7,12 +7,12 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.currentDirectory) return this.reply(402, 'Not supported by file system');
 
-    return Promise.try(() => this.fs.currentDirectory())
-    .then((cwd) => {
+    return Promise.resolve(this.fs.currentDirectory())
+    .then(cwd => {
       const path = cwd ? `"${escapePath(cwd)}"` : undefined;
       return this.reply(257, path);
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/retr.js

@@ -10,22 +10,15 @@ module.exports = {
 
     return this.connector.waitForConnection()
     .tap(() => this.commandSocket.pause())
-    .then(() => Promise.try(() => this.fs.read(filePath, {start: this.restByteCount})))
-    .then((fsResponse) => {
-      let {stream, clientPath} = fsResponse;
-      if (!stream && !clientPath) {
-        stream = fsResponse;
-        clientPath = filePath;
-      }
-      const serverPath = stream.path || filePath;
-
-      const destroyConnection = (connection, reject) => (err) => {
+    .then(() => Promise.resolve(this.fs.read(filePath, {start: this.restByteCount})))
+    .then(stream => {
+      const destroyConnection = (connection, reject) => err => {
         if (connection) connection.destroy(err);
         reject(err);
       };
 
       const eventsPromise = new Promise((resolve, reject) => {
-        stream.on('data', (data) => {
+        stream.on('data', data => {
           if (stream) stream.pause();
           if (this.connector.socket) {
             this.connector.socket.write(data, this.transferType, () => stream && stream.resume());
@@ -41,15 +34,15 @@ module.exports = {
 
       return this.reply(150).then(() => stream.resume() && this.connector.socket.resume())
       .then(() => eventsPromise)
-      .tap(() => this.emit('RETR', null, serverPath))
-      .then(() => this.reply(226, clientPath))
+      .tap(() => this.emit('RETR', null, filePath))
       .finally(() => stream.destroy && stream.destroy());
     })
-    .catch(Promise.TimeoutError, (err) => {
+    .then(() => this.reply(226))
+    .catch(Promise.TimeoutError, err => {
       log.error(err);
       return this.reply(425, 'No connection established');
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       this.emit('RETR', err);
       return this.reply(551, err.message);

src/commands/registration/rnfr.js

@@ -7,12 +7,12 @@ module.exports = {
     if (!this.fs.get) return this.reply(402, 'Not supported by file system');
 
     const fileName = command.arg;
-    return Promise.try(() => this.fs.get(fileName))
+    return Promise.resolve(this.fs.get(fileName))
     .then(() => {
       this.renameFrom = fileName;
       return this.reply(350);
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/rnto.js

@@ -11,11 +11,11 @@ module.exports = {
     const from = this.renameFrom;
     const to = command.arg;
 
-    return Promise.try(() => this.fs.rename(from, to))
+    return Promise.resolve(this.fs.rename(from, to))
     .then(() => {
       return this.reply(250);
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       return this.reply(550, err.message);
     })

src/commands/registration/site/chmod.js

@@ -6,11 +6,11 @@ module.exports = function ({log, command} = {}) {
 
   const [mode, ...fileNameParts] = command.arg.split(' ');
   const fileName = fileNameParts.join(' ');
-  return Promise.try(() => this.fs.chmod(fileName, parseInt(mode, 8)))
+  return Promise.resolve(this.fs.chmod(fileName, parseInt(mode, 8)))
   .then(() => {
     return this.reply(200);
   })
-  .catch((err) => {
+  .catch(err => {
     log.error(err);
     return this.reply(500);
   });

src/commands/registration/size.js

@@ -6,11 +6,11 @@ module.exports = {
     if (!this.fs) return this.reply(550, 'File system not instantiated');
     if (!this.fs.get) return this.reply(402, 'Not supported by file system');
 
-    return Promise.try(() => this.fs.get(command.arg))
-    .then((fileStat) => {
+    return Promise.resolve(this.fs.get(command.arg))
+    .then(fileStat => {
       return this.reply(213, {message: fileStat.size});
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       return this.reply(550, err.message);
     });

src/commands/registration/stat.js

@@ -11,28 +11,28 @@ module.exports = {
       if (!this.fs) return this.reply(550, 'File system not instantiated');
       if (!this.fs.get) return this.reply(402, 'Not supported by file system');
 
-      return Promise.try(() => this.fs.get(path))
-      .then((stat) => {
+      return Promise.resolve(this.fs.get(path))
+      .then(stat => {
         if (stat.isDirectory()) {
           if (!this.fs.list) return this.reply(402, 'Not supported by file system');
 
-          return Promise.try(() => this.fs.list(path))
-          .then((stats) => [213, stats]);
+          return Promise.resolve(this.fs.list(path))
+          .then(stats => [213, stats]);
         }
         return [212, [stat]];
       })
       .then(([code, fileStats]) => {
-        return Promise.map(fileStats, (file) => {
+        return Promise.map(fileStats, file => {
           const message = getFileStat(file, _.get(this, 'server.options.file_format', 'ls'));
           return {
             raw: true,
             message
           };
         })
-        .then((messages) => [code, messages]);
+        .then(messages => [code, messages]);
       })
       .then(([code, messages]) => this.reply(code, 'Status begin', ...messages, 'Status end'))
-      .catch((err) => {
+      .catch(err => {
         log.error(err);
         return this.reply(450, err.message);
       });

src/commands/registration/stor.js

@@ -11,20 +11,10 @@ module.exports = {
 
     return this.connector.waitForConnection()
     .tap(() => this.commandSocket.pause())
-    .then(() => Promise.try(() => this.fs.write(fileName, {append, start: this.restByteCount})))
-    .then((fsResponse) => {
-      let {stream, clientPath} = fsResponse;
-      if (!stream && !clientPath) {
-        stream = fsResponse;
-        clientPath = fileName;
-      }
-      const serverPath = stream.path || fileName;
-
-      const destroyConnection = (connection, reject) => (err) => {
-        if (connection) {
-          if (connection.writeable) connection.end();
-          connection.destroy(err);
-        }
+    .then(() => Promise.resolve(this.fs.write(fileName, {append, start: this.restByteCount})))
+    .then(stream => {
+      const destroyConnection = (connection, reject) => err => {
+        if (connection) connection.destroy(err);
         reject(err);
       };
 
@@ -34,7 +24,7 @@ module.exports = {
       });
 
       const socketPromise = new Promise((resolve, reject) => {
-        this.connector.socket.on('data', (data) => {
+        this.connector.socket.on('data', data => {
           if (this.connector.socket) this.connector.socket.pause();
           if (stream) {
             stream.write(data, this.transferType, () => this.connector.socket && this.connector.socket.resume());
@@ -51,16 +41,16 @@ module.exports = {
       this.restByteCount = 0;
 
       return this.reply(150).then(() => this.connector.socket.resume())
-      .then(() => Promise.all([streamPromise, socketPromise]))
-      .tap(() => this.emit('STOR', null, serverPath))
-      .then(() => this.reply(226, clientPath))
+      .then(() => Promise.join(streamPromise, socketPromise))
+      .tap(() => this.emit('STOR', null, fileName))
       .finally(() => stream.destroy && stream.destroy());
     })
-    .catch(Promise.TimeoutError, (err) => {
+    .then(() => this.reply(226, fileName))
+    .catch(Promise.TimeoutError, err => {
       log.error(err);
       return this.reply(425, 'No connection established');
     })
-    .catch((err) => {
+    .catch(err => {
       log.error(err);
       this.emit('STOR', err);
       return this.reply(550, err.message);

src/commands/registration/stou.js

@@ -8,10 +8,12 @@ module.exports = {
     if (!this.fs.get || !this.fs.getUniqueName) return this.reply(402, 'Not supported by file system');
 
     const fileName = args.command.arg;
-    return Promise.try(() => this.fs.get(fileName))
-    .then(() => Promise.try(() => this.fs.getUniqueName()))
-    .catch(() => fileName)
-    .then((name) => {
+    return Promise.try(() => {
+      return Promise.resolve(this.fs.get(fileName))
+      .then(() => Promise.resolve(this.fs.getUniqueName()))
+      .catch(() => Promise.resolve(fileName));
+    })
+    .then(name => {
       args.command.arg = name;
       return stor.call(this, args);
     });

src/commands/registration/user.js

@@ -13,7 +13,7 @@ module.exports = {
       .then(() => {
         return this.reply(230);
       })
-      .catch((err) => {
+      .catch(err => {
         log.error(err);
         return this.reply(530, err.message || 'Authentication failed');
       });

src/commands/registry.js

@@ -43,7 +43,7 @@ const commands = [
 
 const registry = commands.reduce((result, cmd) => {
   const aliases = Array.isArray(cmd.directive) ? cmd.directive : [cmd.directive];
-  aliases.forEach((alias) => result[alias] = cmd);
+  aliases.forEach(alias => result[alias] = cmd);
   return result;
 }, {});
 

src/connection.js

@@ -25,7 +25,7 @@ class FtpConnection extends EventEmitter {
     this.connector = new BaseConnector(this);
 
     this.commandSocket = options.socket;
-    this.commandSocket.on('error', (err) => {
+    this.commandSocket.on('error', err => {
       this.log.error(err, 'Client error');
       this.server.emit('client-error', {connection: this, context: 'commandSocket', error: err});
     });
@@ -41,7 +41,7 @@ class FtpConnection extends EventEmitter {
   _handleData(data) {
     const messages = _.compact(data.toString(this.encoding).split('\r\n'));
     this.log.trace(messages);
-    return Promise.mapSeries(messages, (message) => this.commands.handle(message));
+    return Promise.mapSeries(messages, message => this.commands.handle(message));
   }
 
   get ip() {
@@ -68,7 +68,7 @@ class FtpConnection extends EventEmitter {
 
   close(code = 421, message = 'Closing connection') {
     return Promise.resolve(code)
-      .then((_code) => _code && this.reply(_code, message))
+      .then(_code => _code && this.reply(_code, message))
       .then(() => this.commandSocket && this.commandSocket.end());
   }
 
@@ -96,7 +96,7 @@ class FtpConnection extends EventEmitter {
       if (!letters.length) letters = [{}];
       return Promise.map(letters, (promise, index) => {
         return Promise.resolve(promise)
-        .then((letter) => {
+        .then(letter => {
           if (!letter) letter = {};
           else if (typeof letter === 'string') letter = {message: letter}; // allow passing in message as first param
 
@@ -104,7 +104,7 @@ class FtpConnection extends EventEmitter {
           if (!letter.message) letter.message = DEFAULT_MESSAGE[options.code] || 'No information';
           if (!letter.encoding) letter.encoding = this.encoding;
           return Promise.resolve(letter.message) // allow passing in a promise as a message
-          .then((message) => {
+          .then(message => {
             const seperator = !options.hasOwnProperty('eol') ?
               letters.length - 1 === index ? ' ' : '-' :
               options.eol ? ' ' : '-';
@@ -116,11 +116,11 @@ class FtpConnection extends EventEmitter {
       });
     };
 
-    const processLetter = (letter) => {
+    const processLetter = letter => {
       return new Promise((resolve, reject) => {
         if (letter.socket && letter.socket.writable) {
           this.log.trace({port: letter.socket.address().port, encoding: letter.encoding, message: letter.message}, 'Reply');
-          letter.socket.write(letter.message + '\r\n', letter.encoding, (err) => {
+          letter.socket.write(letter.message + '\r\n', letter.encoding, err => {
             if (err) {
               this.log.error(err);
               return reject(err);
@@ -132,10 +132,10 @@ class FtpConnection extends EventEmitter {
     };
 
     return satisfyParameters()
-    .then((satisfiedLetters) => Promise.mapSeries(satisfiedLetters, (letter, index) => {
+    .then(satisfiedLetters => Promise.mapSeries(satisfiedLetters, (letter, index) => {
       return processLetter(letter, index);
     }))
-    .catch((err) => {
+    .catch(err => {
       this.log.error(err);
     });
   }

src/connector/active.js

@@ -1,7 +1,9 @@
 const {Socket} = require('net');
 const tls = require('tls');
+const ip = require('ip');
 const Promise = require('bluebird');
 const Connector = require('./base');
+const {SocketError} = require('../errors');
 
 class Active extends Connector {
   constructor(connection) {
@@ -27,14 +29,18 @@ class Active extends Connector {
 
     return closeExistingServer()
     .then(() => {
+      if (!ip.isEqual(this.connection.commandSocket.remoteAddress, host)) {
+        throw new SocketError('The given address is not yours', 500);
+      }
+
       this.dataSocket = new Socket();
       this.dataSocket.setEncoding(this.connection.transferType);
-      this.dataSocket.on('error', (err) => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataSocket', error: err}));
+      this.dataSocket.on('error', err => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataSocket', error: err}));
       this.dataSocket.connect({host, port, family}, () => {
         this.dataSocket.pause();
 
         if (this.connection.secure) {
-          const secureContext = tls.createSecureContext(this.server.options.tls);
+          const secureContext = tls.createSecureContext(this.server._tls);
           const secureSocket = new tls.TLSSocket(this.dataSocket, {
             isServer: true,
             secureContext

src/connector/base.js

@@ -26,28 +26,22 @@ class Connector {
     return Promise.reject(new errors.ConnectorError('No connector setup, send PASV or PORT'));
   }
 
-  closeSocket() {
-    if (this.dataSocket) {
-      const socket = this.dataSocket;
-      this.dataSocket.end(() => socket.destroy());
-      this.dataSocket = null;
-    }
-  }
-
-  closeServer() {
-    if (this.dataServer) {
-      this.dataServer.close();
-      this.dataServer = null;
-    }
-  }
-
-
   end() {
-    this.closeSocket();
-    this.closeServer();
+    const closeDataSocket = new Promise(resolve => {
+      if (this.dataSocket) this.dataSocket.end(() => this.dataSocket && this.dataSocket.destroy());
+      else resolve();
+    });
+    const closeDataServer = new Promise(resolve => {
+      if (this.dataServer) this.dataServer.close(() => resolve());
+      else resolve();
+    });
 
-    this.type = false;
-    this.connection.connector = new Connector(this);
+    return Promise.all([closeDataSocket, closeDataServer])
+    .then(() => {
+      this.dataSocket = null;
+      this.dataServer = null;
+      this.type = false;
+    });
   }
 }
 module.exports = Connector;

src/connector/passive.js

@@ -4,6 +4,7 @@ const ip = require('ip');
 const Promise = require('bluebird');
 
 const Connector = require('./base');
+const findPort = require('../helpers/find-port');
 const errors = require('../errors');
 
 class Passive extends Connector {
@@ -12,7 +13,7 @@ class Passive extends Connector {
     this.type = 'passive';
   }
 
-  waitForConnection({timeout = 5000, delay = 50} = {}) {
+  waitForConnection({timeout = 5000, delay = 250} = {}) {
     if (!this.dataServer) return Promise.reject(new errors.ConnectorError('Passive server not setup'));
 
     const checkSocket = () => {
@@ -27,10 +28,14 @@ class Passive extends Connector {
   }
 
   setupServer() {
-    this.closeServer();
-    return this.server.getNextPasvPort()
-    .then((port) => {
-      const connectionHandler = (socket) => {
+    const closeExistingServer = () => this.dataServer ?
+      new Promise(resolve => this.dataServer.close(() => resolve())) :
+      Promise.resolve();
+
+    return closeExistingServer()
+    .then(() => this.getPort())
+    .then(port => {
+      const connectionHandler = socket => {
         if (!ip.isEqual(this.connection.commandSocket.remoteAddress, socket.remoteAddress)) {
           this.log.error({
             pasv_connection: socket.remoteAddress,
@@ -44,34 +49,29 @@ class Passive extends Connector {
         this.log.trace({port, remoteAddress: socket.remoteAddress}, 'Passive connection fulfilled.');
 
         this.dataSocket = socket;
+        this.dataSocket.connected = true;
         this.dataSocket.setEncoding(this.connection.transferType);
-        this.dataSocket.on('error', (err) => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataSocket', error: err}));
-
-        if (!this.connection.secure) {
-          this.dataSocket.connected = true;
-        }
+        this.dataSocket.on('error', err => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataSocket', error: err}));
+        this.dataSocket.on('close', () => {
+          this.log.trace('Passive connection closed');
+          this.end();
+        });
       };
 
       this.dataSocket = null;
 
-      const serverOptions = Object.assign({}, this.connection.secure ? this.server.options.tls : {}, {pauseOnConnect: true});
+      const serverOptions = Object.assign({}, this.connection.secure ? this.server._tls : {}, {pauseOnConnect: true});
       this.dataServer = (this.connection.secure ? tls : net).createServer(serverOptions, connectionHandler);
       this.dataServer.maxConnections = 1;
 
-      this.dataServer.on('error', (err) => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataServer', error: err}));
-      this.dataServer.once('close', () => {
+      this.dataServer.on('error', err => this.server && this.server.emit('client-error', {connection: this.connection, context: 'dataServer', error: err}));
+      this.dataServer.on('close', () => {
         this.log.trace('Passive server closed');
-        this.end();
+        this.dataServer = null;
       });
 
-      if (this.connection.secure) {
-        this.dataServer.on('secureConnection', (socket) => {
-          socket.connected = true;
-        });
-      }
-
       return new Promise((resolve, reject) => {
-        this.dataServer.listen(port, this.server.url.hostname, (err) => {
+        this.dataServer.listen(port, this.server.url.hostname, err => {
           if (err) reject(err);
           else {
             this.log.debug({port}, 'Passive connection listening');
@@ -82,5 +82,15 @@ class Passive extends Connector {
     });
   }
 
+  getPort() {
+    if (this.server.options.pasv_range) {
+      const [min, max] = typeof this.server.options.pasv_range === 'string' ?
+        this.server.options.pasv_range.split('-').map(v => v ? parseInt(v) : v) :
+        [this.server.options.pasv_range];
+      return findPort(min, max);
+    }
+    throw new errors.ConnectorError('Invalid pasv_range');
+  }
+
 }
 module.exports = Passive;

src/fs.js

@@ -17,7 +17,7 @@ class FileSystem {
   }
 
   _resolvePath(path = '.') {
-    const clientPath = (() => {
+    const serverPath = (() => {
       path = nodePath.normalize(path);
       if (nodePath.isAbsolute(path)) {
         return nodePath.join(path);
@@ -27,12 +27,12 @@ class FileSystem {
     })();
 
     const fsPath = (() => {
-      const resolvedPath = nodePath.resolve(this.root, `.${nodePath.sep}${clientPath}`);
+      const resolvedPath = nodePath.resolve(this.root, `.${nodePath.sep}${serverPath}`);
       return nodePath.join(resolvedPath);
     })();
 
     return {
-      clientPath,
+      serverPath,
       fsPath
     };
   }
@@ -44,19 +44,19 @@ class FileSystem {
   get(fileName) {
     const {fsPath} = this._resolvePath(fileName);
     return fs.statAsync(fsPath)
-    .then((stat) => _.set(stat, 'name', fileName));
+    .then(stat => _.set(stat, 'name', fileName));
   }
 
   list(path = '.') {
     const {fsPath} = this._resolvePath(path);
     return fs.readdirAsync(fsPath)
-    .then((fileNames) => {
-      return Promise.map(fileNames, (fileName) => {
+    .then(fileNames => {
+      return Promise.map(fileNames, fileName => {
         const filePath = nodePath.join(fsPath, fileName);
         return fs.accessAsync(filePath, fs.constants.F_OK)
         .then(() => {
           return fs.statAsync(filePath)
-          .then((stat) => _.set(stat, 'name', fileName));
+          .then(stat => _.set(stat, 'name', fileName));
         })
         .catch(() => null);
       });
@@ -65,47 +65,41 @@ class FileSystem {
   }
 
   chdir(path = '.') {
-    const {fsPath, clientPath} = this._resolvePath(path);
+    const {fsPath, serverPath} = this._resolvePath(path);
     return fs.statAsync(fsPath)
-    .tap((stat) => {
+    .tap(stat => {
       if (!stat.isDirectory()) throw new errors.FileSystemError('Not a valid directory');
     })
     .then(() => {
-      this.cwd = clientPath;
+      this.cwd = serverPath;
       return this.currentDirectory();
     });
   }
 
   write(fileName, {append = false, start = undefined} = {}) {
-    const {fsPath, clientPath} = this._resolvePath(fileName);
+    const {fsPath} = this._resolvePath(fileName);
     const stream = fs.createWriteStream(fsPath, {flags: !append ? 'w+' : 'a+', start});
     stream.once('error', () => fs.unlinkAsync(fsPath));
     stream.once('close', () => stream.end());
-    return {
-      stream,
-      clientPath
-    };
+    return stream;
   }
 
   read(fileName, {start = undefined} = {}) {
-    const {fsPath, clientPath} = this._resolvePath(fileName);
+    const {fsPath} = this._resolvePath(fileName);
     return fs.statAsync(fsPath)
-    .tap((stat) => {
+    .tap(stat => {
       if (stat.isDirectory()) throw new errors.FileSystemError('Cannot read a directory');
     })
     .then(() => {
       const stream = fs.createReadStream(fsPath, {flags: 'r', start});
-      return {
-        stream,
-        clientPath
-      };
+      return stream;
     });
   }
 
   delete(path) {
     const {fsPath} = this._resolvePath(path);
     return fs.statAsync(fsPath)
-    .then((stat) => {
+    .then(stat => {
       if (stat.isDirectory()) return fs.rmdirAsync(fsPath);
       else return fs.unlinkAsync(fsPath);
     });

src/helpers/find-port.js

@@ -2,35 +2,26 @@ const net = require('net');
 const Promise = require('bluebird');
 const errors = require('../errors');
 
-function* portNumberGenerator(min, max) {
-  let current = min;
-  while (true) {
-    if (current > 65535 || current > max) {
-      current = min;
-    }
-    yield current++;
-  }
-}
-
-function getNextPortFactory(min, max = Infinity) {
-  const nextPortNumber = portNumberGenerator(min, max);
-  const portCheckServer = net.createServer();
-  portCheckServer.maxConnections = 0;
-  portCheckServer.on('error', () => {
-    portCheckServer.listen(nextPortNumber.next().value);
-  });
-
-  return () => new Promise((resolve) => {
-    portCheckServer.once('listening', () => {
-      const {port} = portCheckServer.address();
-      portCheckServer.close(() => resolve(port));
+module.exports = function (min = 1, max = undefined) {
+  return new Promise((resolve, reject) => {
+    let checkPort = min;
+    let portCheckServer = net.createServer();
+    portCheckServer.maxConnections = 0;
+    portCheckServer.on('error', () => {
+      if (checkPort < 65535 && (!max || checkPort < max)) {
+        checkPort = checkPort + 1;
+        portCheckServer.listen(checkPort);
+      } else {
+        reject(new errors.GeneralError('Unable to find open port', 500));
+      }
     });
-    portCheckServer.listen(nextPortNumber.next().value);
-  })
-  .catch(RangeError, (err) => Promise.reject(new errors.ConnectorError(err.message)));
-}
-
-module.exports = {
-  getNextPortFactory,
-  portNumberGenerator
+    portCheckServer.on('listening', () => {
+      const {port} = portCheckServer.address();
+      portCheckServer.close(() => {
+        portCheckServer = null;
+        resolve(port);
+      });
+    });
+    portCheckServer.listen(checkPort);
+  });
 };

src/helpers/resolve-host.js

@@ -8,12 +8,12 @@ module.exports = function (hostname) {
   return new Promise((resolve, reject) => {
     if (!hostname || hostname === '0.0.0.0') {
       let ip = '';
-      http.get(IP_WEBSITE, (response) => {
+      http.get(IP_WEBSITE, response => {
         if (response.statusCode !== 200) {
           return reject(new errors.GeneralError('Unable to resolve hostname', response.statusCode));
         }
         response.setEncoding('utf8');
-        response.on('data', (chunk) => {
+        response.on('data', chunk => {
           ip += chunk;
         });
         response.on('end', () => {

src/index.js

@@ -4,42 +4,38 @@ const nodeUrl = require('url');
 const buyan = require('bunyan');
 const net = require('net');
 const tls = require('tls');
+const fs = require('fs');
 const EventEmitter = require('events');
 
 const Connection = require('./connection');
 const resolveHost = require('./helpers/resolve-host');
-const {getNextPortFactory} = require('./helpers/find-port');
 
 class FtpServer extends EventEmitter {
-  constructor(options = {}) {
+  constructor(url, options = {}) {
     super();
-    this.options = Object.assign({
+    this.options = _.merge({
       log: buyan.createLogger({name: 'ftp-srv'}),
-      url: 'ftp://127.0.0.1:21',
-      pasv_min: 1024,
-      pasv_max: 65535,
-      pasv_url: null,
       anonymous: false,
+      pasv_range: 22,
+      pasv_url: null,
       file_format: 'ls',
       blacklist: [],
       whitelist: [],
       greeting: null,
       tls: false
     }, options);
-
     this._greeting = this.setupGreeting(this.options.greeting);
     this._features = this.setupFeaturesMessage();
+    this._tls = this.setupTLS(this.options.tls);
 
     delete this.options.greeting;
+    delete this.options.tls;
 
     this.connections = {};
     this.log = this.options.log;
-    this.url = nodeUrl.parse(this.options.url);
-    this.getNextPasvPort = getNextPortFactory(
-      _.get(this, 'options.pasv_min'),
-      _.get(this, 'options.pasv_max'));
+    this.url = nodeUrl.parse(url || 'ftp://127.0.0.1:21');
 
-    const serverConnectionHandler = (socket) => {
+    const serverConnectionHandler = socket => {
       let connection = new Connection(this, {log: this.log, socket});
       this.connections[connection.id] = connection;
 
@@ -50,10 +46,10 @@ class FtpServer extends EventEmitter {
       return connection.reply(220, ...greeting, features)
       .finally(() => socket.resume());
     };
-    const serverOptions = Object.assign({}, this.isTLS ? this.options.tls : {}, {pauseOnConnect: true});
+    const serverOptions = Object.assign({}, this.isTLS ? this._tls : {}, {pauseOnConnect: true});
 
     this.server = (this.isTLS ? tls : net).createServer(serverOptions, serverConnectionHandler);
-    this.server.on('error', (err) => this.log.error(err, '[Event] error'));
+    this.server.on('error', err => this.log.error(err, '[Event] error'));
 
     const quit = _.debounce(this.quit.bind(this), 100);
 
@@ -63,17 +59,17 @@ class FtpServer extends EventEmitter {
   }
 
   get isTLS() {
-    return this.url.protocol === 'ftps:' && this.options.tls;
+    return this.url.protocol === 'ftps:' && this._tls;
   }
 
   listen() {
     return resolveHost(this.options.pasv_url || this.url.hostname)
-    .then((pasvUrl) => {
+    .then(pasvUrl => {
       this.options.pasv_url = pasvUrl;
 
       return new Promise((resolve, reject) => {
         this.server.once('error', reject);
-        this.server.listen(this.url.port, this.url.hostname, (err) => {
+        this.server.listen(this.url.port, this.url.hostname, err => {
           this.server.removeListener('error', reject);
           if (err) return reject(err);
           this.log.info({
@@ -94,6 +90,15 @@ class FtpServer extends EventEmitter {
     });
   }
 
+  setupTLS(_tls) {
+    if (!_tls) return false;
+    return _.assign({}, _tls, {
+      cert: _tls.cert ? fs.readFileSync(_tls.cert) : undefined,
+      key: _tls.key ? fs.readFileSync(_tls.key) : undefined,
+      ca: _tls.ca ? Array.isArray(_tls.ca) ? _tls.ca.map(_ca => fs.readFileSync(_ca)) : [fs.readFileSync(_tls.ca)] : undefined
+    });
+  }
+
   setupGreeting(greet) {
     if (!greet) return [];
     const greeting = Array.isArray(greet) ? greet : greet.split('\n');
@@ -112,7 +117,7 @@ class FtpServer extends EventEmitter {
   }
 
   disconnectClient(id) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       const client = this.connections[id];
       if (!client) return resolve();
       delete this.connections[id];
@@ -134,9 +139,9 @@ class FtpServer extends EventEmitter {
   close() {
     this.log.info('Server closing...');
     this.server.maxConnections = 0;
-    return Promise.map(Object.keys(this.connections), (id) => Promise.try(this.disconnectClient.bind(this, id)))
-    .then(() => new Promise((resolve) => {
-      this.server.close((err) => {
+    return Promise.map(Object.keys(this.connections), id => Promise.try(this.disconnectClient.bind(this, id)))
+    .then(() => new Promise(resolve => {
+      this.server.close(err => {
         if (err) this.log.error(err, 'Error closing server');
         resolve('Closed');
       });

test/commands/index.spec.js

@@ -20,7 +20,7 @@ describe('FtpCommands', function () {
   };
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     commands = new FtpCommands(mockConnection);
 
@@ -64,8 +64,8 @@ describe('FtpCommands', function () {
     it('two args, with flags: test -l arg1 -A arg2 --zz88A', () => {
       const cmd = commands.parse('test -l arg1 -A arg2 --zz88A');
       expect(cmd.directive).to.equal('TEST');
-      expect(cmd.arg).to.equal('arg1 arg2 --zz88A');
-      expect(cmd.flags).to.deep.equal(['-l', '-A']);
+      expect(cmd.arg).to.equal('arg1 arg2');
+      expect(cmd.flags).to.deep.equal(['-l', '-A', '--zz88A']);
       expect(cmd.raw).to.equal('test -l arg1 -A arg2 --zz88A');
     });
 
@@ -76,13 +76,6 @@ describe('FtpCommands', function () {
       expect(cmd.flags).to.deep.equal(['-l']);
       expect(cmd.raw).to.equal('list -l');
     });
-
-    it('does not check for option flags', () => {
-      const cmd = commands.parse('retr -test');
-      expect(cmd.directive).to.equal('RETR');
-      expect(cmd.arg).to.equal('-test');
-      expect(cmd.flags).to.deep.equal([]);
-    });
   });
 
   describe('handle', function () {

test/commands/registration/abor.spec.js

@@ -3,7 +3,7 @@ const {expect} = require('chai');
 const sinon = require('sinon');
 
 const CMD = 'ABOR';
-describe.skip(CMD, function () {
+describe(CMD, function () {
   let sandbox;
   const mockClient = {
     reply: () => Promise.resolve(),
@@ -15,7 +15,7 @@ describe.skip(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
     sandbox.spy(mockClient.connector, 'waitForConnection');

test/commands/registration/allo.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/auth.spec.js

@@ -8,15 +8,13 @@ describe(CMD, function () {
   const mockClient = {
     reply: () => Promise.resolve(),
     server: {
-      options: {
-        tls: {}
-      }
+      _tls: {}
     }
   };
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/cdup.spec.js

@@ -16,7 +16,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
     sandbox.spy(mockClient.fs, 'chdir');

test/commands/registration/cwd.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'chdir').resolves();

test/commands/registration/dele.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'delete').resolves();

test/commands/registration/eprt.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
     sandbox.stub(ActiveConnector.prototype, 'setupConnection').resolves();
@@ -23,7 +23,7 @@ describe(CMD, function () {
   });
 
   it('// unsuccessful | no argument', () => {
-    return cmdFn()
+    return cmdFn({})
     .then(() => {
       expect(mockClient.reply.args[0][0]).to.equal(504);
     });

test/commands/registration/epsv.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(PassiveConnector.prototype, 'setupServer').resolves({
@@ -25,7 +25,7 @@ describe(CMD, function () {
   });
 
   it('// successful IPv4', () => {
-    return cmdFn()
+    return cmdFn({})
     .then(() => {
       const [code, message] = mockClient.reply.args[0];
       expect(code).to.equal(229);

test/commands/registration/help.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/list.spec.js

@@ -15,7 +15,7 @@ describe(CMD, function () {
     },
     connector: {
       waitForConnection: () => Promise.resolve({}),
-      end: () => Promise.resolve({})
+      end: () => {}
     },
     commandSocket: {
       resume: () => {},
@@ -25,7 +25,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'get').resolves({

test/commands/registration/mdtm.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'get').resolves({mtime: 'Mon, 10 Oct 2011 23:24:11 GMT'});

test/commands/registration/mkd.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'mkdir').resolves();

test/commands/registration/mode.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/nlst.spec.js

@@ -15,7 +15,7 @@ describe(CMD, function () {
     },
     connector: {
       waitForConnection: () => Promise.resolve({}),
-      end: () => Promise.resolve({})
+      end: () => {}
     },
     commandSocket: {
       resume: () => {},
@@ -25,7 +25,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'get').resolves({

test/commands/registration/noop.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/opts.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/pass.spec.js

@@ -15,7 +15,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient, 'login').resolves();

test/commands/registration/pbsz.spec.js

@@ -12,7 +12,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/port.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
     sandbox.stub(ActiveConnector.prototype, 'setupConnection').resolves();

test/commands/registration/prot.spec.js

@@ -12,7 +12,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/pwd.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'reply').resolves();
     sandbox.stub(mockClient.fs, 'currentDirectory').resolves();

test/commands/registration/quit.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'close').resolves();
   });

test/commands/registration/rest.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/retr.spec.js

@@ -19,13 +19,13 @@ describe(CMD, function () {
       waitForConnection: () => Promise.resolve({
         resume: () => {}
       }),
-      end: () => Promise.resolve({})
+      end: () => {}
     }
   };
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     mockClient.fs = {
       read: () => {}
@@ -87,7 +87,7 @@ describe(CMD, function () {
     });
 
     let errorEmitted = false;
-    emitter.once('RETR', (err) => {
+    emitter.once('RETR', err => {
       errorEmitted = !!err;
     });
 

test/commands/registration/rnfr.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     mockClient.renameFrom = 'test';
     mockClient.fs = {

test/commands/registration/rnto.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     mockClient.renameFrom = 'test';
     mockClient.fs = {

test/commands/registration/site/chmod.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../../src/commands/registration/site/${CMD.toLowerCase()}`).bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     mockClient.fs = {
       chmod: () => Promise.resolve()
@@ -23,7 +23,7 @@ describe(CMD, function () {
     sandbox.restore();
   });
 
-  it('// unsuccessful | no file system', (done) => {
+  it('// unsuccessful | no file system', done => {
     delete mockClient.fs;
 
     cmdFn()
@@ -34,7 +34,7 @@ describe(CMD, function () {
     .catch(done);
   });
 
-  it('// unsuccessful | file system does not have functions', (done) => {
+  it('// unsuccessful | file system does not have functions', done => {
     mockClient.fs = {};
 
     cmdFn()
@@ -45,7 +45,7 @@ describe(CMD, function () {
     .catch(done);
   });
 
-  it('777 test // unsuccessful | file chmod fails', (done) => {
+  it('777 test // unsuccessful | file chmod fails', done => {
     mockClient.fs.chmod.restore();
     sandbox.stub(mockClient.fs, 'chmod').rejects(new Error('test'));
 
@@ -57,7 +57,7 @@ describe(CMD, function () {
     .catch(done);
   });
 
-  it('777 test // successful', (done) => {
+  it('777 test // successful', done => {
     cmdFn({log: mockLog, command: {arg: '777 test'}})
     .then(() => {
       expect(mockClient.fs.chmod.args[0]).to.eql(['test', 511]);

test/commands/registration/site/site.spec.js

@@ -17,7 +17,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.stub(mockClient, 'reply').resolves();
   });

test/commands/registration/size.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     mockClient.fs = {
       get: () => Promise.resolve({size: 1})

test/commands/registration/stat.spec.js

@@ -10,7 +10,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     mockClient.fs = {
       get: () => Promise.resolve({}),

test/commands/registration/stor.spec.js

@@ -19,13 +19,13 @@ describe(CMD, function () {
       waitForConnection: () => Promise.resolve({
         resume: () => {}
       }),
-      end: () => Promise.resolve({})
+      end: () => {}
     }
   };
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     mockClient.fs = {
       write: () => {}
@@ -86,7 +86,7 @@ describe(CMD, function () {
     });
 
     let errorEmitted = false;
-    emitter.once('STOR', (err) => {
+    emitter.once('STOR', err => {
       errorEmitted = !!err;
     });
 

test/commands/registration/stou.spec.js

@@ -13,7 +13,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     mockClient.fs = {
       get: () => Promise.resolve(),

test/commands/registration/stru.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/syst.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     sandbox.spy(mockClient, 'reply');
   });

test/commands/registration/type.spec.js

@@ -11,7 +11,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     mockClient.transferType = null;
     sandbox.spy(mockClient, 'reply');

test/commands/registration/user.spec.js

@@ -16,7 +16,7 @@ describe(CMD, function () {
   const cmdFn = require(`../../../src/commands/registration/${CMD.toLowerCase()}`).handler.bind(mockClient);
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
     delete mockClient.username;
     mockClient.server.options = {};

test/connector/active.spec.js

@@ -1,38 +1,42 @@
 /* eslint no-unused-expressions: 0 */
 const {expect} = require('chai');
 const sinon = require('sinon');
+const Promise = require('bluebird');
 
 const net = require('net');
 const tls = require('tls');
 
 const ActiveConnector = require('../../src/connector/active');
-const {getNextPortFactory} = require('../../src/helpers/find-port');
+const findPort = require('../../src/helpers/find-port');
 
 describe('Connector - Active //', function () {
-  let getNextPort = getNextPortFactory(1024);
   let PORT;
   let active;
-  let mockConnection = {};
+  let mockConnection = {
+    commandSocket: {
+      remoteAddress: '::ffff:127.0.0.1'
+    }
+  };
   let sandbox;
   let server;
 
-  before(() => {
-    active = new ActiveConnector(mockConnection);
-  });
   beforeEach((done) => {
+    active = new ActiveConnector(mockConnection);
     sandbox = sinon.sandbox.create().usingPromise(Promise);
 
-    getNextPort()
-    .then((port) => {
+    findPort()
+    .then(port => {
       PORT = port;
       server = net.createServer()
-      .on('connection', (socket) => socket.destroy())
+      .on('connection', socket => socket.destroy())
       .listen(PORT, () => done());
     });
   });
-  afterEach((done) => {
+
+  afterEach(() => {
     sandbox.restore();
-    server.close(done);
+    server.close();
+    active.end();
   });
 
   it('sets up a connection', function () {
@@ -42,13 +46,27 @@ describe('Connector - Active //', function () {
     });
   });
 
-  it('destroys existing connection, then sets up a connection', function () {
-    const destroyFnSpy = sandbox.spy(active.dataSocket, 'destroy');
+  it('rejects alternative host', function () {
+    return active.setupConnection('123.45.67.89', PORT)
+    .catch((err) => {
+      expect(err.code).to.equal(500);
+      expect(err.message).to.equal('The given address is not yours');
+    })
+    .finally(() => {
+      expect(active.dataSocket).not.to.exist;
+    });
+  });
 
+  it('destroys existing connection, then sets up a connection', function () {
     return active.setupConnection('127.0.0.1', PORT)
     .then(() => {
-      expect(destroyFnSpy.callCount).to.equal(1);
-      expect(active.dataSocket).to.exist;
+      const destroyFnSpy = sandbox.spy(active.dataSocket, 'destroy');
+
+      return active.setupConnection('127.0.0.1', PORT)
+      .then(() => {
+        expect(destroyFnSpy.callCount).to.equal(1);
+        expect(active.dataSocket).to.exist;
+      });
     });
   });
 
@@ -58,7 +76,7 @@ describe('Connector - Active //', function () {
       expect(active.dataSocket).to.exist;
       return active.waitForConnection();
     })
-    .then((dataSocket) => {
+    .then(dataSocket => {
       expect(dataSocket.connected).to.equal(true);
       expect(dataSocket instanceof net.Socket).to.equal(true);
       expect(dataSocket instanceof tls.TLSSocket).to.equal(false);
@@ -67,18 +85,14 @@ describe('Connector - Active //', function () {
 
   it('upgrades to a secure connection', function () {
     mockConnection.secure = true;
-    mockConnection.server = {
-      options: {
-        tls: {}
-      }
-    };
+    mockConnection.server = {_tls: {}};
 
     return active.setupConnection('127.0.0.1', PORT)
     .then(() => {
       expect(active.dataSocket).to.exist;
       return active.waitForConnection();
     })
-    .then((dataSocket) => {
+    .then(dataSocket => {
       expect(dataSocket.connected).to.equal(true);
       expect(dataSocket instanceof net.Socket).to.equal(true);
       expect(dataSocket instanceof tls.TLSSocket).to.equal(true);

test/connector/passive.spec.js

@@ -7,117 +7,87 @@ const net = require('net');
 const bunyan = require('bunyan');
 
 const PassiveConnector = require('../../src/connector/passive');
-const {getNextPortFactory} = require('../../src/helpers/find-port');
 
 describe('Connector - Passive //', function () {
+  let passive;
   let mockConnection = {
     reply: () => Promise.resolve({}),
     close: () => Promise.resolve({}),
     encoding: 'utf8',
     log: bunyan.createLogger({name: 'passive-test'}),
-    commandSocket: {
-      remoteAddress: '::ffff:127.0.0.1'
-    },
-    server: {
-      url: '',
-      getNextPasvPort: getNextPortFactory(1024)
-    }
+    commandSocket: {},
+    server: {options: {}, url: {}}
   };
   let sandbox;
 
-  before(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
-  });
+  function shouldNotResolve() {
+    throw new Error('Should not resolve');
+  }
 
+  before(() => {
+    passive = new PassiveConnector(mockConnection);
+  });
   beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+
     sandbox.spy(mockConnection, 'reply');
     sandbox.spy(mockConnection, 'close');
+
+    mockConnection.commandSocket.remoteAddress = '::ffff:127.0.0.1';
+    mockConnection.server.options.pasv_range = '8000';
   });
   afterEach(() => {
     sandbox.restore();
   });
 
-  it('cannot wait for connection with no server', function (done) {
-    let passive = new PassiveConnector(mockConnection);
-    passive.waitForConnection()
-    .catch((err) => {
+  it('cannot wait for connection with no server', function () {
+    return passive.waitForConnection()
+    .then(shouldNotResolve)
+    .catch(err => {
       expect(err.name).to.equal('ConnectorError');
-      done();
     });
   });
 
-  describe('setup', function () {
-    before(function () {
-      sandbox.stub(mockConnection.server, 'getNextPasvPort').value(getNextPortFactory());
-    });
+  it('no pasv range provided', function () {
+    delete mockConnection.server.options.pasv_range;
 
-    it('no pasv range provided', function (done) {
-      let passive = new PassiveConnector(mockConnection);
-      passive.setupServer()
-      .catch((err) => {
-        try {
-          expect(err.name).to.equal('ConnectorError');
-          done();
-        } catch (ex) {
-          done(ex);
-        }
-      });
+    return passive.setupServer()
+    .then(shouldNotResolve)
+    .catch(err => {
+      expect(err.name).to.equal('ConnectorError');
     });
   });
 
-  describe('setup', function () {
-    let connection;
-    before(function () {
-      sandbox.stub(mockConnection.server, 'getNextPasvPort').value(getNextPortFactory(-1, -1));
+  it('has invalid pasv range', function () {
+    mockConnection.server.options.pasv_range = -1;
 
-      connection = new PassiveConnector(mockConnection);
-    });
-
-    it('has invalid pasv range', function (done) {
-      connection.setupServer()
-      .catch((err) => {
-        expect(err.name).to.equal('ConnectorError');
-        done();
-      });
+    return passive.setupServer()
+    .then(shouldNotResolve)
+    .catch(err => {
+      expect(err).to.be.instanceOf(RangeError);
     });
   });
 
   it('sets up a server', function () {
-    let passive = new PassiveConnector(mockConnection);
     return passive.setupServer()
     .then(() => {
       expect(passive.dataServer).to.exist;
-      return passive.end();
     });
   });
 
-  describe('setup', function () {
-    let passive;
-    let closeFnSpy;
-    beforeEach(function () {
-      passive = new PassiveConnector(mockConnection);
-      return passive.setupServer()
-      .then(() => {
-        closeFnSpy = sandbox.spy(passive.dataServer, 'close');
-      });
-    });
-    afterEach(function () {
-      return passive.end();
-    });
+  it('destroys existing server, then sets up a server', function () {
+    const closeFnSpy = sandbox.spy(passive.dataServer, 'close');
 
-    it('destroys existing server, then sets up a server', function () {
-      return passive.setupServer()
-      .then(() => {
-        expect(closeFnSpy.callCount).to.equal(1);
-        expect(passive.dataServer).to.exist;
-      });
+    return passive.setupServer()
+    .then(() => {
+      expect(closeFnSpy.callCount).to.equal(1);
+      expect(passive.dataServer).to.exist;
     });
   });
 
   it('refuses connection with different remote address', function (done) {
-    sandbox.stub(mockConnection.commandSocket, 'remoteAddress').value('bad');
+    mockConnection.commandSocket.remoteAddress = 'bad';
 
-    let passive = new PassiveConnector(mockConnection);
     passive.setupServer()
     .then(() => {
       expect(passive.dataServer).to.exist;
@@ -128,8 +98,6 @@ describe('Connector - Passive //', function () {
         setTimeout(() => {
           expect(passive.connection.reply.callCount).to.equal(1);
           expect(passive.connection.reply.args[0][0]).to.equal(550);
-
-          passive.end();
           done();
         }, 100);
       });
@@ -138,7 +106,6 @@ describe('Connector - Passive //', function () {
   });
 
   it('accepts connection', function () {
-    let passive = new PassiveConnector(mockConnection);
     return passive.setupServer()
     .then(() => {
       expect(passive.dataServer).to.exist;

test/fs.spec.js

@@ -1,9 +1,7 @@
 const {expect} = require('chai');
 const nodePath = require('path');
-const Promise = require('bluebird');
 
 const FileSystem = require('../src/fs');
-const errors = require('../src/errors');
 
 describe('FileSystem', function () {
   let fs;
@@ -15,30 +13,11 @@ describe('FileSystem', function () {
     });
   });
 
-  describe('extend', function () {
-    class FileSystemOV extends FileSystem {
-      chdir() {
-        throw new errors.FileSystemError('Not a valid directory');
-      }
-    }
-    let ovFs;
-    before(function () {
-      ovFs = new FileSystemOV({});
-    });
-
-    it('handles error', function () {
-      return Promise.try(() => ovFs.chdir())
-      .catch((err) => {
-        expect(err).to.be.instanceof(errors.FileSystemError);
-      });
-    });
-  });
-
   describe('#_resolvePath', function () {
     it('gets correct relative path', function () {
       const result = fs._resolvePath();
       expect(result).to.be.an('object');
-      expect(result.clientPath).to.equal(
+      expect(result.serverPath).to.equal(
         nodePath.normalize('/file/1/2/3'));
       expect(result.fsPath).to.equal(
         nodePath.resolve('/tmp/ftp-srv/file/1/2/3'));
@@ -47,7 +26,7 @@ describe('FileSystem', function () {
     it('gets correct relative path', function () {
       const result = fs._resolvePath('..');
       expect(result).to.be.an('object');
-      expect(result.clientPath).to.equal(
+      expect(result.serverPath).to.equal(
         nodePath.normalize('/file/1/2'));
       expect(result.fsPath).to.equal(
         nodePath.resolve('/tmp/ftp-srv/file/1/2'));
@@ -56,7 +35,7 @@ describe('FileSystem', function () {
     it('gets correct absolute path', function () {
       const result = fs._resolvePath('/other');
       expect(result).to.be.an('object');
-      expect(result.clientPath).to.equal(
+      expect(result.serverPath).to.equal(
         nodePath.normalize('/other'));
       expect(result.fsPath).to.equal(
         nodePath.resolve('/tmp/ftp-srv/other'));
@@ -65,7 +44,7 @@ describe('FileSystem', function () {
     it('cannot escape root', function () {
       const result = fs._resolvePath('../../../../../../../../../../..');
       expect(result).to.be.an('object');
-      expect(result.clientPath).to.equal(
+      expect(result.serverPath).to.equal(
         nodePath.normalize('/'));
       expect(result.fsPath).to.equal(
         nodePath.resolve('/tmp/ftp-srv'));
@@ -74,7 +53,7 @@ describe('FileSystem', function () {
     it('resolves to file', function () {
       const result = fs._resolvePath('/cool/file.txt');
       expect(result).to.be.an('object');
-      expect(result.clientPath).to.equal(
+      expect(result.serverPath).to.equal(
         nodePath.normalize('/cool/file.txt'));
       expect(result.fsPath).to.equal(
         nodePath.resolve('/tmp/ftp-srv/cool/file.txt'));

test/helpers/file-stat.spec.js

@@ -9,7 +9,7 @@ describe('helpers // file-stat', function () {
   let sandbox;
 
   before(function () {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
   });
   afterEach(function () {
     sandbox.restore();

test/helpers/find-port.spec.js

@@ -1,52 +1,35 @@
 /* eslint no-unused-expressions: 0 */
 const {expect} = require('chai');
-const net = require('net');
+const {Server} = require('net');
 const sinon = require('sinon');
 
-const {getNextPortFactory} = require('../../src/helpers/find-port');
+const findPort = require('../../src/helpers/find-port');
 
 describe('helpers // find-port', function () {
   let sandbox;
-  let getNextPort;
 
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
 
-    getNextPort = getNextPortFactory(1, 2);
+    sandbox.spy(Server.prototype, 'listen');
   });
   afterEach(() => {
     sandbox.restore();
   });
 
   it('finds a port', () => {
-    sandbox.stub(net.Server.prototype, 'listen').callsFake(function (port) {
-      this.address = () => ({port});
-      setImmediate(() => this.emit('listening'));
-    });
-
-    return getNextPort()
-    .then((port) => {
-      expect(port).to.equal(1);
+    return findPort(1)
+    .then(port => {
+      expect(Server.prototype.listen.callCount).to.be.above(0);
+      expect(port).to.be.above(0);
     });
   });
 
-  it('restarts count', () => {
-    sandbox.stub(net.Server.prototype, 'listen').callsFake(function (port) {
-      this.address = () => ({port});
-      setImmediate(() => this.emit('listening'));
-    });
-
-    return getNextPort()
-    .then((port) => {
-      expect(port).to.equal(1);
-    })
-    .then(() => getNextPort())
-    .then((port) => {
-      expect(port).to.equal(2);
-    })
-    .then(() => getNextPort())
-    .then((port) => {
-      expect(port).to.equal(1);
+  it('does not find a port', () => {
+    return findPort(1, 2)
+    .then(() => expect(1).to.equal(2)) // should not happen
+    .catch(err => {
+      expect(err).to.exist;
     });
   });
 });

test/helpers/resolve-host.spec.js

@@ -7,14 +7,14 @@ describe('helpers //resolve-host', function () {
 
   let sandbox;
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
   });
   afterEach(() => sandbox.restore());
 
   it('fetches ip address', () => {
     const hostname = '0.0.0.0';
     return resolveHost(hostname)
-    .then((resolvedHostname) => {
+    .then(resolvedHostname => {
       expect(resolvedHostname).to.match(/^\d+\.\d+\.\d+\.\d+$/);
     });
   });
@@ -22,7 +22,7 @@ describe('helpers //resolve-host', function () {
   it('fetches ip address', () => {
     const hostname = null;
     return resolveHost(hostname)
-    .then((resolvedHostname) => {
+    .then(resolvedHostname => {
       expect(resolvedHostname).to.match(/^\d+\.\d+\.\d+\.\d+$/);
     });
   });
@@ -30,7 +30,7 @@ describe('helpers //resolve-host', function () {
   it('does nothing', () => {
     const hostname = '127.0.0.1';
     return resolveHost(hostname)
-    .then((resolvedHostname) => {
+    .then(resolvedHostname => {
       expect(resolvedHostname).to.equal(hostname);
     });
   });
@@ -44,7 +44,7 @@ describe('helpers //resolve-host', function () {
 
     return resolveHost(null)
     .then(() => expect(1).to.equal(2))
-    .catch((err) => {
+    .catch(err => {
       expect(err.code).to.equal(420);
     });
   });

test/index.spec.js

@@ -22,10 +22,10 @@ describe('Integration', function () {
   const clientDirectory = `${process.cwd()}/test_tmp`;
 
   before(() => {
-    return startServer({url: 'ftp://127.0.0.1:8880'});
+    return startServer('ftp://127.0.0.1:8880');
   });
   beforeEach(() => {
-    sandbox = sinon.sandbox.create().usingPromise(Promise);
+    sandbox = sinon.sandbox.create();
   });
   afterEach(() => sandbox.restore());
   after(() => server.close());
@@ -36,19 +36,10 @@ describe('Integration', function () {
   });
   after(() => directoryPurge(clientDirectory));
 
-  function readFile(path) {
-    return new Promise((resolve, reject) => {
-      fs.readFile(path, 'utf8', (err, data) => {
-        if (err) reject(err);
-        else resolve(data);
-      });
-    });
-  }
-
-  function startServer(options = {}) {
-    server = new FtpServer(_.assign({
+  function startServer(url, options = {}) {
+    server = new FtpServer(url, _.assign({
       log,
-      pasv_min: 8881,
+      pasv_range: 8881,
       greeting: ['hello', 'world'],
       anonymous: true
     }, options));
@@ -64,7 +55,7 @@ describe('Integration', function () {
     return new Promise((resolve, reject) => {
       client = new FtpClient();
       client.once('ready', () => resolve(client));
-      client.once('error', (err) => reject(err));
+      client.once('error', err => reject(err));
       client.connect(_.assign({
         host: server.url.hostname,
         port: server.url.port,
@@ -72,7 +63,7 @@ describe('Integration', function () {
         password: 'test'
       }, options));
     })
-    .then((instance) => {
+    .then(instance => {
       client = instance;
     });
   }
@@ -80,8 +71,8 @@ describe('Integration', function () {
   function closeClient() {
     return new Promise((resolve, reject) => {
       client.once('close', () => resolve());
-      client.once('error', (err) => reject(err));
-      client.logout((err) => {
+      client.once('error', err => reject(err));
+      client.logout(err => {
         expect(err).to.be.undefined;
       });
     });
@@ -92,7 +83,7 @@ describe('Integration', function () {
     if (!dirExists) return;
 
     const list = fs.readdirSync(dir);
-    list.map((item) => nodePath.resolve(dir, item)).forEach((item) => {
+    list.map(item => nodePath.resolve(dir, item)).forEach(item => {
       const itemExists = fs.existsSync(dir);
       if (!itemExists) return;
 
@@ -113,7 +104,7 @@ describe('Integration', function () {
 
     after(() => directoryPurge(`${clientDirectory}/${name}/`));
 
-    it('STAT', (done) => {
+    it('STAT', done => {
       client.status((err, status) => {
         expect(err).to.not.exist;
         expect(status).to.equal('Status OK');
@@ -121,7 +112,7 @@ describe('Integration', function () {
       });
     });
 
-    it('SYST', (done) => {
+    it('SYST', done => {
       client.system((err, os) => {
         expect(err).to.not.exist;
         expect(os).to.equal('UNIX');
@@ -129,7 +120,7 @@ describe('Integration', function () {
       });
     });
 
-    it('CWD ..', (done) => {
+    it('CWD ..', done => {
       client.cwd('..', (err, data) => {
         expect(err).to.not.exist;
         expect(data).to.equal('/');
@@ -137,7 +128,7 @@ describe('Integration', function () {
       });
     });
 
-    it(`CWD ${name}`, (done) => {
+    it(`CWD ${name}`, done => {
       client.cwd(`${name}`, (err, data) => {
         expect(err).to.not.exist;
         expect(data).to.equal(`/${name}`);
@@ -145,7 +136,7 @@ describe('Integration', function () {
       });
     });
 
-    it('PWD', (done) => {
+    it('PWD', done => {
       client.pwd((err, data) => {
         expect(err).to.not.exist;
         expect(data).to.equal(`/${name}`);
@@ -153,7 +144,7 @@ describe('Integration', function () {
       });
     });
 
-    it('LIST .', (done) => {
+    it('LIST .', done => {
       client.list('.', (err, data) => {
         expect(err).to.not.exist;
         expect(data).to.be.an('array');
@@ -163,7 +154,7 @@ describe('Integration', function () {
       });
     });
 
-    it('LIST fake.txt', (done) => {
+    it('LIST fake.txt', done => {
       client.list('fake.txt', (err, data) => {
         expect(err).to.not.exist;
         expect(data).to.be.an('array');
@@ -173,7 +164,7 @@ describe('Integration', function () {
       });
     });
 
-    it('STOR fail.txt', (done) => {
+    it('STOR fail.txt', done => {
       const buffer = Buffer.from('test text file');
       const fsPath = `${clientDirectory}/${name}/fail.txt`;
 
@@ -185,7 +176,7 @@ describe('Integration', function () {
         return stream;
       });
 
-      client.put(buffer, 'fail.txt', (err) => {
+      client.put(buffer, 'fail.txt', err => {
         setImmediate(() => {
           const fileExists = fs.existsSync(fsPath);
           expect(err).to.exist;
@@ -195,15 +186,15 @@ describe('Integration', function () {
       });
     });
 
-    it('STOR tést.txt', (done) => {
+    it('STOR tést.txt', done => {
       const buffer = Buffer.from('test text file');
       const fsPath = `${clientDirectory}/${name}/tést.txt`;
 
-      connection.once('STOR', (err) => {
+      connection.once('STOR', err => {
         expect(err).to.not.exist;
       });
 
-      client.put(buffer, 'tést.txt', (err) => {
+      client.put(buffer, 'tést.txt', err => {
         expect(err).to.not.exist;
         setImmediate(() => {
           expect(fs.existsSync(fsPath)).to.equal(true);
@@ -216,10 +207,10 @@ describe('Integration', function () {
       });
     });
 
-    it('APPE tést.txt', (done) => {
+    it('APPE tést.txt', done => {
       const buffer = Buffer.from(', awesome!');
       const fsPath = `${clientDirectory}/${name}/tést.txt`;
-      client.append(buffer, 'tést.txt', (err) => {
+      client.append(buffer, 'tést.txt', err => {
         expect(err).to.not.exist;
         setImmediate(() => {
           expect(fs.existsSync(fsPath)).to.equal(true);
@@ -232,15 +223,15 @@ describe('Integration', function () {
       });
     });
 
-    it('RETR tést.txt', (done) => {
-      connection.once('RETR', (err) => {
+    it('RETR tést.txt', done => {
+      connection.once('RETR', err => {
         expect(err).to.not.exist;
       });
 
       client.get('tést.txt', (err, stream) => {
         expect(err).to.not.exist;
         let text = '';
-        stream.on('data', (data) => {
+        stream.on('data', data => {
           text += data.toString();
         });
         stream.on('end', () => {
@@ -251,8 +242,8 @@ describe('Integration', function () {
       });
     });
 
-    it('RNFR tést.txt, RNTO awesome.txt', (done) => {
-      client.rename('tést.txt', 'awesome.txt', (err) => {
+    it('RNFR tést.txt, RNTO awesome.txt', done => {
+      client.rename('tést.txt', 'awesome.txt', err => {
         expect(err).to.not.exist;
         expect(fs.existsSync(`${clientDirectory}/${name}/tést.txt`)).to.equal(false);
         expect(fs.existsSync(`${clientDirectory}/${name}/awesome.txt`)).to.equal(true);
@@ -264,7 +255,7 @@ describe('Integration', function () {
       });
     });
 
-    it('SIZE awesome.txt', (done) => {
+    it('SIZE awesome.txt', done => {
       client.size('awesome.txt', (err, size) => {
         expect(err).to.not.exist;
         expect(size).to.be.a('number');
@@ -272,7 +263,7 @@ describe('Integration', function () {
       });
     });
 
-    it('MDTM awesome.txt', (done) => {
+    it('MDTM awesome.txt', done => {
       client.lastMod('awesome.txt', (err, modTime) => {
         expect(err).to.not.exist;
         expect(modTime).to.be.instanceOf(Date);
@@ -281,14 +272,14 @@ describe('Integration', function () {
       });
     });
 
-    it.skip('MLSD .', (done) => {
+    it.skip('MLSD .', done => {
       client.mlsd('.', () => {
         done();
       });
     });
 
-    it('SITE CHMOD 700 awesome.txt', (done) => {
-      client.site('CHMOD 600 awesome.txt', (err) => {
+    it('SITE CHMOD 700 awesome.txt', done => {
+      client.site('CHMOD 600 awesome.txt', err => {
         expect(err).to.not.exist;
         fs.stat(`${clientDirectory}/${name}/awesome.txt`, (fserr, stats) => {
           expect(fserr).to.not.exist;
@@ -299,27 +290,27 @@ describe('Integration', function () {
       });
     });
 
-    it('DELE awesome.txt', (done) => {
-      client.delete('awesome.txt', (err) => {
+    it('DELE awesome.txt', done => {
+      client.delete('awesome.txt', err => {
         expect(err).to.not.exist;
         expect(fs.existsSync(`${clientDirectory}/${name}/awesome.txt`)).to.equal(false);
         done();
       });
     });
 
-    it('MKD témp', (done) => {
+    it('MKD témp', done => {
       const path = `${clientDirectory}/${name}/témp`;
       if (fs.existsSync(path)) {
         fs.rmdirSync(path);
       }
-      client.mkdir('témp', (err) => {
+      client.mkdir('témp', err => {
         expect(err).to.not.exist;
         expect(fs.existsSync(path)).to.equal(true);
         done();
       });
     });
 
-    it('CWD témp', (done) => {
+    it('CWD témp', done => {
       client.cwd('témp', (err, data) => {
         expect(err).to.not.exist;
         expect(data).to.to.be.a('string');
@@ -327,23 +318,23 @@ describe('Integration', function () {
       });
     });
 
-    it('CDUP', (done) => {
-      client.cdup((err) => {
+    it('CDUP', done => {
+      client.cdup(err => {
         expect(err).to.not.exist;
         done();
       });
     });
 
-    it('RMD témp', (done) => {
-      client.rmdir('témp', (err) => {
+    it('RMD témp', done => {
+      client.rmdir('témp', err => {
         expect(err).to.not.exist;
         expect(fs.existsSync(`${clientDirectory}/${name}/témp`)).to.equal(false);
         done();
       });
     });
 
-    it('CDUP', (done) => {
-      client.cdup((err) => {
+    it('CDUP', done => {
+      client.cdup(err => {
         expect(err).to.not.exist;
         done();
       });
@@ -362,8 +353,8 @@ describe('Integration', function () {
 
     after(() => closeClient(client));
 
-    it('TYPE A', (done) => {
-      client.ascii((err) => {
+    it('TYPE A', done => {
+      client.ascii(err => {
         expect(err).to.not.exist;
         done();
       });
@@ -384,8 +375,8 @@ describe('Integration', function () {
 
     after(() => closeClient(client));
 
-    it('TYPE I', (done) => {
-      client.binary((err) => {
+    it('TYPE I', done => {
+      client.binary(err => {
         expect(err).to.not.exist;
         done();
       });
@@ -397,14 +388,12 @@ describe('Integration', function () {
   describe('#EXPLICIT', function () {
     before(() => {
       return server.close()
-      .then(() => Promise.all([
-        readFile(`${process.cwd()}/test/cert/server.key`),
-        readFile(`${process.cwd()}/test/cert/server.crt`),
-        readFile(`${process.cwd()}/test/cert/server.csr`)
-      ]))
-      .then(([key, cert, ca]) => startServer({
-        url: 'ftp://127.0.0.1:8880',
-        tls: {key, cert, ca}
+      .then(() => startServer('ftp://127.0.0.1:8880', {
+        tls: {
+          key: `${process.cwd()}/test/cert/server.key`,
+          cert: `${process.cwd()}/test/cert/server.crt`,
+          ca: `${process.cwd()}/test/cert/server.csr`
+        }
       }))
       .then(() => {
         return connectClient({
@@ -425,14 +414,12 @@ describe('Integration', function () {
   describe.skip('#IMPLICIT', function () {
     before(() => {
       return server.close()
-      .then(() => Promise.all([
-        readFile(`${process.cwd()}/test/cert/server.key`),
-        readFile(`${process.cwd()}/test/cert/server.crt`),
-        readFile(`${process.cwd()}/test/cert/server.csr`)
-      ]))
-      .then(([key, cert, ca]) => startServer({
-        url: 'ftps://127.0.0.1:8880',
-        tls: {key, cert, ca}
+      .then(() => startServer('ftps://127.0.0.1:8880', {
+        tls: {
+          key: `${process.cwd()}/test/cert/server.key`,
+          cert: `${process.cwd()}/test/cert/server.crt`,
+          ca: `${process.cwd()}/test/cert/server.csr`
+        }
       }))
       .then(() => {
         return connectClient({

test/start.js

@@ -1,17 +1,18 @@
 require('dotenv').load();
 const bunyan = require('bunyan');
-const fs = require('fs');
+
 const FtpServer = require('../src');
 
-const server = new FtpServer({
-  log: bunyan.createLogger({name: 'test', level: 'trace'}),
-  url: 'ftp://127.0.0.1:8880',
-  pasv_min: 8881,
+const log = bunyan.createLogger({name: 'test'});
+log.level('trace');
+const server = new FtpServer('ftp://127.0.0.1:8880', {
+  log,
+  pasv_range: 8881,
   greeting: ['Welcome', 'to', 'the', 'jungle!'],
   tls: {
-    key: fs.readFileSync(`${process.cwd()}/test/cert/server.key`),
-    cert: fs.readFileSync(`${process.cwd()}/test/cert/server.crt`),
-    ca: fs.readFileSync(`${process.cwd()}/test/cert/server.csr`)
+    key: `${process.cwd()}/test/cert/server.key`,
+    cert: `${process.cwd()}/test/cert/server.crt`,
+    ca: `${process.cwd()}/test/cert/server.csr`
   },
   file_format: 'ep',
   anonymous: 'sillyrabbit'