@reactoo/watchtogether-sdk-js 2.4.43 → 2.5.3

package/src/models/room-session.js

@@ -54,13 +54,27 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 		
 		syncModule: null,
 		playerInterface: null,
-		
+
+		get userId() {
+			return room.userId;
+		},
+		get roomId() {
+			return roomId;
+		},
+		get sessionId () {
+			return room.sessionId;
+		},
+		get constructId () {
+			return room.constructId;
+		},
+
 		destroy: function () {
 			clearTimeout(alpTimeoutId);
 			this.detachPlayer();
-			return wt.room.destroySession(room.constructId)
+			return room.destroy()
 				.finally(() => {
 					this.$clear();
+					return true;
 				});
 		},
 		
@@ -79,7 +93,10 @@ 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, _]) => {
+					return roomData
+				})
 				.finally(() => {
 					emitter.emit('connecting', false);
 				})
@@ -92,7 +109,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 		},
   
 		//TODO: refactor restart method
-		restart: function (reason, forceCurrentStream = false, isObserver = false) {
+		restart: function (isObserver = false) {
 			
 			emitter.emit('reconnecting', true);
 			room.isRestarting = true;
@@ -100,7 +117,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 			let wasPublished = room._isPublished;
 			let handle = room._getHandle(room.handleId);
 			let stream = null;
-			if (handle && handle.webrtcStuff && (wasPublished || forceCurrentStream)) {
+			if (handle?.webrtcStuff?.stream && wasPublished) {
 				stream = handle.webrtcStuff.stream;
 			}
 			
@@ -141,12 +158,13 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 			if (msg.videoroom === 'message') {
 				if (msg.action === 'pending_shutdown' || msg.action === 'shutting_down') {
 					emitter.emit('scaling');
-					this.restart('scaling'); // current videoroom was reassigned to a different WebRTC instance
+					this.restart(); // current videoroom was reassigned to a different WebRTC instance
 				} else if (msg.action === 'force_restart') {
-					this.restart('force');
+					this.restart();
 				} 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);
 					});
@@ -165,11 +183,11 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 				}
 			}
 		},
-		
-		renderPlayer: function (playerWrapper, fullscreenElement, roomId) {
+
+		renderPlayer: function (playerWrapper, fullscreenElement) {
 			try {
 				this.syncModule = syncUniversal({room, wt, roomSession: this, emitter});
-				this.playerInterface = wt.__privates.playerFactory(playerWrapper, fullscreenElement, this.syncModule.getHandlers(), {roomId});
+				this.playerInterface = wt.__privates.playerFactory(playerWrapper, fullscreenElement, this.syncModule.getHandlers(), {roomId: room.roomId});
 				this.syncModule.initialize({playerInterface: this.playerInterface});
 				return true;
 			} catch (e) {
@@ -314,7 +332,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 					"request": "configure",
 					"bitrate": parseInt(bitrate)
 				}
-			}).catch(e => null)
+			}).catch(() => null)
 		},
 		
 		switchChannel: (channelId) => {

package/src/models/room.js

@@ -4,26 +4,44 @@ import roomSession from './room-session';
 import streamingSession from "./streaming-session";
 
 let room = function () {
+	
+	let roomSessions = [];
+
+	let setExitListeners = () => {
+		window.addEventListener('pagehide', (event) => {
+			if (!event.persisted) {
+				this.room.destroySessions()
+			}
+		});
+		window.addEventListener('beforeunload', () => {
+			this.room.destroySessions()
+		});
+	}
+
+	setExitListeners();
+
 	return {
-		
-		//TODO: should have own model
-		
+
+		//TODO: new model
 		integration: (data = {}) => {
 			return this.__privates.auth.__client
-				.then(client => client.apis.system.integration({type: this.__instanceType},{requestBody:{...data}, requestInterceptor: (req) => {
+				.then(client => client.apis.system.integration({type: this.__instanceType}, {
+					requestBody: {...data}, requestInterceptor: (req) => {
 						if (!req.headers) {
 							req.headers = {};
 						}
 						req.headers['Authorization'] = 'Bearer ' + localStorage.getItem('rwt_idToken');
 						return req;
-					}}));
+					}
+				}));
 		},
-		
+
+		//TODO: new model
 		getAnalytics: (data = {}) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.system.getAnalytics({instanceType: this.__instanceType, ...data}))
 		},
-		
+
 		sendChatMessage: ({roomId, message, options, senderUserId}) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.sendRoomMessage({}, {
@@ -35,22 +53,8 @@ let room = function () {
 					}
 				}))
 		},
