evernode-js-client 0.6.49 → 0.6.50

package/index.js

@@ -65484,7 +65484,6 @@ const { TransactionHelper } = __nccwpck_require__(7071);
 const { XrplApiEvents } = __nccwpck_require__(3307);
 const { XrplAccount } = __nccwpck_require__(9329);
 const { XrplHelpers } = __nccwpck_require__(3189);
-const { UtilHelpers } = __nccwpck_require__(6687);
 
 const MAX_PAGE_LIMIT = 400;
 const API_REQ_TYPE = {
@@ -65535,7 +65534,7 @@ class XrplApi {
     }
 
     async #acquireClient() {
-        while (!(this.#isPrimaryServerConnected || this.#isFallbackServerConnected) && this.#isClientAcquired || this.#isConnectionAcquired) {
+        while (!(this.#isPrimaryServerConnected || this.#isFallbackServerConnected) && this.#isClientAcquired) {
             await new Promise((resolve) => setTimeout(resolve, 100));
         }
         this.#isClientAcquired = true;
@@ -65546,7 +65545,7 @@ class XrplApi {
     }
 
     async #acquireConnection() {
-        while (this.#isClientAcquired) {
+        while (this.#isConnectionAcquired) {
             await new Promise((resolve) => setTimeout(resolve, 100));
         }
         this.#isConnectionAcquired = true;
@@ -65581,8 +65580,6 @@ class XrplApi {
 
         if (!FUNCTIONING_SERVER_STATES.includes(serverState))
             throw "Client might have functioning issues."
-
-        await this.#setXrplClient(client);
     }
 
     async #initEventListeners(client) {
@@ -65597,6 +65594,10 @@ 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);
 
@@ -65698,50 +65699,51 @@ class XrplApi {
         });
     }
 
-    async #attemptFallbackServerReconnect(maxAttempts = null) {
+    async #attemptFallbackServerReconnect(maxRounds, attemptsPerServer = 3) {
         if (!this.#fallbackServers || this.#fallbackServers?.length == 0)
             return;
 
         await this.#acquireClient();
 
-        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;
+        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;
                     }
-                    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();
+                    ++attempt;
+                    const client = new xrpl.Client(server, this.#xrplClientOptions);
+                    try {
+                        if (!this.#isPrimaryServerConnected) {
+                            await this.#handleClientConnect(client);
+                            this.#isFallbackServerConnected = true;
+                        }
+                        break serverIterator;
                     }
-
-                    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 };
+                    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();
                         }
 
-                        await new Promise(resolve => setTimeout(resolve, delaySec * 1000));
+                        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 (maxAttempts && attempt >= maxAttempts)
-                return { error: Object.values(errors) };
         }
 
         return {};
@@ -65793,9 +65795,9 @@ class XrplApi {
         }
         else {
             if (this.#primaryServer) {
-                res = await Promise.all([this.#attemptPrimaryServerReconnect(1), this.#attemptFallbackServerReconnect(1)]);
+                res = await Promise.all([this.#attemptPrimaryServerReconnect(1), this.#attemptFallbackServerReconnect(1, 1)]);
             } else {
-                res = [await this.#attemptFallbackServerReconnect(1)];
+                res = [await this.#attemptFallbackServerReconnect(1, 1)];
             }
         }
 
@@ -65925,7 +65927,7 @@ class XrplApi {
         const info = await this.getAccountInfo(address);
         const accountFlags = xrpl.parseAccountRootFlags(info.Flags);
         const regularKey = info.RegularKey;
-        const derivedPubKeyAddress = UtilHelpers.deriveAddress(publicKey);
+        const derivedPubKeyAddress = kp.deriveAddress(publicKey);
 
         // If the master key is disabled the derived pubkey address should be the regular key.
         // Otherwise it could be account address or the regular key

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.49",
+    "version": "0.6.50",
     "dependencies": {
         "elliptic": "6.5.4",
         "libsodium-wrappers": "0.7.10",