evernode-js-client 0.5.1 → 0.5.2

package/index.js

@@ -12804,41 +12804,47 @@ class TenantClient extends BaseEvernodeClient {
      * @returns An object including transaction details,instance info, and acquireReference Id.
      */
     async watchAcquireResponse(tx, options = {}) {
-            console.log(`Waiting for acquire response... (txHash: ${tx.id})`);
+        console.log(`Waiting for acquire response... (txHash: ${tx.id})`);
 
+        return new Promise(async (resolve, reject) => {
+            let rejected = false;
             const failTimeout = setTimeout(() => {
-                throw({ error: ErrorCodes.ACQUIRE_ERR, reason: ErrorReasons.TIMEOUT });
+                rejected = true;
+                reject({ error: ErrorCodes.ACQUIRE_ERR, reason: ErrorReasons.TIMEOUT });
             }, options.timeout || DEFAULT_WAIT_TIMEOUT);
-    
+
             let relevantTx = null;
-            while (!relevantTx) {
+            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);
-                        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;
-                        }
+                    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;
+                    }
                 }
-                await new Promise(resolve => setTimeout(resolve, 2000));
+                await new Promise(resolveSleep => setTimeout(resolveSleep, 2000));
             }
-    
-            if (relevantTx?.name === TenantEvents.AcquireSuccess) {
-                return({
-                    transaction: relevantTx?.data.transaction,
-                    instance: relevantTx?.data.payload.content,
-                    acquireRefId: relevantTx?.data.acquireRefId
-                });
-            } else if (relevantTx?.name === TenantEvents.AcquireError) {
-                throw({
-                    error: ErrorCodes.ACQUIRE_ERR,
-                    transaction: relevantTx?.data.transaction,
-                    reason: relevantTx?.data.reason,
-                    acquireRefId: relevantTx?.data.acquireRefId
-                })
+
+            if (!rejected) {
+                if (relevantTx?.name === TenantEvents.AcquireSuccess) {
+                    resolve({
+                        transaction: relevantTx?.data.transaction,
+                        instance: relevantTx?.data.payload.content,
+                        acquireRefId: relevantTx?.data.acquireRefId
+                    });
+                } else if (relevantTx?.name === TenantEvents.AcquireError) {
+                    reject({
+                        error: ErrorCodes.ACQUIRE_ERR,
+                        transaction: relevantTx?.data.transaction,
+                        reason: relevantTx?.data.reason,
+                        acquireRefId: relevantTx?.data.acquireRefId
+                    });
+                }
             }
+        });
     }
 
     /**
@@ -12887,38 +12893,44 @@ class TenantClient extends BaseEvernodeClient {
     async watchExtendResponse(tx, options = {}) {
         console.log(`Waiting for extend lease response... (txHash: ${tx.id})`);
 
-        const failTimeout = setTimeout(() => {
-            throw({ error: ErrorCodes.EXTEND_ERR, reason: ErrorReasons.TIMEOUT });
-        }, options.timeout || DEFAULT_WAIT_TIMEOUT);
-
-        let relevantTx = null;
-        while (!relevantTx) {
-            const txList = await this.xrplAcc.getAccountTrx(tx.details.ledger_index);
-            for (let t of txList) {
-                t.tx.Memos = TransactionHelper.deserializeMemos(t.tx.Memos);
-                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;
+        return new Promise(async (resolve, reject) => {
+            let rejected = false;
+            const failTimeout = setTimeout(() => {
+                rejected = true;
+                reject({ error: ErrorCodes.EXTEND_ERR, reason: ErrorReasons.TIMEOUT });
+            }, options.timeout || DEFAULT_WAIT_TIMEOUT);
+
+            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);
+                    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;
+                    }
                 }
+                await new Promise(resolveSleep => setTimeout(resolveSleep, 1000));
             }
-            await new Promise(resolve => setTimeout(resolve, 1000));
-        }
 
-        if (relevantTx?.name === TenantEvents.ExtendSuccess) {
-            return({
-                transaction: relevantTx?.data.transaction,
-                expiryMoment: relevantTx?.data.expiryMoment,
-                extendeRefId: relevantTx?.data.extendRefId
-            });
-        } else if (relevantTx?.name === TenantEvents.ExtendError) {
-            throw({
-                error: ErrorCodes.EXTEND_ERR,
-                transaction: relevantTx?.data.transaction,
-                reason: relevantTx?.data.reason
-            })
-        }
+            if (!rejected) {
+                if (relevantTx?.name === TenantEvents.ExtendSuccess) {
+                    resolve({
+                        transaction: relevantTx?.data.transaction,
+                        expiryMoment: relevantTx?.data.expiryMoment,
+                        extendeRefId: relevantTx?.data.extendRefId
+                    });
+                } else if (relevantTx?.name === TenantEvents.ExtendError) {
+                    reject({
+                        error: ErrorCodes.EXTEND_ERR,
+                        transaction: relevantTx?.data.transaction,
+                        reason: relevantTx?.data.reason
+                    });
+                }
+            }
+        });
     }
 
     /**
@@ -15110,6 +15122,14 @@ class XrplApi {
         return this.#requestWithPaging({ command: 'account_offers', account: address, ledger_index: "validated", ...options }, API_REQ_TYPE.OFFERS);
     }
 
+    async getSellOffers(nfTokenId, options = {}) {
+        return this.#requestWithPaging({ command: 'nft_sell_offers', nft_id: nfTokenId, ledger_index: "validated", ...options }, API_REQ_TYPE.OFFERS);
+    }
+
+    async getBuyOffers(nfTokenId, options = {}) {
+        return this.#requestWithPaging({ command: 'nft_buy_offers', nft_id: nfTokenId, ledger_index: "validated", ...options }, API_REQ_TYPE.OFFERS);
+    }
+
     async getLedgerEntry(index, options) {
         const resp = (await this.#client.request({ command: 'ledger_entry', index: index, ledger_index: "validated", ...options }));
         return resp?.result?.node;

package/package.json

@@ -6,7 +6,7 @@
     ],
     "homepage": "https://github.com/HotPocketDev/evernode-js-client",
     "license": "MIT",
-    "version": "0.5.1",
+    "version": "0.5.2",
     "dependencies": {
         "elliptic": "6.5.4",
         "ripple-address-codec": "4.2.0",