livekit-client 1.1.2 → 1.1.3

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.2";
+var version$1 = "1.1.3";
 
 const version = version$1;
 const protocolVersion = 8;
@@ -12225,6 +12225,8 @@ class RemoteVideoTrack extends RemoteTrack {
 
       this.debouncedHandleResize();
       this.updateVisibility();
+    } else {
+      livekitLogger.warn('visibility resize observer not triggered');
     }
   }
   /**
@@ -12373,9 +12375,7 @@ class RemoteVideoTrack extends RemoteTrack {
 }
 
 class HTMLElementInfo {
-  constructor(element) {
-    let visible = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
+  constructor(element, visible) {
     this.onVisibilityChanged = entry => {
       var _a;
 
@@ -12392,7 +12392,7 @@ class HTMLElementInfo {
     };
 
     this.element = element;
-    this.visible = visible;
+    this.visible = visible !== null && visible !== void 0 ? visible : isElementInViewport(element);
     this.visibilityChangedAt = 0;
   }
 
@@ -12423,6 +12423,29 @@ class HTMLElementInfo {
     (_b = getResizeObserver()) === null || _b === void 0 ? void 0 : _b.unobserve(this.element);
   }
 
+} // does not account for occlusion by other elements
+
+
+function isElementInViewport(el) {
+  let top = el.offsetTop;
+  let left = el.offsetLeft;
+  const width = el.offsetWidth;
+  const height = el.offsetHeight;
+  const {
+    hidden
+  } = el;
+  const {
+    opacity,
+    display
+  } = getComputedStyle(el);
+
+  while (el.offsetParent) {
+    el = el.offsetParent;
+    top += el.offsetTop;
+    left += el.offsetLeft;
+  }
+
+  return top < window.pageYOffset + window.innerHeight && left < window.pageXOffset + window.innerWidth && top + height > window.pageYOffset && left + width > window.pageXOffset && !hidden && (opacity !== '' ? parseFloat(opacity) > 0 : true) && display !== 'none';
 }
 
 class TrackPublication extends events.exports.EventEmitter {
@@ -13395,9 +13418,7 @@ class RemoteParticipant extends Participant {
 
 
   static fromParticipantInfo(signalClient, pi) {
-    const rp = new RemoteParticipant(signalClient, pi.sid, pi.identity);
-    rp.updateInfo(pi);
-    return rp;
+    return new RemoteParticipant(signalClient, pi.sid, pi.identity);
   }
 
   addTrackPublication(publication) {
@@ -13538,7 +13559,6 @@ class RemoteParticipant extends Participant {
 
 
   updateInfo(info) {
-    const alreadyHasMetadata = this.hasMetadata;
     super.updateInfo(info); // we are getting a list of all available tracks, reconcile in here
     // and send out events for changes
     // reconcile track publications, publish events only if metadata is already there
@@ -13566,14 +13586,11 @@ class RemoteParticipant extends Participant {
       }
 
       validTracks.set(ti.sid, publication);
-    }); // send new tracks
-
-    if (alreadyHasMetadata) {
-      newTracks.forEach(publication => {
-        this.emit(ParticipantEvent.TrackPublished, publication);
-      });
-    } // detect removed tracks
+    }); // always emit events for new publications, Room will not forward them unless it's ready
 
+    newTracks.forEach(publication => {
+      this.emit(ParticipantEvent.TrackPublished, publication);
+    }); // detect removed tracks
 
     this.tracks.forEach(publication => {
       if (!validTracks.has(publication.trackSid)) {
@@ -20015,6 +20032,22 @@ class Room extends events.exports.EventEmitter {
   }
 
   onTrackAdded(mediaTrack, stream, receiver) {
+    // don't fire onSubscribed when connecting
+    // WebRTC fires onTrack as soon as setRemoteDescription is called on the offer
+    // at that time, ICE connectivity has not been established so the track is not
+    // technically subscribed.
+    // We'll defer these events until when the room is connected or eventually disconnected.
+    if (this.state === ConnectionState.Connecting || this.state === ConnectionState.Reconnecting) {
+      setTimeout(() => {
+        this.onTrackAdded(mediaTrack, stream, receiver);
+      }, 10);
+      return;
+    }
+
+    if (this.state === ConnectionState.Disconnected) {
+      livekitLogger.warn('skipping incoming track after Room disconnected');
+    }
+
     const parts = unpackStreamId(stream.id);
     const participantId = parts[0];
     let trackId = parts[1];
@@ -20131,7 +20164,7 @@ class Room extends events.exports.EventEmitter {
 
 
     participant.on(ParticipantEvent.TrackPublished, trackPublication => {
-      this.emit(RoomEvent.TrackPublished, trackPublication, participant);
+      this.emitWhenConnected(RoomEvent.TrackPublished, trackPublication, participant);
     }).on(ParticipantEvent.TrackSubscribed, (track, publication) => {
       // monitor playback status
       if (track.kind === Track.Kind.Audio) {
@@ -20141,22 +20174,27 @@ class Room extends events.exports.EventEmitter {
 
       this.emit(RoomEvent.TrackSubscribed, track, publication, participant);
     }).on(ParticipantEvent.TrackUnpublished, publication => {
-      this.emit(RoomEvent.TrackUnpublished, publication, participant);
+      this.emitWhenConnected(RoomEvent.TrackUnpublished, publication, participant);
     }).on(ParticipantEvent.TrackUnsubscribed, (track, publication) => {
       this.emit(RoomEvent.TrackUnsubscribed, track, publication, participant);
     }).on(ParticipantEvent.TrackSubscriptionFailed, sid => {
       this.emit(RoomEvent.TrackSubscriptionFailed, sid, participant);
     }).on(ParticipantEvent.TrackMuted, pub => {
-      this.emit(RoomEvent.TrackMuted, pub, participant);
+      this.emitWhenConnected(RoomEvent.TrackMuted, pub, participant);
     }).on(ParticipantEvent.TrackUnmuted, pub => {
-      this.emit(RoomEvent.TrackUnmuted, pub, participant);
+      this.emitWhenConnected(RoomEvent.TrackUnmuted, pub, participant);
     }).on(ParticipantEvent.ParticipantMetadataChanged, metadata => {
-      this.emit(RoomEvent.ParticipantMetadataChanged, metadata, participant);
+      this.emitWhenConnected(RoomEvent.ParticipantMetadataChanged, metadata, participant);
     }).on(ParticipantEvent.ConnectionQualityChanged, quality => {
-      this.emit(RoomEvent.ConnectionQualityChanged, quality, participant);
+      this.emitWhenConnected(RoomEvent.ConnectionQualityChanged, quality, participant);
     }).on(ParticipantEvent.ParticipantPermissionsChanged, prevPermissions => {
-      this.emit(RoomEvent.ParticipantPermissionsChanged, prevPermissions, participant);
-    });
+      this.emitWhenConnected(RoomEvent.ParticipantPermissionsChanged, prevPermissions, participant);
+    }); // update info at the end after callbacks have been set up
+
+    if (info) {
+      participant.updateInfo(info);
+    }
+
     return participant;
   }
 
@@ -20222,12 +20260,24 @@ class Room extends events.exports.EventEmitter {
     this.state = state;
     this.emit(RoomEvent.ConnectionStateChanged, this.state);
     return true;
+  }
+
+  emitWhenConnected(event) {
+    if (this.state === ConnectionState.Connected) {
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+
+      return this.emit(event, ...args);
+    }
+
+    return false;
   } // /** @internal */
 
 
   emit(event) {
-    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      args[_key - 1] = arguments[_key];
+    for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+      args[_key2 - 1] = arguments[_key2];
     }
 
     livekitLogger.debug('room event', {