Further checks for user disconnect

lickdltd · Feb 7, 2023 · 9e13b18 · 9e13b18
1 parent f6fee92
commit 9e13b18
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lickdltd/chorus-dcl",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "Lickd Chorus DCL library",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/src/player.ts b/src/player.ts
@@ -188,18 +188,22 @@ export class Player extends Entity {
       this._token = await this.signIn(this._stream)
 
       if (!this._connected) {
-        Logger.log('connect discarded - user has disconnected')
+        Logger.log('connection discarded - user has disconnected while retrieving token')
+        await this.disconnect(true)
         return
       }
 
       this.addComponentOrReplace(new AudioStream(this._url + this._stream + '?token=' + this._token))
       this.getComponent(AudioStream).volume = this._volume
 
-      this.addComponentOrReplace(
-        new utils.Interval(Player.HEARTBEAT_INTERVAL, async () => await this.heartbeat(this._token))
-      )
+      this.addComponentOrReplace(new utils.Interval(Player.HEARTBEAT_INTERVAL, () => this.heartbeat(this._token)))
 
       Logger.log('connected successfully')
+
+      if (!this._connected) {
+        Logger.log('connection stream discarded - user has disconnected while connecting')
+        await this.disconnect(true)
+      }
     } catch (e) {
       Logger.log('connection failed', e.message)
     }
@@ -347,6 +351,6 @@ export class Player extends Entity {
   }
 
   private isConnected(): boolean {
-    return this.hasComponent(AudioStream)
+    return this.hasComponent(AudioStream) || this._connected
   }
 }