@reactoo/watchtogether-sdk-js 2.6.62 → 2.6.64

package/package.json

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

package/src/modules/wt-room.js

@@ -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
 											}
@@ -747,7 +753,7 @@ class RoomSession {
 			if (event === "updated") {
 				this._log('Remote has updated tracks', msg);
 				if(msg["streams"]) {
-					this._updateCurrentSubscriptions(handle.handleId, msg["streams"]);
+					this._updateTransceiverMap(handle.handleId, msg["streams"]);
 				}
 
 			}
@@ -755,7 +761,7 @@ class RoomSession {
 			if (event === "attached") {
 				this._log('Remote have successfully joined Room', msg);
 				if(msg["streams"]) {
-					this._updateCurrentSubscriptions(handle.handleId, msg["streams"] || []);
+					this._updateTransceiverMap(handle.handleId, msg["streams"] || []);
 				}
 				this.emit(this._getAddParticipantEventName(handle.handleId), {
 					tid: generateUUID(),
@@ -764,6 +770,7 @@ class RoomSession {
 					role: decodeJanusDisplay(handle.userId)?.role,
 					stream: null,
 					streamMap: structuredClone(handle.webrtcStuff?.streamMap),
+					talkIntercomChannels: structuredClone(this._talkIntercomChannels),
 					source: null,
 					track: null,
 					adding: false,
@@ -899,7 +906,8 @@ class RoomSession {
 					stream: null,
 					streamMap: {},
 					tracksMap: [],
-					currentSubscriptions: [],
+					transceiverMap: [],
+					subscribeMap: [],
 					mySdp: null,
 					mediaConstraints: null,
 					pc: null,
@@ -951,7 +959,8 @@ class RoomSession {
 					stream: null,
 					streamMap: {},
 					tracksMap: [],
-					currentSubscriptions: [],
+					transceiverMap: [],
+					subscribeMap: [],
 					mySdp: null,
 					mediaConstraints: null,
 					pc: null,
@@ -968,7 +977,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', {
@@ -979,23 +1014,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) {
@@ -1037,7 +1072,7 @@ class RoomSession {
 		}
 		let config = handle.webrtcStuff;
 		config.streamMap = {};
-		config.currentSubscriptions.forEach(tItem => {
+		config.transceiverMap.forEach(tItem => {
 			if(tItem.type === 'data') {
 				return;
 			}
@@ -1469,6 +1504,7 @@ class RoomSession {
 						role: decodeJanusDisplay(handle.userId)?.role,
 						stream: config.stream,
 						streamMap: structuredClone(config.streamMap),
+						talkIntercomChannels: structuredClone(this._talkIntercomChannels),
 						track: null,
 						source: null,
 						constructId: this.constructId,
@@ -1493,6 +1529,7 @@ class RoomSession {
 						role: decodeJanusDisplay(handle.userId)?.role,
 						stream: config.stream,
 						streamMap: structuredClone(config.streamMap),
+						talkIntercomChannels: structuredClone(this._talkIntercomChannels),
 						track: null,
 						source: null,
 						constructId: this.constructId,
@@ -1560,6 +1597,7 @@ class RoomSession {
 								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
 								streamMap: structuredClone(config.streamMap),
+								talkIntercomChannels: structuredClone(this._talkIntercomChannels),
 								source,
 								track: ev.track,
 								adding: false,
@@ -1583,6 +1621,7 @@ class RoomSession {
 							role: decodeJanusDisplay(handle.userId)?.role,
 							stream: config.stream,
 							streamMap: structuredClone(config.streamMap),
+							talkIntercomChannels: structuredClone(this._talkIntercomChannels),
 							source,
 							track: event.track,
 							constructId: this.constructId,
@@ -1616,6 +1655,7 @@ class RoomSession {
 								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
 								streamMap: structuredClone(config.streamMap),
+								talkIntercomChannels: structuredClone(this._talkIntercomChannels),
 								source,
 								track: ev.target,
 								adding: false,
@@ -2565,20 +2605,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._listenIntercomChannels.some(g => intercomGroups.includes(g))) {
-						subscribe.push({feed: track.id, mid: track.mid})
+						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: {