@reactoo/watchtogether-sdk-js 2.5.25 → 2.5.32

package/example/bulk_join_room/bulk_join_room.html

@@ -32,7 +32,6 @@
 	<input type="number" id="connection-timeout" placeholder="5000" min="0">
 
 	<br><br>
-
 	<button type="submit" id="join-room">Create users and join room</button>
 
 	<button type="button" id="leave-room" onclick="leaveParticipants()">Leave room</button>
@@ -52,7 +51,7 @@
 
 	let participantsCount = 3;
 	let instanceType = "reactooDemo";
-	let roomId = "0512f218-6a4a-45e1-9d05-d5a0e5afb33d";
+	let roomId = "2e705d79-aaa9-4790-a3d7-512858f60932";
 	let pinHash = undefined;
 	let timeoutBetweenParticipantsJoins = 5000;
 

package/package.json

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

package/src/models/room-session.js

@@ -102,7 +102,7 @@ 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, (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, roomData.data.display, roomData.data.userId, roomData.data.webrtcVersion, (roomData.data.bitrate ? parseInt(roomData.data.bitrate) : 0), isMonitor, roomData.data.recordingFilename)]))
 				.finally(() => {
 					emitter.emit('connecting', false);
 				})
@@ -170,7 +170,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 => {
+					this.setRoomVars().catch(e => {
 						room._log('Setting observers failed, this will cause issues', e);
 					});
 				} else if (msg.action === 'bitrate_changed') {
@@ -286,15 +286,9 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 			}
 		},
 
-		setRoomVars: (observerIds = [], emit = true) => {
+		setRoomVars: () => {
 			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);

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

@@ -429,7 +429,7 @@ const syncVodDashJs = function ({room, wt, roomSession, emitter} = {}) {
                 timestamp: new Date().getTime(),
                 fragment: isPlaying ? "1":"0",
                 fragment_pos: Number(fragmentPosition),
-                slave_id:Number(slaveId)
+				slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
 

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

@@ -328,7 +328,7 @@ const syncDashJs = function ({room, wt, roomSession, emitter} = {}) {
                 timestamp: new Date().getTime(),
                 fragment: String("0"),
                 fragment_pos: Number(fragmentPosition),
-                slave_id:Number(slaveId)
+                slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
     

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

@@ -335,7 +335,7 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
                 timestamp: new Date().getTime(),
                 fragment: String("0"),
                 fragment_pos: Number(fragmentPosition),
-                slave_id:Number(slaveId)
+                slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
     

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

@@ -326,7 +326,7 @@ const syncDoris = function ({room, wt, roomSession, emitter} = {}) {
                 timestamp: new Date().getTime(),
                 fragment: String("0"),
                 fragment_pos: Number(fragmentPosition),
-                slave_id:Number(slaveId)
+                slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
     

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

@@ -429,7 +429,7 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
                 timestamp: new Date().getTime(),
                 fragment: isPlaying ? "1":"0",
                 fragment_pos: Number(fragmentPosition),
-                slave_id:Number(slaveId)
+                slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
 

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

@@ -499,7 +499,7 @@ const syncHlsJs = function ({room, wt, roomSession, emitter} = {}) {
                 timestamp: new Date().getTime(),
                 fragment: String(fragment),
                 fragment_pos: Number(fragmentPosition),
-                slave_id:Number(slaveId)
+                slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
 

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

@@ -421,7 +421,7 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
                 timestamp: new Date().getTime(),
                 fragment: isPlaying ? "1":"0",
                 fragment_pos: Number(fragmentPosition),
-                slave_id:Number(slaveId)
+                slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
 

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

@@ -331,7 +331,7 @@ const syncNativeHls = function ({room, wt, roomSession, emitter} = {}) {
                 timestamp: new Date().getTime(),
                 fragment: String("0"),
                 fragment_pos: Number(fragmentPosition),
-                slave_id:Number(slaveId)
+                slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
     

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

@@ -427,7 +427,7 @@ const syncVodShakaDash = function ({room, wt, roomSession, emitter} = {}) {
                 timestamp: new Date().getTime(),
                 fragment: isPlaying ? "1":"0",
                 fragment_pos: Number(fragmentPosition),
-                slave_id:Number(slaveId)
+				slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
 

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

@@ -341,7 +341,7 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
                 timestamp: new Date().getTime(),
                 fragment: String("0"),
                 fragment_pos: Number(fragmentPosition),
-                slave_id:Number(slaveId)
+                slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
     

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

@@ -339,7 +339,7 @@ const syncUniversal = function ({room, wt, roomSession, emitter} = {}) {
 				timestamp: new Date().getTime(),
 				fragment: String("0"),
 				fragment_pos: Number(fragmentPosition),
-				slave_id: Number(slaveId)
+				slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
 			}});
 	};
 	

package/src/modules/wt-room.js

@@ -507,6 +507,7 @@ class RoomSession {
 											"ptype": "subscriber",
 											"feed": id,
 											"private_id": this.privateId,
+											...(this.webrtcVersion > 1000 ? {id: this.userId} : {}),
 											pin: this.pin
 										}
 									})
@@ -542,6 +543,7 @@ class RoomSession {
 											"ptype": "subscriber",
 											"feed": id,
 											"private_id": this.privateId,
+											...(this.webrtcVersion > 1000 ? {id: this.userId} : {}),
 											pin: this.pin
 										}
 									})
