Only override deviceId constraint if it diverges (livekit#1388)

Author: lukasIO

src/room/track/LocalTrack.ts

@@ -232,6 +232,7 @@ export default abstract class LocalTrack<
     ) {
       return true;
     }
+
     this._constraints.deviceId = deviceId;
 
     // when track is muted, underlying media stream track is stopped and
@@ -313,6 +314,7 @@ export default abstract class LocalTrack<
       if (!constraints) {
         constraints = this._constraints;
       }
+      const { deviceId, ...otherConstraints } = this._constraints;
       this.log.debug('restarting track with constraints', { ...this.logContext, constraints });
 
       const streamConstraints: MediaStreamConstraints = {
@@ -321,9 +323,9 @@ export default abstract class LocalTrack<
       };
 
       if (this.kind === Track.Kind.Video) {
-        streamConstraints.video = constraints;
+        streamConstraints.video = deviceId ? { deviceId } : true;
       } else {
-        streamConstraints.audio = constraints;
+        streamConstraints.audio = deviceId ? { deviceId } : true;
       }
 
       // these steps are duplicated from setMediaStreamTrack because we must stop
@@ -340,6 +342,7 @@ export default abstract class LocalTrack<
       // create new track and attach
       const mediaStream = await navigator.mediaDevices.getUserMedia(streamConstraints);
       const newTrack = mediaStream.getTracks()[0];
+      await newTrack.applyConstraints(otherConstraints);
       newTrack.addEventListener('ended', this.handleEnded);
       this.log.debug('re-acquired MediaStreamTrack', this.logContext);
 

src/room/track/create.ts

@@ -2,7 +2,7 @@ import DeviceManager from '../DeviceManager';
 import { audioDefaults, videoDefaults } from '../defaults';
 import { DeviceUnsupportedError, TrackInvalidError } from '../errors';
 import { mediaTrackToLocalTrack } from '../participant/publishUtils';
-import { isAudioTrack, isSafari17, isVideoTrack } from '../utils';
+import { isAudioTrack, isSafari17, isVideoTrack, unwrapConstraint } from '../utils';
 import LocalAudioTrack from './LocalAudioTrack';
 import type LocalTrack from './LocalTrack';
 import LocalVideoTrack from './LocalVideoTrack';
@@ -68,10 +68,14 @@ export async function createLocalTracks(
 
       // update the constraints with the device id the user gave permissions to in the permission prompt
       // otherwise each track restart (e.g. mute - unmute) will try to initialize the device again -> causing additional permission prompts
-      if (trackConstraints) {
-        trackConstraints.deviceId = mediaStreamTrack.getSettings().deviceId;
-      } else {
-        trackConstraints = { deviceId: mediaStreamTrack.getSettings().deviceId };
+      const newDeviceId = mediaStreamTrack.getSettings().deviceId;
+      if (
+        trackConstraints?.deviceId &&
+        unwrapConstraint(trackConstraints.deviceId) !== newDeviceId
+      ) {
+        trackConstraints.deviceId = newDeviceId;
+      } else if (!trackConstraints) {
+        trackConstraints = { deviceId: newDeviceId };
       }
 
       const track = mediaTrackToLocalTrack(mediaStreamTrack, trackConstraints);