@reactoo/watchtogether-sdk-js 2.6.99 → 2.7.2

package/example/index.html

@@ -169,10 +169,14 @@
             Instance.room.getSessionByConstructId(constructId).setTalkIntercomChannels(groups)
         }
 
+        function setRestrictSubscribeToUserIds(userIds) {
+            Instance.room.getSessionByConstructId(constructId).setRestrictSubscribeToUserIds(userIds)
+        }
+
         let Instance = WatchTogetherSDK({debug:true})({instanceType:'reactooDemo'});
 
-        Instance.auth.$on('login', () => {
-            console.log('We are in');
+        Instance.auth.$on('login', (r) => {
+            console.log('We are in', r);
         });
 
         Instance.iot.$on('connect', () => {

package/package.json

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

package/src/models/room-session.js

@@ -21,7 +21,7 @@ import syncModule from "../modules/sync-modules/sync-module";
 let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 
 	let primaryRoomId = roomId;
-	let {simulcast = null, simulcastBitrates = null, simulcastMode = null, simulcastDefaultManualSubstream = null} = options;
+	let {simulcast = null, simulcastBitrates = null, simulcastMode = null, simulcastDefaultManualSubstream = null, enableDtx = null} = options;
 	let publicCustomEvents = ['changePlayerSource', 'chatMessage', 'userUpdate', 'reconnecting', 'connecting', 'remoteMuted', 'scaling'];
 
 	const addEvents = (events) => {
@@ -122,6 +122,7 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 						simulcastBitrates !== null ? simulcastBitrates : roomData?.data?.simulcast?.bitrates,
 						simulcastMode !== null ? simulcastMode : roomData?.data?.simulcast?.mode,
 						simulcastDefaultManualSubstream !== null ? simulcastDefaultManualSubstream : roomData?.data?.simulcast?.defaultManualSubstream,
+						enableDtx !== null ? enableDtx : roomData?.data?.enableDtx,
 					)
 				})
 				.finally(() => {
@@ -339,6 +340,10 @@ let roomSession = function ({roomId, pinHash, role, options = {}}, room, wt) {
 			return room.toggleVideo(value, source);
 		},
 
+		setRestrictSubscribeToUserIds: (userIds = []) => {
+			return room.setRestrictSubscribeToUserIds(userIds);
+		},
+
 		setTalkIntercomChannels: (groups) => {
 			return room.setTalkIntercomChannels(groups);
 		},

package/src/models/room.js

@@ -55,14 +55,16 @@ let room = function () {
 				}))
 		},
 		
-		createRoom: ({title, description, isPublic, isRouter, isStudioLayout, wtChannelId, isHd, disableSync, reduceRoomControls, hasStudioChat, maxParticipants, customAttributes, chatRoomId, linkedRoomId, type, dotAttribute} = {}) => {
+		createRoom: ({sourceRoomId, title, description, isPublic, isRouter, isStudioLayout, wtChannelId, isHd, disableSync, reduceRoomControls, hasStudioChat, maxParticipants, customAttributes, chatRoomId, linkedRoomId, type, dotAttribute} = {}) => {
 			let _da = dotAttribute
 				? (Array.isArray(dotAttribute)
 					? dotAttribute.reduce((p, cv) => (p[cv.name] = cv.value) && p || p, {})
 					: {[dotAttribute.name]: dotAttribute.value})
 				: {};
 			return this.__privates.auth.__client
-				.then(client => client.apis.wt.createRoom({}, {
+				.then(client => client.apis.wt.createRoom({
+					sourceRoomId
+				}, {
 					requestBody: {
 						title,
 						description,

package/src/modules/wt-room.js

@@ -182,6 +182,7 @@ class RoomSession {
 		this.sessiontype = type;
 		this.initialBitrate = 0;
 		this.simulcast = false;
+		this.enableDtx = false;
 		this.simulcastMode = 'controlled'; // controlled, manual, browserControlled
 		this.simulcastDefaultManualSubstream = 0; // 0 = maximum quality
 
@@ -222,11 +223,13 @@ class RoomSession {
 		this._maxRetries = 5;
 		this._keepAliveId = null;
 		this._participants = [];
+		this._restrictSubscribeToUserIds = []; // all if empty
 		this._talkIntercomChannels = ['participants'];
 		this._listenIntercomChannels = ['participants'];
 		this._roomType = 'watchparty';
 		this._isDataChannelOpen = false;
 		this._abortController = null;
+		this._remoteUsersCache = [];
 
 		this.userRoleSubscriptionRules = {
 			...RoomSession.userRoleSubscriptionRules,
@@ -239,12 +242,29 @@ class RoomSession {
 		}
 	}
 
+	_pushToRemoteUsersCache(userId, streams, id) {
+		const existingIndex = this._remoteUsersCache.findIndex(u => u.userId === userId);
+		if (existingIndex > -1) {
+			this._remoteUsersCache.splice(existingIndex, 1, {userId, streams, id})
+		} else {
+			this._remoteUsersCache.push({userId, streams, id});
+		}
+	}
+
+	_removeFromRemoteUsersCache(rfid) {
+		const existingIndex = this._remoteUsersCache.findIndex(u => u.id === rfid);
+		if (existingIndex > -1) {
+			this._remoteUsersCache.splice(existingIndex, 1);
+		}
+	}
+
 	_participantShouldSubscribe(userId) {
 		const myUser = decodeJanusDisplay(this.display);
 		const remoteUser = decodeJanusDisplay(userId);
 		let localUserRole = myUser?.role || 'participant';
 		let remoteUserRole = remoteUser?.role || 'participant';
-		return this.userRoleSubscriptionRules[localUserRole][(this._roomType || 'watchparty')].indexOf(remoteUserRole) > -1;
+		return this.userRoleSubscriptionRules[localUserRole][(this._roomType || 'watchparty')].indexOf(remoteUserRole) > -1
+			&& (this._restrictSubscribeToUserIds.length === 0 || this._restrictSubscribeToUserIds.indexOf(remoteUser?.userId) > -1);
 	}
 
 	_intercomSubscribe = (stream) => {
@@ -582,6 +602,7 @@ class RoomSession {
 							streams[i]["display"] = userId;
 						}
 						this._log('Remote userId: ', userId);
+						this._pushToRemoteUsersCache(userId, streams, id);
 						if (this._participantShouldSubscribe(userId)) {
 							this._log('Creating user: ', userId);
 							this._createParticipant(userId, id)
@@ -632,6 +653,9 @@ class RoomSession {
 							streams[i]["display"] = userId;
 						}
 						this._log('Remote userId: ', userId);
+
+						this._pushToRemoteUsersCache(userId, streams, id);
+
 						if (this._participantShouldSubscribe(userId)) {
 
 							let handle = this._getHandle(null, id);
@@ -694,8 +718,9 @@ class RoomSession {
 							this.disconnect().catch(() => {});
 						}
 					} else if (leaving) {
-						//TODO: in 1 PeerConnection case we only unsubscribe from streams
+						//TODO: in 1 PeerConnection case we only unsubscribe from streams, this may not be true, check janus docs
 						this._log('leaving', leaving);
+						this._removeFromRemoteUsersCache(leaving);
 						this._removeParticipant(null, leaving, true);
 					}
 
@@ -705,6 +730,7 @@ class RoomSession {
 					} else if (unpublished) {
 						//TODO: in 1 PeerConnection case we only unsubscribe from streams
 						this._log('unpublished', unpublished);
+						this._removeFromRemoteUsersCache(unpublished);
 						this._removeParticipant(null, unpublished, true); // we do hangup and detach
 					}
 
@@ -712,6 +738,7 @@ class RoomSession {
 						// this case shouldn't exist
 					} else if(kicked) {
 						this._log('kicked', kicked);
+						this._removeFromRemoteUsersCache(kicked);
 						this._removeParticipant(null, kicked, true);  // we do hangup and detach
 					}
 
@@ -1068,7 +1095,7 @@ class RoomSession {
 				message: 'id non-existent',
 				data: [handleId, 'isAlreadySubscribed']
 			});
-			return;
+			return false;
 		}
 		return handle.webrtcStuff.subscribeMap.findIndex(t => t.mid === mid && t.feed === feed) > -1
 	}
@@ -1264,7 +1291,7 @@ class RoomSession {
 		simulcastBitrates = this.simulcastBitrates,
 		simulcastMode = this.simulcastMode,
 		simulcastDefaultManualSubstream = this.simulcastDefaultManualSubstream,
-		simulcastInitialSubstream = null
+		enableDtx = false
 	) {
 
 		if (this.isConnecting) {
@@ -1289,6 +1316,7 @@ class RoomSession {
 		this.initialBitrate = initialBitrate;
 		this.recordingFilename = recordingFilename;
 		this.isConnecting = true;
+		this.enableDtx = enableDtx;
 		this.simulcast = simulcast;
 		this.simulcastMode = simulcastMode;
 		this.simulcastDefaultManualSubstream = simulcastDefaultManualSubstream;
@@ -2343,6 +2371,13 @@ class RoomSession {
 
 		return config.pc[methodName](mediaConstraints)
 			.then( (response) => {
+
+				// if type offer and its me and we want dtx we mungle the sdp
+				if(handleId === this.handleId && type === 'offer' && this.enableDtx) {
+					// enable DTX
+					response.sdp = response.sdp.replace("useinbandfec=1", "useinbandfec=1;usedtx=1")
+				}
+
 				config.mySdp = response.sdp;
 				let _p = config.pc.setLocalDescription(response)
 					.catch((e) => {
@@ -3140,6 +3175,68 @@ class RoomSession {
 		return this._roomType;
 	}
 
+	setRestrictSubscribeToUserIds(userIds = []) {
+		this._restrictSubscribeToUserIds = structuredClone(userIds);
+		if(!this.isConnected) {
+			return Promise.resolve(this._restrictSubscribeToUserIds);
+		}
+		// sanity check by getting listparticipants and comparing it to _remoteUsersCache
+		this.sendMessage(this.handleId, {body: {request: 'listparticipants', room: this.roomId}})
+			.then(r => {
+				let participants = r.participants;
+				let remoteUsersCache = this._remoteUsersCache;
+				let handle = this._getHandle(this.handleId);
+
+				// filter out my user id from response and compare it to remoteUsersCache
+				participants = participants.filter(p => p.id !== handle.userId);
+
+				// get rid of participants that are in participants but not in remoteUsersCache
+				remoteUsersCache = remoteUsersCache.filter(r => participants.find(p => p.id === r.id));
+				remoteUsersCache.forEach(r => {
+					const handle = this._getHandle(null, null, decodeJanusDisplay(r.userId)?.userId);
+
+					if(this._participantShouldSubscribe(r.userId)) {
+						// todo: do a nicer flag to indicate inactive handle than just checking for pc
+						if(!handle || !handle.webrtcStuff?.pc) {
+							this._log('Subscribing to ', r.userId)
+							this._createParticipant(r.userId, r.id)
+								.then(handle => {
+									this._updateParticipantsTrackData(handle.handleId, r.streams);
+									const subscribe = r.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: subscribe,
+											//"feed": id,
+											...(this.webrtcVersion > 1000 ? {id: this.userId} : {}),
+											pin: this.pin
+										}
+									})
+								})
+								.catch(err => {
+									this.emit('error', err);
+								})
+
+						}
+
+						else {
+							this._log('Already subscribed to ', r.userId);
+						}
+
+					} else if(handle) {
+						this._log('Unsubscribing from ', r.userId)
+						this._removeParticipant(handle.handleId);
+					}
+				})
+			});
+
+
+	}
+
 
 }