@reactoo/watchtogether-sdk-js 2.6.92 → 2.6.95

package/package.json

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

package/src/models/room-session.js

@@ -364,7 +364,7 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 		},
 
 		selectSubStream: (handleId, substream, source, mid) => {
-			return room.selectSubStream(handleId, substream, source, mid);
+			return room.selectSubStream(handleId, substream, source, mid, true);
 		},
 
 		setBitrateCap: (bitrate) => {

package/src/modules/wt-room.js

@@ -968,7 +968,7 @@ class RoomSession {
 					stats: {},
 					selectedSubstream: {},
 					initialSimulcastSubstreamBeenSet: {},
-					simulcastSwitchFailedAttempts: {},
+					forcedAutoMode:{},
 				};
 
 				if (handleId === this.handleId) {
@@ -1025,7 +1025,7 @@ class RoomSession {
 					stats: {},
 					selectedSubstream: {},
 					initialSimulcastSubstreamBeenSet: {},
-					simulcastSwitchFailedAttempts: {},
+					forcedAutoMode:{},
 				}
 			};
 			this._participants.push(handle);
@@ -1579,17 +1579,18 @@ class RoomSession {
 						}
 
 						const initialSubstreamBeenSet = !!p.webrtcStuff.initialSimulcastSubstreamBeenSet[mid];
+
 						const defaultSelectedSubstream = typeof this.simulcastDefaultManualSubstream === 'object'
 								? (this.simulcastDefaultManualSubstream[source] !== undefined
 									? this.simulcastDefaultManualSubstream[source]
 									: this.simulcastDefaultManualSubstream['default'])
 								: this.simulcastDefaultManualSubstream;
+
 						const simulcastMode = typeof this.simulcastMode === 'object'
 							? (this.simulcastMode[source] !== undefined ? this.simulcastMode[source] : this.simulcastMode['default'])
 							: this.simulcastMode;
-						const failedAttempts = p.webrtcStuff.simulcastSwitchFailedAttempts[mid] || 0;
 
-						if((simulcastMode === 'auto') /* || failedAttempts > 3 */) {
+						if((simulcastMode === 'auto' || p.webrtcStuff.forcedAutoMode[mid])) {
 							// do nothing
 						}
 						
@@ -1599,17 +1600,6 @@ class RoomSession {
 							if(defaultSelectedSubstream !== undefined && defaultSelectedSubstream !== null && defaultSelectedSubstream !== currentSubstream) {
 								this._log('Attempting to force substream quality', defaultSelectedSubstream);
 								this.selectSubStream(p.handleId, defaultSelectedSubstream, undefined, mid, false)
-									.then(() => {
-										p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 0
-									})
-									.catch(() => {
-										if(!p.webrtcStuff.simulcastSwitchFailedAttempts[mid]) {
-											p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 1;
-										}
-										else {
-											p.webrtcStuff.simulcastSwitchFailedAttempts[mid]++;
-										}
-									});
 							}
 						}
 
@@ -1636,18 +1626,6 @@ class RoomSession {
 									this._log('Attempting to down the quality', currentSubstream + 1);
 									this._resetStats(p.handleId, mid);
 									this.selectSubStream(p.handleId, currentSubstream + 1, undefined, mid, false)
-										.then(() => {
-											p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 0
-										})
-										.catch((e) => {
-											this._log('switch failed:', e);
-											if(!p.webrtcStuff.simulcastSwitchFailedAttempts[mid]) {
-												p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 1;
-											}
-											else {
-												p.webrtcStuff.simulcastSwitchFailedAttempts[mid]++;
-											}
-										})
 								}
 							}
 							else if (directionDecision === 1) {
@@ -1655,18 +1633,6 @@ class RoomSession {
 									this._log('Attempting to up the quality', currentSubstream - 1);
 									this._resetStats(p.handleId, mid);
 									this.selectSubStream(p.handleId, currentSubstream - 1, undefined, mid, false)
-										.then(() => {
-											p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 0
-										})
-										.catch((e) => {
-											this._log('switch failed:', e);
-											if(!p.webrtcStuff.simulcastSwitchFailedAttempts[mid]) {
-												p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 1;
-											}
-											else {
-												p.webrtcStuff.simulcastSwitchFailedAttempts[mid]++;
-											}
-										})
 								}
 							}
 						}
@@ -1754,6 +1720,8 @@ class RoomSession {
 							if(report.type === 'local-candidate') {
 								stats.networkType = report.networkType;
 							}
+
+							stats.selectedSubstream = handle.webrtcStuff.selectedSubstream[participantStats.mid];
 						});
 
 						// pushing stats into handle stats array but keeping only 6 last stats
@@ -1761,8 +1729,8 @@ class RoomSession {
 						if(handle.webrtcStuff.stats[participantStats.mid].length > this._statsMaxLength) {
 							handle.webrtcStuff.stats[participantStats.mid].shift();
 						}
-						
-						this.emit('rtcStats', {handleId: participantStats.handle.handleId, stats, source: participantStats.source, mid: participantsStats.mid});
+
+						this.emit('rtcStats', {handleId: participantStats.handle.handleId, stats, userId: decodeJanusDisplay(participantStats.handle.userId)?.userId,  source: participantStats.source, mid: participantStats.mid});
 					}
 				}
 			});
@@ -2955,7 +2923,7 @@ class RoomSession {
 		}
 	}
 
-	selectSubStream(handleId, substream = 2, source, mid) {
+	selectSubStream(handleId, substream = 2, source, mid, manual = false) {
 		this._log('Select substream called for handle:', handleId, 'Source or mid:', source ? source : mid, 'Substream:', substream);
 		let handle = this._getHandle(handleId);
 		if(!handle) {
@@ -2998,12 +2966,20 @@ class RoomSession {
 					}
 				}
 				if(mid !== undefined) {
-
 					if(substream === null) {
+
+						if(manual) {
+							config.forcedAutoMode[mid] = false
+						}
+
 						resolve({substream, sender: handleId});
 						return;
 					}
 
+					if(manual) {
+						config.forcedAutoMode[mid] = true
+					}
+
 					this.ws.addEventListener('message', parseResponse);
 					this._abortController.signal.addEventListener('abort', abortResponse);
 					messageTimeoutId = setTimeout(() => {