evernode-js-client 0.6.42 → 0.6.43

package/index.js

@@ -9189,7 +9189,7 @@ module.exports = { mask, unmask };
 
 
 try {
-  module.exports = require(__nccwpck_require__.ab + "prebuilds/linux-x64/node.napi1.node");
+  module.exports = require(__nccwpck_require__.ab + "prebuilds/linux-x64/node.napi.node");
 } catch (e) {
   module.exports = __nccwpck_require__(2567);
 }
@@ -38321,7 +38321,7 @@ module.exports = isValidUTF8;
 
 
 try {
-  module.exports = require(__nccwpck_require__.ab + "prebuilds/linux-x64/node.napi.node");
+  module.exports = require(__nccwpck_require__.ab + "prebuilds/linux-x64/node.napi1.node");
 } catch (e) {
   module.exports = __nccwpck_require__(9372);
 }
@@ -60240,7 +60240,7 @@ class BaseEvernodeClient {
      * Get the hosts registered in Evernode.
      * @returns The list of hosts. 
      */
-    async getAllHostsFromLedger(skipGetDomain = false) {
+    async getAllHostsFromLedger(getDomain = true) {
         const states = await this.getHookStates();
         let hosts = {};
 
@@ -60260,7 +60260,7 @@ class BaseEvernodeClient {
         const curMomentStartIdx = await this.getMomentStartIndex();
         await Promise.all((hostList).map(async host => {
             const hostAcc = new XrplAccount(host.address, null, { xrplApi: this.xrplApi });
-            if (!skipGetDomain) {
+            if (getDomain) {
                 host.domain = await hostAcc.getDomain();
             }
             host.active = (host.lastHeartbeatIndex > (this.config.hostHeartbeatFreq * this.config.momentSize) ?
@@ -65022,7 +65022,7 @@ class XrplApi {
     }
 
     async #acquireClient() {
-        while (!(this.#isPrimaryServerConnected || this.#isFallbackServerConnected) && this.#isClientAcquired) {
+        while (!(this.#isPrimaryServerConnected || this.#isFallbackServerConnected) && this.#isClientAcquired || this.#isConnectionAcquired) {
             await new Promise((resolve) => setTimeout(resolve, 100));
         }
         this.#isClientAcquired = true;
@@ -65033,7 +65033,7 @@ class XrplApi {
     }
 
     async #acquireConnection() {
-        while (this.#isConnectionAcquired) {
+        while (this.#isClientAcquired) {
             await new Promise((resolve) => setTimeout(resolve, 100));
         }
         this.#isConnectionAcquired = true;
@@ -65068,6 +65068,8 @@ class XrplApi {
 
         if (!FUNCTIONING_SERVER_STATES.includes(serverState))
             throw "Client might have functioning issues."
+
+        await this.#setXrplClient(client);
     }
 
     async #initEventListeners(client) {
@@ -65082,10 +65084,6 @@ class XrplApi {
             console.log(errorCode + ': ' + errorMessage);
         });
 
-        client.on('connected', async () => {
-            await this.#setXrplClient(client)
-        });
-
         client.on('disconnected', async (code) => {
             this.#events.emit(XrplApiEvents.DISCONNECTED, code);
 
@@ -65182,51 +65180,50 @@ class XrplApi {
         });
     }
 
-    async #attemptFallbackServerReconnect(maxRounds, attemptsPerServer = 3) {
+    async #attemptFallbackServerReconnect(maxAttempts = null) {
         if (!this.#fallbackServers || this.#fallbackServers?.length == 0)
             return;
 
         await this.#acquireClient();
 
-        const fallbackServers = this.#fallbackServers;
-        let round = 0;
-        while (!this.#isPermanentlyDisconnected && !this.#isPrimaryServerConnected && !this.#isFallbackServerConnected && (!maxRounds || round < maxRounds)) { // Keep attempting until consumer calls disconnect() manually or if the primary server is disconnected.
-            ++round;
-            serverIterator:
-            for (let serverIndex in fallbackServers) {
-                const server = fallbackServers[serverIndex];
-                for (let attempt = 0; attempt < attemptsPerServer;) {
-                    if (this.#isPrimaryServerConnected || this.#isPermanentlyDisconnected) {
-                        break serverIterator;
+        let errors = {};
+        let attempt = 0;
+        retryIterator:
+        while (!this.#isPermanentlyDisconnected && !this.#isPrimaryServerConnected && !this.#isFallbackServerConnected) { // Keep attempting until consumer calls disconnect() manually or if the primary server is disconnected.
+            ++attempt;
+            for (const server of this.#fallbackServers) {
+                const client = new xrpl.Client(server, this.#xrplClientOptions);
+                try {
+                    if (!this.#isPrimaryServerConnected) {
+                        await this.#handleClientConnect(client);
+                        this.#isFallbackServerConnected = true;
                     }
-                    ++attempt;
-                    const client = new xrpl.Client(server, this.#xrplClientOptions);
-                    try {
-                        if (!this.#isPrimaryServerConnected) {
-                            await this.#handleClientConnect(client);
-                            this.#isFallbackServerConnected = true;
-                        }
-                        break serverIterator;
+                    break retryIterator;
+                }
+                catch (e) {
+                    this.#releaseClient();
+                    console.log(`Error occurred while connecting to fallback server ${server}`);
+                    await new Promise(resolve => setTimeout(resolve, 1000));
+                    if (client.isConnected()) {
+                        console.log('Connection closure already handled');
+                        await client.disconnect();
                     }
-                    catch (e) {
-                        this.#releaseClient();
-                        console.log(`Error occurred while connecting to fallback server ${server}`);
-                        await new Promise(resolve => setTimeout(resolve, 1000));
-                        if (client.isConnected()) {
-                            console.log('Connection closure already handled');
-                            await client.disconnect();
-                        }
 
-                        if (!this.#isPermanentlyDisconnected) {
-                            if (!maxRounds || round < maxRounds)
-                                console.log(`Fallback server ${server} connection attempt ${attempt} failed. Retrying in ${2 * round}s...`);
-                            else
-                                return { error: `Fallback server ${server} connection max attempts failed.`, exception: e };
-                            await new Promise(resolve => setTimeout(resolve, 2 * round * 1000));
+                    if (!this.#isPermanentlyDisconnected) {
+                        const delaySec = 2 * attempt; // Retry with backoff delay.
+                        if (!maxAttempts || attempt < maxAttempts)
+                            console.log(`Fallback server ${server} connection attempt ${attempt} failed. Retrying in ${delaySec}s...`);
+                        else {
+                            errors[server] = { error: `Fallback server ${server} connection max attempts failed.`, exception: e };
                         }
+
+                        await new Promise(resolve => setTimeout(resolve, delaySec * 1000));
                     }
                 }
             }
+
+            if (maxAttempts && attempt >= maxAttempts)
+                return { error: Object.values(errors) };
         }
 
         return {};
@@ -65278,9 +65275,9 @@ class XrplApi {
         }
         else {
             if (this.#primaryServer) {
-                res = await Promise.all([this.#attemptPrimaryServerReconnect(1), this.#attemptFallbackServerReconnect(1, 1)]);
+                res = await Promise.all([this.#attemptPrimaryServerReconnect(1), this.#attemptFallbackServerReconnect(1)]);
             } else {
-                res = [await this.#attemptFallbackServerReconnect(1, 1)];
+                res = [await this.#attemptFallbackServerReconnect(1)];
             }
         }
 

package/package.json

@@ -6,7 +6,7 @@
     ],
     "homepage": "https://github.com/HotPocketDev/evernode-js-client",
     "license": "SEE LICENSE IN https://raw.githubusercontent.com/EvernodeXRPL/evernode-resources/main/license/evernode-license.pdf",
-    "version": "0.6.42",
+    "version": "0.6.43",
     "dependencies": {
         "elliptic": "6.5.4",
         "libsodium-wrappers": "0.7.10",