@reactoo/watchtogether-sdk-js 2.5.1 → 2.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/watchtogether-sdk.js +2 -2
  2. package/dist/watchtogether-sdk.min.js +2 -2
  3. package/package.json +1 -1
  4. package/src/models/room-session.js +11 -1
  5. package/src/modules/wt-room.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@reactoo/watchtogether-sdk-js",
3
- "version": "2.5.1",
3
+ "version": "2.5.5",
4
4
  "description": "Javascript SDK for Reactoo",
5
5
  "main": "src/index.js",
6
6
  "unpkg": "dist/watchtogether-sdk.min.js",
package/src/models/room-session.js CHANGED
@@ -93,7 +93,17 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
93
93
  isInstructor
94
94
  }), wt.user.getUserSelf()])
95
95
  .then(([roomData, userData]) => Promise.all([roomData, userData, this.setRoomVars()]))
96
- .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))
96
+ .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)]))
97
+ .then(([roomData, userData, _]) => {
98
+
99
+ // Happens when we reroute user to a different room
100
+
101
+ if(roomData?.data?.reactooRoomId) {
102
+ roomId = roomData.data.reactooRoomId
103
+ }
104
+
105
+ return roomData.data
106
+ })
97
107
  .finally(() => {
98
108
  emitter.emit('connecting', false);
99
109
  })
package/src/modules/wt-room.js CHANGED
@@ -412,7 +412,7 @@ class RoomSession {
412
412
  let subCondition = false
413
413
 
414
414
  if(!isClassroom) {
415
- subscribeCondition = allowedObservers.indexOf(userId) === -1 && allowedTalkback.indexOf(this.userId) === -1;
415
+ subscribeCondition = allowedObservers.indexOf(userId) === -1 && allowedTalkback.indexOf(this.userId) === -1;
416
416
  } else {
417
417
 
418
418
  // instructor -> everyone but observer