@bithomp/xrpl-api 3.1.5 → 3.1.7

package/lib/common/utils.d.ts

@@ -3,6 +3,7 @@ export type SortDirection = -1 | 0 | 1;
 export declare function signum(num: number): SortDirection;
 export declare function compareTransactions(first: any, second: any): SortDirection;
 export declare function sleep(ms: number): Promise<void>;
+export declare function getTimestamp(): number;
 export declare function createMarker(hash: string, marker?: any): any;
 export declare function parseMarker(marker?: any): any;
 export declare function dropsToXrp(drops: BigNumber.Value): string;

package/lib/common/utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.signum = signum;
 exports.compareTransactions = compareTransactions;
 exports.sleep = sleep;
+exports.getTimestamp = getTimestamp;
 exports.createMarker = createMarker;
 exports.parseMarker = parseMarker;
 exports.dropsToXrp = dropsToXrp;
@@ -32,6 +33,9 @@ async function sleep(ms) {
         setTimeout(resolve, ms);
     });
 }
+function getTimestamp() {
+    return new Date().getTime();
+}
 function createMarker(hash, marker) {
     if (marker === undefined) {
         return undefined;

package/lib/connection.js

@@ -88,20 +88,26 @@ class Connection extends events_1.EventEmitter {
                 (request.command === "subscribe" || request.command === "unsubscribe")) {
                 return this.updateSubscriptions(request);
             }
-            if (!this.client || !this.isConnected()) {
-                return { error: "Not connected" };
+            const waitTime = (0, utils_1.getTimestamp)() + RECONNECT_TIMEOUT;
+            while ((!this.client || !this.isConnected())) {
+                await (0, utils_1.sleep)(100);
+                if (this.shutdown) {
+                    return { error: "shutdownConnection", error_message: "Connection is shutdown.", status: "error" };
+                }
+                if ((0, utils_1.getTimestamp)() > waitTime) {
+                    return { error: "notConnected", error_message: "Not connected.", status: "error" };
+                }
             }
-            const startDate = new Date();
+            const startTimestamp = (0, utils_1.getTimestamp)();
             if (this.apiVersion && !request.hasOwnProperty("api_version") && exports.DEFAULT_API_VERSION !== this.apiVersion) {
                 request.api_version = this.apiVersion;
             }
             const response = await this.client.connection.request(request);
-            const endDate = new Date();
-            this.updateLatency(endDate.getTime() - startDate.getTime());
+            this.updateLatency((0, utils_1.getTimestamp)() - startTimestamp);
             return response;
         }
         catch (err) {
-            this.updateLatency(1000);
+            this.updateLatency(RECONNECT_TIMEOUT);
             this.logger?.debug({
                 service: "Bithomp::XRPL::Connection",
                 function: "request",
@@ -144,7 +150,7 @@ class Connection extends events_1.EventEmitter {
     }
     getOnlinePeriodMs() {
         if (this.isConnected()) {
-            return this.onlineSince ? new Date().getTime() - this.onlineSince : 0;
+            return this.onlineSince ? (0, utils_1.getTimestamp)() - this.onlineSince : 0;
         }
         return null;
     }
@@ -229,7 +235,7 @@ class Connection extends events_1.EventEmitter {
                 url: this.url,
             });
             this.emit("connected");
-            this.onlineSince = new Date().getTime();
+            this.onlineSince = (0, utils_1.getTimestamp)();
         });
         this.client.connection.on("disconnected", (code) => {
             this.logger?.debug({
@@ -383,7 +389,7 @@ class Connection extends events_1.EventEmitter {
         return await this.request(request, { skip_subscription_update: true });
     }
     onLedgerClosed(ledgerStream) {
-        const time = new Date().getTime();
+        const time = (0, utils_1.getTimestamp)();
         const ledgerTime = (0, ledger_1.ledgerTimeToTimestamp)(ledgerStream.ledger_time);
         if (ledgerTime < time) {
             this.updateLatency(time - ledgerTime);

package/lib/ledger/account_tx.js

@@ -76,6 +76,13 @@ async function getTransactions(account, options = { limit: DEFAULT_LIMIT }) {
         };
     }
     const result = response?.result;
+    if (!result) {
+        return {
+            account,
+            status: "error",
+            error: "invalidResponse",
+        };
+    }
     if (Array.isArray(result.transactions)) {
         if (options.balanceChanges === true || options.specification === true) {
             for (const transaction of result.transactions) {
@@ -152,7 +159,7 @@ async function findTransactions(account, options = { limit: DEFAULT_LIMIT, timeo
             break;
         }
     }
-    if (accountTransactionsError) {
+    if (accountTransactionsError && transactions.length === 0) {
         return accountTransactionsError;
     }
     if (options.marker && transactions.length === 0) {

package/lib/ledger/transaction.js

@@ -387,7 +387,7 @@ async function waitForFinalTransactionOutcome(txHash, lastLedger) {
     await (0, utils_1.sleep)(LEDGER_CLOSE_TIME_AWAIT);
     const tx = await getTransaction(txHash);
     const error = tx?.error;
-    if (error === "Not connected") {
+    if (error === "notConnected") {
         return tx;
     }
     if (!tx || error === "txnNotFound" || tx.validated !== true) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bithomp/xrpl-api",
-  "version": "3.1.5",
+  "version": "3.1.7",
   "description": "A Bithomp JavaScript/TypeScript library for interacting with the XRP Ledger",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -65,18 +65,18 @@
     "@types/chai": "^4.3.19",
     "@types/chai-as-promised": "^7.1.8",
     "@types/lodash": "^4.17.7",
-    "@types/mocha": "^10.0.7",
+    "@types/mocha": "^10.0.8",
     "@types/nconf": "^0.10.7",
     "@types/node": "^20.14.15",
-    "@typescript-eslint/eslint-plugin": "^8.4.0",
-    "@typescript-eslint/parser": "^8.4.0",
+    "@typescript-eslint/eslint-plugin": "^8.6.0",
+    "@typescript-eslint/parser": "^8.6.0",
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-chai-friendly": "^1.0.1",
     "eslint-plugin-import": "^2.30.0",
-    "eslint-plugin-n": "^17.10.2",
+    "eslint-plugin-n": "^17.10.3",
     "eslint-plugin-promise": "^7.1.0",
     "mocha": "^10.7.3",
     "nconf": "^0.12.1",