@reactoo/watchtogether-sdk-js 2.5.30 → 2.5.35

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.30",
+  "version": "2.5.35",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",

package/src/models/room-session.js

@@ -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);
+			abortController = new AbortController();
 			return Promise.all([wt.room.__joinRoom({
 				roomId: reactooRoomId || primaryRoomId,
 				pinHash,
 				isTalkback,
 				isMonitor,
 				isInstructor
-			}), wt.user.getUserSelf()])
+			}, abortController?.signal), wt.user.getUserSelf()])
 				.then(([roomData, userData]) => {
 					// Happens when we reroute user to a different room
 					if(roomData?.data?.reactooRoomId !== roomId) {
@@ -111,6 +113,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 
 		disconnect: function (dontWaitForResponses) {
 			clearTimeout(alpTimeoutId);
+			abortController?.abort?.();
 			return room.disconnect(dontWaitForResponses);
 		},
 
@@ -120,7 +123,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) {
@@ -287,7 +290,7 @@ 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.setObserverIds(r.data.allowedObservers);

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,7 +205,7 @@ 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, isMonitor = undefined, isInstructor = undefined, customBearer = undefined} = {}, signal) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.join({
 					roomId,
@@ -210,15 +216,12 @@ let room = function () {
 					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 = {}) => {