@reactoo/watchtogether-sdk-js 2.5.44 → 2.5.50

package/example/bulk_join_room/bulk_join_room_2.html

@@ -48,6 +48,11 @@
 			<input type="text" id="instance-type" onchange="applySettingsFromForm()">
 		</div>
 
+		<div class="form-group">
+			<label for="swagger-url">Swagger URL</label>
+			<input type="text" id="swagger-url" onchange="applySettingsFromForm()">
+		</div>
+
 		<div class="form-group">
 			<label for="fetch-names">Fetch participants names</label>
 			<input type="checkbox" id="fetch-names" onchange="applySettingsFromForm()">
@@ -95,11 +100,12 @@
 		participantsOrderRandomization: false,
 		minParticipantsCount: 1,
 		maxParticipantsCount: 32,
-		instanceType: "reactooDemo",
 		roomId: "",
 		pinHash: "",
 		connectionDelay: 1,
 		parallelQueues: 1, // number of parallel queues for joining participants - only applied when connectionDelay is 0
+		instanceType: "reactooDemo",
+		swaggerUrl: "https://api.reactoo.com/v3/swagger.json",
 		fetchNames: false,
 		participantsNames: [],
 	};
@@ -119,6 +125,7 @@
 			connectionDelay: document.getElementById("connection-delay"),
 			parallelQueues: document.getElementById("parallel-queues"),
 			instanceType: document.getElementById("instance-type"),
+			swaggerUrl: document.getElementById("swagger-url"),
 			fetchNames: document.getElementById("fetch-names"),
 			participantsNames: document.getElementById("participants-names"),
 		},
@@ -144,17 +151,18 @@
 
 	function applySettingsFromForm() {
 		settings = {
-			participantsCount: parseInt(elements.form.participantsCount.value) || 0,
+			participantsCount: parseInt(elements.form.participantsCount.value) || defaultSettings.participantsCount,
 			participantsOrderRandomization: elements.form.participantsOrderRandomization.checked,
-			minParticipantsCount: parseInt(settings.minParticipantsCount) || 1,
-			maxParticipantsCount: parseInt(settings.maxParticipantsCount) || 32,
-			roomId: elements.form.roomId.value || "",
-			pinHash: elements.form.pinHash.value || "",
-			connectionDelay: parseFloat(elements.form.connectionDelay.value) || 0,
-			parallelQueues: parseInt(elements.form.parallelQueues.value) || 1,
-			instanceType: elements.form.instanceType.value || "reactooDemo",
+			minParticipantsCount: parseInt(settings.minParticipantsCount) || defaultSettings.minParticipantsCount,
+			maxParticipantsCount: parseInt(settings.maxParticipantsCount) || defaultSettings.maxParticipantsCount,
+			roomId: elements.form.roomId.value || defaultSettings.roomId,
+			pinHash: elements.form.pinHash.value || defaultSettings.pinHash,
+			connectionDelay: parseFloat(elements.form.connectionDelay.value) || defaultSettings.connectionDelay,
+			parallelQueues: parseInt(elements.form.parallelQueues.value) || defaultSettings.parallelQueues,
+			instanceType: elements.form.instanceType.value || defaultSettings.instanceType,
+			swaggerUrl: elements.form.swaggerUrl.value || defaultSettings.swaggerUrl,
 			fetchNames: elements.form.fetchNames.checked,
-			participantsNames: elements.form.participantsNames.value.split("\n"),
+			participantsNames: elements.form.participantsNames.value.split("\n") || "",
 		};
 
 		setSettingsToUrl(false);
@@ -201,6 +209,7 @@
 		elements.form.connectionDelay.value = settings.connectionDelay;
 		elements.form.parallelQueues.value = settings.parallelQueues;
 		elements.form.instanceType.value = settings.instanceType;
+		elements.form.swaggerUrl.value = settings.swaggerUrl;
 		elements.form.fetchNames.checked = settings.fetchNames;
 		elements.form.participantsNames.value = settings.participantsNames.join("\n");
 	}
@@ -234,7 +243,7 @@
 
 		const gifUrl = `./persons_gifs/${gifId}.gif`;
 		const frameIndex = 0;
-		const sdkInstance = WatchTogetherSDK({debug:true, storagePrefix: `participant_${gifId}`})({instanceType: settings.instanceType});
+		const sdkInstance = WatchTogetherSDK({debug: true, storagePrefix: `participant_${gifId}`, apiUrl: settings.swaggerUrl})({instanceType: settings.instanceType});
 
 		const containerElement = document.createElement('div');
 		containerElement.classList.add('participant-container');

package/package.json

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

package/src/models/room.js

@@ -2,6 +2,7 @@
 
 import roomSession from './room-session';
 import streamingSession from "./streaming-session";
