@bithomp/xrpl-api 3.7.3 → 3.7.4

package/lib/connection.js

@@ -102,8 +102,9 @@ class Connection extends events_1.EventEmitter {
                 url: this.url,
                 error: err?.message || err?.name || err,
             });
+            this.removeClient();
         }
-        this.connectionValidation();
+        this.connectionValidation("connect");
     }
     async disconnect() {
         this.logger?.debug({
@@ -125,7 +126,16 @@ class Connection extends events_1.EventEmitter {
         const result = await this._request(request, options);
         let validResponse = true;
         if (result?.error) {
-            if (result.error === "timeout") {
+            if (result.error === "slowDown" || result.error === "Unexpected server response: 429") {
+                this.logger?.debug({
+                    service: "Bithomp::XRPL::Connection",
+                    function: "request",
+                    url: this.url,
+                    error: `Received slowdown error, reconnecting...`,
+                });
+                validResponse = false;
+            }
+            else if (result.error === "timeout") {
                 const timeouts = this.latency.filter((info) => info.delta >= this.timeout).length;
                 if (timeouts >= 3) {
                     this.logger?.debug({
@@ -135,10 +145,9 @@ class Connection extends events_1.EventEmitter {
                         error: `Too many timeouts (${timeouts}) in last ${this.latency.length} requests, reconnecting...`,
                     });
                     validResponse = false;
-                    this.removeClient();
                 }
             }
-            else if (result.error.startsWith("websocket was closed")) {
+            else if (result.error.toLowerCase().startsWith("websocket was closed")) {
                 this.logger?.debug({
                     service: "Bithomp::XRPL::Connection",
                     function: "request",
@@ -146,11 +155,13 @@ class Connection extends events_1.EventEmitter {
                     error: "Websocket was closed, reconnecting...",
                 });
                 validResponse = false;
-                this.removeClient();
             }
         }
         if (validResponse) {
-            this.connectionValidation();
+            this.connectionValidation("request");
+        }
+        else {
+            this.removeClient();
         }
         return result;
     }
@@ -294,7 +305,6 @@ class Connection extends events_1.EventEmitter {
         if (!this.shutdown) {
             this.emit("reconnect");
             try {
-                this.emit("disconnected", 1000);
                 this.removeClient();
                 this.resetTypes();
                 this.serverInfoUpdating = false;
@@ -311,15 +321,16 @@ class Connection extends events_1.EventEmitter {
                     error: e.message,
                 });
             }
-            this.connectionValidation();
+            this.connectionValidation("reconnect");
         }
     }
-    removeClient() {
+    removeClient(code = 1000) {
         try {
             if (this.client) {
                 this.client.removeAllListeners();
                 this.client.disconnect();
                 this.client = undefined;
+                this.emit("disconnected", code);
             }
         }
         catch (_err) {
@@ -345,9 +356,10 @@ class Connection extends events_1.EventEmitter {
                 code,
                 url: this.url,
             });
-            this.onlineSince = 0;
-            this.serverInfo = null;
-            this.streamsSubscribed = false;
+            if (this.client) {
+                this.client.removeAllListeners();
+                this.client = undefined;
+            }
             this.emit("disconnected", code);
         });
         this.client.on("error", (source, message, error) => {
@@ -369,7 +381,6 @@ class Connection extends events_1.EventEmitter {
                     error: err?.message || err?.name || err,
                 });
             }
-            this.connectionValidation();
         });
         this.client.on("ledgerClosed", (ledgerStream) => {
             this.onLedgerClosed(ledgerStream);
@@ -484,7 +495,7 @@ class Connection extends events_1.EventEmitter {
             request.accounts = accounts;
         }
         const result = await this.request(request, { skip_subscription_update: true });
-        if (result.result) {
+        if (result.result && !result.error) {
             this.streamsSubscribed = true;
         }
         return result;
@@ -528,7 +539,7 @@ class Connection extends events_1.EventEmitter {
         else {
             this.updateServerInfo();
         }
-        this.connectionValidation();
+        this.connectionValidation("ledgerClosed");
     }
     async updateServerInfo() {
         if (this.serverInfoUpdating || this.shutdown) {
@@ -556,10 +567,11 @@ class Connection extends events_1.EventEmitter {
         }
         this.serverInfoUpdating = false;
     }
-    connectionValidation() {
+    connectionValidation(event) {
         this.logger?.debug({
             service: "Bithomp::XRPL::Connection",
             function: "connectionValidation",
+            event,
             url: this.url,
             shutdown: this.shutdown,
         });
@@ -567,17 +579,16 @@ class Connection extends events_1.EventEmitter {
             clearTimeout(this.connectionWatchTimer);
             this.connectionWatchTimer = null;
         }
-        if (!this.shutdown) {
-            if (this.streamsSubscribed === false) {
-                this.subscribe();
-            }
-            if (this.serverInfo === null && this.isConnected()) {
-                this.updateServerInfo();
-            }
-            this.connectionWatchTimer = setTimeout(this.bindConnectionWatchTimeout, LEDGER_CLOSED_TIMEOUT);
-        }
-        else {
+        if (this.shutdown) {
             this.removeClient();
+            return;
+        }
+        this.connectionWatchTimer = setTimeout(this.bindConnectionWatchTimeout, LEDGER_CLOSED_TIMEOUT);
+        if (this.streamsSubscribed === false) {
+            this.subscribe();
+        }
+        if (this.serverInfo === null && this.isConnected()) {
+            this.updateServerInfo();
         }
     }
     async connectionWatchTimeout() {
@@ -600,7 +611,7 @@ class Connection extends events_1.EventEmitter {
                 url: this.url,
                 error: e.message,
             });
-            this.connectionValidation();
+            this.connectionValidation("connectionWatchTimeout");
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bithomp/xrpl-api",
-  "version": "3.7.3",
+  "version": "3.7.4",
   "description": "A Bithomp JavaScript/TypeScript library for interacting with the XRP Ledger",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -42,7 +42,7 @@
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
     "lint": "eslint",
     "prepare": "npm run build",
-    "prepublishOnly": "npm test && npm run lint",
+    "-prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
     "postversion": "git push && git push --tags"