@reactoo/watchtogether-sdk-js 2.7.38 → 2.7.40

package/dist/watchtogether-sdk.js

@@ -1,6 +1,6 @@
 /*!
  *  @reactoo/watchtogether-sdk-js
- *  @version 2.7.38-beta.3
+ *  @version 2.7.39
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -25494,7 +25494,10 @@ class Iot {
       }
 
       // Find a suitable topic for the connection check
-      const suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('user') > -1);
+      let suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('user') > -1);
+      if (!suitableTopic) {
+        suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('room') > -1 && topic !== 'wt/instanceroom/reactooDemo');
+      }
       if (!suitableTopic) {
         reject(new Error('No suitable topic found for connection check'));
         return;
@@ -25531,7 +25534,10 @@ class Iot {
       return;
     }
     // Find a suitable topic for the connection check
-    const suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('user') > -1);
+    let suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('user') > -1);
+    if (!suitableTopic) {
+      suitableTopic = Array.from(this.subscribedTopics).find(topic => topic.indexOf('room') > -1 && topic !== 'wt/instanceroom/reactooDemo');
+    }
     if (!suitableTopic) {
       this.log('No suitable topic found for keep alive message');
       return;
@@ -27167,13 +27173,13 @@ class RoomSession {
               let directionDecision = 0;
               if (((_p$webrtcStuff4 = p.webrtcStuff) === null || _p$webrtcStuff4 === void 0 ? void 0 : (_p$webrtcStuff4$stats = _p$webrtcStuff4.stats) === null || _p$webrtcStuff4$stats === void 0 ? void 0 : (_p$webrtcStuff4$stats2 = _p$webrtcStuff4$stats[mid]) === null || _p$webrtcStuff4$stats2 === void 0 ? void 0 : _p$webrtcStuff4$stats2.length) > this._upStatsLength) {
                 const upMedianStats = this._calculateMedianStats(p.webrtcStuff.stats[mid].slice(this._upStatsLength * -1));
-                if ((upMedianStats === null || upMedianStats === void 0 ? void 0 : upMedianStats.framesPerSecond) >= Math.floor(((settingsForCurrentSubstream === null || settingsForCurrentSubstream === void 0 ? void 0 : settingsForCurrentSubstream.maxFramerate) || 30) * 0.7) && (upMedianStats === null || upMedianStats === void 0 ? void 0 : upMedianStats.freezeDurationSinceLast) < this._upStatsLength * this._statsInterval * 0.33 / 1000 /* && upMedianStats?.freezeCountSinceLast < 3 */) {
+                if ((upMedianStats === null || upMedianStats === void 0 ? void 0 : upMedianStats.freezeDurationSinceLast) < this._upStatsLength * this._statsInterval * 0.33 / 1000 /* && upMedianStats?.freezeCountSinceLast < 3 */) {
                   directionDecision = 1;
                 }
               }
               if (((_p$webrtcStuff5 = p.webrtcStuff) === null || _p$webrtcStuff5 === void 0 ? void 0 : (_p$webrtcStuff5$stats = _p$webrtcStuff5.stats) === null || _p$webrtcStuff5$stats === void 0 ? void 0 : (_p$webrtcStuff5$stats2 = _p$webrtcStuff5$stats[mid]) === null || _p$webrtcStuff5$stats2 === void 0 ? void 0 : _p$webrtcStuff5$stats2.length) > this._downStatsLength) {
                 const downMedianStats = this._calculateMedianStats(p.webrtcStuff.stats[mid].slice(this._downStatsLength * -1));
-                if ((downMedianStats === null || downMedianStats === void 0 ? void 0 : downMedianStats.framesPerSecond) < Math.floor(((settingsForCurrentSubstream === null || settingsForCurrentSubstream === void 0 ? void 0 : settingsForCurrentSubstream.maxFramerate) || 30) * 0.7) || (downMedianStats === null || downMedianStats === void 0 ? void 0 : downMedianStats.freezeDurationSinceLast) > this._downStatsLength * this._statsInterval * 0.33 / 1000 /*  || downMedianStats?.freezeCountSinceLast > 5 || downMedianStats?.jitter > maxJitter(settingsForCurrentSubstream.maxFramerate) */) {
+                if ((downMedianStats === null || downMedianStats === void 0 ? void 0 : downMedianStats.freezeDurationSinceLast) > this._downStatsLength * this._statsInterval * 0.33 / 1000 /*  || downMedianStats?.freezeCountSinceLast > 5 || downMedianStats?.jitter > maxJitter(settingsForCurrentSubstream.maxFramerate) */) {
                   directionDecision = -1;
                 }
               }
@@ -27585,10 +27591,6 @@ class RoomSession {
                 hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)
               });
             };
