Only restart track after permission change if not muted (#581)

* only restart track after permission change if not muted * fix implicit restart case * Create rotten-bottles-work.md * restart audio track on unmute if readyState is ended
livekit · Feb 16, 2023 · 6b35e07 · 6b35e07
1 parent b8fd583
commit 6b35e07
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/.changeset/rotten-bottles-work.md b/.changeset/rotten-bottles-work.md
@@ -0,0 +1,5 @@
+---
+"livekit-client": patch
+---
+
+Only restart track after permission change if not muted
diff --git a/src/room/participant/LocalParticipant.ts b/src/room/participant/LocalParticipant.ts
@@ -999,7 +999,9 @@ export default class LocalParticipant extends Participant {
               // detect granted change after permissions were denied to try and resume then
               currentPermissions.onchange = () => {
                 if (currentPermissions.state !== 'denied') {
-                  track.restartTrack();
+                  if (!track.isMuted) {
+                    track.restartTrack();
+                  }
                   currentPermissions.onchange = null;
                 }
               };
@@ -1009,8 +1011,10 @@ export default class LocalParticipant extends Participant {
             // permissions query fails for firefox, we continue and try to restart the track
           }
         }
-        log.debug('track ended, attempting to use a different device');
-        await track.restartTrack();
+        if (!track.isMuted) {
+          log.debug('track ended, attempting to use a different device');
+          await track.restartTrack();
+        }
       } catch (e) {
         log.warn(`could not restart track, muting instead`);
         await track.mute();

diff --git a/src/room/track/LocalAudioTrack.ts b/src/room/track/LocalAudioTrack.ts
@@ -53,7 +53,11 @@ export default class LocalAudioTrack extends LocalTrack {
 
   async unmute(): Promise<LocalAudioTrack> {
     await this.muteQueue.run(async () => {
-      if (this.source === Track.Source.Microphone && this.stopOnMute && !this.isUserProvided) {
+      if (
+        this.source === Track.Source.Microphone &&
+        (this.stopOnMute || this._mediaStreamTrack.readyState === 'ended') &&
+        !this.isUserProvided
+      ) {
         log.debug('reacquiring mic track');
         await this.restartTrack();
       }