fix: Server listening

Author: Rapsssito

TcpServer.js

@@ -21,11 +21,11 @@ export default class TcpServer extends TcpSocket {
 
     listen(port, host, callback) {
         host = host || '0.0.0.0';
-        const listenEvent = this._eventEmitter.addListener('listening', () => {
-            this._eventEmitter.removeSubscription(listenEvent);
-            if (callback) callback();
+        const connectListener = this._eventEmitter.addListener('connect', (ev) => {
+            if (this._id !== ev.id) return;
+            connectListener.remove();
+            if (callback) callback(ev.address);
         });
-
         this._registerEvents();
         this._eventEmitter.addListener('connection', (ev) => {
             if (this._id !== ev.id) return;

TcpSocket.js

@@ -53,9 +53,10 @@ export default class TcpSocket {
         options.localPort = Number(options.localPort) || 0;
         options.localAddress = options.localAddress || '0.0.0.0';
         options.interface = options.interface || '';
-        const connectListener = this._eventEmitter.addListener('connect', (address) => {
+        const connectListener = this._eventEmitter.addListener('connect', (ev) => {
+            if (this._id !== ev.id) return;
             connectListener.remove();
-            if (callback) callback(address);
+            if (callback) callback(ev.address);
         });
         if (options.timeout) this.setTimeout(options.timeout);
         else if (this._timeout) this._activeTimer(this._timeout.msecs);