@reactoo/watchtogether-sdk-js 2.5.46 → 2.5.55

package/example/index.html

@@ -119,7 +119,7 @@
             console.log('Iot message:', r);
         });
 
-        Instance.auth.deviceLogin() // login as browser
+        Instance.auth.deviceLogin(true) // login as browser
             .then(r => Instance.iot.iotLogin()) // login to mqtt
             .then(r => {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.5.46",
+  "version": "2.5.55",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",
@@ -43,6 +43,7 @@
   },
   "dependencies": {
     "@fingerprintjs/fingerprintjs": "^3.3.2",
+    "@fingerprintjs/fingerprintjs-pro": "^3.7.0",
     "aws-iot-device-sdk": "^2.2.11",
     "serialize-error": "9.1.0",
     "swagger-client": "^3.18.0",

package/src/models/auth.js

@@ -33,8 +33,8 @@ let auth = function () {
             return this.__privates.providerAuth;
         },
         
-        deviceLogin: (salt) => {
-            return getBrowserFingerprint(this.__instanceType, salt)
+        deviceLogin: ( usePrecise = false, salt = 'ThisIsSaltyAF') => {
+            return getBrowserFingerprint(this.__instanceType, usePrecise, 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/modules/wt-room.js

@@ -98,9 +98,9 @@ class RoomSession {
 		participant: {
 			"watchparty": ['participant', 'talkback'],
 			"commentary": ['participant', 'talkback'],
-			"videowall": ['host', 'talkback', 'observerSolo1', 'observerSolo2', 'observerSolo3'],
-			"videowall-queue": ['host', 'talkback', 'observerSolo1', 'observerSolo2', 'observerSolo3'],
-			"videowall-queue-video": ['host', 'talkback', 'observerSolo1', 'observerSolo2', 'observerSolo3']
+			"videowall": ['host', 'talkback', 'observer', 'observerSolo1', 'observerSolo2', 'observerSolo3'],
+			"videowall-queue": ['host', 'talkback', 'observer', 'observerSolo1', 'observerSolo2', 'observerSolo3'],
+			"videowall-queue-video": ['host', 'talkback', 'observer', 'observerSolo1', 'observerSolo2', 'observerSolo3']
 		},
 		monitor: {
 			"watchparty": ['participant'],
@@ -271,6 +271,9 @@ class RoomSession {
 			case 'monitor':
 				return 'addRemoteTalkback';
 			case 'observer':
+			case 'observerSolo1':
+			case 'observerSolo2':
+			case 'observerSolo3':
 				return 'addRemoteObserver';
 			case 'host':
 				return 'addRemoteInstructor';
@@ -304,6 +307,9 @@ class RoomSession {
 			case 'monitor':
 				return 'removeRemoteTalkback';
 			case 'observer':
+			case 'observerSolo1':
+			case 'observerSolo2':
+			case 'observerSolo3':
 				return 'removeRemoteObserver';
 			case 'host':
 				return 'removeRemoteInstructor';
@@ -685,6 +691,7 @@ class RoomSession {
 					tid: generateUUID(),
 					id: handle.handleId,
 					userId: decodeJanusDisplay(handle.userId)?.userId,
+					role: decodeJanusDisplay(handle.userId)?.role,
 					stream: null,
 					track: null,
 					adding: false,
@@ -1261,6 +1268,7 @@ class RoomSession {
 						tid: generateUUID(),
 						id: handle.handleId,
 						userId: decodeJanusDisplay(handle.userId)?.userId,
+						role: decodeJanusDisplay(handle.userId)?.role,
 						stream: config.stream,
 						track: null,
 						optional: true,
@@ -1282,6 +1290,7 @@ class RoomSession {
 						tid: generateUUID(),
 						id: handle.handleId,
 						userId: decodeJanusDisplay(handle.userId)?.userId,
+						role: decodeJanusDisplay(handle.userId)?.role,
 						stream: config.stream,
 						track: null,
 						optional: true,
@@ -1335,6 +1344,7 @@ class RoomSession {
 							mid,
 							id: handle.handleId,
 							userId: decodeJanusDisplay(handle.userId)?.userId,
+							role: decodeJanusDisplay(handle.userId)?.role,
 							stream: config.stream,
 							track: event.track,
 							constructId: this.constructId,
@@ -1363,6 +1373,7 @@ class RoomSession {
 									id: handle.handleId,
 									mid,
 									userId: decodeJanusDisplay(handle.userId)?.userId,
+									role: decodeJanusDisplay(handle.userId)?.role,
 									stream: config.stream,
 									track: ev.target,
 									constructId: this.constructId,
@@ -1389,6 +1400,7 @@ class RoomSession {
 								id: handle.handleId,
 								mid,
 								userId: decodeJanusDisplay(handle.userId)?.userId,
+								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
 								kind: ev.target.kind,
 								track: ev.target,
@@ -1410,6 +1422,7 @@ class RoomSession {
 								id: handle.handleId,
 								mid,
 								userId: decodeJanusDisplay(handle.userId)?.userId,
+								role: decodeJanusDisplay(handle.userId)?.role,
 								stream: config.stream,
 								kind: ev.target.kind,
 								track: ev.target,
@@ -2014,6 +2027,7 @@ class RoomSession {
 								tid: generateUUID(),
 								id: handle.handleId,
 								userId: decodeJanusDisplay(handle.userId)?.userId,
+								role: decodeJanusDisplay(handle.userId)?.role,
 								track,
 								stream: config.stream,
 								adding: true,
@@ -2027,6 +2041,7 @@ class RoomSession {
 									tid:generateUUID(),
 									id: handle.handleId,
 									userId: decodeJanusDisplay(handle.userId)?.userId,
+									role: decodeJanusDisplay(handle.userId)?.role,
 									track: ev.target,
 									stream: config.stream,
 									adding: false,
@@ -2044,6 +2059,7 @@ class RoomSession {
 						tid: generateUUID(),
 						id: handle.handleId,
 						userId: decodeJanusDisplay(handle.userId)?.userId,
+						role: decodeJanusDisplay(handle.userId)?.role,
 						stream: null,
 						adding: false,
 						constructId: this.constructId,

package/src/modules/wt-utils.js

@@ -1,21 +1,41 @@
 import FingerprintJs from "@fingerprintjs/fingerprintjs";
+import FingerprintJsPro from "@fingerprintjs/fingerprintjs-pro";
 
 let wait = function(ms) { return new Promise(resolve => setTimeout(resolve, ms))};
 let fingerprint = FingerprintJs.load({
     monitoring: false
 })
-let getBrowserFingerprint = function (instanceType = '', salt = '') {
-    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)
-            }, FingerprintJs.hashComponents(components)).substring(0,36)
-        })
+let fingerprintPro = FingerprintJsPro.load({
+    monitoring: false,
+    apiKey: '5UHdpSuX3wHr3CjyEiSP',
+    endpoint: "https://fingerprint.reactoo.com"
+})
+
+let getBrowserFingerprint = function (instanceType = '', usePrecise = false, salt = '') {
+
+    if(!usePrecise) {
+        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)
+                }, FingerprintJs.hashComponents(components)).substring(0,36)
+            })
+    }
+    else {
+        return fingerprintPro
+            .then(fp => fp.get())
+            .then(result => {
+                let id = result.visitorId.padEnd(32, '0');
+                return [8,13,18,23].reduce((acc, cur) => {
+                    return acc.slice(0,cur) + '-' + acc.slice(cur)
+                }, id).substring(0,36)
+            })
+    }
 };
 
 let generateUUID = function () {