@reactoo/watchtogether-sdk-js 2.6.61 → 2.6.63

package/example/index.html

@@ -149,12 +149,12 @@
             Instance.room.getSessionByConstructId(constructId).toggleAudio()
         }
 
-        function setListenIntercomGroups(groups) {
-            Instance.room.getSessionByConstructId(constructId).setListenIntercomGroups(groups)
+        function setListenIntercomChannels(groups) {
+            Instance.room.getSessionByConstructId(constructId).setListenIntercomChannels(groups)
         }
 
-        function setTalkIntercomGroups(groups) {
-            Instance.room.getSessionByConstructId(constructId).setTalkIntercomGroups(groups)
+        function setTalkIntercomChannels(groups) {
+            Instance.room.getSessionByConstructId(constructId).setTalkIntercomChannels(groups)
         }
 
         let Instance = WatchTogetherSDK({debug:true, apiUrl: 'https://api.reactoo.com/stefan/swagger.json'})({instanceType:'reactooDemo'});
@@ -212,6 +212,9 @@
             }})) // pin hash is not needed if you're owner of the room
             .then(session => {
 
+                session.setTalkIntercomChannels([]);
+                session.setListenIntercomChannels([]);
+
                 session.$on('connecting', (status) => {
                     console.log('connecting', status);
                 });

package/package.json

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

package/src/models/room-session.js

@@ -336,16 +336,16 @@ let roomSession = function ({roomId, pinHash, role}, room, wt) {
 			return room.toggleVideo(value, source);
 		},
 
-		setTalkIntercomGroups: (groups) => {
-			return room.setTalkIntercomGroups(groups);
+		setTalkIntercomChannels: (groups) => {
+			return room.setTalkIntercomChannels(groups);
 		},
 
 		getTalkIntercomGroups: () => {
 			return room._talkIntercomGroups;
 		},
 
-		setListenIntercomGroups: (groups) => {
-			return room.setListenIntercomGroups(groups);
+		setListenIntercomChannels: (groups) => {
+			return room.setListenIntercomChannels(groups);
 		},
 
 		getListenIntercomGroups: () => {

package/src/modules/wt-room.js

@@ -202,8 +202,8 @@ class RoomSession {
 		this._maxRetries = 5;
 		this._keepAliveId = null;
 		this._participants = [];
-		this._talkIntercomGroups = ['participants'];
-		this._listenIntercomGroups = ['participants'];
+		this._talkIntercomChannels = ['participants'];
+		this._listenIntercomChannels = ['participants'];
 		this._roomType = 'watchparty';
 		this._isDataChannelOpen = false;
 		this._abortController = null;
@@ -232,7 +232,7 @@ class RoomSession {
 			return true;
 		}
 		const intercomGroups = JSON.parse(stream.description || "[]")?.intercomGroups || [];
-		return intercomGroups.some(g => this._listenIntercomGroups.indexOf(g) > -1);
+		return intercomGroups.some(g => this._listenIntercomChannels.indexOf(g) > -1);
 	};
 
 	_getAddParticipantEventName(handleId) {
@@ -565,13 +565,15 @@ class RoomSession {
 							this._createParticipant(userId, id)
 								.then(handle => {
 									this._updateParticipantsTrackData(handle.handleId, streams);
+									const subscribe = streams.filter(s => !s.disabled && this._intercomSubscribe(s)).map(stream => ({feed: stream.id, mid: stream.mid}));
+									handle.webrtcStuff.subscribeMap = structuredClone(subscribe);
 									return this.sendMessage(handle.handleId, {
 										body: {
 											"request": "join",
 											"room": this.roomId,
 											"ptype": "subscriber",
 											"private_id": this.privateId,
-											streams: streams.filter(s => !s.disabled && this._intercomSubscribe(s)).map(stream => ({feed: stream.id, mid: stream.mid})),
+											streams: subscribe,
 											//"feed": id,
 											...(this.webrtcVersion > 1000 ? {id: this.userId} : {}),
 											pin: this.pin
@@ -608,12 +610,14 @@ class RoomSession {
 								this._updateParticipantsTrackData(handle.handleId, streams)
 
 								let subscribe = streams
-									.filter(stream => !stream.disabled && this._intercomSubscribe(stream) && !this._isAlreadySubscribed(handle.handleId, stream))
+									.filter(stream => !stream.disabled && this._intercomSubscribe(stream) && !this._isAlreadySubscribed(handle.handleId, stream.id, stream.mid))
 									.map(s => ({feed: s.id, mid: s.mid}));
 
 								let unsubscribe = streams.filter(stream => stream.disabled || !this._intercomSubscribe(stream))
 									.map(s => ({feed: s.id, mid: s.mid}));
 
+								this._updateSubscribeMap(handle.handleId, subscribe, unsubscribe);
+
 								this._log('Already subscribed to user: ', userId, 'Update streams', subscribe, unsubscribe);
 
 								if(subscribe.length || unsubscribe.length) {
@@ -631,13 +635,15 @@ class RoomSession {
 								this._createParticipant(userId, id)
 									.then(handle => {
 										this._updateParticipantsTrackData(handle.handleId, streams);
+										const subscribe = streams.filter(s => !s.disabled && this._intercomSubscribe(s)).map(stream => ({feed: stream.id, mid: stream.mid}));
+										handle.webrtcStuff.subscribeMap = structuredClone(subscribe);
 										return this.sendMessage(handle.handleId, {
 											body: {
 												"request": "join",
 												"room": this.roomId,
 												"ptype": "subscriber",
 												"private_id": this.privateId,
-												streams: streams.filter(s => !s.disabled && this._intercomSubscribe(s)).map(stream => ({feed: stream.id, mid: stream.mid})),
+												streams: subscribe,
 												...(this.webrtcVersion > 1000 ? {id: this.userId} : {}),
 												pin: this.pin
 											}
@@ -746,12 +752,17 @@ class RoomSession {
 
 			if (event === "updated") {
 				this._log('Remote has updated tracks', msg);
-				this._updateCurrentSubscriptions(handle.handleId, msg["streams"] || []);
+				if(msg["streams"]) {
+					this._updateTransceiverMap(handle.handleId, msg["streams"]);
+				}
+
 			}
 
 			if (event === "attached") {
 				this._log('Remote have successfully joined Room', msg);
-				this._updateCurrentSubscriptions(handle.handleId, msg["streams"] || []);
+				if(msg["streams"]) {
+					this._updateTransceiverMap(handle.handleId, msg["streams"] || []);
+				}
 				this.emit(this._getAddParticipantEventName(handle.handleId), {
 					tid: generateUUID(),
 					id: handle.handleId,
@@ -855,18 +866,20 @@ class RoomSession {
 				try {
 					if (handle.webrtcStuff.stream) {
 						if(!this.isRestarting) {
-							handle.webrtcStuff.stream.getTracks().forEach(track => track.stop());
+							handle.webrtcStuff.stream?.getTracks().forEach(track => track.stop());
 						}
 						else {
-							handle.webrtcStuff.stream.getTracks().forEach(track => track.onended = null);
+							handle.webrtcStuff.stream?.getTracks().forEach(track => track.onended = null);
 						}
 					}
 				} catch (e) {
 					// Do nothing
 				}
 
-				handle.webrtcStuff.stream.onremovetrack = null;
-				handle.webrtcStuff.stream = null;
+				if(handle.webrtcStuff.stream) {
+					handle.webrtcStuff.stream.onremovetrack = null;
+					handle.webrtcStuff.stream = null;
+				}
 
 				if (handle.webrtcStuff.dataChannel) {
 					Object.keys(handle.webrtcStuff.dataChannel).forEach(label => {
@@ -892,7 +905,8 @@ class RoomSession {
 					stream: null,
 					streamMap: {},
 					tracksMap: [],
-					currentSubscriptions: [],
+					transceiverMap: [],
+					subscribeMap: [],
 					mySdp: null,
 					mediaConstraints: null,
 					pc: null,
@@ -944,7 +958,8 @@ class RoomSession {
 					stream: null,
 					streamMap: {},
 					tracksMap: [],
-					currentSubscriptions: [],
+					transceiverMap: [],
+					subscribeMap: [],
 					mySdp: null,
 					mediaConstraints: null,
 					pc: null,
@@ -961,7 +976,33 @@ class RoomSession {
 		})
 	}
 
-	_isAlreadySubscribed(handleId, stream) {
+
+	_updateSubscribeMap(handleId, subscribe, unsubscribe) {
+		let handle = this._getHandle(handleId);
+		if (!handle) {
+			this.emit('error', {
+				type: 'warning',
+				id: 15,
+				message: 'id non-existent',
+				data: [handleId, 'updateSubscribeMap']
+			});
+			return;
+		}
+		let currentSubscribeMap = handle.webrtcStuff.subscribeMap;
+		subscribe.forEach(s => {
+			if(!currentSubscribeMap.find(c => c.feed === s.feed && c.mid === s.mid)) {
+				currentSubscribeMap.push(s);
+			}
+		});
+		unsubscribe.forEach(s => {
+			let index = currentSubscribeMap.findIndex(c => c.feed === s.feed && c.mid === s.mid);
+			if(index > -1) {
+				currentSubscribeMap.splice(index, 1);
+			}
+		});
+	}
+
+	_isAlreadySubscribed(handleId, feed, mid) {
 		let handle = this._getHandle(handleId);
 		if (!handle) {
 			this.emit('error', {
@@ -972,23 +1013,23 @@ class RoomSession {
 			});
 			return;
 		}
-		return handle.webrtcStuff.currentSubscriptions.filter(t => t.active).findIndex(t => t.mid === stream.mid) > -1
+		return handle.webrtcStuff.subscribeMap.findIndex(t => t.mid === mid && t.feed === feed) > -1
 	}
 
-	_updateCurrentSubscriptions(handleId, streams) {
-		this._log('Updating current subscription data', handleId, streams);
+	_updateTransceiverMap(handleId, streams) {
+		this._log('Updating current transceiver map', handleId, streams);
 		let handle = this._getHandle(handleId);
 		if (!handle) {
 			this.emit('error', {
 				type: 'warning',
 				id: 15,
 				message: 'id non-existent',
-				data: [handleId, 'updateCurrentSubscriptions']
+				data: [handleId, 'updateTransceiverMap']
 			});
 			return;
 		}
 		let config = handle.webrtcStuff;
-		config.currentSubscriptions = structuredClone(streams);
+		config.transceiverMap = structuredClone(streams);
 	}
 
 	_updateParticipantsTrackData(handleId, streams) {
@@ -1030,18 +1071,18 @@ class RoomSession {
 		}
 		let config = handle.webrtcStuff;
 		config.streamMap = {};
-		config.tracksMap.forEach(tItem => {
+		config.transceiverMap.forEach(tItem => {
 			if(tItem.type === 'data') {
 				return;
 			}
 			if(tItem.active === false) {
 				return;
 			}
-			const source = JSON.parse(tItem.description)?.source;
+			const source = JSON.parse(tItem.feed_description)?.source;
 			if(!config.streamMap[source]) {
 				config.streamMap[source] = [];
 			}
-			let trackId = config.pc.getTransceivers().find(t => t.mid === tItem.mid).receiver.track.id;
+			let trackId = config.pc.getTransceivers().find(t => t.mid === tItem.mid)?.receiver?.track?.id;
 			if(trackId) {
 				config.streamMap[source].push(trackId);
 			}
@@ -1537,13 +1578,13 @@ class RoomSession {
 							if(!this._getHandle(handle.handleId)) {
 								return;
 							}
+							this._updateRemoteParticipantStreamMap(handle.handleId);
 
 							let transceiver = config.pc?.getTransceivers()?.find(
 								t => t.receiver.track === ev.track);
 
 							let mid = transceiver?.mid || ev.track.id;
 							let source = Object.keys(config.streamMap).find(key => config.streamMap[key].includes(ev.track.id));
-							this._updateRemoteParticipantStreamMap(handle.handleId);
 							this.emit(this._getAddParticipantEventName(handle.handleId), {
 								tid: generateUUID(),
 								id: handle.handleId,
@@ -1565,9 +1606,9 @@ class RoomSession {
 
 					if (event.track) {
 						config.stream?.addTrack(event.track);
+						this._updateRemoteParticipantStreamMap(handle.handleId);
 						let mid = event.transceiver ? event.transceiver.mid : event.track.id;
 						let source = Object.keys(config.streamMap).find(key => config.streamMap[key].includes(event.track.id));
-						this._updateRemoteParticipantStreamMap(handle.handleId);
 						this.emit(this._getAddParticipantEventName(handle.handleId), {
 							tid: generateUUID(),
 							mid,
@@ -1595,11 +1636,11 @@ class RoomSession {
 							if(!this._getHandle(handle.handleId)) {
 								return;
 							}
+							this._updateRemoteParticipantStreamMap(handle.handleId);
 							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));
-							this._updateRemoteParticipantStreamMap(handle.handleId);
 							this.emit(this._getAddParticipantEventName(handle.handleId), {
 								tid: generateUUID(),
 								id: handle.handleId,
@@ -1802,7 +1843,6 @@ class RoomSession {
 	}
 
 	_setupTransceivers(handleId, [audioSend, audioRecv, videoSend, videoRecv, audioTransceiver = null, videoTransceiver = null]) {
-
 		//TODO: this should be refactored to use handle's trackMap so we dont have to pass any parameters
 
 		let handle = this._getHandle(handleId);
@@ -1811,7 +1851,7 @@ class RoomSession {
 		}
 		let config = handle.webrtcStuff;
 
-		const setTransceiver = (transceiver, send, recv) => {
+		const setTransceiver = (transceiver, send, recv, kind = 'audio') => {
 			if (!send && !recv) {
 				// disabled: have we removed it?
 				if (transceiver) {
@@ -1847,7 +1887,7 @@ class RoomSession {
 						}
 					} else {
 						// In theory, this is the only case where we might not have a transceiver yet
-						config.pc.addTransceiver("audio", {direction: "recvonly"});
+						config.pc.addTransceiver(kind, {direction: "recvonly"});
 					}
 				}
 			}
@@ -1856,10 +1896,10 @@ class RoomSession {
 		// if we're passing any transceivers, we work only on them, doesn't matter if one of them is null
 		if(audioTransceiver || videoTransceiver) {
 			if(audioTransceiver) {
-				setTransceiver(audioTransceiver, audioSend, audioRecv);
+				setTransceiver(audioTransceiver, audioSend, audioRecv, 'audio');
 			}
 			if(videoTransceiver) {
-				setTransceiver(videoTransceiver, videoSend, videoRecv);
+				setTransceiver(videoTransceiver, videoSend, videoRecv, 'video');
 			}
 		}
 		// else we work on all transceivers
@@ -1872,13 +1912,13 @@ class RoomSession {
 						(t.sender && t.sender.track && t.sender.track.kind === "audio") ||
 						(t.receiver && t.receiver.track && t.receiver.track.kind === "audio")
 					) {
-						setTransceiver(t, audioSend, audioRecv);
+						setTransceiver(t, audioSend, audioRecv, 'audio');
 					}
 					if (
 						(t.sender && t.sender.track && t.sender.track.kind === "video") ||
 						(t.receiver && t.receiver.track && t.receiver.track.kind === "video")
 					) {
-						setTransceiver(t, videoSend, videoRecv);
+						setTransceiver(t, videoSend, videoRecv, 'video');
 					}
 				}
 			}
@@ -2238,6 +2278,7 @@ class RoomSession {
 
 		let hasAudio = !!(stream && stream.getAudioTracks().length > 0);
 		let hasVideo = !!(stream && stream.getVideoTracks().length > 0);
+
 		this._setupTransceivers(this.handleId, [hasAudio, false, hasVideo, false, audioTransceiver, videoTransceiver]);
 
 		const emitEvents = () => {
@@ -2341,7 +2382,7 @@ class RoomSession {
 					config.streamMap[source].forEach(trackId => {
 						let t = transceivers.find(transceiver => transceiver.sender.track && transceiver.sender.track.id === trackId)
 						if(t) {
-							descriptions.push({mid: t.mid, description: JSON.stringify({source, intercomGroups: this._talkIntercomGroups})});
+							descriptions.push({mid: t.mid, description: JSON.stringify({source, intercomGroups: this._talkIntercomChannels})});
 						}
 					})
 				});
@@ -2496,14 +2537,14 @@ class RoomSession {
 	}
 
 
-	setTalkIntercomGroups(groups = ['participants']) {
+	setTalkIntercomChannels(groups = ['participants']) {
 
 		if(typeof groups !== 'object' || !("length" in groups)) {
-			this._log('setTalkIntercomGroups: groups must be an array');
+			this._log('setTalkIntercomChannels: groups must be an array');
 			groups = [groups];
 		}
 
-		this._talkIntercomGroups = structuredClone(groups);
+		this._talkIntercomChannels = structuredClone(groups);
 		let handle = this._getHandle(this.handleId);
 		if (!handle) {
 			return Promise.resolve();
@@ -2527,14 +2568,14 @@ class RoomSession {
 		})
 	}
 
-	setListenIntercomGroups(groups = ['participants']) {
+	setListenIntercomChannels(groups = ['participants']) {
 
 		if(typeof groups !== 'object' || !("length" in groups)) {
-			this._log('setListenIntercomGroups: groups must be an array');
+			this._log('setListenIntercomChannels: groups must be an array');
 			groups = [groups];
 		}
 
-		this._listenIntercomGroups = structuredClone(groups);
+		this._listenIntercomChannels = structuredClone(groups);
 		let handle = this._getHandle(this.handleId);
 		if (!handle) {
 			return Promise.resolve();
@@ -2558,20 +2599,22 @@ class RoomSession {
 
 				tracksMap.forEach(track => {
 					if(track.type === 'data') {
-						//subscribe.push({feed: track.id, mid: track.mid})
 						return;
 					}
 					const description = JSON.parse(track.description);
 					const intercomGroups = description?.intercomGroups || [];
-
-					if(this._listenIntercomGroups.some(g => intercomGroups.includes(g))) {
-						subscribe.push({feed: track.id, mid: track.mid})
+					if(this._listenIntercomChannels.some(g => intercomGroups.includes(g))) {
+						if(!this._isAlreadySubscribed(participant.handleId, track.id, track.mid)) {
+							subscribe.push({feed: track.id, mid: track.mid})
+						}
 					}
 					else {
 						unsubscribe.push({feed: track.id, mid: track.mid})
 					}
 				});
 
+				this._updateSubscribeMap(participant.handleId, subscribe, unsubscribe);
+
 				if(subscribe.length || unsubscribe.length) {
 					promises.push(this.sendMessage(handle.handleId, {
 						body: {