evernode-js-client 0.6.15 → 0.6.16

package/index.js

@@ -12443,6 +12443,16 @@ class BaseEvernodeClient {
             fullHostList = fullHostList.concat(hosts);
         }
 
+        const curMomentStartIdx = await this.getMomentStartIndex();
+        await Promise.all((fullHostList).map(async host => {
+            const hostAcc = new XrplAccount(host.address, null, { xrplApi: this.xrplApi });
+            host.domain = await hostAcc.getDomain();
+            host.active = (host.lastHeartbeatIndex > (this.config.hostHeartbeatFreq * this.config.momentSize) ?
+                (host.lastHeartbeatIndex >= (curMomentStartIdx - (this.config.hostHeartbeatFreq * this.config.momentSize))) :
+                (host.lastHeartbeatIndex > 0));
+            return host;
+        }));
+
         return fullHostList;
     }
 
@@ -17141,33 +17151,49 @@ class XrplApi {
     #client;
     #events = new EventEmitter();
     #addressSubscriptions = [];
-    #maintainConnection = false;
+    #initialConnectCalled = false;
+    #isPermanentlyDisconnected = false;
+    #autoReconnect;
 
     constructor(rippledServer = null, options = {}) {
-
         this.#rippledServer = rippledServer || DefaultValues.rippledServer;
         this.#initXrplClient(options.xrplClientOptions);
+        this.#autoReconnect = options.autoReconnect ?? true;
     }
 
     async #initXrplClient(xrplClientOptions = {}) {
-
         if (this.#client) { // If the client already exists, clean it up.
             this.#client.removeAllListeners(); // Remove existing event listeners to avoid them getting called from the old client object.
             await this.#client.disconnect();
             this.#client = null;
         }
 
-        this.#client = new xrpl.Client(this.#rippledServer, xrplClientOptions);
+        try {
+            this.#client = new xrpl.Client(this.#rippledServer, xrplClientOptions);
+        }
+        catch (e) {
+            console.log("Error occurred in Client initiation:", e)
+        }
 
         this.#client.on('error', (errorCode, errorMessage) => {
             console.log(errorCode + ': ' + errorMessage);
         });
 
+        this.#client.on('reconnect', () => {
+            console.log("Reconnecting....");
+        });
+
         this.#client.on('disconnected', (code) => {
-            if (this.#maintainConnection) {
+            this.#autoReconnect && console.log(" : ", this.#autoReconnect)
+            if (this.#autoReconnect && !this.#isPermanentlyDisconnected) {
                 console.log(`Connection failure for ${this.#rippledServer} (code:${code})`);
-                console.log("Reinitializing xrpl client.");
-                this.#initXrplClient().then(() => this.#connectXrplClient(true));
+                console.log("Re-initializing xrpl client.");
+                try {
+                    this.#initXrplClient().then(() => this.#connectXrplClient(true));
+                }
+                catch (e) {
+                    console.log("Error occurred while re-initializing", e)
+                }
             }
         });
 
@@ -17217,6 +17243,7 @@ class XrplApi {
                     }
                 }
             }
+
         });
     }
 
@@ -17224,14 +17251,15 @@ class XrplApi {
 
         if (reconnect) {
             let attempts = 0;
-            while (this.#maintainConnection) { // Keep attempting until consumer calls disconnect() manually.
+            while (!this.#isPermanentlyDisconnected) { // Keep attempting until consumer calls disconnect() manually.
                 console.log(`Reconnection attempt ${++attempts}`);
                 try {
                     await this.#client.connect();
                     break;
                 }
-                catch {
-                    if (this.#maintainConnection) {
+                catch (e) {
+                    console.log("Error occurred while re-connecting", e)
+                    if (!this.#isPermanentlyDisconnected) {
                         const delaySec = 2 * attempts; // Retry with backoff delay.
                         console.log(`Attempt ${attempts} failed. Retrying in ${delaySec}s...`);
                         await new Promise(resolve => setTimeout(resolve, delaySec * 1000));
@@ -17246,7 +17274,7 @@ class XrplApi {
 
         // After connection established, check again whether maintainConnections has become false.
         // This is in case the consumer has called disconnect() while connection is being established.
-        if (this.#maintainConnection) {
+        if (!this.#isPermanentlyDisconnected) {
             this.ledgerIndex = await this.#client.getLedgerIndex();
             this.#subscribeToStream('ledger');
 
@@ -17295,15 +17323,17 @@ class XrplApi {
     }
 
     async connect() {
-        if (this.#maintainConnection)
-            return;
-
-        this.#maintainConnection = true;
+        if (this.#initialConnectCalled) {
+            return
+        }
+        this.#initialConnectCalled = true
+        this.#isPermanentlyDisconnected = false
         await this.#connectXrplClient();
     }
 
     async disconnect() {
-        this.#maintainConnection = false;
+        this.#initialConnectCalled = false;
+        this.#isPermanentlyDisconnected = true
 
         if (this.#client.isConnected()) {
             await this.#client.disconnect().catch(console.error);

package/package.json

@@ -6,7 +6,7 @@
     ],
     "homepage": "https://github.com/HotPocketDev/evernode-js-client",
     "license": "MIT",
-    "version": "0.6.15",
+    "version": "0.6.16",
     "dependencies": {
         "elliptic": "6.5.4",
         "libsodium-wrappers": "0.7.10",