-            let mutedTimerId = {};
-            let waitPeriod = 300; // ms
-            let screenShareWaitPeriod = 5000; // ms
-
             event.track.onmute = ev => {
               var _decodeJanusDisplay23, _decodeJanusDisplay24;
               this._log('Remote track muted');
@@ -27609,34 +27611,6 @@ class RoomSession {
                 track: ev.target,
                 muted: true
               });
-
-              // when a track is muted, we try to switch to lower quality substream, but not for screen sharing
-
-              if (!this.simulcast) {
-                return;
-              }
-              const wPeriod = source.indexOf('screen') > -1 ? screenShareWaitPeriod : waitPeriod;
-              if (!mutedTimerId[mid]) {
-                mutedTimerId[mid] = setTimeout(() => {
-                  var _handle$webrtcStuff5, _handle$webrtcStuff5$;
-                  mutedTimerId[mid] = null;
-                  const simulcastConfigForSource = this._findSimulcastConfig(source, this.simulcastSettings);
-                  const simulcastMode = ((_handle$webrtcStuff5 = handle.webrtcStuff) === null || _handle$webrtcStuff5 === void 0 ? void 0 : (_handle$webrtcStuff5$ = _handle$webrtcStuff5.overriddenSimulcastMode[mid]) === null || _handle$webrtcStuff5$ === void 0 ? void 0 : _handle$webrtcStuff5$.mode) || (simulcastConfigForSource === null || simulcastConfigForSource === void 0 ? void 0 : simulcastConfigForSource.mode);
-                  const {
-                    simulcastBitrates
-                  } = handle.webrtcStuff.tracksMap.find(t => t.mid === mid) || {};
-
-                  // track is gone
-                  if (!simulcastBitrates) {
-                    return;
-                  }
-                  const currentSubstream = handle.webrtcStuff.selectedSubstream[mid];
-                  if (!(simulcastMode === 'browserControlled') && ev.target.kind === 'video' && currentSubstream < simulcastBitrates.length - 1) {
-                    this._log('Attempting to down the quality due to track muted');
-                    this.selectSubStream(handle.handleId, currentSubstream + 1, undefined, mid, false).catch(reason => this._log(`Changing substream for mid: ${mid} failed. Reason: ${reason}`));
-                  }
-                }, wPeriod);
-              }
             };
             event.track.onunmute = ev => {
               var _decodeJanusDisplay25, _decodeJanusDisplay26;
@@ -27644,10 +27618,6 @@ class RoomSession {
               let transceiver = config.pc.getTransceivers().find(t => t.receiver.track === ev.target);
               let mid = transceiver.mid || ev.target.id;
               let source = Object.keys(config.streamMap).find(key => config.streamMap[key].includes(ev.target.id));
-              if (mutedTimerId[mid]) {
-                clearTimeout(mutedTimerId[mid]);
-                mutedTimerId[mid] = null;
-              }
               this.emit('remoteTrackMuted', {
                 id: handle.handleId,
                 mid,
@@ -27966,6 +27936,61 @@ class RoomSession {
       });
     });
   }
