@reactoo/watchtogether-sdk-js 2.5.6 → 2.5.10

package/example/bulk_join_room/bulk_join_room.html

@@ -70,11 +70,6 @@
 		document.getElementById('join-room').setAttribute('disabled', true);
 		document.getElementById('joined-participants-count').value = joinedParticipantsCount;
 
-		// // TODO - toto tu na konci nebude. Je to len preistotu, aby som znova nezhodil server
-		// if (participantsCount > 4) {
-		// 	participantsCount = 4;
-		// }
-
 		participantsData = Array(participantsCount).fill(0).map((_, i) => {
 			const canvas = document.createElement('canvas');
 			const canvasContext = canvas.getContext('2d');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.5.6",
+  "version": "2.5.10",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",
@@ -42,10 +42,9 @@
     "yargs": "^10.1.2"
   },
   "dependencies": {
-    "@fingerprintjs/fingerprintjs": "^2.1.5",
+    "@fingerprintjs/fingerprintjs": "^3.3.2",
     "aws-iot-device-sdk": "^2.2.11",
-    "paho-mqtt": "^1.1.0",
-    "serialize-error": "^7.0.1",
+    "serialize-error": "^9.1.0",
     "swagger-client": "^3.18.0",
     "webrtc-adapter": "^8.1.1"
   },

package/src/models/auth.js

@@ -34,8 +34,7 @@ let auth = function () {
         },
         
         deviceLogin: (salt) => {
-            return wait(300)
-                .then(() => getBrowserFingerprint(this.__instanceType, salt))
+            return getBrowserFingerprint(this.__instanceType, salt)
                 .then( deviceId => Promise.all([deviceId, this.__privates.auth.__client]))
                 .then(([deviceId, client]) => client.apis.auth.deviceSignIn({},{requestBody:{deviceId, domain: location.hostname}}))
                 .then(response => {

package/src/models/room-session.js

@@ -19,6 +19,7 @@ import syncUniversal from "../modules/sync-modules/sync-universal";
 
 let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructor}, room, wt) {
 
+	let primaryRoomId = roomId;
 	let publicCustomEvents = ['changePlayerSource', 'chatMessage', 'userUpdate', 'reconnecting', 'connecting', 'remoteMuted', 'scaling'];
 
 	const addEvents = (events) => {
@@ -34,13 +35,13 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 
 	room.on('addLocalParticipant', () => {
 
-		// TODO: this timeout is a hotfix and should be sorted differently
+		// TODO: this doesnt seem to be fixable until we switch to differen type of messaging
 		// At some random case we don't get message back if we don't wait
 
 		clearTimeout(alpTimeoutId);
 		alpTimeoutId = setTimeout(() => {
 			___.__requestMuteStatus();
-		}, 1000);
+		}, 2000);
 	});
 
 	room.on('localMuted', ({type, value}) => {
@@ -82,11 +83,11 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 			return room._iceRestart(room.handleId);
 		},
 
-		connect: function () {
+		connect: function ({reactooRoomId = null} = {}) {
 			emitter.emit('connecting', true);
 			clearTimeout(alpTimeoutId);
 			return Promise.all([wt.room.__joinRoom({
-				roomId,
+				roomId: reactooRoomId || primaryRoomId,
 				pinHash,
 				isTalkback,
 				isMonitor,
@@ -94,16 +95,14 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 			}), wt.user.getUserSelf()])
 				.then(([roomData, userData]) => {
 					// Happens when we reroute user to a different room
-					if(roomData?.data?.reactooRoomId) {
-						roomId = roomData.data.reactooRoomId
+					if(roomData?.data?.reactooRoomId !== roomId) {
+						roomId = roomData.data.reactooRoomId;
+						emitter.emit('changeRoomId', roomId);
 					}
 					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, _]) => {
-					return roomData.data
-				})
 				.finally(() => {
 					emitter.emit('connecting', false);
 				})
@@ -116,7 +115,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 		},
 
 		//TODO: refactor restart method
-		restart: function (isObserver = false) {
+		restart: function ({isObserver = false, reactooRoomId = null} = {}) {
 
 			emitter.emit('reconnecting', true);
 			room.isRestarting = true;
@@ -130,7 +129,7 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 
 			return this.disconnect()
 				.then(() => wait(1000)) //TODO: remove 1000ms wait by waiting for proper events from janus
-				.then(() => this.connect())
+				.then(() => this.connect({reactooRoomId}))
 				.then(() => {
 					if (isObserver) {
 						return this.publishLocal(null, {getStreamIfEmpty: false, unpublishFirst: true});
@@ -171,7 +170,6 @@ 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 => {
 						room._log('Setting observers failed, this will cause issues', e);
 					});
@@ -291,7 +289,6 @@ let roomSession = function ({roomId, pinHash, isTalkback, isMonitor, isInstructo
 		setRoomVars: (observerIds = [], emit = true) => {
 			return wt.room.getRoomById(roomId, pinHash)
 				.then(r => {
-
 					if (emit) {
 						// emiting "fake" playerSource event
 						//TODO: somehow push into sync modules instead

package/src/modules/wt-room.js

@@ -12,10 +12,8 @@ class Room {
 		this.safariVp8 = false;
 		this.browser = adapter.browserDetails.browser;
 		this.browserDetails = adapter.browserDetails;
-
-		this.isWebrtcSupported = Room.isWebrtcSupported();
+		this.webrtcSupported = Room.isWebrtcSupported();
 		this.safariVp8TestPromise = Room.testSafariVp8();
-
 		this.safariVp8 = null;
 		this.safariVp8TestPromise.then(safariVp8 => {
 			this.safariVp8 = safariVp8;
@@ -103,6 +101,9 @@ class RoomSession {
 	};
 	
 	constructor(constructId = null, type = 'reactooroom', debug, options = {}) {
+
+		Object.assign(this, emitter());
+
 		this.server = null;
 		this.iceServers = null;
 		this.token = null;
@@ -124,18 +125,15 @@ class RoomSession {
 			},
 			options
 		};
-		
-		Object.assign(this, emitter());
-		
 		this.id = null;
 		this.privateId = null;
-		
 		this.constructId = constructId || RoomSession.randomString(16);
 		this.sessionId = null;
 		this.handleId = null;
 		this.ws = null;
 		this.isRestarting = false;
-		
+
+		//TODO: do it better
 		// double click prevention
 		this.connectingPromise = null;
 		this.disconnectingPromise = null;
@@ -152,14 +150,11 @@ class RoomSession {
 		this._isStreaming = false;
 		this._isPublished = false;
 		this._isDataChannelOpen = false;
-		
 		this.isAudioMuted = false;
 		this.isVideoMuted = false;
 		this.isVideoEnabled = false;
 		this.isAudioEnabed = false;
-
 		this.isUnifiedPlan = RoomSession.checkUnifiedPlan();
-
 		this._log = RoomSession.noop;
 		if (this.options.debug) {
 			this._enableDebug();
@@ -682,6 +677,7 @@ class RoomSession {
 					track: null,
 					adding: false,
 					constructId: this.constructId,
+					metaData: this.options.metaData,
 					hasAudioTrack: false,
 					hasVideoTrack: false
 				});
@@ -1271,6 +1267,7 @@ class RoomSession {
 							stream: config.stream,
 							track: event.track,
 							constructId: this.constructId,
+							metaData: this.options.metaData,
 							adding: true,
 							hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 							hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)
@@ -1305,6 +1302,7 @@ class RoomSession {
 									stream: config.stream,
 									track: ev.target,
 									constructId: this.constructId,
+									metaData: this.options.metaData,
 									adding: false,
 									hasAudioTrack: !!(config.stream && config.stream.getAudioTracks().length),
 									hasVideoTrack: !!(config.stream && config.stream.getVideoTracks().length)

package/src/modules/wt-utils.js

@@ -1,27 +1,21 @@
-import Fingerprint2 from '@fingerprintjs/fingerprintjs';
+import FingerprintJs from "@fingerprintjs/fingerprintjs";
 
 let wait = function(ms) { return new Promise(resolve => setTimeout(resolve, ms))};
-
+let fingerprint = FingerprintJs.load({
+    monitoring: false
+})
 let getBrowserFingerprint = function (instanceType = '', salt = '') {
-    return new Promise((resolve) => {
-        let options = {
-            extraComponents : [
-                {
-                    key: 'instanceType',
-                    getData: function (done, options) {
-                        done(instanceType + '_' + salt)
-                    }
-                }
-            ]
-        }
-        new Fingerprint2.get(options, (components) => {
-            var values = components.map(function (component) { return component.value });
-            var murmur = Fingerprint2.x64hash128(values.join(''), 31);
-            resolve([8,13,18,23].reduce((acc, cur) => {
+    return fingerprint
+        .then(fp => fp.get())
+        .then(result => {
+            const components = {
+                ...result.components,
+                instanceType: { value: instanceType + '_' + salt },
+            }
+            return [8,13,18,23].reduce((acc, cur) => {
                 return acc.slice(0,cur) + '-' + acc.slice(cur)
-            }, murmur).substr(0,36));
+            }, FingerprintJs.hashComponents(components)).substring(0,36)
         })
-    });
 };
 
 let generateUUID = function () {