feat: async init and connect

DIY0R · Dec 13, 2024 · e9ecf84 · e9ecf84
1 parent 604bc66
commit e9ecf84
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 16 deletions.
diff --git a/index.js b/index.js
@@ -1,4 +1,7 @@
 const Messaging = require('./lib/messaging');
 const constants = require('./lib/constants');
 
-module.exports = { ClapPeer: Messaging, ...constants };
+module.exports = {
+  ClapPeer: (...params) => new Messaging(...params),
+  ...constants,
+};
diff --git a/lib/connection.js b/lib/connection.js
@@ -7,15 +7,22 @@ const { EVENTS, ERRORS } = require('./constants');
 
 class Connection extends EventEmitter {
   #connections = new Map();
-
-  constructor(port, targetNode) {
+  _fulfill = null;
+  _reject = null;
+  _started = false;
+  port = 0;
+  constructor() {
     super();
-    this.#start(port, targetNode);
   }
 
   connect(targetNode) {
-    const socket = new net.Socket();
-    socket.connect(targetNode, () => this.#handleConnection(socket));
+    return new Promise(resolve => {
+      const socket = new net.Socket();
+      socket.connect(targetNode, () => {
+        this.#handleConnection(socket);
+        resolve();
+      });
+    });
   }
 
   #handleConnection(socket) {
@@ -37,9 +44,10 @@ class Connection extends EventEmitter {
 
   close() {
     for (let [connectionId, socket] of this.#connections) {
-      socket.close();
+      if (!socket.destroyed) socket.destroy();
       this.#deleteConnection(connectionId);
     }
+    this.#connections.clear();
   }
 
   #deleteConnection(connectionId) {
@@ -56,10 +64,15 @@ class Connection extends EventEmitter {
     this._onMessage(connectionId, message);
   }
 
-  #start(port, targetNode = null) {
-    const server = net.createServer(this.#handleConnection.bind(this));
-    server.listen(port, '0.0.0.0');
-    if (targetNode) this.connect(targetNode);
+  _serverStart(port, targetNode = null) {
+    return new Promise((resolve, reject) => {
+      const server = net.createServer(this.#handleConnection.bind(this));
+      server.listen(port, '0.0.0.0', () => {
+        this.port = server.address().port;
+        targetNode ? this.connect(targetNode).then(resolve, reject) : resolve();
+      });
+      server.on('error', error => reject(error));
+    });
   }
 
   #errorHandler(error) {

diff --git a/lib/cryptoRsa.js b/lib/cryptoRsa.js
@@ -11,8 +11,8 @@ class CryptoRSA extends Connection {
   #responseEmitter = new EventEmitter();
   _nodePublicKeys = new Map();
 
-  constructor(port, targetNode) {
-    super(port, targetNode);
+  constructor() {
+    super();
     this.#init();
   }
 

diff --git a/lib/messaging.js b/lib/messaging.js
@@ -10,8 +10,8 @@ class Messaging extends CryptoRSA {
   neighbors = new Map();
 
   constructor(port, nodePrefix, targetNode) {
-    super(port, targetNode);
-    this.#init(nodePrefix);
+    super();
+    return this.#init(nodePrefix, port, targetNode);
   }
 
   async publish(targetNode, message) {
@@ -124,9 +124,11 @@ class Messaging extends CryptoRSA {
     return ttl < 1 || this.#seenMessages.has(messageId);
   }
 
-  #init(nodePrefix) {
+  async #init(nodePrefix, port, targetNode) {
     if (nodePrefix) this.#NODE_ID = nodePrefix + '-' + uuid();
     this.#cleanSeenMessages();
+    await this._serverStart(port, targetNode);
+    return this;
   }
 
   #addSeenMessage(messageId) {