Merge pull request #5 from mailsvb/listenEvents

emit specific listen events

Author: mailsvb

lib/jsftpd.js

@@ -84,14 +84,20 @@ class ftpd {
         this._tcp = net.createServer()
         this._tcp.on('connection', (socket) => this.Handler(this, socket))
         this._tcp.on('error', (err) => this.ErrorHandler(err))
-        this._tcp.on('listening', () => this.DebugHandler(`FTP server listening on ${util.inspect(this._tcp.address(), { showHidden: false, depth: null, breakLength: 'Infinity' })}`))
+        this._tcp.on('listening', () => {
+            this.DebugHandler(`FTP server listening on ${util.inspect(this._tcp.address(), { showHidden: false, depth: null, breakLength: 'Infinity' })}`)
+            this.emit('listen-tcp', this._tcp.address())
+        })
         this._tcp.maxConnections = this._opt.cnf.maxConnections
 
         // setup FTP on TLS
         this._tls = tls.createServer(this._opt.tls)
         this._tls.on('secureConnection', (socket) => this.Handler(this, socket))
         this._tls.on('error', (err) => this.ErrorHandler(err))
-        this._tls.on('listening', () => this.DebugHandler(`FTP server listening on ${util.inspect(this._tls.address(), { showHidden: false, depth: null, breakLength: 'Infinity' })}`))
+        this._tls.on('listening', () => {
+            this.DebugHandler(`FTP server listening on ${util.inspect(this._tls.address(), { showHidden: false, depth: null, breakLength: 'Infinity' })}`)
+            this.emit('listen-tls', this._tls.address())
+        })
         this._tls.maxConnections = this._opt.cnf.maxConnections
     }
 

test/jsftpd.test.js

@@ -38,14 +38,25 @@ test('create ftpd instance without options created with default values', () => {
     expect(server._opt.cnf.securePort).toBe(990)
 });
 
-test('ftp server can be started on non default ports', () => {
+test('ftp server can be started on non default ports', async () => {
     server = new ftpd({tls: {rejectUnauthorized: false}, cnf: {port: 50021, securePort: 50990}})
     expect(server).toBeInstanceOf(ftpd);
     expect(server._opt.cnf.port).toBe(50021)
     expect(server._opt.cnf.securePort).toBe(50990)
     server.start()
     expect(server._tcp.address().port).toBe(50021)
     expect(server._tls.address().port).toBe(50990)
+    server.on('listen-tls', data => expect(data.port).toBe(50990))
+    server.on('listen-tcp', data => expect(data.port).toBe(50021))
+
+    const promiseSocket = new PromiseSocket(new net.Socket())
+    const socket = promiseSocket.stream
+    let content
+    await socket.connect(50021, 'localhost')
+    content = await promiseSocket.read();
+    expect(content.toString().trim()).toBe('220 Welcome')
+
+    await promiseSocket.end()
 });
 
 test('ftp server fails when basefolder does not exist', () => {