+  _addSimulcastToSDP(sdp) {
+    // Split SDP into lines
+    let sdpLines = sdp.split('\n');
+
+    // Find the index of the video m-line
+    let videoIndex = sdpLines.findIndex(line => line.startsWith('m=video'));
+    if (videoIndex === -1) {
+      // No video m-line found
+      return sdp;
+    }
+
+    // We need to insert the lines after the mid attribute
+    // Find the index of the 'a=mid' line in the video section
+    let midIndex = sdpLines.findIndex((line, index) => index > videoIndex && line.startsWith('a=mid:'));
+    if (midIndex === -1) {
+      // No 'a=mid' line found in video m-section
+      return sdp;
+    }
+
+    // Prepare the simulcast attributes
+    const simulcastLines = ['a=rid:l recv', 'a=rid:m recv', 'a=rid:h recv', 'a=simulcast:recv l;m;h'];
+
+    // Prepare the extmap attributes for RID and Repaired RID
+    const extmapId = sdpLines.reduce((maxId, line) => {
+      const match = line.match(/a=extmap:(\d+)/);
+      return match ? Math.max(maxId, parseInt(match[1])) : maxId;
+    }, 0);
+    const extmapLines = [`a=extmap:${extmapId + 1} urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id`, `a=extmap:${extmapId + 2} urn:ietf:params:rtp-hdrext:sdes:repaired-rtp-stream-id`];
+
+    // Insert the extmap lines after the last existing extmap in the video section
+    let lastExtmapIndex = midIndex;
+    for (let i = midIndex + 1; i < sdpLines.length; i++) {
+      if (sdpLines[i].startsWith('a=extmap:')) {
+        lastExtmapIndex = i;
+      } else if (sdpLines[i].startsWith('a=')) {
+        // Reached another attribute
+        break;
+      }
+    }
+
+    // Check if the attributes are already present
+    const hasSimulcast = sdpLines.some(line => line.startsWith('a=simulcast'));
+    const hasRidExtmap = sdpLines.some(line => line.includes('urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id'));
+    if (!hasRidExtmap) {
+      // Insert the extmap lines
+      sdpLines.splice(lastExtmapIndex + 1, 0, ...extmapLines);
+    }
+    if (!hasSimulcast) {
+      // Insert the simulcast lines after the 'a=mid' line
+      sdpLines.splice(midIndex + 1, 0, ...simulcastLines);
+    }
+
+    // Return the modified SDP
+    return sdpLines.join('\n');
+  }
   _publishRemote(handleId, jsep) {
     let handle = this._getHandle(handleId);
     if (!handle) {
@@ -27979,6 +28004,12 @@ class RoomSession {
     this._webrtc(handleId, true);
     let config = handle.webrtcStuff;
     if (jsep) {
+      // Just For Debugging
+      // Munge the SDP before setting the remote description
+      // if (jsep && jsep.sdp) {
+      // 	jsep.sdp = this._addSimulcastToSDP(jsep.sdp);
+      // }
+
       return config.pc.setRemoteDescription(jsep).then(() => {
         config.remoteSdp = jsep.sdp;
         // Any trickle candidate we cached?
@@ -28822,9 +28853,9 @@ class RoomSession {
       remoteUsersCache.forEach(r => {
         const handle = this._getHandle(null, null, null, r.userId);
         if (this._participantShouldSubscribe(r.userId)) {
-          var _handle$webrtcStuff6;
+          var _handle$webrtcStuff5;
           // todo: do a nicer flag to indicate inactive handle than just checking for pc
-          if (!handle || !((_handle$webrtcStuff6 = handle.webrtcStuff) !== null && _handle$webrtcStuff6 !== void 0 && _handle$webrtcStuff6.pc)) {
+          if (!handle || !((_handle$webrtcStuff5 = handle.webrtcStuff) !== null && _handle$webrtcStuff5 !== void 0 && _handle$webrtcStuff5.pc)) {
             this._log('Subscribing to ', r.userId);
             this._createParticipant(r.userId, r.id).then(handle => {
               this._updateParticipantsTrackData(handle.handleId, r.streams);