@stream-io/video-client 1.33.0 → 1.33.1

package/dist/index.cjs.js

@@ -4582,9 +4582,11 @@ const speaking = (a, b) => {
  * @param b the second participant.
  */
 const screenSharing = (a, b) => {
-    if (hasScreenShare(a) && !hasScreenShare(b))
+    const hasA = hasScreenShare(a);
+    const hasB = hasScreenShare(b);
+    if (hasA && !hasB)
         return -1;
-    if (!hasScreenShare(a) && hasScreenShare(b))
+    if (!hasA && hasB)
         return 1;
     return 0;
 };
@@ -4595,9 +4597,11 @@ const screenSharing = (a, b) => {
  * @param b the second participant.
  */
 const publishingVideo = (a, b) => {
-    if (hasVideo(a) && !hasVideo(b))
+    const hasA = hasVideo(a);
+    const hasB = hasVideo(b);
+    if (hasA && !hasB)
         return -1;
-    if (!hasVideo(a) && hasVideo(b))
+    if (!hasA && hasB)
         return 1;
     return 0;
 };
@@ -4608,9 +4612,11 @@ const publishingVideo = (a, b) => {
  * @param b the second participant.
  */
 const publishingAudio = (a, b) => {
-    if (hasAudio(a) && !hasAudio(b))
+    const hasA = hasAudio(a);
+    const hasB = hasAudio(b);
+    if (hasA && !hasB)
         return -1;
-    if (!hasAudio(a) && hasAudio(b))
+    if (!hasA && hasB)
         return 1;
     return 0;
 };
@@ -4641,14 +4647,22 @@ const pinned = (a, b) => {
  * A comparator creator which will set up a comparator which prioritizes
  * participants who are from a specific source (e.g., WebRTC, RTMP, WHIP...).
  *
- * @param source the source to prioritize.
+ * The priority of a source is determined by the order of the sources passed in.
+ * e.g. [SRT, RTMP, WHIP] will prioritize SRT sources first, then RTMP, then WHIP.
+ *
+ * @param sources the sources to prioritize.
  */
-const withParticipantSource = (source) => (a, b) => {
-    if (a.source === source && b.source !== source)
-        return -1;
-    if (a.source !== source && b.source === source)
-        return 1;
-    return 0;
+const withParticipantSource = (...sources) => {
+    const priority = (i) => (i === -1 ? Number.MAX_SAFE_INTEGER : i);
+    return (a, b) => {
+        const priorityA = priority(sources.indexOf(a.source));
+        const priorityB = priority(sources.indexOf(b.source));
+        if (priorityA < priorityB)
+            return -1;
+        if (priorityA > priorityB)
+            return 1;
+        return 0;
+    };
 };
 /**
  * A comparator creator which will set up a comparator which prioritizes
@@ -4672,9 +4686,11 @@ const reactionType = (type) => {
  * @param roles the roles to prioritize.
  */
 const role = (...roles) => (a, b) => {
-    if (hasAnyRole(a, roles) && !hasAnyRole(b, roles))
+    const hasA = hasAnyRole(a, roles);
+    const hasB = hasAnyRole(b, roles);
+    if (hasA && !hasB)
         return -1;
-    if (!hasAnyRole(a, roles) && hasAnyRole(b, roles))
+    if (!hasA && hasB)
         return 1;
     return 0;
 };
@@ -4707,6 +4723,10 @@ const ifInvisibleOrUnknownBy = conditional((a, b) => a.viewportVisibilityState?.
     a.viewportVisibilityState?.videoTrack === exports.VisibilityState.UNKNOWN ||
     b.viewportVisibilityState?.videoTrack === exports.VisibilityState.INVISIBLE ||
     b.viewportVisibilityState?.videoTrack === exports.VisibilityState.UNKNOWN);
+/**
+ * A comparator that prioritizes participants with video ingress sources.
+ */
+const withVideoIngressSource = withParticipantSource(ParticipantSource.RTMP, ParticipantSource.SRT, ParticipantSource.WHIP, ParticipantSource.RTSP);
 /**
  * The default sorting preset.
  */
@@ -4714,16 +4734,16 @@ const defaultSortPreset = combineComparators(screenSharing, pinned, ifInvisibleB
 /**
  * The sorting preset for speaker layout.
  */
-const speakerLayoutSortPreset = combineComparators(screenSharing, pinned, dominantSpeaker, ifInvisibleBy(combineComparators(speaking, reactionType('raised-hand'), publishingVideo, publishingAudio)));
+const speakerLayoutSortPreset = combineComparators(screenSharing, pinned, dominantSpeaker, ifInvisibleBy(combineComparators(speaking, reactionType('raised-hand'), withVideoIngressSource, publishingVideo, publishingAudio)));
 /**
  * The sorting preset for layouts that don't render all participants but
  * instead, render them in pages.
  */
-const paginatedLayoutSortPreset = combineComparators(pinned, ifInvisibleOrUnknownBy(combineComparators(dominantSpeaker, speaking, reactionType('raised-hand'), publishingVideo, publishingAudio)));
+const paginatedLayoutSortPreset = combineComparators(pinned, ifInvisibleOrUnknownBy(combineComparators(dominantSpeaker, speaking, reactionType('raised-hand'), withVideoIngressSource, publishingVideo, publishingAudio)));
 /**
  * The sorting preset for livestreams and audio rooms.
  */
-const livestreamOrAudioRoomSortPreset = combineComparators(ifInvisibleBy(combineComparators(dominantSpeaker, speaking, reactionType('raised-hand'), withParticipantSource(ParticipantSource.RTMP), publishingVideo, publishingAudio)), role('admin', 'host', 'speaker'));
+const livestreamOrAudioRoomSortPreset = combineComparators(ifInvisibleBy(combineComparators(dominantSpeaker, speaking, reactionType('raised-hand'), withVideoIngressSource, publishingVideo, publishingAudio)), role('admin', 'host', 'speaker'));
 
 /**
  * Returns the default egress object - when no egress data is available.
@@ -5835,7 +5855,7 @@ const getSdkVersion = (sdk) => {
     return sdk ? `${sdk.major}.${sdk.minor}.${sdk.patch}` : '0.0.0-development';
 };
 
-const version = "1.33.0";
+const version = "1.33.1";
 const [major, minor, patch] = version.split('.');
 let sdkInfo = {
     type: SdkType.PLAIN_JAVASCRIPT,
@@ -14778,7 +14798,7 @@ class StreamClient {
         this.getUserAgent = () => {
             if (!this.cachedUserAgent) {
                 const { clientAppIdentifier = {} } = this.options;
-                const { sdkName = 'js', sdkVersion = "1.33.0", ...extras } = clientAppIdentifier;
+                const { sdkName = 'js', sdkVersion = "1.33.1", ...extras } = clientAppIdentifier;
                 this.cachedUserAgent = [
                     `stream-video-${sdkName}-v${sdkVersion}`,
                     ...Object.entries(extras).map(([key, value]) => `${key}=${value}`),