@reactoo/watchtogether-sdk-js 2.7.38 → 2.7.40

package/example/index.html

@@ -32,8 +32,8 @@
 
         //https://studio.reactoo.com/room/edf441b3-7415-49c4-9557-273cb93bc746/LJj4W2Cz-nG3U-lb0R-TAaY-o7Thmb8xHSbE
 
-        let roomId = "c22ada04-6c95-4524-91d8-e915bcef2e61"; // It will create room automatically if not set
-        let pinHash = "OayoOVzK-XmWr-BTID-fVwH-eH44Tn3xSWeR";// '967ca05f-7fab-a205-5913-39393bbbe923';
+        let roomId = "d841ad58-e5a6-4cb8-aeb8-c92499a213a4"; // It will create room automatically if not set
+        let pinHash = null;
 
         let participants = document.querySelector('.participants');
         var video = document.querySelector('.contentVideo');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.7.38",
+  "version": "2.7.40",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",

package/src/modules/wt-iot.js

@@ -280,7 +280,11 @@ 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'));
@@ -323,7 +327,12 @@ 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;

package/src/modules/wt-room.js

@@ -1700,14 +1700,14 @@ class RoomSession {
 							let directionDecision = 0;
 							if(p.webrtcStuff?.stats?.[mid]?.length > this._upStatsLength) {
 								const upMedianStats = this._calculateMedianStats(p.webrtcStuff.stats[mid].slice(this._upStatsLength * -1));
-								if(upMedianStats?.framesPerSecond >= Math.floor((settingsForCurrentSubstream?.maxFramerate || 30) * 0.7) && upMedianStats?.freezeDurationSinceLast < (this._upStatsLength * this._statsInterval * 0.33) / 1000 /* && upMedianStats?.freezeCountSinceLast < 3 */) {
+								if(upMedianStats?.freezeDurationSinceLast < (this._upStatsLength * this._statsInterval * 0.33) / 1000 /* && upMedianStats?.freezeCountSinceLast < 3 */) {
 									directionDecision = 1;
 								}
 							}
 
 							if(p.webrtcStuff?.stats?.[mid]?.length > this._downStatsLength) {
 								const downMedianStats = this._calculateMedianStats(p.webrtcStuff.stats[mid].slice(this._downStatsLength * -1));
-								if(downMedianStats?.framesPerSecond < Math.floor((settingsForCurrentSubstream?.maxFramerate || 30) * 0.7) || downMedianStats?.freezeDurationSinceLast > (this._downStatsLength * this._statsInterval * 0.33) / 1000 /*  || downMedianStats?.freezeCountSinceLast > 5 || downMedianStats?.jitter > maxJitter(settingsForCurrentSubstream.maxFramerate) */) {
+								if(downMedianStats?.freezeDurationSinceLast > (this._downStatsLength * this._statsInterval * 0.33) / 1000 /*  || downMedianStats?.freezeCountSinceLast > 5 || downMedianStats?.jitter > maxJitter(settingsForCurrentSubstream.maxFramerate) */) {
 									directionDecision = -1;
 								}
 							}
@@ -2127,10 +2127,6 @@ class RoomSession {
 							});
 						};
 
-						let mutedTimerId = {};
-						let waitPeriod = 300; // ms
-						let screenShareWaitPeriod = 5000; // ms
-
 						event.track.onmute = (ev) => {
 							this._log('Remote track muted');
 
@@ -2153,35 +2149,6 @@ class RoomSession {
 								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(() => {
-									mutedTimerId[mid] = null;
-									const simulcastConfigForSource = this._findSimulcastConfig(source, this.simulcastSettings);
-									const simulcastMode = handle.webrtcStuff?.overriddenSimulcastMode[mid]?.mode || 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) => {
@@ -2192,11 +2159,6 @@ class RoomSession {
 							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,
@@ -2349,7 +2311,6 @@ class RoomSession {
 				config.isIceRestarting = false;
 			});
 		}
-
 	}
 
 	_setupTransceivers(handleId, [audioSend, audioRecv, videoSend, videoRecv, audioTransceiver = null, videoTransceiver = null]) {
@@ -2507,6 +2468,77 @@ 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) {
@@ -2523,6 +2555,13 @@ class RoomSession {
 		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;