From 798358ee9aaad17068fad0e4bdfd88c7fac57b4d Mon Sep 17 00:00:00 2001 From: Shahzaib Date: Wed, 9 Oct 2024 05:20:29 +0000 Subject: [PATCH 1/3] fix: check for websocket alive state --- src/client-library/deriv-api-client.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client-library/deriv-api-client.ts b/src/client-library/deriv-api-client.ts index ad4bf51..ac88e52 100644 --- a/src/client-library/deriv-api-client.ts +++ b/src/client-library/deriv-api-client.ts @@ -274,12 +274,12 @@ export class DerivAPIClient { await this.reinitializeData(this.subscribeHandler, this.authorizePayload); } - isSocketClosingOrClosed() { - return ![2, 3].includes(this.websocket.readyState); + isSocketReadyForSending() { + return this.websocket.readyState === WebSocket.OPEN; // 1 } disconnect() { - if (!this.isSocketClosingOrClosed()) { + if (!this.isSocketReadyForSending()) { this.websocket.close(); } } From 7830e4d76ab3a6af98aeabc2c4e2fe090ffe0ef5 Mon Sep 17 00:00:00 2001 From: Shahzaib Date: Wed, 9 Oct 2024 13:30:20 +0800 Subject: [PATCH 2/3] Update deriv-api-client.ts --- src/client-library/deriv-api-client.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client-library/deriv-api-client.ts b/src/client-library/deriv-api-client.ts index ac88e52..c1ef2af 100644 --- a/src/client-library/deriv-api-client.ts +++ b/src/client-library/deriv-api-client.ts @@ -279,7 +279,7 @@ export class DerivAPIClient { } disconnect() { - if (!this.isSocketReadyForSending()) { + if (this.isSocketReadyForSending()) { this.websocket.close(); } } From 658af1780def70a0dce88afd03e22114ec4adac4 Mon Sep 17 00:00:00 2001 From: Shahzaib Date: Thu, 10 Oct 2024 12:42:50 +0800 Subject: [PATCH 3/3] chore: rename method --- src/client-library/deriv-api-client.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client-library/deriv-api-client.ts b/src/client-library/deriv-api-client.ts index c1ef2af..f666c08 100644 --- a/src/client-library/deriv-api-client.ts +++ b/src/client-library/deriv-api-client.ts @@ -274,12 +274,12 @@ export class DerivAPIClient { await this.reinitializeData(this.subscribeHandler, this.authorizePayload); } - isSocketReadyForSending() { + isSocketReady() { return this.websocket.readyState === WebSocket.OPEN; // 1 } disconnect() { - if (this.isSocketReadyForSending()) { + if (this.isSocketReady()) { this.websocket.close(); } }