@reactoo/watchtogether-sdk-js 2.5.3 → 2.5.7

package/example/bulk_join_room/bulk_join_room.html

@@ -70,10 +70,10 @@
 		document.getElementById('join-room').setAttribute('disabled', true);
 		document.getElementById('joined-participants-count').value = joinedParticipantsCount;
 
-		// TODO - toto tu na konci nebude. Je to len preistotu, aby som znova nezhodil server
-		if (participantsCount > 4) {
-			participantsCount = 4;
-		}
+		// // TODO - toto tu na konci nebude. Je to len preistotu, aby som znova nezhodil server
+		// if (participantsCount > 4) {
+		// 	participantsCount = 4;
+		// }
 
 		participantsData = Array(participantsCount).fill(0).map((_, i) => {
 			const canvas = document.createElement('canvas');

package/package.json

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

package/src/models/room-session.js

@@ -18,40 +18,40 @@ 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 publicCustomEvents = ['changePlayerSource', 'chatMessage', 'userUpdate', 'reconnecting', 'connecting', 'remoteMuted', 'scaling'];
-	
+
 	const addEvents = (events) => {
 		publicCustomEvents = [...publicCustomEvents, ...events];
 	};
 	const removeEvents = (events) => {
 		publicCustomEvents = publicCustomEvents.filter(ev => events.indexOf(ev) === -1);
 	};
-	
+
 	const emitter = _emitter_();
 	let alpTimeoutId = null;
 	let ___; // return object
-	
+
 	room.on('addLocalParticipant', () => {
-		
+
 		// TODO: this timeout is a hotfix and should be sorted differently
 		// At some random case we don't get message back if we don't wait
-		
+
 		clearTimeout(alpTimeoutId);
 		alpTimeoutId = setTimeout(() => {
 			___.__requestMuteStatus();
 		}, 1000);
 	});
-	
+
 	room.on('localMuted', ({type, value}) => {
 		___.sendSystemMessage('remote_muted', {type, value})
 	});
 	room.on('data', (data) => {
 		___.__parseDataEvents(data);
 	});
-	
+
 	return (___ = {
-		
+
 		syncModule: null,
 		playerInterface: null,
 
@@ -77,11 +77,11 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 					return true;
 				});
 		},
-		
+
 		iceRestart: function () {
 			return room._iceRestart(room.handleId);
 		},
-		
+
 		connect: function () {
 			emitter.emit('connecting', true);
 			clearTimeout(alpTimeoutId);
@@ -92,35 +92,42 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				isMonitor,
 				isInstructor
 			}), wt.user.getUserSelf()])
+				.then(([roomData, userData]) => {
+					// Happens when we reroute user to a different room
+					if(roomData?.data?.reactooRoomId) {
+						roomId = roomData.data.reactooRoomId
+					}
+					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, (isMonitor || isInstructor || isTalkback) ? roomData.data.userId : userData.data._id, roomData.data.webrtcVersion, (roomData.data.bitrate ? parseInt(roomData.data.bitrate) : 0), isMonitor, roomData.data.recordingFilename)]))
 				.then(([roomData, userData, _]) => {
-					return roomData
+					return roomData.data
 				})
 				.finally(() => {
 					emitter.emit('connecting', false);
 				})
-			
+
 		},
-		
+
 		disconnect: function (dontWaitForResponses) {
 			clearTimeout(alpTimeoutId);
 			return room.disconnect(dontWaitForResponses);
 		},
-  
+
 		//TODO: refactor restart method
 		restart: function (isObserver = false) {
-			
+
 			emitter.emit('reconnecting', true);
 			room.isRestarting = true;
-			
+
 			let wasPublished = room._isPublished;
 			let handle = room._getHandle(room.handleId);
 			let stream = null;
 			if (handle?.webrtcStuff?.stream && wasPublished) {
 				stream = handle.webrtcStuff.stream;
 			}
-			
+
 			return this.disconnect()
 				.then(() => wait(1000)) //TODO: remove 1000ms wait by waiting for proper events from janus
 				.then(() => this.connect())
@@ -143,17 +150,17 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 					emitter.emit('error', {type: 'error', id: 26, message: 'reconnecting failed', data: error});
 					return Promise.reject(0);
 				});
-			
+
 		},
-		
+
 		getStats: function (type = null) {
 			return room._getStats(type)
 		},
-		
+
 		getRoomParticipants: function () {
 			return room._participants;
 		},
