Consolidate ws close action (#685)

* Consolidate ws close action * Create hot-insects-teach.md
livekit · May 3, 2023 · 8088387 · 8088387
1 parent 07bf567
commit 8088387
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/.changeset/hot-insects-teach.md b/.changeset/hot-insects-teach.md
@@ -0,0 +1,5 @@
+---
+"livekit-client": patch
+---
+
+Consolidate ws close action
diff --git a/src/api/SignalClient.ts b/src/api/SignalClient.ts
@@ -321,6 +321,7 @@ export class SignalClient {
       };
 
       this.ws.onclose = (ev: CloseEvent) => {
+        log.warn(`websocket closed`, { ev });
         this.handleOnClose(ev.reason);
       };
     });
@@ -344,12 +345,14 @@ export class SignalClient {
           }
         });
 
-        this.ws.close();
-        // 250ms grace period for ws to close gracefully
-        await Promise.race([closePromise, sleep(250)]);
+        if (this.ws.readyState < this.ws.CLOSING) {
+          this.ws.close();
+          // 250ms grace period for ws to close gracefully
+          await Promise.race([closePromise, sleep(250)]);
+        }
+        this.ws = undefined;
+        this.clearPingInterval();
       }
-      this.ws = undefined;
-      this.clearPingInterval();
     } finally {
       unlock();
     }
@@ -611,17 +614,13 @@ export class SignalClient {
     this.isReconnecting = false;
   }
 
-  private handleOnClose(reason: string) {
+  private async handleOnClose(reason: string) {
     if (!this.isConnected) return;
-    this.clearPingInterval();
-    this.clearPingTimeout();
-
+    await this.close();
     log.debug(`websocket connection closed: ${reason}`);
-    this.isConnected = false;
     if (this.onClose) {
       this.onClose(reason);
     }
-    this.ws = undefined;
   }
 
   private handleWSError(ev: Event) {