livekit-client 1.1.3 → 1.1.4

package/dist/livekit-client.esm.mjs

@@ -10070,7 +10070,7 @@ function computeBitrate(currentStats, prevStats) {
   return (bytesNow - bytesPrev) * 8 * 1000 / (currentStats.timestamp - prevStats.timestamp);
 }
 
-var version$1 = "1.1.3";
+var version$1 = "1.1.4";
 
 const version = version$1;
 const protocolVersion = 8;
@@ -11060,6 +11060,7 @@ function detachTrack(track, element) {
 
 class LocalTrack extends Track {
   constructor(mediaTrack, kind, constraints) {
+    let userProvidedTrack = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     super(mediaTrack, kind);
     this._isUpstreamPaused = false;
 
@@ -11076,6 +11077,7 @@ class LocalTrack extends Track {
     this.constraints = constraints !== null && constraints !== void 0 ? constraints : mediaTrack.getConstraints();
     this.reacquireTrack = false;
     this.wasMuted = false;
+    this.providedByUser = userProvidedTrack;
   }
 
   get id() {
@@ -11105,6 +11107,10 @@ class LocalTrack extends Track {
   get isUpstreamPaused() {
     return this._isUpstreamPaused;
   }
+
+  get isUserProvided() {
+    return this.providedByUser;
+  }
   /**
    * @returns DeviceID of the device that is currently being used for this track
    */
@@ -11136,6 +11142,8 @@ class LocalTrack extends Track {
   }
 
   async replaceTrack(track) {
+    let userProvidedTrack = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+
     if (!this.sender) {
       throw new TrackInvalidError('unable to replace an unpublished track');
     } // detach
@@ -11164,6 +11172,7 @@ class LocalTrack extends Track {
       attachToElement(track, el);
     });
     this.mediaStream = new MediaStream([track]);
+    this.providedByUser = userProvidedTrack;
     return this;
   }
 
@@ -11235,7 +11244,7 @@ class LocalTrack extends Track {
     if (!isMobile()) return;
     livekitLogger.debug("visibility changed, is in Background: ".concat(this.isInBackground));
 
-    if (!this.isInBackground && this.needsReAcquisition) {
+    if (!this.isInBackground && this.needsReAcquisition && !this.isUserProvided) {
       livekitLogger.debug("track needs to be reaquired, restarting ".concat(this.source));
       await this.restart();
       this.reacquireTrack = false; // Restore muted state if had to be restarted
@@ -11386,7 +11395,8 @@ function getNewAudioContext() {
 
 class LocalAudioTrack extends LocalTrack {
   constructor(mediaTrack, constraints) {
-    super(mediaTrack, Track.Kind.Audio, constraints);
+    let userProvidedTrack = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    super(mediaTrack, Track.Kind.Audio, constraints, userProvidedTrack);
     /** @internal */
 
     this.stopOnMute = false;
@@ -11446,7 +11456,7 @@ class LocalAudioTrack extends LocalTrack {
   }
 
   async unmute() {
-    if (this.source === Track.Source.Microphone && this.stopOnMute) {
+    if (this.source === Track.Source.Microphone && this.stopOnMute && !this.isUserProvided) {
       livekitLogger.debug('reacquiring mic track');
       await this.restartTrack();
     }
@@ -11530,7 +11540,8 @@ class LocalAudioTrack extends LocalTrack {
 const refreshSubscribedCodecAfterNewCodec = 5000;
 class LocalVideoTrack extends LocalTrack {
   constructor(mediaTrack, constraints) {
-    super(mediaTrack, Track.Kind.Video, constraints);
+    let userProvidedTrack = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    super(mediaTrack, Track.Kind.Video, constraints, userProvidedTrack);
     this.simulcastCodecs = new Map();
 
     this.monitorSender = async () => {
@@ -11627,7 +11638,7 @@ class LocalVideoTrack extends LocalTrack {
   }
 
   async unmute() {
-    if (this.source === Track.Source.Camera) {
+    if (this.source === Track.Source.Camera && !this.isUserProvided) {
       livekitLogger.debug('reacquiring camera track');
       await this.restartTrack();
     }
@@ -12955,10 +12966,10 @@ function trackPermissionToProto(perms) {
 function mediaTrackToLocalTrack(mediaStreamTrack, constraints) {
   switch (mediaStreamTrack.kind) {
     case 'audio':
-      return new LocalAudioTrack(mediaStreamTrack, constraints);
+      return new LocalAudioTrack(mediaStreamTrack, constraints, false);
 
     case 'video':
-      return new LocalVideoTrack(mediaStreamTrack, constraints);
+      return new LocalVideoTrack(mediaStreamTrack, constraints, false);
 
     default:
       throw new TrackInvalidError("unsupported track type: ".concat(mediaStreamTrack.kind));
@@ -14065,12 +14076,12 @@ class LocalParticipant extends Participant {
       throw new TrackInvalidError('no video track found');
     }
 
-    const screenVideo = new LocalVideoTrack(tracks[0]);
+    const screenVideo = new LocalVideoTrack(tracks[0], undefined, false);
     screenVideo.source = Track.Source.ScreenShare;
     const localTracks = [screenVideo];
 
     if (stream.getAudioTracks().length > 0) {
-      const screenAudio = new LocalAudioTrack(stream.getAudioTracks()[0]);
+      const screenAudio = new LocalAudioTrack(stream.getAudioTracks()[0], undefined, false);
       screenAudio.source = Track.Source.ScreenShareAudio;
       localTracks.push(screenAudio);
     }
@@ -14093,11 +14104,11 @@ class LocalParticipant extends Participant {
     if (track instanceof MediaStreamTrack) {
       switch (track.kind) {
         case 'audio':
-          track = new LocalAudioTrack(track);
+          track = new LocalAudioTrack(track, undefined, true);
           break;
 
         case 'video':
-          track = new LocalVideoTrack(track);
+          track = new LocalVideoTrack(track, undefined, true);
           break;
 
         default:
@@ -19489,7 +19500,7 @@ class Room extends events.exports.EventEmitter {
         this.metadata = joinResponse.room.metadata;
         this.emit(RoomEvent.SignalConnected);
       } catch (err) {
-        this.engine.close();
+        this.recreateEngine();
         this.setAndEmitConnectionState(ConnectionState.Disconnected);
         throw err;
       } // don't return until ICE connected
@@ -19500,7 +19511,7 @@ class Room extends events.exports.EventEmitter {
 
         const connectTimeout = setTimeout(() => {
           // timeout
-          this.engine.close();
+          this.recreateEngine();
           this.setAndEmitConnectionState(ConnectionState.Disconnected);
           reject(new ConnectionError('could not connect after timeout'));
         }, maxICEConnectTimeout);
@@ -19508,7 +19519,7 @@ class Room extends events.exports.EventEmitter {
         const abortHandler = () => {
           livekitLogger.warn('closing engine');
           clearTimeout(connectTimeout);
-          this.engine.close();
+          this.recreateEngine();
           this.setAndEmitConnectionState(ConnectionState.Disconnected);
           reject(new ConnectionError('room connection has been cancelled'));
         };
@@ -19573,14 +19584,14 @@ class Room extends events.exports.EventEmitter {
     };
 
     this.handleRestarting = () => {
-      if (this.setAndEmitConnectionState(ConnectionState.Reconnecting)) {
-        this.emit(RoomEvent.Reconnecting);
-      } // also unwind existing participants & existing subscriptions
-
-
+      // also unwind existing participants & existing subscriptions
       for (const p of this.participants.values()) {
         this.handleParticipantDisconnected(p.sid, p);
       }
+
+      if (this.setAndEmitConnectionState(ConnectionState.Reconnecting)) {
+        this.emit(RoomEvent.Reconnecting);
+      }
     };
 
     this.handleRestarted = async joinResponse => {
@@ -19609,7 +19620,7 @@ class Room extends events.exports.EventEmitter {
         this.localParticipant.unpublishTrack(track, false);
 
         if (!track.isMuted) {
-          if (track instanceof LocalAudioTrack || track instanceof LocalVideoTrack) {
+          if ((track instanceof LocalAudioTrack || track instanceof LocalVideoTrack) && !track.isUserProvided) {
             // we need to restart the track before publishing, often a full reconnect
             // is necessary because computer had gone to sleep.
             livekitLogger.debug('restarting existing track', {
@@ -19648,7 +19659,7 @@ class Room extends events.exports.EventEmitter {
           this.handleParticipantDisconnected(info.sid, remoteParticipant);
         } else if (isNewParticipant) {
           // fire connected event
-          this.emit(RoomEvent.ParticipantConnected, remoteParticipant);
+          this.emitWhenConnected(RoomEvent.ParticipantConnected, remoteParticipant);
         } else {
           // just update, no events
           remoteParticipant.updateInfo(info);
@@ -19690,7 +19701,7 @@ class Room extends events.exports.EventEmitter {
         }
       });
       this.activeSpeakers = activeSpeakers;
-      this.emit(RoomEvent.ActiveSpeakersChanged, activeSpeakers);
+      this.emitWhenConnected(RoomEvent.ActiveSpeakersChanged, activeSpeakers);
     }; // process list of changed speakers
 
 
@@ -19722,7 +19733,7 @@ class Room extends events.exports.EventEmitter {
       const activeSpeakers = Array.from(lastSpeakers.values());
       activeSpeakers.sort((a, b) => b.audioLevel - a.audioLevel);
       this.activeSpeakers = activeSpeakers;
-      this.emit(RoomEvent.ActiveSpeakersChanged, activeSpeakers);
+      this.emitWhenConnected(RoomEvent.ActiveSpeakersChanged, activeSpeakers);
     };
 
     this.handleStreamStateUpdate = streamStateUpdate => {
@@ -19741,7 +19752,7 @@ class Room extends events.exports.EventEmitter {
 
         pub.track.streamState = Track.streamStateFromProto(streamState.state);
         participant.emit(ParticipantEvent.TrackStreamStateChanged, pub, pub.track.streamState);
-        this.emit(ParticipantEvent.TrackStreamStateChanged, pub, pub.track.streamState, participant);
+        this.emitWhenConnected(ParticipantEvent.TrackStreamStateChanged, pub, pub.track.streamState, participant);
       });
     };
 
@@ -19760,7 +19771,7 @@ class Room extends events.exports.EventEmitter {
 
       pub._allowed = update.allowed;
       participant.emit(ParticipantEvent.TrackSubscriptionPermissionChanged, pub, pub.subscriptionStatus);
-      this.emit(ParticipantEvent.TrackSubscriptionPermissionChanged, pub, pub.subscriptionStatus, participant);
+      this.emitWhenConnected(ParticipantEvent.TrackSubscriptionPermissionChanged, pub, pub.subscriptionStatus, participant);
     };
 
     this.handleDataPacket = (userPacket, kind) => {
@@ -19797,7 +19808,7 @@ class Room extends events.exports.EventEmitter {
 
     this.handleRoomUpdate = r => {
       this.metadata = r.metadata;
-      this.emit(RoomEvent.RoomMetadataChanged, r.metadata);
+      this.emitWhenConnected(RoomEvent.RoomMetadataChanged, r.metadata);
     };
 
     this.handleConnectionQualityUpdate = update => {
@@ -19855,6 +19866,10 @@ class Room extends events.exports.EventEmitter {
         this.sendSyncState();
       }
     }).on(EngineEvent.Restarting, this.handleRestarting).on(EngineEvent.Restarted, this.handleRestarted);
+
+    if (this.localParticipant) {
+      this.localParticipant.engine = this.engine;
+    }
   }
   /**
    * getLocalDevices abstracts navigator.mediaDevices.enumerateDevices.
@@ -20031,6 +20046,17 @@ class Room extends events.exports.EventEmitter {
     }
   }
 
+  recreateEngine() {
+    this.engine.close();
+    /* @ts-ignore */
+
+    this.engine = undefined; // clear out existing remote participants, since they may have attached
+    // the old engine
+
+    this.participants.clear();
+    this.createEngine();
+  }
+
   onTrackAdded(mediaTrack, stream, receiver) {
     // don't fire onSubscribed when connecting
     // WebRTC fires onTrack as soon as setRemoteDescription is called on the offer
@@ -20040,7 +20066,7 @@ class Room extends events.exports.EventEmitter {
     if (this.state === ConnectionState.Connecting || this.state === ConnectionState.Reconnecting) {
       setTimeout(() => {
         this.onTrackAdded(mediaTrack, stream, receiver);
-      }, 10);
+      }, 50);
       return;
     }
 
@@ -20117,7 +20143,7 @@ class Room extends events.exports.EventEmitter {
     participant.tracks.forEach(publication => {
       participant.unpublishTrack(publication.trackSid, true);
     });
-    this.emit(RoomEvent.ParticipantDisconnected, participant);
+    this.emitWhenConnected(RoomEvent.ParticipantDisconnected, participant);
   }
 
   acquireAudioContext() {
@@ -20386,12 +20412,12 @@ async function createLocalScreenTracks(options) {
     throw new TrackInvalidError('no video track found');
   }
 
-  const screenVideo = new LocalVideoTrack(tracks[0]);
+  const screenVideo = new LocalVideoTrack(tracks[0], undefined, false);
   screenVideo.source = Track.Source.ScreenShare;
   const localTracks = [screenVideo];
 
   if (stream.getAudioTracks().length > 0) {
-    const screenAudio = new LocalAudioTrack(stream.getAudioTracks()[0]);
+    const screenAudio = new LocalAudioTrack(stream.getAudioTracks()[0], undefined, false);
     screenAudio.source = Track.Source.ScreenShareAudio;
     localTracks.push(screenAudio);
   }