-		
+
 		__parseDataEvents: function (msg = {}) {
 			if (msg.videoroom === 'message') {
 				if (msg.action === 'pending_shutdown' || msg.action === 'shutting_down') {
@@ -194,11 +201,11 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				return false;
 			}
 		},
-		
+
 		attachPlayer: function (type, inputs) {
-			
+
 			this.detachPlayer();
-			
+
 			if (type === 'hlsjs') {
 				this.syncModule = syncHlsJs({room, wt, roomSession: this, emitter});
 				if (this.syncModule.__events) {
@@ -269,7 +276,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				room._log('Synchronisation type not recognised');
 			}
 		},
-		
+
 		detachPlayer: function () {
 			if (this.syncModule) {
 				this.playerInterface = null;
@@ -280,24 +287,24 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				this.syncModule = null;
 			}
 		},
-		
+
 		setRoomVars: (observerIds = [], emit = true) => {
 			return wt.room.getRoomById(roomId, pinHash)
 				.then(r => {
-					
+
 					if (emit) {
 						// emiting "fake" playerSource event
 						//TODO: somehow push into sync modules instead
 						emitter.emit('changePlayerSource', r.data.wtChannelId, true);
 					}
-					
+
 					// setting observers userId's so we can ignore them when creating participant
 					room.setObserverIds(r.data.allowedObservers);
 					room.setTalkbackIds(r.data.allowedTalkbacks);
 					room.setInstructorId(r.data.classroom?.instructorUserId);
 				});
 		},
-		
+
 		publishLocal: function (stream = null, {
 			keepAudio = false,
 			keepVideo = false,
@@ -308,25 +315,25 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				? room.publishLocal(stream, {keepAudio, keepVideo})
 				: wt.utils.getUserStream(askVideo).then(stream => room.publishLocal(stream)))
 		},
-		
+
 		unpublishLocal: () => {
 			return room.unpublishLocal();
 		},
-		
+
 		toggleAudio: (value) => {
 			return room.toggleAudio(value);
 		},
-		
+
 		toggleVideo: () => {
 			return room.toggleVideo();
 		},
-		
+
 		setBitrateCap: (bitrate) => {
-			
+
 			if(isInstructor) {
 				return;
 			}
-			
+
 			return room.sendMessage(room.handleId, {
 				"body": {
 					"request": "configure",
@@ -334,7 +341,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				}
 			}).catch(() => null)
 		},
-		
+
 		switchChannel: (channelId) => {
 			return room.sendMessage(room.handleId, {
 				body: {
@@ -347,7 +354,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				}
 			});
 		},
-		
+
 		sendSystemMessage: (action, value = {}, to, set_master) => {
 			return room.sendMessage(room.handleId, {
 				body: {
@@ -361,7 +368,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				}
 			});
 		},
-		
+
 		sendChatMessage: (text, to) => {
 			return room.sendMessage(room.handleId, {
 				body: {
@@ -374,26 +381,26 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				}
 			});
 		},
-		
+
 		__requestMuteStatus: function () {
 			this.sendSystemMessage('remote_muted_request');
 		},
-		
+
 		__sendMuteStatus: function () {
 			this.sendSystemMessage('remote_muted', {type: 'video', value: room.isVideoMuted});
 			this.sendSystemMessage('remote_muted', {type: 'audio', value: room.isAudioMuted});
 		},
-		
+
 		$on: (key, callback, that) => {
 			emitter.on(key, callback, that || this);
 			room.on(key, callback, that || this);
 		},
-		
+
 		$off: (key, callback, that) => {
 			emitter.on(key, callback, that || this);
 			room.on(key, callback, that || this);
 		},
-		
+
 		$clear: function () {
 			room.clear();
 			emitter.clear();

package/src/modules/wt-room.js

@@ -103,6 +103,9 @@ class RoomSession {
 	};
 	
 	constructor(constructId = null, type = 'reactooroom', debug, options = {}) {
+
+		Object.assign(this, emitter());
+
 		this.server = null;
 		this.iceServers = null;
 		this.token = null;
@@ -124,18 +127,15 @@ class RoomSession {
 			},
 			options
 		};
-		
-		Object.assign(this, emitter());
-		
 		this.id = null;
 		this.privateId = null;
-		
 		this.constructId = constructId || RoomSession.randomString(16);
 		this.sessionId = null;
 		this.handleId = null;
 		this.ws = null;
 		this.isRestarting = false;
-		
+
+		//TODO: do it better
 		// double click prevention
 		this.connectingPromise = null;
 		this.disconnectingPromise = null;
@@ -152,14 +152,11 @@ class RoomSession {
 		this._isStreaming = false;
 		this._isPublished = false;
 		this._isDataChannelOpen = false;
-		
 		this.isAudioMuted = false;
 		this.isVideoMuted = false;
 		this.isVideoEnabled = false;
 		this.isAudioEnabed = false;
-
 		this.isUnifiedPlan = RoomSession.checkUnifiedPlan();
-
 		this._log = RoomSession.noop;
 		if (this.options.debug) {
 			this._enableDebug();
@@ -682,6 +679,7 @@ class RoomSession {
 					track: null,
 					adding: false,
 					constructId: this.constructId,
+					metaData: this.options.metaData,
 					hasAudioTrack: false,
 					hasVideoTrack: false
 				});
@@ -1271,6 +1269,7 @@ class RoomSession {
 							stream: config.stream,
 							track: event.track,
 							constructId: this.constructId,
+							metaData: this.options.metaData,
 							adding: true,
 							hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 							hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)
@@ -1305,6 +1304,7 @@ class RoomSession {
 									stream: config.stream,
 									track: ev.target,
 									constructId: this.constructId,
+									metaData: this.options.metaData,
 									adding: false,
 									hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 									hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)