@reactoo/watchtogether-sdk-js 2.6.64 → 2.6.65

package/package.json

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

package/src/models/room-session.js

@@ -340,16 +340,20 @@ let roomSession = function ({roomId, pinHash, role}, room, wt) {
 			return room.setTalkIntercomChannels(groups);
 		},
 
-		getTalkIntercomGroups: () => {
-			return room._talkIntercomGroups;
+		getTalkIntercomChannels: () => {
+			return room._talkIntercomChannels;
+		},
+
+		getUserTalkIntercomChannels: (userId) => {
+			return room.getUserTalkIntercomChannels(userId);
 		},
 
 		setListenIntercomChannels: (groups) => {
 			return room.setListenIntercomChannels(groups);
 		},
 
-		getListenIntercomGroups: () => {
-			return room._listenIntercomGroups;
+		getListenIntercomChannels: () => {
+			return room._listenIntercomChannels;
 		},
 
 		selectSubStream: (handleId, substream) => {

package/src/modules/wt-room.js

@@ -770,7 +770,6 @@ class RoomSession {
 					role: decodeJanusDisplay(handle.userId)?.role,
 					stream: null,
 					streamMap: structuredClone(handle.webrtcStuff?.streamMap),
-					talkIntercomChannels: structuredClone(this._talkIntercomChannels),
 					source: null,
 					track: null,
 					adding: false,
@@ -1425,8 +1424,8 @@ class RoomSession {
 		this._log = console.log.bind(console);
 	}
 
-	_getHandle(handleId, rfid = null) {
-		return this._participants.find(p => p.handleId === handleId || (rfid && p.rfid === rfid));
+	_getHandle(handleId, rfid = null, userId = null) {
+		return this._participants.find(p => p.handleId === handleId || (rfid && p.rfid === rfid) || (userId && p.userId === userId));
 	}
 
 	_getStats(type = null) {
@@ -1504,7 +1503,6 @@ 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,
@@ -1529,7 +1527,6 @@ 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,
@@ -1597,7 +1594,6 @@ class RoomSession {
 								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
 								streamMap: structuredClone(config.streamMap),
-								talkIntercomChannels: structuredClone(this._talkIntercomChannels),
 								source,
 								track: ev.track,
 								adding: false,
@@ -1621,7 +1617,6 @@ 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,
@@ -1655,7 +1650,6 @@ class RoomSession {
 								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
 								streamMap: structuredClone(config.streamMap),
-								talkIntercomChannels: structuredClone(this._talkIntercomChannels),
 								source,
 								track: ev.target,
 								adding: false,
@@ -2460,6 +2454,30 @@ class RoomSession {
 			: Promise.resolve()
 	}
 
+	getUserTalkIntercomChannels(userId) {
+		let talkIntercomChannels = []
+		let handle = this._getHandle(null, null, userId);
+		if (handle) {
+			let config = handle.webrtcStuff;
+			talkIntercomChannels = config.tracksMap.reduce((acc, val) => {
+				if(val.description) {
+					try {
+						let description = JSON.parse(val.description);
+						if(description.intercomGroups) {
+							description.intercomGroups.forEach(group => {
+								if(!acc.includes(group)) {
+									acc.push(group);
+								}
+							});
+						}
+					}
+					catch(e) {}
+				}
+			}, []);
+		}
+		return talkIntercomChannels;
+	}
+
 	toggleAudio(value = null, source = 'camera0', mid) {
 		let handle = this._getHandle(this.handleId);
 		if (!handle) {