@reactoo/watchtogether-sdk-js 2.6.88 → 2.6.90

package/package.json

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

package/src/modules/wt-room.js

@@ -787,6 +787,7 @@ class RoomSession {
 				this._log('Substream: ', sender, mid, substream);
 				this._setSelectedSubstream(sender, mid, substream);
 				this._resetStats(sender, mid);
+				this.requestKeyFrame(sender, mid)
 			}
 
 			if(temporal !== undefined && temporal !== null) {
@@ -967,7 +968,6 @@ class RoomSession {
 					stats: {},
 					selectedSubstream: {},
 					initialSimulcastSubstreamBeenSet: {},
-					simulcastSubstreamManualSelect: {},
 					simulcastSwitchFailedAttempts: {},
 				};
 
@@ -1025,7 +1025,6 @@ class RoomSession {
 					stats: {},
 					selectedSubstream: {},
 					initialSimulcastSubstreamBeenSet: {},
-					simulcastSubstreamManualSelect: {},
 					simulcastSwitchFailedAttempts: {},
 				}
 			};
@@ -1580,7 +1579,6 @@ class RoomSession {
 						}
 
 						const initialSubstreamBeenSet = !!p.webrtcStuff.initialSimulcastSubstreamBeenSet[mid];
-						const manualSelectedSubstream = p.webrtcStuff.simulcastSubstreamManualSelect?.[mid];
 						const defaultSelectedSubstream = typeof this.simulcastDefaultManualSubstream === 'object'
 								? (this.simulcastDefaultManualSubstream[source] !== undefined
 									? this.simulcastDefaultManualSubstream[source]
@@ -1591,28 +1589,14 @@ class RoomSession {
 							: this.simulcastMode;
 						const failedAttempts = p.webrtcStuff.simulcastSwitchFailedAttempts[mid] || 0;
 
-						if((simulcastMode === 'auto' && !manualSelectedSubstream) /* || failedAttempts > 3 */) {
+						if((simulcastMode === 'auto') /* || failedAttempts > 3 */) {
 							// do nothing
 						}
 						
-						else if(simulcastMode === 'manual' || manualSelectedSubstream || !initialSubstreamBeenSet) {
+						else if(simulcastMode === 'manual' || !initialSubstreamBeenSet) {
 							p.webrtcStuff.initialSimulcastSubstreamBeenSet[mid] = true;
 							const currentSubstream = p.webrtcStuff.selectedSubstream[mid];
-							if(manualSelectedSubstream !== undefined && manualSelectedSubstream !== null && currentSubstream !== manualSelectedSubstream) {
-								this.selectSubStream(p.handleId, manualSelectedSubstream, 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]++;
-										}
-									});
-							}
-							else if(defaultSelectedSubstream !== undefined && defaultSelectedSubstream !== null && defaultSelectedSubstream !== currentSubstream) {
+							if(defaultSelectedSubstream !== undefined && defaultSelectedSubstream !== null && defaultSelectedSubstream !== currentSubstream) {
 								this.selectSubStream(p.handleId, defaultSelectedSubstream, undefined, mid, false)
 									.then(() => {
 										p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 0
@@ -2971,9 +2955,9 @@ class RoomSession {
 		}
 	}
 
-	selectSubStream(handleId, substream = 2, source, mid, manual = true) {
+	selectSubStream(handleId, substream = 2, source, mid = true) {
 
-		this._log('Select SubStream attempt', handleId, substream, source, mid, 'was this selected by user', manual);
+		this._log('Select SubStream attempt', handleId, substream, source, mid);
 
 		let handle = this._getHandle(handleId);
 		if(!handle) {
@@ -2999,11 +2983,6 @@ class RoomSession {
 						clearTimeout(messageTimeoutId);
 						this._abortController.signal.removeEventListener('abort', abortResponse);
 						this.ws.removeEventListener('message', parseResponse);
-
-						if(manual) {
-							config.simulcastSubstreamManualSelect[mid] = substream;
-						}
-
 						resolve({substream, sender});
 					}
 				}
@@ -3022,8 +3001,7 @@ class RoomSession {
 				}
 				if(mid !== undefined) {
 
-					if(manual && substream === null) {
-						config.simulcastSubstreamManualSelect[mid] = substream;
+					if(substream === null) {
 						resolve({substream, sender: handleId});
 						return;
 					}