evernode-js-client 0.6.48 → 0.6.49

package/index.js

@@ -61222,7 +61222,7 @@ class HostClient extends BaseEvernodeClient {
      */
     async getLeaseByIndex(index) {
         const token = await EvernodeHelpers.getLeaseByIndex(this.xrplApi, index);
-        if (token.Issuer !== this.xrplAcc.address)
+        if (token?.Issuer !== this.xrplAcc.address)
             return null;
         return token;
     }
@@ -62335,10 +62335,10 @@ class TenantClient extends BaseEvernodeClient {
         super(xrpAddress, xrpSecret, Object.values(TenantEvents), false, options);
     }
 
-    async prepareAccount() {
+    async prepareAccount(options = {}) {
         try {
             if (!await this.xrplAcc.getMessageKey())
-                await this.xrplAcc.setAccountFields({ MessageKey: this.accKeyPair.publicKey });
+                await this.xrplAcc.setAccountFields({ MessageKey: this.accKeyPair.publicKey }, options);
         }
         catch (err) {
             console.log("Error in preparing user xrpl account for Evernode.", err);
@@ -62464,21 +62464,29 @@ class TenantClient extends BaseEvernodeClient {
 
             let relevantTx = null;
             while (!rejected && !relevantTx) {
-                const txList = await this.xrplAcc.getAccountTrx(tx.details.ledger_index);
-                for (let t of txList) {
-                    t.tx.Memos = TransactionHelper.deserializeMemos(t.tx?.Memos);
-                    t.tx.HookParameters = TransactionHelper.deserializeHookParams(t.tx?.HookParameters);
-
-                    if (t.meta?.delivered_amount)
-                        t.tx.DeliveredAmount = t.meta.delivered_amount;
-
-                    const res = await this.extractEvernodeEvent(t.tx);
-                    if ((res?.name === EvernodeEvents.AcquireSuccess || res?.name === EvernodeEvents.AcquireError) && res?.data?.acquireRefId === tx.id) {
-                        clearTimeout(failTimeout);
-                        relevantTx = res;
-                        break;
+                try {
+                    const txList = await this.xrplAcc.getAccountTrx(tx.details.ledger_index);
+                    for (let t of txList) {
+                        t.tx.Memos = TransactionHelper.deserializeMemos(t.tx?.Memos);
+                        t.tx.HookParameters = TransactionHelper.deserializeHookParams(t.tx?.HookParameters);
+
+                        if (t.meta?.delivered_amount)
+                            t.tx.DeliveredAmount = t.meta.delivered_amount;
+
+                        const res = await this.extractEvernodeEvent(t.tx);
+                        if ((res?.name === EvernodeEvents.AcquireSuccess || res?.name === EvernodeEvents.AcquireError) && res?.data?.acquireRefId === tx.id) {
+                            clearTimeout(failTimeout);
+                            relevantTx = res;
+                            break;
+                        }
                     }
                 }
+                catch (e) {
+                    rejected = true;
+                    clearTimeout(failTimeout);
+                    reject({ error: ErrorCodes.ACQUIRE_ERR, reason: 'UNKNOWN', acquireRefId: tx.id });
+                    break;
+                }
                 await new Promise(resolveSleep => setTimeout(resolveSleep, 2000));
             }
 
@@ -62579,21 +62587,29 @@ class TenantClient extends BaseEvernodeClient {
 
             let relevantTx = null;
             while (!rejected && !relevantTx) {
-                const txList = await this.xrplAcc.getAccountTrx(tx.details.ledger_index);
-                for (let t of txList) {
-                    t.tx.Memos = TransactionHelper.deserializeMemos(t.tx.Memos);
-                    t.tx.HookParameters = TransactionHelper.deserializeHookParams(t.tx?.HookParameters);
-
-                    if (t.meta?.delivered_amount)
-                        t.tx.DeliveredAmount = t.meta.delivered_amount;
-
-                    const res = await this.extractEvernodeEvent(t.tx);
-                    if ((res?.name === TenantEvents.ExtendSuccess || res?.name === TenantEvents.ExtendError) && res?.data?.extendRefId === tx.id) {
-                        clearTimeout(failTimeout);
-                        relevantTx = res;
-                        break;
+                try {
+                    const txList = await this.xrplAcc.getAccountTrx(tx.details.ledger_index);
+                    for (let t of txList) {
+                        t.tx.Memos = TransactionHelper.deserializeMemos(t.tx.Memos);
+                        t.tx.HookParameters = TransactionHelper.deserializeHookParams(t.tx?.HookParameters);
+
+                        if (t.meta?.delivered_amount)
+                            t.tx.DeliveredAmount = t.meta.delivered_amount;
+
+                        const res = await this.extractEvernodeEvent(t.tx);
+                        if ((res?.name === TenantEvents.ExtendSuccess || res?.name === TenantEvents.ExtendError) && res?.data?.extendRefId === tx.id) {
+                            clearTimeout(failTimeout);
+                            relevantTx = res;
+                            break;
+                        }
                     }
                 }
+                catch (e) {
+                    rejected = true;
+                    clearTimeout(failTimeout);
+                    reject({ error: ErrorCodes.EXTEND_ERR, reason: 'UNKNOWN', extendRefId: tx.id });
+                    break;
+                }
                 await new Promise(resolveSleep => setTimeout(resolveSleep, 1000));
             }
 
@@ -62608,7 +62624,8 @@ class TenantClient extends BaseEvernodeClient {
                     reject({
                         error: ErrorCodes.EXTEND_ERR,
                         transaction: relevantTx?.data.transaction,
-                        reason: relevantTx?.data.reason
+                        reason: relevantTx?.data.reason,
+                        extendRefId: relevantTx?.data.extendRefId
                     });
                 }
             }
@@ -65613,7 +65630,12 @@ class XrplApi {
                         this.#events.emit(XrplApiEvents.SERVER_DESYNCED, { "event_type": "on_alert", "server_state": serverState });
                     }
                 } catch (e) {
-                    console.log("Error occurred while listening to server de-syncs.", e)
+                    if (e.name === 'TimeoutError') {
+                        console.error("Server timeout detected.");
+                        this.#events.emit(XrplApiEvents.DISCONNECTED, 408);
+                    }
+                    else
+                        console.error("Error occurred while listening to server de-syncs.", e);
                 } finally {
                     clearTimeout(ledgerTimeout);
                 }

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