-		createRoom: ({
-			             title,
-			             description,
-			             isPublic,
-			             isListed,
-			             isStudioLayout,
-			             allowedParticipants,
-			             wtChannelId,
-			             isHd,
-			             disableSync,
-			             reduceRoomControls,
-			             muteParticipantOnJoin,
-			             hasStudioChat,
-			             maxParticipants,
-			             customAttributes
-		             } = {}) => {
+		
+		createRoom: ({title, description, isPublic, isListed, isStudioLayout, allowedParticipants, wtChannelId, isHd, disableSync, reduceRoomControls, muteParticipantOnJoin, hasStudioChat, maxParticipants, customAttributes} = {}) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.createRoom({}, {
 					requestBody: {
@@ -72,33 +76,12 @@ let room = function () {
 					}
 				}))
 		},
-		updateRoom: ({
-			             roomId,
-			             title,
-			             description,
-			             isPublic,
-			             isListed,
-			             allowedParticipants,
-			             recordings,
-			             slug,
-			             password,
-			             maxParticipants,
-			             setInstanceType = false,
-			             wtChannelId,
-			             isHd,
-			             isStudioLayout,
-			             hasStudioChat,
-			             reduceRoomControls,
-			             muteParticipantOnJoin,
-			             disableSync,
-			             defaultRegion,
-						 customAttributes,
-						 dotAttribute
-		             } = {}) => {
+		
+		updateRoom: ({roomId, title, description, isPublic, isListed, allowedParticipants, recordings, slug, password, maxParticipants, setInstanceType = false, wtChannelId, isHd, isStudioLayout, hasStudioChat, reduceRoomControls, muteParticipantOnJoin, disableSync, defaultRegion, customAttributes, dotAttribute} = {}) => {
 			let _da = dotAttribute
 				? (Array.isArray(dotAttribute)
 					? dotAttribute.reduce((p, cv) => (p[cv.name] = cv.value) && p || p, {})
-					: {[dotAttribute.name] : dotAttribute.value})
+					: {[dotAttribute.name]: dotAttribute.value})
 				: {};
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.updateRoom({id: roomId}, {
@@ -123,19 +106,21 @@ let room = function () {
 					}
 				}))
 		},
+		
 		deleteRoom: (roomId) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.deleteRoom({id: roomId}))
 		},
+		
 		leaveRoom: (roomId) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.leave({roomId}))
 		},
-		
+
 		updateLayout: ({roomId, operation, name, attributeName, value, target}) => {
-			
+
 			//operation : clearLayouts, setLayout, setLayouts, unsetLayout, setName, setTarget, setStyle, setAttribute, unsetAttribute,'sendMessage'
-			
+
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.updateLayout({}, {
 					requestBody: {
@@ -148,6 +133,7 @@ let room = function () {
 					}
 				}))
 		},
+		
 		getInviteUrl: (roomId, domain, url) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.invite({}, {
@@ -158,7 +144,7 @@ let room = function () {
 					}
 				}))
 		},
