@reactoo/watchtogether-sdk-js 2.5.0 → 2.5.4

package/package.json

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

package/src/models/room-session.js

@@ -93,7 +93,17 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				isInstructor
 			}), wt.user.getUserSelf()])
 				.then(([roomData, userData]) => Promise.all([roomData, userData, this.setRoomVars()]))
-				.then(([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, _]) => 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, _]) => {
+
+					// Happens when we reroute user to a different room
+
+					if(roomData?.data?.reactooRoomId) {
+						roomId = roomData.data.reactooRoomId
+					}
+
+					return roomData.data
+				})
 				.finally(() => {
 					emitter.emit('connecting', false);
 				})
@@ -161,6 +171,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				} else if (msg.action === 'user_update_displayname' || msg.action === 'user_update_avatar' || msg.action === 'user_update_customattributes' || msg.action === 'user_update_privateattributes') {
 					emitter.emit('userUpdate', msg.text);
 				} else if (msg.action === 'observer_connecting' || msg.action === 'talkback_connecting' || msg.action === 'instructor_connecting') {
+
 					this.setRoomVars(null, msg.action === 'observer_connecting').catch(e => {
 						room._log('Setting observers failed, this will cause issues', e);
 					});

package/src/modules/wt-room.js

@@ -412,7 +412,7 @@ class RoomSession {
 						let subCondition = false
 						
 						if(!isClassroom) {
-							subscribeCondition =    allowedObservers.indexOf(userId) === -1 && allowedTalkback.indexOf(this.userId) === -1;
+							subscribeCondition =   allowedObservers.indexOf(userId) === -1 && allowedTalkback.indexOf(this.userId) === -1;
 						} else {
 				
 							// instructor -> everyone but observer
@@ -681,6 +681,7 @@ class RoomSession {
 					stream: null,
 					track: null,
 					adding: false,
+					constructId: this.constructId,
 					hasAudioTrack: false,
 					hasVideoTrack: false
 				});
@@ -1269,6 +1270,7 @@ class RoomSession {
 							userId: handle.userId,
 							stream: config.stream,
 							track: event.track,
+							constructId: this.constructId,
 							adding: true,
 							hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 							hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)
@@ -1302,6 +1304,7 @@ class RoomSession {
 									userId: handle.userId,
 									stream: config.stream,
 									track: ev.target,
+									constructId: this.constructId,
 									adding: false,
 									hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 									hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)