fix(blockchain-link): stop ripple ping timeout if api disconnected

trezor · Jan 29, 2025 · 0342e33 · 0342e33
1 parent 967fc34
commit 0342e33
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/packages/blockchain-link/src/workers/baseWorker.ts b/packages/blockchain-link/src/workers/baseWorker.ts
@@ -163,7 +163,7 @@ export abstract class BaseWorker<API> {
             return true;
         }
         if (data.type === MESSAGES.DISCONNECT) {
-            this.disconnect();
+            await this.disconnect();
             this.post({ id, type: RESPONSES.DISCONNECTED, payload: true });
 
             return true;

diff --git a/packages/blockchain-link/src/workers/ripple/index.ts b/packages/blockchain-link/src/workers/ripple/index.ts
@@ -475,9 +475,7 @@ class RippleWorker extends BaseWorker<RippleAPI> {
     }
 
     disconnect() {
-        if (this.api) {
-            this.api.disconnect();
-        }
+        return this.api?.disconnect();
     }
 
     async messageHandler(event: { data: MessageTypes.Message }) {
@@ -508,10 +506,9 @@ class RippleWorker extends BaseWorker<RippleAPI> {
         if (this.pingTimeout) {
             clearTimeout(this.pingTimeout);
         }
-        this.pingTimeout = setTimeout(
-            () => this.onPing(),
-            this.settings.pingTimeout || DEFAULT_PING_TIMEOUT,
-        );
+        this.pingTimeout = this.api?.isConnected()
+            ? setTimeout(() => this.onPing(), this.settings.pingTimeout || DEFAULT_PING_TIMEOUT)
+            : undefined;
     }
 
     async onPing() {