@@ -817,10 +819,10 @@ class RoomSession {
 		})
 	}
 
-	_joinRoom(roomId, pin, userId) {
+	_joinRoom(roomId, pin, userId, display) {
 		return this.sendMessage(this.handleId, {
 			body: {
-				"request": "join", "room": roomId, "pin": pin, "ptype": "publisher", "display": userId
+				"request": "join", "room": roomId, "pin": pin, "ptype": "publisher", "display": display, ...(this.webrtcVersion > 1000 ? {id: userId} : {})
 			}
 		}, false, true)
 	}
@@ -892,7 +894,7 @@ class RoomSession {
 		return this.connectingPromise;
 	}
 
-	connect(roomId, pin, server, iceServers, token, userId, webrtcVersion = 0, initialBitrate = 0, isMonitor, recordingFilename) {
+	connect(roomId, pin, server, iceServers, token, display, userId, webrtcVersion = 0, initialBitrate = 0, isMonitor, recordingFilename) {
 
 		if (this.connectingPromise) {
 			return this.connectingPromise;
@@ -910,7 +912,9 @@ class RoomSession {
 		this.token = token;
 		this.roomId = roomId;
 		this.pin = pin;
+		this.display = display;
 		this.userId = userId;
+		this.webrtcVersion = webrtcVersion;
 		this.initialBitrate = initialBitrate;
 		this.isMonitor = isMonitor;
 		this.recordingFilename = recordingFilename;
@@ -935,7 +939,7 @@ class RoomSession {
 						this.handleId = handle.handleId;
 						return 1
 					})
-					.then(() => this._joinRoom(roomId, pin, userId))
+					.then(() => this._joinRoom(roomId, pin, userId, display))
 					.then(() => {
 						this.connectingPromise = null;
 						this.emit('joining', false);
@@ -960,6 +964,9 @@ class RoomSession {
 		if (this.disconnectingPromise) {
 			return this.disconnectingPromise;
 		}
+
+		let _hasJoined = this._hasJoined;
+
 		clearTimeout(this._messageTimeoutId);
 		clearTimeout(this._dataChannelTimeoutId);
 		this._stopKeepAlive();
@@ -974,9 +981,11 @@ class RoomSession {
 				//TODO: Just in case something crashed along the way
 				this._isPublished = false;
 				this._hasJoined = false;
+				this.emit('publishing', false);
 				this.emit('published', {status: false, hasStream: false});
+				this.emit('joining', false);
 				this.emit('joined', false);
-				this.emit('disconnect');
+				this.emit('disconnect', _hasJoined);
 				return Promise.resolve('Disconnected');
 			})
 		return this.disconnectingPromise;
@@ -1046,6 +1055,9 @@ class RoomSession {
 		if (this.disconnectingPromise) {
 			return this.disconnectingPromise;
 		}
+
+		let _isStreaming = this._isStreaming;
+
 		this._stopKeepAlive();
 		this.disconnectingPromise = this.sendMessage(this.handleId, {
 			body: {
@@ -1061,9 +1073,9 @@ class RoomSession {
 				}
 				this.sessionId = null;
 				this._isStreaming = false;
+				this.emit('streamStarting', false);
 				this.emit('streaming', false);
-				// last event
-				this.emit('disconnect');
+				this.emit('disconnect', _isStreaming);
 				this.disconnectingPromise = null;
 				return Promise.resolve('Disconnected');
 			});
@@ -1071,7 +1083,6 @@ class RoomSession {
 		return this.disconnectingPromise;
 	}
 
-
 	destroy() {
 
 		if (this.sessiontype === 'reactooroom') {