@reactoo/watchtogether-sdk-js 2.5.89 → 2.5.91

package/package.json

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

package/src/models/room-session.js

@@ -15,7 +15,7 @@ import syncVodDashJs from "../modules/sync-modules/sync-dash-vod";
 import syncDoris from "../modules/sync-modules/sync-doris";
 import syncDisabled from "../modules/sync-modules/sync-disabled";
 import syncDaznDash from "../modules/sync-modules/sync-dazn-dash";
-import syncUniversal from "../modules/sync-modules/sync-universal";
+import syncDazn from "../modules/sync-modules/sync-dazn";
 import syncModule from "../modules/sync-modules/sync-module";
 
 let roomSession = function ({roomId, pinHash, role}, room, wt) {
@@ -205,7 +205,7 @@ let roomSession = function ({roomId, pinHash, role}, room, wt) {
 		// DAZN interface
 		renderPlayer: function (playerWrapper, fullscreenElement, roomId) {
 			try {
-				this.syncModule = syncUniversal({room, wt, roomSession: this, emitter});
+				this.syncModule = syncDazn({room, wt, roomSession: this, emitter});
 				this.playerInterface = wt.__privates.playerFactory(playerWrapper, fullscreenElement, this.syncModule.getHandlers(), {roomId});
 				this.syncModule.initialize({playerInterface: this.playerInterface});
 				return true;

package/src/modules/sync-modules/{sync-universal.js → sync-dazn.js}

@@ -1,7 +1,7 @@
 import {setExactTimeout} from "../wt-utils";
 import localEmitter from "../wt-emitter";
 
-const syncUniversal = function ({room, wt, roomSession, emitter} = {}) {
+const syncDazn = function ({room, wt, roomSession, emitter} = {}) {
 	
 	//SYNC VARS
 	let _emitter = localEmitter();
@@ -530,4 +530,4 @@ const syncUniversal = function ({room, wt, roomSession, emitter} = {}) {
 	
 };
 
-export default syncUniversal;
+export default syncDazn;

package/src/modules/wt-iot.js

@@ -232,7 +232,7 @@ class Iot {
             else if(topic[1] === 'asset') {
                 this.emit('message',  {event: 'asset', assetId: topic[2], ...payload});
             }
-        } else if(topic[0] === 'wtr') {
+        } else if(topic[0] === 'wtr' || topic[0] === 'gwtr') {
             const recorderId = topic[1];
             const sessionId = topic[2];
             if(topic[3] === 'control') {

package/src/modules/wt-utils.js

@@ -2,39 +2,53 @@ 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 fingerprintPro = FingerprintJsPro.load({
-    monitoring: false,
-    apiKey: '5UHdpSuX3wHr3CjyEiSP',
-    endpoint: "https://fingerprint.reactoo.com"
-})
 
-let getBrowserFingerprint = function (instanceType = '', usePrecise = false, salt = '') {
 
+const getFingerPrint = function(instanceType, salt) {
+
+    let fingerprint = FingerprintJs.load({
+        monitoring: false
+    })
+
+    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)
+        })
+}
+
+const getPreciseFingerPrint = function() {
+
+    let fingerprintPro = FingerprintJsPro.load({
+        monitoring: false,
+        apiKey: '5UHdpSuX3wHr3CjyEiSP',
+        endpoint: "https://fingerprint.reactoo.com"
+    })
+
+    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 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)
-            })
+        return getFingerPrint(instanceType, salt)
     }
     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)
-            })
+        return getPreciseFingerPrint()
+            .catch(() => getFingerPrint(instanceType, salt))
     }
 };