+import {decodeJanusDisplay} from "../modules/wt-utils";
 
 let room = function () {
 	
@@ -302,7 +303,7 @@ let room = function () {
 			return roomSessions.find(session => session.roomId === roomId) || null
 		},
 		getSessionByUserId: (userId) => {
-			return roomSessions.find(session => session.userId === userId) || null
+			return roomSessions.find(session => decodeJanusDisplay(session.userId)?.userId === userId) || null
 		},
 		getSessionByStreamId: (streamId) => {
 			return roomSessions.find(session => session.streamId === streamId) || null

package/src/modules/wt-room.js

@@ -98,9 +98,9 @@ class RoomSession {
 		participant: {
 			"watchparty": ['participant', 'talkback'],
 			"commentary": ['participant', 'talkback'],
-			"videowall": ['host', 'observer', 'talkback'],
-			"videowall-queue": ['host', 'observer', 'talkback'],
-			"videowall-queue-video": ['host', 'observer', 'talkback']
+			"videowall": ['host', 'talkback', 'observerSolo1', 'observerSolo2', 'observerSolo3'],
+			"videowall-queue": ['host', 'talkback', 'observerSolo1', 'observerSolo2', 'observerSolo3'],
+			"videowall-queue-video": ['host', 'talkback', 'observerSolo1', 'observerSolo2', 'observerSolo3']
 		},
 		monitor: {
 			"watchparty": ['participant'],
@@ -123,6 +123,27 @@ class RoomSession {
 			"videowall-queue": ['participant'],
 			"videowall-queue-video": ['participant'],
 		},
+		observerSolo1: {
+			"watchparty": ['participant'],
+			"commentary": ['participant'],
+			"videowall": ['participant'],
+			"videowall-queue": ['participant'],
+			"videowall-queue-video": ['participant'],
+		},
+		observerSolo2: {
+			"watchparty": ['participant'],
+			"commentary": ['participant'],
+			"videowall": ['participant'],
+			"videowall-queue": ['participant'],
+			"videowall-queue-video": ['participant'],
+		},
+		observerSolo3: {
+			"watchparty": ['participant'],
+			"commentary": ['participant'],
+			"videowall": ['participant'],
+			"videowall-queue": ['participant'],
+			"videowall-queue-video": ['participant'],
+		},
 		host: {
 			"watchparty": [],
 			"commentary": [],
@@ -250,6 +271,9 @@ class RoomSession {
 			case 'monitor':
 				return 'addRemoteTalkback';
 			case 'observer':
+			case 'observerSolo1':
+			case 'observerSolo2':
+			case 'observerSolo3':
 				return 'addRemoteObserver';
 			case 'host':
 				return 'addRemoteInstructor';
@@ -283,6 +307,9 @@ class RoomSession {
 			case 'monitor':
 				return 'removeRemoteTalkback';
 			case 'observer':
+			case 'observerSolo1':
+			case 'observerSolo2':
+			case 'observerSolo3':
 				return 'removeRemoteObserver';
 			case 'host':
 				return 'removeRemoteInstructor';
@@ -664,6 +691,7 @@ class RoomSession {
 					tid: generateUUID(),
 					id: handle.handleId,
 					userId: decodeJanusDisplay(handle.userId)?.userId,
+					role: decodeJanusDisplay(handle.userId)?.role,
 					stream: null,
 					track: null,
 					adding: false,
@@ -1240,6 +1268,7 @@ class RoomSession {
 						tid: generateUUID(),
 						id: handle.handleId,
 						userId: decodeJanusDisplay(handle.userId)?.userId,
+						role: decodeJanusDisplay(handle.userId)?.role,
 						stream: config.stream,
 						track: null,
 						optional: true,
@@ -1261,6 +1290,7 @@ class RoomSession {
 						tid: generateUUID(),
 						id: handle.handleId,
 						userId: decodeJanusDisplay(handle.userId)?.userId,
+						role: decodeJanusDisplay(handle.userId)?.role,
 						stream: config.stream,
 						track: null,
 						optional: true,
@@ -1314,6 +1344,7 @@ class RoomSession {
 							mid,
 							id: handle.handleId,
 							userId: decodeJanusDisplay(handle.userId)?.userId,
+							role: decodeJanusDisplay(handle.userId)?.role,
 							stream: config.stream,
 							track: event.track,
 							constructId: this.constructId,
@@ -1342,6 +1373,7 @@ class RoomSession {
 									id: handle.handleId,
 									mid,
 									userId: decodeJanusDisplay(handle.userId)?.userId,
+									role: decodeJanusDisplay(handle.userId)?.role,
 									stream: config.stream,
 									track: ev.target,
 									constructId: this.constructId,
@@ -1368,6 +1400,7 @@ class RoomSession {
 								id: handle.handleId,
 								mid,
 								userId: decodeJanusDisplay(handle.userId)?.userId,
+								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
 								kind: ev.target.kind,
 								track: ev.target,
@@ -1389,6 +1422,7 @@ class RoomSession {
 								id: handle.handleId,
 								mid,
 								userId: decodeJanusDisplay(handle.userId)?.userId,
+								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
 								kind: ev.target.kind,
 								track: ev.target,
@@ -1993,6 +2027,7 @@ class RoomSession {
 								tid: generateUUID(),
 								id: handle.handleId,
 								userId: decodeJanusDisplay(handle.userId)?.userId,
+								role: decodeJanusDisplay(handle.userId)?.role,
 								track,
 								stream: config.stream,
 								adding: true,
@@ -2006,6 +2041,7 @@ class RoomSession {
 									tid:generateUUID(),
 									id: handle.handleId,
 									userId: decodeJanusDisplay(handle.userId)?.userId,
+									role: decodeJanusDisplay(handle.userId)?.role,
 									track: ev.target,
 									stream: config.stream,
 									adding: false,
@@ -2023,6 +2059,7 @@ class RoomSession {
 						tid: generateUUID(),
 						id: handle.handleId,
 						userId: decodeJanusDisplay(handle.userId)?.userId,
+						role: decodeJanusDisplay(handle.userId)?.role,
 						stream: null,
 						adding: false,
 						constructId: this.constructId,