@reactoo/watchtogether-sdk-js 2.6.21 → 2.6.23

package/example/index.html

@@ -200,7 +200,8 @@
             })
             .then(r => Instance.room.createSession({constructId, roomId:r.roomId, pinHash: r.pinHash, role:'participant', options: {
                 //subscriptionRules: {participant: {videoWall: [], watchTogether: []}}
-                }})) // pin hash is not needed if you're owner of the room
+                //restrictSources: ['camera0']
+            }})) // pin hash is not needed if you're owner of the room
             .then(session => {
 
                 session.$on('connecting', (status) => {

package/package.json

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

package/src/models/room-session.js

@@ -389,17 +389,6 @@ let roomSession = function ({roomId, pinHash, role}, room, wt) {
 			}
 		},
 
-		__test: function (value) {
-			return room.sendMessage(room.handleId, {
-				body: {
-					request: "data",
-					room: room.roomId,
-					timestamp: new Date().getTime(),
-					text: JSON.stringify(value),
-				}
-			});
-		},
-
 		$on: (key, callback, that) => {
 			emitter.on(key, callback, that || this);
 			room.on(key, callback, that || this);

package/src/modules/wt-room.js

@@ -94,7 +94,7 @@ class RoomSession {
 		'streaming': 'janus.plugin.streaming'
 	}
 
-	static subscriptionRules = {
+	static userRoleSubscriptionRules = {
 		participant: {
 			"watchparty": ['participant', 'talkback'],
 			"studio": ['participant', 'talkback', 'host', 'observer'],
@@ -210,9 +210,9 @@ class RoomSession {
 		this.isVideoEnabled = false;
 		this.isAudioEnabed = false;
 
-		this.subscriptionRules = {
-			...RoomSession.subscriptionRules,
-			...(this.options.subscriptionRules || {})
+		this.userRoleSubscriptionRules = {
+			...RoomSession.userRoleSubscriptionRules,
+			...(this.options.userRoleSubscriptionRules || {})
 		}
 
 		this._log = RoomSession.noop;
@@ -226,7 +226,7 @@ class RoomSession {
 		const remoteUser = decodeJanusDisplay(userId);
 		let localUserRole = myUser?.role || 'participant';
 		let remoteUserRole = remoteUser?.role || 'participant';
-		return this.subscriptionRules[localUserRole][(this._roomType || 'watchparty')].indexOf(remoteUserRole) > -1;
+		return this.userRoleSubscriptionRules[localUserRole][(this._roomType || 'watchparty')].indexOf(remoteUserRole) > -1;
 	}
 
 	_getAddParticipantEventName(handleId) {
@@ -572,7 +572,22 @@ class RoomSession {
 
 							let handle = this._getHandle(null, id);
 							if(handle) {
-								let subscribe = streams.filter(stream => !stream.disabled && handle.webrtcStuff.tracksMap.filter(t => t.active).findIndex(t => t.mid === stream.mid) === -1).map(s => ({feed: s.id, mid: s.mid}));
+
+								//description: 'camera0'
+								const _sfn = (stream) => {
+									if(stream.type === 'data') {
+										return true;
+									}
+									if(!this.options?.restrictSources?.length) {
+										return true
+									}
+									else if(this.options?.restrictSources?.includes(stream.description)) {
+										return true;
+									}
+									return false;
+								}
+
+								let subscribe = streams.filter(stream => !stream.disabled && _sfn(stream) && handle.webrtcStuff.tracksMap.filter(t => t.active).findIndex(t => t.mid === stream.mid) === -1).map(s => ({feed: s.id, mid: s.mid}));
 								let unsubscribe = streams.filter(stream => stream.disabled).map(s => ({feed: s.id, mid: s.mid}));
 								this._log('Already subscribed to user: ', userId, 'Update streams', subscribe, unsubscribe);
 								if(subscribe.length || unsubscribe.length) {