-		
+
 		getRoomChatList: ({roomId, type = "normal", size = 50, startKey = null} = {}) => {
 			let apiParams = {
 				roomId, type,
@@ -168,18 +154,8 @@ let room = function () {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.getRoomChatList(apiParams))
 		},
-		
-		getRoomsList: ({
-			               type = 'participant',
-			               activeOnly = null,
-			               instanceType = this.__instanceType,
-			               size = 20,
-			               startKey = null,
-			               includeWtEventModels = false,
-			               demo = false,
-			               viewType = 'list',
-			               wtChannelId = undefined
-		               } = {}) => {
+
+		getRoomsList: ({ type = 'participant', activeOnly = null, instanceType = this.__instanceType, size = 20, startKey = null, includeWtEventModels = false, demo = false, viewType = 'list', wtChannelId = undefined} = {}) => {
 			let apiParams = {
 				type, instanceType,
 				size,
@@ -190,30 +166,30 @@ let room = function () {
 				...(activeOnly && {activeOnly}),
 				...(startKey && {startKey})
 			};
-			
+
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.getRoomList(apiParams))
-			
+
 		},
-		
+
 		setUser: ({messageId, userId, roomId, flag, timestamp, option}) => {
 			//leave, kick, ban, unban, approve, report
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.setUser({messageId, userId, roomId, flag, timestamp, option}));
 		},
-		
+
 		getRoomById: (id, pinHash = undefined, showPublic = undefined, demo = false) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.getRoom({id, pinHash, "public": showPublic, demo}))
-			
+
 		},
-		
+
 		getRoomBySlug: (slug, password = undefined, showPublic = undefined, demo = false) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.getRoom({slug, password, "public": showPublic, demo}))
-			
+
 		},
-		
+
 		roomRecorder: ({roomId, operation = 'get', config} = {}) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.recordRoom({}, {
@@ -222,16 +198,8 @@ 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} = {}) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.join({
 					roomId,
@@ -253,13 +221,17 @@ let room = function () {
 					} : {})
 				}))
 		},
-		
-		__isThisSafariSupported: () => {
+
+		isSafariSupported: () => {
 			return this.__privates.room.safariVp8;
 		},
-		
-		createStreamingSession: ({roomId, pinHash, streamId, href, iceServers, accessToken} = {}) => {
-			return this.__privates.room.isReady
+
+		isWebrtcSupported: () => {
+			return this.__privates.room.isWebrtcSupported;
+		},
+
+		createStreamingSession: ({constructId, roomId, pinHash, streamId, href, iceServers, accessToken} = {}) => {
+			return this.__privates.room.whenInitialized
 				.then(lib => streamingSession.call(this, {
 					roomId,
 					pinHash,
@@ -267,24 +239,93 @@ let room = function () {
 					href,
 					iceServers,
 					accessToken
-				}, lib.createSession('streaming'), this))
+				}, lib.createSession(constructId, 'streaming'), this))
+				.then(newSession => {
+					let existingSessionIndex = roomSessions.findIndex(session => session.constructId === newSession.constructId);
+					if(existingSessionIndex > -1) {
+						return this.room.destroySession(newSession.constructId).then(() => {
+							roomSessions.push(newSession);
+							return newSession;
+						});
+					} else {
+						roomSessions.push(newSession);
+						return newSession;
+					}
+				})
 		},
-		
-		createSession: ({roomId, pinHash, isTalkback, isMonitor, isInstructor, options}) => {
-			return this.__privates.room.isReady
+
+		createSession: ({constructId, roomId, pinHash, isTalkback, isMonitor, isInstructor, options}) => {
+			return this.__privates.room.whenInitialized
 				.then(lib => roomSession.call(this, {
 					roomId,
 					pinHash,
 					isTalkback,
 					isMonitor,
 					isInstructor
-				}, lib.createSession('reactooroom', options), this))
+				}, lib.createSession(constructId, 'reactooroom', options), this))
+				.then(newSession => {
+					let existingSessionIndex = roomSessions.findIndex(session => session.constructId === newSession.constructId);
+					if(existingSessionIndex > -1) {
+						return this.room.destroySession(newSession.constructId).then(() => {
+							roomSessions.push(newSession);
+							return newSession;
+						});
+					} else {
+						roomSessions.push(newSession);
+						return newSession;
+					}
+				})
 		},
