feat(connector): return promise on end

QuorumDMS · Jan 10, 2018 · 2255be9 · 2255be9
1 parent d22c911
commit 2255be9
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/connector/base.js b/src/connector/base.js
@@ -27,11 +27,21 @@ class Connector {
   }
 
   end() {
-    if (this.dataSocket) this.dataSocket.end();
-    if (this.dataServer) this.dataServer.close();
-    this.dataSocket = null;
-    this.dataServer = null;
-    this.type = false;
+    const closeDataSocket = new Promise(resolve => {
+      if (this.dataSocket) this.dataSocket.end();
+      else resolve();
+    });
+    const closeDataServer = new Promise(resolve => {
+      if (this.dataServer) this.dataServer.close(() => resolve());
+      else resolve();
+    });
+
+    return Promise.all([closeDataSocket, closeDataServer])
+    .then(() => {
+      this.dataSocket = null;
+      this.dataServer = null;
+      this.type = false;
+    });
   }
 }
 module.exports = Connector;