@reactoo/watchtogether-sdk-js 2.5.83 → 2.5.85

package/src/modules/wt-room.js

@@ -166,6 +166,7 @@ class RoomSession {
 	constructor(constructId = null, type = 'reactooroom', options = {}) {
 
 		Object.assign(this, emitter());
+		this.options = {...options};
 		this.defaultDataChannelLabel = 'JanusDataChannel'
 		this.server = null;
 		this.iceServers = null;
@@ -176,9 +177,14 @@ class RoomSession {
 		this.userId = null;
 		this.sessiontype = type;
 		this.initialBitrate = 0;
+		this.simulcast = false;
+		this.simulcastBitrates = {
+			high: 900000,
+			medium: 300000,
+			low: 100000
+		};
 		this.recordingFilename = null;
 		this.pluginName = RoomSession.sessionTypes[type];
-		this.options = options;
 		this.id = null;
 		this.privateId = null;
 		this.constructId = constructId || RoomSession.randomString(16);
@@ -186,7 +192,6 @@ class RoomSession {
 		this.handleId = null;
 		this.ws = null;
 		this.isRestarting = false;
-
 		this.isConnecting = false;
 		this.isDisconnecting = false;
 		this.isConnected = false;
@@ -206,7 +211,6 @@ class RoomSession {
 		this.isVideoMuted = false;
 		this.isVideoEnabled = false;
 		this.isAudioEnabed = false;
-		this.isUnifiedPlan = RoomSession.checkUnifiedPlan();
 
 		this.subscriptionRules = {
 			...RoomSession.subscriptionRules,
@@ -220,35 +224,6 @@ class RoomSession {
 
 	}
 
-	// Check if this browser supports Unified Plan and transceivers
-	// Based on https://codepen.io/anon/pen/ZqLwWV?editors=0010
-	static checkUnifiedPlan() {
-		let unifiedPlan = false;
-		if (adapter.browserDetails.browser === 'firefox' &&
-			adapter.browserDetails.version >= 59) {
-			// Firefox definitely does, starting from version 59
-			unifiedPlan = true;
-		} else if (adapter.browserDetails.browser === 'chrome' &&
-			adapter.browserDetails.version >= 72) {
-			// Chrome does, but it's only usable from version 72 on
-			unifiedPlan = true;
-		} else if (!window.RTCRtpTransceiver || !('currentDirection' in RTCRtpTransceiver.prototype)) {
-			// Safari supports addTransceiver() but not Unified Plan when
-			// currentDirection is not defined (see codepen above).
-			unifiedPlan = false;
-		} else {
-			// Check if addTransceiver() throws an exception
-			const tempPc = new RTCPeerConnection();
-			try {
-				tempPc.addTransceiver('audio');
-				unifiedPlan = true;
-			} catch (e) {
-			}
-			tempPc.close();
-		}
-		return unifiedPlan;
-	}
-
 	_participantShouldSubscribe(userId) {
 		const myUser = decodeJanusDisplay(this.display);
 		const remoteUser = decodeJanusDisplay(userId);
@@ -564,7 +539,8 @@ class RoomSession {
 											"request": "join",
 											"room": this.roomId,
 											"ptype": "subscriber",
-											"feed": id,
+											streams: streams.map(stream => ({feed: stream.id, mid: stream.mid})),
+											//"feed": id,
 											"private_id": this.privateId,
 											...(this.webrtcVersion > 1000 ? {id: this.userId} : {}),
 											pin: this.pin
@@ -576,7 +552,8 @@ class RoomSession {
 								})
 						}
 					}
-				} else if (event === "event") {
+				}
+				else if (event === "event") {
 
 					if (msg["streams"] !== undefined && msg["streams"] !== null) {
 						this._log('Got my own streams back', msg["streams"]);
@@ -600,7 +577,7 @@ class RoomSession {
 											"request": "join",
 											"room": this.roomId,
 											"ptype": "subscriber",
-											"feed": id,
+											streams: streams.map(stream => ({feed: stream.id, mid: stream.mid})),
 											"private_id": this.privateId,
 											...(this.webrtcVersion > 1000 ? {id: this.userId} : {}),
 											pin: this.pin
@@ -679,6 +656,11 @@ class RoomSession {
 
 				}
 			} else if (type === "webrtcup") {
+
+				if(this.simulcast) {
+					return;
+				}
+
 				this._log('Configuring bitrate: ' + this.initialBitrate);
 				if (this.initialBitrate > 0) {
 					this.sendMessage(this.handleId, {
@@ -700,6 +682,7 @@ class RoomSession {
 			let jsep = json["jsep"];
 			let event = msg["videoroom"];
 			let error = msg["error"];
+			let substream = msg["substream"];
 
 			if (event === "attached") {
 				this._log('Remote have successfully joined Room', msg);
@@ -982,7 +965,7 @@ class RoomSession {
 		});
 	}
 
-	connect(roomId, pin, server, iceServers, token, display, userId, webrtcVersion = 0, initialBitrate = 0, recordingFilename) {
+	connect(roomId, pin, server, iceServers, token, display, userId, webrtcVersion = 0, initialBitrate = 0, recordingFilename, simulcast = false, simulcastBitrates = {}) {
 
 		if (this.isConnecting) {
 			return Promise.reject({type: 'warning', id: 16, message: 'connection already in progress'});
@@ -993,6 +976,7 @@ class RoomSession {
 		}
 		this._stopKeepAlive();
 		this._abortController = new AbortController();
+
 		this.sessionId = null;
 		this.server = server;
 		this.iceServers = iceServers;
@@ -1005,6 +989,9 @@ class RoomSession {
 		this.initialBitrate = initialBitrate;
 		this.recordingFilename = recordingFilename;
 		this.isConnecting = true;
+		this.simulcast = simulcast;
+		this.simulcastBitrates = {...this.simulcastBitrates, ...simulcastBitrates};
+
 		this.emit('joining', true);
 		return new Promise((resolve, reject) => {
 
@@ -1263,7 +1250,7 @@ class RoomSession {
 		if (!config.pc) {
 			let pc_config = {"iceServers": this.iceServers, "iceTransportPolicy": 'all', "bundlePolicy": undefined};
 
-			pc_config["sdpSemantics"] = this.isUnifiedPlan ? "unified-plan" : "plan-b";
+			pc_config["sdpSemantics"] = "unified-plan";
 
 			let pc_constraints = {};
 
@@ -1281,6 +1268,7 @@ class RoomSession {
 				}
 				this.emit('connectionState', [handleId, handleId === this.handleId, config.pc.connectionState]);
 				if(handleId !== this.handleId && config.pc.connectionState === 'connected') {
+
 					this.emit(this._getAddParticipantEventName(handle.handleId), {
 						tid: generateUUID(),
 						id: handle.handleId,
@@ -1376,12 +1364,9 @@ class RoomSession {
 
 						event.track.onended = (ev) => {
 
-							let mid = ev.target.id;
-							if(this.isUnifiedPlan) {
-								let transceiver = config.pc.getTransceivers().find(
-									t => t.receiver.track === ev.target);
-								mid = transceiver.mid;
-							}
+							let transceiver = config.pc?.getTransceivers()?.find(
+								t => t.receiver.track === ev.target);
+							let mid = transceiver?.mid || ev.target.id;
 
 							if (config.stream) {
 								config.stream && config.stream.removeTrack(ev.target);
@@ -1406,12 +1391,9 @@ class RoomSession {
 						event.track.onmute = (ev) => {
 							this._log('remoteTrackMuted', 'onmute');
 
-							let mid = ev.target.id;
-							if(this.isUnifiedPlan) {
-								let transceiver = config.pc.getTransceivers().find(
-									t => t.receiver.track === ev.target);
-								mid = transceiver.mid;
-							}
+							let transceiver = config.pc.getTransceivers().find(
+								t => t.receiver.track === ev.target);
+							let mid = transceiver.mid || ev.target.id;
 
 							this.emit('remoteTrackMuted', {
 								id: handle.handleId,
@@ -1428,12 +1410,9 @@ class RoomSession {
 						event.track.onunmute = (ev) => {
 							this._log('remoteTrackMuted', 'onunmute');
 
-							let mid = ev.target.id;
-							if(this.isUnifiedPlan) {
-								let transceiver = config.pc.getTransceivers().find(
-									t => t.receiver.track === ev.target);
-								mid = transceiver.mid;
-							}
+							let transceiver = config.pc.getTransceivers().find(
+								t => t.receiver.track === ev.target);
+							let mid = transceiver.mid || ev.target.id;
 
 							this.emit('remoteTrackMuted', {
 								id: handle.handleId,
@@ -1552,7 +1531,8 @@ class RoomSession {
 			config.isIceRestarting = true;
 			let hasAudio = !!(config.stream && config.stream.getAudioTracks().length > 0);
 			let hasVideo = !!(config.stream && config.stream.getVideoTracks().length > 0);
-			this._createAO('offer', handleId, true, [hasAudio, false, hasVideo, false])
+			this._setupTransceivers([hasAudio, false, hasVideo, false]);
+			this._createAO('offer', handleId, true )
 				.then((jsep) => {
 					if (!jsep) {
 						return null;
@@ -1568,7 +1548,7 @@ class RoomSession {
 				})
 				.catch((e) => {
 					config.isIceRestarting = false;
-					this.emit('warning', {type: 'error', id: 28, message: 'iceRestart failed', data: e});
+					this.emit('error', {type: 'warning', id: 28, message: 'iceRestart failed', data: e});
 				});
 		} else {
 			this._log('Performing remote ICE restart', handleId);
@@ -1584,148 +1564,139 @@ class RoomSession {
 
 	}
 
-	_createAO(type = 'offer', handleId, iceRestart = false, [audioSend, audioRecv, videoSend, videoRecv]) {
+	_setupTransceivers(handleId, [audioSend, audioRecv, videoSend, videoRecv]) {
 
 		let handle = this._getHandle(handleId);
 		if (!handle) {
-			return Promise.reject({
-				type: 'warning',
-				id: 15,
-				message: 'id non-existent',
-				data: [handleId, 'createAO', type]
-			});
+			return null;
 		}
 
-		let methodName = null;
-		if (type === 'offer') {
-			methodName = 'createOffer'
-		} else {
-			methodName = 'createAnswer'
+		let config = handle.webrtcStuff;
+		let audioTransceiver = null, videoTransceiver = null;
+		let transceivers = config.pc.getTransceivers();
+		if (transceivers && transceivers.length > 0) {
+			for (var i in transceivers) {
+				var t = transceivers[i];
+				if ((t.sender && t.sender.track && t.sender.track.kind === "audio") ||
+					(t.receiver && t.receiver.track && t.receiver.track.kind === "audio")) {
+					if (!audioTransceiver)
+						audioTransceiver = t;
+					continue;
+				}
+				if ((t.sender && t.sender.track && t.sender.track.kind === "video") ||
+					(t.receiver && t.receiver.track && t.receiver.track.kind === "video")) {
+					if (!videoTransceiver)
+						videoTransceiver = t;
+					continue;
+				}
+			}
 		}
 
-		var config = handle.webrtcStuff;
-
-		// https://code.google.com/p/webrtc/issues/detail?id=3508
-		var mediaConstraints = {};
-		if (this.isUnifiedPlan) {
-			var audioTransceiver = null, videoTransceiver = null;
-			var transceivers = config.pc.getTransceivers();
-			if (transceivers && transceivers.length > 0) {
-				for (var i in transceivers) {
-					var t = transceivers[i];
-					if ((t.sender && t.sender.track && t.sender.track.kind === "audio" && t.stopped === false) ||
-						(t.receiver && t.receiver.track && t.receiver.track.kind === "audio" && t.stopped === false)) {
-						if (!audioTransceiver)
-							audioTransceiver = t;
-						continue;
-					}
-					if ((t.sender && t.sender.track && t.sender.track.kind === "video" && t.stopped === false) ||
-						(t.receiver && t.receiver.track && t.receiver.track.kind === "video" && t.stopped === false)) {
-						if (!videoTransceiver)
-							videoTransceiver = t;
-						continue;
-					}
+		// Handle audio (and related changes, if any)
+		if (!audioSend && !audioRecv) {
+			// Audio disabled: have we removed it?
+			if (audioTransceiver) {
+				if (audioTransceiver.setDirection) {
+					audioTransceiver.setDirection("inactive");
+				} else {
+					audioTransceiver.direction = "inactive";
 				}
 			}
-
-			// Handle audio (and related changes, if any)
-			if (!audioSend && !audioRecv) {
-				// Audio disabled: have we removed it?
+		} else {
+			// Take care of audio m-line
+			if (audioSend && audioRecv) {
 				if (audioTransceiver) {
 					if (audioTransceiver.setDirection) {
-						audioTransceiver.setDirection("inactive");
+						audioTransceiver.setDirection("sendrecv");
 					} else {
-						audioTransceiver.direction = "inactive";
+						audioTransceiver.direction = "sendrecv";
 					}
 				}
-			} else {
-				// Take care of audio m-line
-				if (audioSend && audioRecv) {
-					if (audioTransceiver) {
-						if (audioTransceiver.setDirection) {
-							audioTransceiver.setDirection("sendrecv");
-						} else {
-							audioTransceiver.direction = "sendrecv";
-						}
-					}
-				} else if (audioSend && !audioRecv) {
-					if (audioTransceiver) {
-						if (audioTransceiver.setDirection) {
-							audioTransceiver.setDirection("sendonly");
-						} else {
-							audioTransceiver.direction = "sendonly";
-						}
+			} else if (audioSend && !audioRecv) {
+				if (audioTransceiver) {
+					if (audioTransceiver.setDirection) {
+						audioTransceiver.setDirection("sendonly");
+					} else {
+						audioTransceiver.direction = "sendonly";
 					}
-				} else if (!audioSend && audioRecv) {
-					if (audioTransceiver) {
-						if (audioTransceiver.setDirection) {
-							audioTransceiver.setDirection("recvonly");
-						} else {
-							audioTransceiver.direction = "recvonly";
-						}
+				}
+			} else if (!audioSend && audioRecv) {
+				if (audioTransceiver) {
+					if (audioTransceiver.setDirection) {
+						audioTransceiver.setDirection("recvonly");
 					} else {
-						// In theory, this is the only case where we might not have a transceiver yet
-						audioTransceiver = config.pc.addTransceiver("audio", {direction: "recvonly"});
+						audioTransceiver.direction = "recvonly";
 					}
+				} else {
+					// In theory, this is the only case where we might not have a transceiver yet
+					config.pc.addTransceiver("audio", {direction: "recvonly"});
+				}
+			}
+		}
+		// Handle video (and related changes, if any)
+		if (!videoSend && !videoRecv) {
+			if (videoTransceiver) {
+				if (videoTransceiver.setDirection) {
+					videoTransceiver.setDirection("inactive");
+				} else {
+					videoTransceiver.direction = "inactive";
 				}
 			}
-			// Handle video (and related changes, if any)
-			if (!videoSend && !videoRecv) {
+		} else {
+			// Take care of video m-line
+			if (videoSend && videoRecv) {
 				if (videoTransceiver) {
 					if (videoTransceiver.setDirection) {
-						videoTransceiver.setDirection("inactive");
+						videoTransceiver.setDirection("sendrecv");
 					} else {
-						videoTransceiver.direction = "inactive";
+						videoTransceiver.direction = "sendrecv";
 					}
 				}
-			} else {
-				// Take care of video m-line
-				if (videoSend && videoRecv) {
-					if (videoTransceiver) {
-						if (videoTransceiver.setDirection) {
-							videoTransceiver.setDirection("sendrecv");
-						} else {
-							videoTransceiver.direction = "sendrecv";
-						}
-					}
-				} else if (videoSend && !videoRecv) {
-					if (videoTransceiver) {
-						if (videoTransceiver.setDirection) {
-							videoTransceiver.setDirection("sendonly");
-						} else {
-							videoTransceiver.direction = "sendonly";
-						}
+			} else if (videoSend && !videoRecv) {
+				if (videoTransceiver) {
+					if (videoTransceiver.setDirection) {
+						videoTransceiver.setDirection("sendonly");
+					} else {
+						videoTransceiver.direction = "sendonly";
 					}
-				} else if (!videoSend && videoRecv) {
-					if (videoTransceiver) {
-						if (videoTransceiver.setDirection) {
-							videoTransceiver.setDirection("recvonly");
-						} else {
-							videoTransceiver.direction = "recvonly";
-						}
+				}
+			} else if (!videoSend && videoRecv) {
+				if (videoTransceiver) {
+					if (videoTransceiver.setDirection) {
+						videoTransceiver.setDirection("recvonly");
 					} else {
-						// In theory, this is the only case where we might not have a transceiver yet
-						videoTransceiver = config.pc.addTransceiver("video", {direction: "recvonly"});
+						videoTransceiver.direction = "recvonly";
 					}
+				} else {
+					// In theory, this is the only case where we might not have a transceiver yet
+					config.pc.addTransceiver("video", {direction: "recvonly"});
 				}
 			}
-		} else {
+		}
+	}
 
-			if (adapter.browserDetails.browser === "firefox" || adapter.browserDetails.browser === "edge") {
-				mediaConstraints = {
-					offerToReceiveAudio: audioRecv,
-					offerToReceiveVideo: videoRecv
-				};
-			} else {
-				mediaConstraints = {
-					mandatory: {
-						OfferToReceiveAudio: audioRecv,
-						OfferToReceiveVideo: videoRecv
-					}
-				};
-			}
+	_createAO(type = 'offer', handleId, iceRestart = false) {
+
+		let handle = this._getHandle(handleId);
+		if (!handle) {
+			return Promise.reject({
+				type: 'warning',
+				id: 15,
+				message: 'id non-existent',
+				data: [handleId, 'createAO', type]
+			});
 		}
 
+		let methodName = null;
+		if (type === 'offer') {
+			methodName = 'createOffer'
+		} else {
+			methodName = 'createAnswer'
+		}
+
+		let config = handle.webrtcStuff;
+		let mediaConstraints = {};
+
 		if (iceRestart) {
 			mediaConstraints["iceRestart"] = true;
 		}
@@ -1795,8 +1766,11 @@ class RoomSession {
 						}
 						config.candidates = [];
 					}
+
+					this._setupTransceivers(handleId, [false, true, false, true]);
+
 					// Create the answer now
-					return this._createAO('answer', handleId, false, [false, true, false, true])
+					return this._createAO('answer', handleId, false)
 						.then(_jsep => {
 							if (!_jsep) {
 								this.emit('error', {
@@ -1827,7 +1801,7 @@ class RoomSession {
 
 	//Public methods
 
-	publishLocal(stream, {keepAudio = false, keepVideo = false} = {}) {
+	publishLocal(stream = null) {
 
 		if(this.isDisconnecting || !this.isConnected) {
 			return Promise.reject({
@@ -1852,122 +1826,130 @@ class RoomSession {
 		this._webrtc(this.handleId);
 
 		let config = handle.webrtcStuff;
+		let audioTrackReplacePromise = Promise.resolve();
+		let videoTrackReplacePromise = Promise.resolve();
 
-		if (stream) {
-			if (!config.stream) {
-				config.stream = stream;
-				stream.getTracks().forEach(function (track) {
-					config.pc.addTrack(track, stream);
-				});
-
-			} else {
-
-				/* UPDATE Audio */
-
-				let replaceAudio = stream.getAudioTracks().length;
+		if (!config.stream) {
+			config.stream = stream;
+			stream?.getTracks()?.forEach( (track) => {
 
-				if (replaceAudio || !keepAudio) {
-					//this will stop existing tracks
-					let oldAudioStream = config.stream.getAudioTracks()[0];
-					if (oldAudioStream) {
-						config.stream.removeTrack(oldAudioStream);
-						try {
-							oldAudioStream.stop();
-						} catch (e) {
-							this._log(e);
+				if(track.kind === 'audio' || !this.simulcast) {
+					config.pc.addTrack(track, stream);
+				}
+				else {
+					// adding simulcast streams
+					let bitRates = this.simulcastBitrates;
+					if(adapter.browserDetails.browser !== 'firefox') {
+						// standard
+
+						config.pc.addTransceiver(track, {
+							direction: 'sendonly',
+							streams: [config.stream],
+							sendEncodings: [
+								{ rid: 'h', active: true, maxBitrate: bitRates.high },
+								{ rid: 'm', active: true, maxBitrate: bitRates.medium, scaleResolutionDownBy: 2 },
+								{ rid: 'l', active: true, maxBitrate: bitRates.low, scaleResolutionDownBy: 4 }
+							]
+						})
+					}
+					else {
+						// firefox
+						let transceiver = config.pc.addTransceiver(track, {
+							direction: 'sendonly',
+							streams: [config.stream]
+						});
+						let sender = transceiver ? transceiver.sender : null;
+						if(sender) {
+							let parameters = sender.getParameters() || {};
+							parameters.encodings = track.sendEncodings || [
+								{ rid: 'h', active: true, maxBitrate: bitRates.high },
+								{ rid: 'm', active: true, maxBitrate: bitRates.medium, scaleResolutionDownBy: 2 },
+								{ rid: 'l', active: true, maxBitrate: bitRates.low, scaleResolutionDownBy: 4 }
+							];
+							sender.setParameters(parameters);
 						}
 					}
 				}
+			});
 
-				if (config.pc.getSenders() && config.pc.getSenders().length) {
-					if (replaceAudio && this.isUnifiedPlan) {
-						//using replace
-					} else {
-						for (let index in config.pc.getSenders()) {
-							let s = config.pc.getSenders()[index];
-							if (s && s.track && s.track.kind === "audio") {
-								config.pc.removeTrack(s);
-							}
-						}
+		} else {
+
+			let transceivers = config.pc.getTransceivers();
+			let audioTransceiver = null;
+			let videoTransceiver = null;
+			if (transceivers && transceivers.length > 0) {
+				for (let i in transceivers) {
+					let t = transceivers[i];
+					if ((t.sender && t.sender.track && t.sender.track.kind === "audio") ||
+						(t.receiver && t.receiver.track && t.receiver.track.kind === "audio")) {
+						audioTransceiver = t;
+						break;
 					}
 				}
-
-				if (replaceAudio) {
-					config.stream.addTrack(stream.getAudioTracks()[0]);
-					var audioTransceiver = null;
-					if (this.isUnifiedPlan) {
-						let transceivers = config.pc.getTransceivers();
-						if (transceivers && transceivers.length > 0) {
-							for (let i in transceivers) {
-								let t = transceivers[i];
-								if ((t.sender && t.sender.track && t.sender.track.kind === "audio" && t.stopped === false) ||
-									(t.receiver && t.receiver.track && t.receiver.track.kind === "audio" && t.stopped === false)) {
-									audioTransceiver = t;
-									break;
-								}
-							}
-						}
+				for (let i in transceivers) {
+					let t = transceivers[i];
+					if ((t.sender && t.sender.track && t.sender.track.kind === "video") ||
+						(t.receiver && t.receiver.track && t.receiver.track.kind === "video")) {
+						videoTransceiver = t;
+						break;
 					}
+				}
+			}
 
-					if (audioTransceiver && audioTransceiver.sender) {
-						audioTransceiver.sender.replaceTrack(stream.getAudioTracks()[0]);
-					} else {
-						config.pc.addTrack(stream.getAudioTracks()[0], stream);
-					}
+			/* UPDATE Audio */
+			// stopping existing tracks
 
+			let oldAudioStream = config?.stream?.getAudioTracks()?.[0];
+			if (oldAudioStream) {
+				config.stream.removeTrack(oldAudioStream);
+				try {
+					oldAudioStream.stop();
+				} catch (e) {
+					this._log(e);
 				}
+			}
 
-				/* UPDATE Video */
+			let replaceAudio = stream?.getAudioTracks()?.length;
+			if (replaceAudio) {
+				config.stream.addTrack(stream.getAudioTracks()[0]);
+				if (audioTransceiver && audioTransceiver.sender) {
+					audioTrackReplacePromise = audioTransceiver.sender.replaceTrack(stream.getAudioTracks()[0]);
+				} else {
+					config.pc.addTrack(stream.getAudioTracks()[0], stream);
+				}
+			}
+			else {
+				if (audioTransceiver && audioTransceiver.sender) {
+					audioTrackReplacePromise = audioTransceiver.sender.replaceTrack(null);
+				}
+			}
 
-				let replaceVideo = stream.getVideoTracks().length;
+			/* UPDATE Video */
 
-				if (replaceVideo || !keepVideo) {
-					let oldVideoStream = config.stream.getVideoTracks()[0];
-					if (oldVideoStream) {
-						config.stream.removeTrack(oldVideoStream);
-						try {
-							oldVideoStream.stop();
-						} catch (e) {
-							this._log(e);
-						}
-					}
-				}
+			// stopping existing tracks
 
-				if (config.pc.getSenders() && config.pc.getSenders().length) {
-					if (replaceVideo && this.isUnifiedPlan) {
-						//using replace
-					} else {
-						for (let index in config.pc.getSenders()) {
-							let s = config.pc.getSenders()[index];
-							if (s && s.track && s.track.kind === "video") {
-								config.pc.removeTrack(s);
-							}
-						}
-					}
+			let oldVideoStream = config?.stream?.getVideoTracks()?.[0];
+			if (oldVideoStream) {
+				config.stream.removeTrack(oldVideoStream);
+				try {
+					oldVideoStream.stop();
+				} catch (e) {
+					this._log(e);
 				}
+			}
 
-				if (replaceVideo) {
-					config.stream.addTrack(stream.getVideoTracks()[0]);
-					var videoTransceiver = null;
-					if (this.isUnifiedPlan) {
-						let transceivers = config.pc.getTransceivers();
-						if (transceivers && transceivers.length > 0) {
-							for (let i in transceivers) {
-								let t = transceivers[i];
-								if ((t.sender && t.sender.track && t.sender.track.kind === "video" && t.stopped === false) ||
-									(t.receiver && t.receiver.track && t.receiver.track.kind === "video" && t.stopped === false)) {
-									videoTransceiver = t;
-									break;
-								}
-							}
-						}
-					}
-					if (videoTransceiver && videoTransceiver.sender) {
-						//TODO: check if t.stopped === false still gets us videoTransceiver
-						videoTransceiver.sender.replaceTrack(stream.getVideoTracks()[0]);
-					} else {
-						config.pc.addTrack(stream.getVideoTracks()[0], stream);
-					}
+			let replaceVideo = stream?.getVideoTracks()?.length;
+			if (replaceVideo) {
+				config.stream.addTrack(stream.getVideoTracks()[0]);
+				if (videoTransceiver && videoTransceiver.sender) {
+					videoTrackReplacePromise = videoTransceiver.sender.replaceTrack(stream.getVideoTracks()[0]);
+				} else {
+					config.pc.addTrack(stream.getVideoTracks()[0], stream);
+				}
+			}
+			else {
+				if (videoTransceiver && videoTransceiver.sender) {
+					videoTrackReplacePromise = videoTransceiver.sender.replaceTrack(null);
 				}
 			}
 		}
@@ -1982,7 +1964,16 @@ class RoomSession {
 		this.isAudioMuted = isAudioMuted;
 		this.isVideoMuted = isVideoMuted;
 
-		return this._createAO('offer', this.handleId, false, [hasAudio, false, hasVideo, false])
+		this._setupTransceivers(this.handleId, [hasAudio, false, hasVideo, false]);
+
+		// this should be enough
+		if(this.isPublished) {
+			return Promise.resolve();
+		}
+
+		return Promise
+			.all([audioTrackReplacePromise, videoTrackReplacePromise])
+			.then(() => this._createAO('offer', this.handleId, false))
 			.then((jsep) => {
 				if (!jsep) {
 					return null;
@@ -2117,20 +2108,24 @@ class RoomSession {
 			return Promise.reject({type: 'error', id: 21, message: 'no local id, connect first', data: null})
 		}
 		let config = handle.webrtcStuff;
-		if (this.isUnifiedPlan) {
-			let transceiver = config.pc.getTransceivers()
-				.find(t => t.sender && t.sender.track && t.receiver.track.kind === "audio" && t.stopped === false && (mid ? t.mid === mid : true));
-			if (transceiver) {
-				transceiver.sender.track.enabled = value !== null ? !!value : !transceiver.sender.track.enabled;
-			}
-			this.isAudioMuted = !transceiver || !transceiver.sender.track.enabled;
-		} else {
-			if (config.stream && config.stream.getAudioTracks().length) {
-				config.stream.getAudioTracks()[0].enabled = value !== null ? !!value : !config.stream.getAudioTracks()[0].enabled;
-			}
-			this.isAudioMuted = config.stream.getAudioTracks().length === 0 || !config.stream.getAudioTracks()[0].enabled;
+
+		let transceiver = config.pc.getTransceivers()
+			.find(t => t.sender && t.sender.track && t.receiver.track.kind === "audio" && (mid ? t.mid === mid : true));
+
+		if (transceiver) {
+			transceiver.sender.track.enabled = value !== null ? !!value : !transceiver.sender.track.enabled;
 		}
+
+		this.isAudioMuted = !transceiver || !transceiver.sender.track.enabled;
+
+		// if (config.stream && config.stream.getAudioTracks().length) {
+		// 	config.stream.getAudioTracks()[0].enabled = value !== null ? !!value : !config.stream.getAudioTracks()[0].enabled;
+		// }
+		// this.isAudioMuted = config.stream.getAudioTracks().length === 0 || !config.stream.getAudioTracks()[0].enabled;
+		//
+
 		this.emit('localMuted', {type: 'audio', value: this.isAudioMuted, mid});
+
 	}
 
 	toggleVideo(value = null, mid) {
@@ -2140,28 +2135,37 @@ class RoomSession {
 		}
 		let config = handle.webrtcStuff;
 
-		if (this.isUnifiedPlan) {
-			let transceiver = config.pc.getTransceivers()
-				.find(t => t.sender && t.sender.track && t.receiver.track.kind === "video" && t.stopped === false && (mid ? t.mid === mid : true));
-			if (transceiver) {
-				transceiver.sender.track.enabled = value !== null ? !!value : !transceiver.sender.track.enabled;
-			}
-			this.isVideoMuted = !transceiver || !transceiver.sender.track.enabled;
-		}
-		else {
-			if (config.stream && config.stream.getVideoTracks().length) {
-				config.stream.getVideoTracks()[0].enabled = value !== null ? !!value : !config.stream.getVideoTracks()[0].enabled;
-			}
-			this.isVideoMuted = config.stream.getVideoTracks().length === 0 || !config.stream.getVideoTracks()[0].enabled;
+		let transceiver = config.pc.getTransceivers()
+			.find(t => t.sender && t.sender.track && t.receiver.track.kind === "video" && (mid ? t.mid === mid : true));
+		if (transceiver) {
+			transceiver.sender.track.enabled = value !== null ? !!value : !transceiver.sender.track.enabled;
 		}
+
+		this.isVideoMuted = !transceiver || !transceiver.sender.track.enabled;
+
+		// if (config.stream && config.stream.getVideoTracks().length) {
+		// 	config.stream.getVideoTracks()[0].enabled = value !== null ? !!value : !config.stream.getVideoTracks()[0].enabled;
+		// }
+		// this.isVideoMuted = config.stream.getVideoTracks().length === 0 || !config.stream.getVideoTracks()[0].enabled;
+
 		this.emit('localMuted', {type: 'video', value: this.isVideoMuted, mid});
 	}
 
+	selectSubStream(handleId, substream = 2) {
+		this.sendMessage(this.handleId, {
+			"body": {
+				"request": "configure",
+				"substream": substream
+			}
+		}).catch(() => null)
+	}
+
 	setRoomType(type = 'watchparty') {
 		this._roomType = type;
 		return this._roomType;
 	}
 
+
 }
 
 export default Room;