🩹 fix(core): reconnect doesn't wait gateway to be disconnected

harmonyland · May 18, 2024 · 25516b0 · 25516b0
1 parent 449a214
commit 25516b0
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/core/src/gateway/mod.ts b/core/src/gateway/mod.ts
@@ -75,6 +75,7 @@ export class Gateway extends EventEmitter<GatewayEvents> {
       );
       const onopen = this.onopen.bind(this);
       this.ws.onopen = () => {
+        this.ws.onopen = onopen;
         onopen();
         resolve();
       };
@@ -99,6 +100,8 @@ export class Gateway extends EventEmitter<GatewayEvents> {
 
   private onopen() {
     this.connected = true;
+    this.reconnecting = false;
+    this.resume = false;
     this.retryCount = 0;
     this.emit("CONNECTED");
   }
@@ -222,13 +225,13 @@ export class Gateway extends EventEmitter<GatewayEvents> {
     this.connectionError = true;
   }
 
-  reconnect(resume = false, code?: number) {
+  async reconnect(resume = false, code?: number) {
     this.resume = resume;
     this.reconnecting = true;
     if (this.connected) {
-      this.disconnect(code, "reconnect");
+      await this.disconnect(code, "reconnect");
     }
-    this.connect();
+    await this.connect();
   }
 
   heartbeat() {