@reactoo/watchtogether-sdk-js 2.4.36 → 2.4.43

package/example/index.html

@@ -153,33 +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.room.getRoomChatList({roomId})
-			            .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.36",
+  "version": "2.4.43",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",
@@ -25,11 +25,11 @@
   },
   "homepage": "https://github.com/picitujeromanov/WR-SDK",
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/plugin-proposal-class-properties": "^7.16.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-    "@babel/plugin-proposal-private-property-in-object": "^7.16.0",
-    "@babel/preset-env": "^7.16.4",
+    "@babel/core": "^7.16.5",
+    "@babel/plugin-proposal-class-properties": "^7.16.5",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.5",
+    "@babel/plugin-proposal-private-property-in-object": "^7.16.5",
+    "@babel/preset-env": "^7.16.5",
     "acorn": "^6.4.2",
     "babel-core": "^6.26.3",
     "babel-loader": "^8.2.3",
@@ -46,7 +46,7 @@
     "aws-iot-device-sdk": "^2.2.11",
     "paho-mqtt": "^1.1.0",
     "serialize-error": "^7.0.1",
-    "swagger-client": "^3.17.0",
+    "swagger-client": "^3.18.0",
     "webrtc-adapter": "^7.7.1"
   },
   "browserslist": [

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', () => {
@@ -171,9 +167,14 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 		},
 		
 		renderPlayer: function (playerWrapper, fullscreenElement, roomId) {
-			this.syncModule = syncUniversal({room, wt, roomSession: this, emitter});
-			this.playerInterface = wt.__privates.playerFactory(playerWrapper, fullscreenElement, this.syncModule.getHandlers(), {roomId});
-			this.syncModule.initialize({playerInterface: this.playerInterface});
+			try {
+				this.syncModule = syncUniversal({room, wt, roomSession: this, emitter});
+				this.playerInterface = wt.__privates.playerFactory(playerWrapper, fullscreenElement, this.syncModule.getHandlers(), {roomId});
+				this.syncModule.initialize({playerInterface: this.playerInterface});
+				return true;
+			} catch (e) {
+				return false;
+			}
 		},
 		
 		attachPlayer: function (type, inputs) {

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) {