-		
+
+		getSessions: () => {
+			return roomSessions;
+		},
+		getSessionByConstructId: (constructId) => {
+			return roomSessions.find(session => session.constructId === constructId) || null
+		},
+		getSessionBySessionId: (sessionId) => {
+			return roomSessions.find(session => session.sessionId === sessionId) || null
+		},
+		getSessionByRoomId: (roomId) => {
+			return roomSessions.find(session => session.roomId === roomId) || null
+		},
+		getSessionByUserId: (userId) => {
+			return roomSessions.find(session => session.userId === userId) || null
+		},
+		getSessionByStreamId: (streamId) => {
+			return roomSessions.find(session => session.streamId === streamId) || null
+		},
+
+
 		destroySession: (constructId) => {
-			return this.__privates.room.closeSessionByConstructId(constructId)
+				let sessionIndex = roomSessions.findIndex(session => session.constructId === constructId);
+				if (sessionIndex > -1) {
+					return roomSessions[sessionIndex].destroy()
+						.finally(() => {
+							roomSessions.splice(sessionIndex, 1);
+							return true
+						})
+				}
+				return Promise.resolve();
 		},
-		
+
+		destroySessionBySessionId: (sessionId) => {
+			let sessionIndex = roomSessions.findIndex(session => session.sessionId === sessionId);
+			if (sessionIndex > -1) {
+				return roomSessions[sessionIndex].destroy()
+					.finally(() => {
+						roomSessions.splice(sessionIndex, 1);
+						return true
+					})
+			}
+			return Promise.resolve();
+		},
+
+		destroySessions: () => {
+			roomSessions.forEach(session => session.destroy().catch(e => this.log(e)));
+			roomSessions.length = 0;
+		},
+
 		queue: ({roomId, operation, userId} = {}) => {
 			//Enum: "status" "join" "approve" "reject" "block" "unblock"
 			return this.__privates.auth.__client
@@ -294,13 +335,13 @@ let room = function () {
 					}
 				}))
 		},
-		
+
 		getDefaultRegions: () => {
 			return this.__privates.auth.__client
 				.then(client => [...(client.spec?.components?.schemas?.WtRoom?.properties?.defaultRegion?.enum || [''])])
 		}
-		
-		
+
+
 	}
 };
 

package/src/models/system.js

@@ -0,0 +1,45 @@
+'use strict';
+
+let system = function () {
+	return {
+		integration: (data = {}) => {
+			return this.__privates.auth.__client
+				.then(client => client.apis.system.integration({type: this.__instanceType}, {
+					requestBody: {...data}, requestInterceptor: (req) => {
+						if (!req.headers) {
+							req.headers = {};
+						}
+						req.headers['Authorization'] = 'Bearer ' + localStorage.getItem('rwt_idToken');
+						return req;
+					}
+				}));
+		},
+		
+		getAnalytics: (data = {}) => {
+			return this.__privates.auth.__client
+				.then(client => client.apis.system.getAnalytics({instanceType: this.__instanceType, ...data}))
+		},
+		
+		getTranslation: ({namespace = 'wt'} = {}) => {
+			return this.__privates.auth.__client
+				.then(client => client.apis.system.getTranslation({namespace}))
+		},
+
+		getConfig: ({instanceType = this.__instanceType, domain = location.hostname} = {}) => {
+			return this.__privates.auth.__client
+				.then(client => client.apis.system.getConfig({instanceType, domain}));
+		},
+
+		updateConfig: (data = {}) => {
+			return this.__privates.auth.__client
+				.then(client => client.apis.system.updateConfig({id: data.instanceType || this.__instanceType},{requestBody:{...data}}));
+		},
+
+		getIntegrationPublic: (type, data = {}) => {
+			return this.__privates.auth.__client
+				.then(client => client.apis.system.integrationPublic({type}, {requestBody:{...data}}))
+		}
+	}
+}
+
+export default system;

package/src/models/user.js

@@ -124,17 +124,20 @@ let user = function () {
                     }
                 }));
         },
-        
+
+        //TODO: new model
         getTranslation: ({namespace = 'wt'} = {}) => {
             return this.__privates.auth.__client
                 .then(client => client.apis.system.getTranslation({namespace}))
         },
-        
+
+        //TODO: new model
         getConfig: ({instanceType = this.__instanceType, domain = location.hostname} = {}) => {
             return this.__privates.auth.__client
                 .then(client => client.apis.system.getConfig({instanceType, domain}));
         },
-        
+
+        //TODO: new model
         getIntegrationPublic: (type, data = {}) => {
             return this.__privates.auth.__client
                 .then(client => client.apis.system.integrationPublic({type}, {requestBody:{...data}}))