@reactoo/watchtogether-sdk-js 2.5.32 → 2.5.38

package/src/models/room-session.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import {wait} from "../modules/wt-utils";
+import {decodeJanusDisplay, wait} from "../modules/wt-utils";
 import _emitter_ from "../modules/wt-emitter";
 
 // SYNCHRONISATION MODULES
@@ -17,7 +17,7 @@ import syncDisabled from "../modules/sync-modules/sync-disabled";
 import syncDaznDash from "../modules/sync-modules/sync-dazn-dash";
 import syncUniversal from "../modules/sync-modules/sync-universal";
 
-let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructor}, room, wt) {
+let roomSession = function ({roomId, pinHash, isTalkback, isInstructor}, room, wt) {
 
 	let primaryRoomId = roomId;
 	let publicCustomEvents = ['changePlayerSource', 'chatMessage', 'userUpdate', 'reconnecting', 'connecting', 'remoteMuted', 'scaling'];
@@ -31,6 +31,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 
 	const emitter = _emitter_();
 	let alpTimeoutId = null;
+	let abortController = null;
 	let ___; // return object
 
 	room.on('addLocalParticipant', () => {
@@ -86,13 +87,14 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 		connect: function ({reactooRoomId = null} = {}) {
 			emitter.emit('connecting', true);
 			clearTimeout(alpTimeoutId);
-			return Promise.all([wt.room.__joinRoom({
-				roomId: reactooRoomId || primaryRoomId,
-				pinHash,
-				isTalkback,
-				isMonitor,
-				isInstructor
-			}), wt.user.getUserSelf()])
+			abortController = new AbortController();
+			return Promise.all([
+				wt.room.__joinRoom({
+					roomId: reactooRoomId || primaryRoomId,
+					pinHash,
+					isTalkback,
+					isInstructor}, abortController?.signal),
+				wt.user.getUserSelf()])
 				.then(([roomData, userData]) => {
 					// Happens when we reroute user to a different room
 					if(roomData?.data?.reactooRoomId !== roomId) {
@@ -102,7 +104,21 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 					return Promise.all([roomData, userData])
 				})
 				.then(([roomData, userData]) => Promise.all([roomData, userData, this.setRoomVars()]))
-				.then(([roomData, userData, _]) => Promise.all([roomData, userData, room.connect(roomData.data.roomId, roomData.data.pin, roomData.data.href, roomData.data.iceServers, roomData.data.accessToken, roomData.data.display, roomData.data.userId, roomData.data.webrtcVersion, (roomData.data.bitrate ? parseInt(roomData.data.bitrate) : 0), isMonitor, roomData.data.recordingFilename)]))
+				.then(([roomData, userData, _]) => Promise.all([
+					roomData,
+					userData,
+					room.connect(
+						roomData.data.roomId,
+						roomData.data.pin,
+						roomData.data.href,
+						roomData.data.iceServers,
+						roomData.data.accessToken,
+						roomData.data.display,
+						roomData.data.userId,
+						roomData.data.webrtcVersion,
+						(roomData.data.bitrate ? parseInt(roomData.data.bitrate) : 0),
+						roomData.data.recordingFilename)
+				]))
 				.finally(() => {
 					emitter.emit('connecting', false);
 				})
@@ -111,6 +127,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 
 		disconnect: function (dontWaitForResponses) {
 			clearTimeout(alpTimeoutId);
+			abortController?.abort?.();
 			return room.disconnect(dontWaitForResponses);
 		},
 
@@ -120,7 +137,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 			emitter.emit('reconnecting', true);
 			room.isRestarting = true;
 
-			let wasPublished = room._isPublished;
+			let wasPublished = room.isPublished;
 			let handle = room._getHandle(room.handleId);
 			let stream = null;
 			if (handle?.webrtcStuff?.stream && wasPublished) {
@@ -179,7 +196,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 					emitter.emit('chatMessage', msg);
 				} else if (msg.user_action === 'remote_muted') {
 					if (msg.from !== room.userId) {
-						emitter.emit('remoteMuted', {userId: msg.from, ...(msg.text && JSON.parse(msg.text))})
+						emitter.emit('remoteMuted', {userId: decodeJanusDisplay(msg.from)?.userId, ...(msg.text && JSON.parse(msg.text))})
 					}
 				} else if (msg.user_action === 'remote_muted_request') {
 					if (msg.from !== room.userId) {
@@ -287,12 +304,13 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 		},
 
 		setRoomVars: () => {
-			return wt.room.getRoomById(roomId, pinHash)
+			return wt.room.getRoomById(roomId, pinHash, undefined, false, abortController?.signal)
 				.then(r => {
 					// setting observers userId's so we can ignore them when creating participant
+					room.setRoomType(r.data.type);
 					room.setObserverIds(r.data.allowedObservers);
 					room.setTalkbackIds(r.data.allowedTalkbacks);
-					room.setInstructorId(r.data.classroom?.instructorUserId);
+					room.setInstructorId(r.data.classroom?.instructorUserId || r.data.videowall?.hostUserId);
 				});
 		},
 

package/src/models/room.js

@@ -178,10 +178,16 @@ let room = function () {
 				.then(client => client.apis.wt.setUser({messageId, userId, roomId, flag, timestamp, option}));
 		},
 
-		getRoomById: (id, pinHash = undefined, showPublic = undefined, demo = false) => {
+		getRoomById: (id, pinHash = undefined, showPublic = undefined, demo = false, signal) => {
 			return this.__privates.auth.__client
-				.then(client => client.apis.wt.getRoom({id, pinHash, "public": showPublic, demo}))
-
+				.then(client => client.apis.wt.getRoom({id, pinHash, "public": showPublic, demo}, {
+					...(signal ? {
+					requestInterceptor: (req) => {
+						req.signal = signal;
+						return req;
+					}
+				} : {}),
+			}))
 		},
 
 		getRoomBySlug: (slug, password = undefined, showPublic = undefined, demo = false) => {
@@ -199,26 +205,22 @@ let room = function () {
 				}))
 		},
 
-		__joinRoom: ({roomId, pinHash, instanceType = this.__instanceType, isTalkback = undefined, isMonitor = undefined, isInstructor = undefined, customBearer = undefined} = {}) => {
+		__joinRoom: ({roomId, pinHash, instanceType = this.__instanceType, isTalkback = undefined, isInstructor = undefined, customBearer = undefined} = {}, signal) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.join({
 					roomId,
 					pinHash,
 					instanceType,
 					isTalkback,
-					isMonitor,
 					isInstructor,
 					platform: this.browser === 'firefox' ? 'web-firefox' : 'web'
 				}, {
-					...(customBearer ? {
+					...(signal ? {
 						requestInterceptor: (req) => {
-							if (!req.headers) {
-								req.headers = {};
-							}
-							req.headers['Authorization'] = customBearer;
+							req.signal = signal;
 							return req;
 						}
-					} : {})
+					} : {}),
 				}))
 		},
 

package/src/modules/sync-modules/sync-dash-vod.js

@@ -196,7 +196,7 @@ const syncVodDashJs = function ({room, wt, roomSession, emitter} = {}) {
 	};
 
     const isConnected = () => {
-        return room._isDataChannelOpen && room._hasJoined;
+        return room._isDataChannelOpen && room.isConnected;
     };
 	
 	const buffering = (event) => {

package/src/modules/sync-modules/sync-dash.js

@@ -178,7 +178,7 @@ const syncDashJs = function ({room, wt, roomSession, emitter} = {}) {
     };
     
     const isConnected = () => {
-        return room._isDataChannelOpen && room._hasJoined;
+        return room._isDataChannelOpen && room.isConnected;
     };
     
     const buffering = (event) => {

package/src/modules/sync-modules/sync-dazn-dash.js

@@ -178,7 +178,7 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
     };
     
     const isConnected = () => {
-        return room._isDataChannelOpen && room._hasJoined;
+        return room._isDataChannelOpen && room.isConnected;
     };
     
     const parseDataEvents = (msg = {}) => {

package/src/modules/sync-modules/sync-doris.js

@@ -178,7 +178,7 @@ const syncDoris = function ({room, wt, roomSession, emitter} = {}) {
     };
     
     const isConnected = () => {
-        return room._isDataChannelOpen && room._hasJoined;
+        return room._isDataChannelOpen && room.isConnected;
     };
     
     const parseDataEvents = (msg = {}) => {

package/src/modules/sync-modules/sync-hls-vod.js

@@ -198,7 +198,7 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
     };
 
     const isConnected = () => {
-        return room._isDataChannelOpen && room._hasJoined;
+        return room._isDataChannelOpen && room.isConnected;
     };
 
     const buffering = (event, data = {}) => {

package/src/modules/sync-modules/sync-hls.js

@@ -197,7 +197,7 @@ const syncHlsJs = function ({room, wt, roomSession, emitter} = {}) {
     };
 
     const isConnected = () => {
-        return room._isDataChannelOpen && room._hasJoined;
+        return room._isDataChannelOpen && room.isConnected;
     };
 
     const buffering = (event, data = {}) => {

package/src/modules/sync-modules/sync-native-hls-vod.js

@@ -196,7 +196,7 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
     };
 
     const isConnected = () => {
-        return room._isDataChannelOpen && room._hasJoined;
+        return room._isDataChannelOpen && room.isConnected;
     };
     
     const executePlayerIotEvents = (data) => {

package/src/modules/sync-modules/sync-native-hls.js

@@ -178,7 +178,7 @@ const syncNativeHls = function ({room, wt, roomSession, emitter} = {}) {
     };
     
     const isConnected = () => {
-        return room._isDataChannelOpen && room._hasJoined;
+        return room._isDataChannelOpen && room.isConnected;
     };
     
     const parseDataEvents = (msg = {}) => {

package/src/modules/sync-modules/sync-shaka-dash-vod.js

@@ -196,7 +196,7 @@ const syncVodShakaDash = function ({room, wt, roomSession, emitter} = {}) {
 	};
 
     const isConnected = () => {
-        return room._isDataChannelOpen && room._hasJoined;
+        return room._isDataChannelOpen && room.isConnected;
     };
 
 	const buffering = (event) => {

package/src/modules/sync-modules/sync-shaka-dash.js

@@ -184,7 +184,7 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
     };
     
     const isConnected = () => {
-        return room._isDataChannelOpen && room._hasJoined;
+        return room._isDataChannelOpen && room.isConnected;
     };
     
     const parseDataEvents = (msg = {}) => {

package/src/modules/sync-modules/sync-universal.js

@@ -181,7 +181,7 @@ const syncUniversal = function ({room, wt, roomSession, emitter} = {}) {
 	};
 	
 	const isConnected = () => {
-		return room._isDataChannelOpen && room._hasJoined;
+		return room._isDataChannelOpen && room.isConnected;
 	};
 	
 	const parseDataEvents = (msg = {}) => {

package/src/modules/wt-iot.js

@@ -1,6 +1,7 @@
 
 import {device} from 'aws-iot-device-sdk';
 import emitter from './wt-emitter';
+import {decodeJanusDisplay} from "./wt-utils";
 
 class Iot {
     
@@ -68,14 +69,14 @@ class Iot {
                 this.startCredentialsExpirationCheck(expiration);
                 
                 let __s = () => {
-                    this.device.off('connect', __s);
-                    this.device.off('error', __e);
+                    this.device?.off('connect', __s);
+                    this.device?.off('error', __e);
                     resolve(this.device)
                 };
                 
                 let __e = (e) => {
-                    this.device.off('connect', __s);
-                    this.device.off('error', __e);
+                    this.device?.off('connect', __s);
+                    this.device?.off('error', __e);
                     reject(e);
                 };
                 
@@ -156,10 +157,16 @@ class Iot {
     }
     
     __messageCb(t, message, packet) {
-        
         const topic = t.split('/');
-        const payload = JSON.parse(this.decoder.decode(message));
-        
+        let payload = JSON.parse(this.decoder.decode(message));
+
+        if(payload.display) {
+            const decodedDisplay = decodeJanusDisplay(payload.display);
+            if(decodedDisplay.userId) {
+                payload = {...payload, userId: decodedDisplay.userId}
+            }
+        }
+
         if(topic[0] === 'user') { // user
             const userId = topic[1].replace("_", ':');
             this.emit('message', {userId, ...payload, event: payload.event ? `user:${payload.event}` : 'user'});