@reactoo/watchtogether-sdk-js 2.4.34 → 2.4.41

package/example/index.html

@@ -25,7 +25,7 @@
 
     <script>
 
-        let roomId = '76e9381d-1bde-4da5-81e0-b2863e8ed661'; //It will create room automatically if not set
+        let roomId = 'fc2d34f2-de58-42a0-9312-5cd40f2d754e'; //It will create room automatically if not set
         let pinHash = undefined;//'967ca05f-7fab-a205-5913-39393bbbe923';
 
 
@@ -123,7 +123,7 @@
             console.log('Iot message:', r);
         });
 
-        Instance.auth.login('dusan1', 'abc123ABC') // login as browser
+        Instance.auth.deviceLogin() // login as browser
             .then(r => Instance.iot.iotLogin()) // login to mqtt
             .then(r => {
 
@@ -153,37 +153,6 @@
             })
             .then(r => Instance.room.createSession({roomId:r.roomId, pinHash: r.pinHash})) // pin hash is not needed if you're owner of the room
             .then(session => {
-	            Instance.user.getUserSelf().then(r => {
-		            Instance.user.getIntegrationPublic('sportBuff',{
-			            "operation": "auth",
-			            uuid: r.data._id,
-			            username: r.data.displayname
-                    })
-			            .then(r => console.log('wooo',r))
-
-				})
-
-	          ;
-
-            	Instance.user.getVideos({type:'room', roomId, includeUserModels: true});
-
-	            // Instance.user.getUserSelf().then(r => {
-	            // 	console.log(r.data._id);
-	            // 	return Instance.room.queue({roomId, operation:'join', userId:r.data._id});
-                // }).then(r => {
-                // 	console.log(r.data);
-		        //     return Instance.room.queue({roomId, operation:'status'});
-                // })
-                // .then(r => {
-                // 	console.log(r.data);
-	            //     return Instance.room.queue({roomId,userId:'eu-west-1:f3532bdd-cc3a-4c62-a77e-4f1f544d8fa9', operation:'approve'});
-                // })
-                // .then(r => {
-                //     console.log(r.data);
-                // })
-
-	           //
-
 
 
                 sessionHandler = session;

package/package.json

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

package/src/models/room-session.js

@@ -29,11 +29,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 	};
 	
 	const emitter = _emitter_();
-	
 	let alpTimeoutId = null;
-	let publishRetry = 0;
-	const maxPublishRetry = 3;
-	
 	let ___; // return object
 	
 	room.on('addLocalParticipant', () => {

package/src/models/room.js

@@ -159,6 +159,16 @@ let room = function () {
 				}))
 		},
 		
+		getRoomChatList: ({roomId, type = "normal", size = 50, startKey = null} = {}) => {
+			let apiParams = {
+				roomId, type,
+				size,
+				...(startKey && {startKey})
+			};
+			return this.__privates.auth.__client
+				.then(client => client.apis.wt.getRoomChatList(apiParams))
+		},
+		
 		getRoomsList: ({
 			               type = 'participant',
 			               activeOnly = null,
@@ -186,10 +196,10 @@ let room = function () {
 			
 		},
 		
-		setUser: ({userId, roomId, flag, timestamp, option}) => {
+		setUser: ({messageId, userId, roomId, flag, timestamp, option}) => {
 			//leave, kick, ban, unban, approve, report
 			return this.__privates.auth.__client
-				.then(client => client.apis.wt.setUser({userId, roomId, flag, timestamp, option}));
+				.then(client => client.apis.wt.setUser({messageId, userId, roomId, flag, timestamp, option}));
 		},
 		
 		getRoomById: (id, pinHash = undefined, showPublic = undefined, demo = false) => {

package/src/models/user.js

@@ -111,16 +111,18 @@ let user = function () {
         
         track: ({eventType = 'ERROR', message} = {}) => {
             return this.__privates.auth.__client
-                .then(client => client.apis.wt.track({},{requestBody:{
+                .then(client => client.apis.wt.track({},{
+                    requestBody:{
                         "eventType": eventType,
                         "appType": "web",
-                        "deviceType": `desktop${navigator.maxTouchPoints ? '/touchy' : ''}`,
+                        "deviceType": `desktop${navigator.maxTouchPoints ? '/touch' : ''}`,
                         "os": navigator.platform,
                         "browser": navigator.userAgent,
                         "domain": location.host,
                         "url": location.href,
                         "message": serializeError(message)
-                    }}));
+                    }
+                }));
         },
         
         getTranslation: ({namespace = 'wt'} = {}) => {

package/src/modules/wt-room.js

@@ -164,12 +164,7 @@ class RoomSession {
 		}
 	};
 	
-	constructor(enableDebugFlag, type = 'reactooroom', options = {
-		classroomObserverSubscribeToInstructor: false,
-		classroomInstructorSubscribeToParticipants: false,
-		safariBugHotfixEnabled: true
-	}) {
-		
+	constructor(enableDebugFlag, type = 'reactooroom', options = {}) {
 		this.server = null;
 		this.iceServers = null;
 		this.token = null;
@@ -182,7 +177,14 @@ class RoomSession {
 		this.isMonitor = false; // currently used just for classroom context so monitor user only subscribes to participants and not trainer (for other monitor this flag is not necessary)
 		this.recordingFilename = null;
 		this.pluginName = RoomSession.sessionTypes()[type];
-		this.options = options;
+		this.options = {
+			...{
+				classroomObserverSubscribeToInstructor: false,
+				classroomInstructorSubscribeToParticipants: false,
+				safariBugHotfixEnabled: adapter.browserDetails.browser === 'safari' && adapter.browserDetails.version < 605
+			},
+			options
+		};
 		//this.pluginName = this.#sessionTypes[type];
 		
 		Object.assign(this, emitter());
@@ -2001,7 +2003,7 @@ class RoomSession {
 		}
 		let config = handle.webrtcStuff;
 		
-		if(this.options.safariBugHotfixEnabled && adapter.browserDetails.browser === 'safari') {
+		if(this.options.safariBugHotfixEnabled) {
 			this.isVideoMuted = !this.isVideoMuted;
 		}
 		else if (this.isUnifiedPlan) {