@reactoo/watchtogether-sdk-js 2.7.80 → 2.7.82

package/example/index.html

@@ -222,7 +222,7 @@
             console.log('Iot message:', r);
         });
 
-        Instance.auth.deviceLogin(true) // login as browser
+        Instance.auth.login('dusan1','abc123ABC') // login as browser
             .then(r => Instance.iot.iotLogin()) // login to mqtt
             .then(r => {
                 if(roomId) {
@@ -527,6 +527,12 @@
             sess.sendSystemMessage('customData', {some: 'data'})
         }
 
+        window.testUnsetAttributesObject = function() {
+            Instance.room.updateAttribute({id:'boha', roomId: roomId, operation: 'setAll', attributeName:'layoutAttributes', value: {cicina:'kuchyna'}})
+                    .then(r => console.log(r))
+                    .catch(e => console.log(e))
+        }
+
     </script>
 
 </body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.7.80",
+  "version": "2.7.82",
   "description": "Javascript SDK for Reactoo",
   "main": "dist/watchtogether-sdk.min.js",
   "module": "dist/watchtogether-sdk.min.js",

package/src/index.js

@@ -9,8 +9,8 @@ import room from './models/room';
 import user from './models/user';
 import asset from "./models/asset";
 import system from "./models/system"
-import utils from './models/utils';
 import iot from './models/iot'
+import * as utils from './models/utils';
 
 function WatchTogether(modules = {}, instanceType, debug, playerFactory, providerAuth) {
     this.username = null;
@@ -31,7 +31,7 @@ function WatchTogether(modules = {}, instanceType, debug, playerFactory, provide
     this.isReady = modules.room.whenInitialized;
     this.browser = modules.room.browser;
     this.browserDetails = modules.room.browserDetails
-    
+
     this.auth = {...auth.call(this)};
     this.user = {...user.call(this)};
     this.room = {...room.call(this)};

package/src/models/asset.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import {generateUUID, chunkArray} from "../modules/wt-utils";
+import {generateUUID, chunkArray} from "./utils";
 
 let asset =  function() {
     return {

package/src/models/auth.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import {wait, getBrowserFingerprint} from "../modules/wt-utils";
+import {getBrowserFingerprint} from "./utils";
 
 let auth = function () {
     return {
@@ -15,11 +15,11 @@ let auth = function () {
         },
 
         providerLogin: (domain, token, displayname, deviceId) => {
-            
+
             if(!token && typeof this.__privates.providerAuth === 'function') {
                 ({token, displayname} = this.__privates.providerAuth());
             }
-            
+
             return this.__privates.auth.__client
                 .then(client => client.apis.auth.providerSignIn({},{requestBody:{domain, token, ...(displayname && {displayname}), ...(deviceId && {deviceId})}}))
                 .then(response => {
@@ -32,7 +32,7 @@ let auth = function () {
         getProviderAuth: () => {
             return this.__privates.providerAuth;
         },
-        
+
         deviceLogin: ( usePrecise = false, salt = 'ThisIsSaltyAF') => {
             return getBrowserFingerprint(this.__instanceType, usePrecise, salt)
                 .then( deviceId => Promise.all([deviceId, this.__privates.auth.__client]))
@@ -55,7 +55,7 @@ let auth = function () {
         setLanguage: (language) => {
             return this.__privates.auth.setLanguage(language);
         },
-        
+
         getLanguage: () => {
             return this.__privates.auth.__language;
         },

package/src/models/room-session.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import {decodeJanusDisplay, wait} from "../modules/wt-utils";
+import {decodeJanusDisplay, wait} from "./utils";
 import _emitter_ from "../modules/wt-emitter";
 
 // SYNCHRONISATION MODULES

package/src/models/room.js

@@ -2,10 +2,10 @@
 
 import roomSession from './room-session';
 import streamingSession from "./streaming-session";
-import {decodeJanusDisplay} from "../modules/wt-utils";
+import {decodeJanusDisplay} from "./utils";
 
 let room = function () {
-	
+
 	let roomSessions = [];
 
 	let setExitListeners = () => {
@@ -54,7 +54,7 @@ let room = function () {
 					}
 				}))
 		},
-		
+
 		createRoom: ({sourceRoomId, title, description, isPublic, isRouter, isStudioLayout, wtChannelId, isHd, disableSync, reduceRoomControls, hasStudioChat, maxParticipants, customAttributes, chatRoomId, linkedRoomId, type, dotAttribute} = {}) => {
 			let _da = dotAttribute
 				? (Array.isArray(dotAttribute)
@@ -122,12 +122,12 @@ let room = function () {
 					}
 				}))
 		},
-		
+
 		deleteRoom: (roomId) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.deleteRoom({id: roomId}))
 		},
-		
+
 		leaveRoom: (roomId) => {
 			return this.__privates.auth.__client
 				.then(client => client.apis.wt.leave({roomId}))
@@ -354,7 +354,7 @@ let room = function () {
 		},
 
 		destroySessions: () => {
-			roomSessions.forEach(session => session.destroy().catch(e => this.log(e)));
+			roomSessions.forEach(session => session.destroy().catch(e => this.__privates.room._log(e)));
 			roomSessions.length = 0;
 		},
 

package/src/models/user.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import {generateUUID, chunkArray} from "../modules/wt-utils";
+import {generateUUID, chunkArray} from "./utils";
 import {serializeError} from "serialize-error";
 
 let user = function () {
@@ -9,12 +9,12 @@ let user = function () {
             return this.__privates.auth.__client
                 .then(client => client.apis.user.updateMyself({...(data.lastRoomId && {lastRoomId:data.lastRoomId})},{requestBody: {...data}}))
         },
-        
+
         updateUser: (data = {}) => {
             return this.__privates.auth.__client
                 .then(client => client.apis.user.updateUser({id: data.id, lastRoomId: data.lastRoomId}, {requestBody: {displayname: data.displayname, bio: data.bio}}));
         },
-        
+
         uploadAvatar: (file, lastRoomId) => {
             let id = generateUUID();
             return this.__privates.auth.__client
@@ -53,7 +53,7 @@ let user = function () {
             return this.__privates.auth.__client
                 .then(client => client.apis.reaction.getReactionById({id}))
         },
-        
+
         getReactions: ({userId, roomId, type, size, startKey, includeUserModels = false} = {}) => {
             let apiParams = {
                 ...(roomId && {roomId}),
@@ -66,12 +66,12 @@ let user = function () {
             return this.__privates.auth.__client
                 .then(client => client.apis.reaction.getReactions(apiParams))
         },
-        
+
         getVideoById: (id) => {
             return this.__privates.auth.__client
                 .then(client => client.apis.video.getVideoById({id}))
         },
-        
+
         getVideos: ({roomId, userId, type, size, startKey, ids, includeUserModels = false, includeRoomQueueStatus, filter} = {}) => {
             return chunkArray(ids, 50)
                 .reduce((promiseChain, idsChunk) => {
@@ -105,7 +105,7 @@ let user = function () {
             return this.__privates.auth.__client
                 .then(client => client.apis.video.getVideoListFilters({roomId}));
         },
-        
+
         deleteVideo: (id) => {
             return this.__privates.auth.__client
                 .then(client => client.apis.video.deleteVideo({id}))
@@ -152,7 +152,7 @@ let user = function () {
             return this.__privates.auth.__client
                 .then(client => client.apis.user.getUsers(apiParams))
         },
-        
+
         //TODO:deprecated
         track: ({eventType = 'ERROR', message} = {}) => {
             return this.__privates.auth.__client
@@ -202,7 +202,7 @@ let user = function () {
 
         //TODO:deprecated
         analytics: ({action, startKey = null, limit = 20} = {}) => {
-            
+
             let apiParams = {
                 action,
                 limit,
@@ -210,7 +210,7 @@ let user = function () {
             };
             return this.__privates.auth.__client
                 .then(client => client.apis.wt.analytics({},{requestBody:{instanceType : this.__instanceType, ...apiParams}}));
-            
+
         }
     }
 };

package/src/models/utils.js

@@ -1,5 +1,147 @@
 'use strict';
 
+// import FingerprintJs from "@fingerprintjs/fingerprintjs";
+// import FingerprintJsPro from "@fingerprintjs/fingerprintjs-pro";
+import {getFingerPrint} from "../modules/wt-fingerprint";
+
+const wait = function(ms) { return new Promise(resolve => setTimeout(resolve, ms))};
+
+const median = function(values) {
+
+    if(values.length ===0) return 0;
+
+    values.sort(function(a,b){
+        return a-b;
+    });
+
+    var half = Math.floor(values.length / 2);
+
+    if (values.length % 2)
+        return values[half];
+
+    return (values[half - 1] + values[half]) / 2.0;
+}
+
+
+// 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)
+//         })
+// }
+
+
+const getBrowserFingerprint = function (instanceType = '', usePrecise = false, salt = '') {
+    // if(!usePrecise) {
+    //     return getFingerPrint(instanceType, salt)
+    // }
+    // else {
+    //     return getPreciseFingerPrint()
+    //         .catch(() => getFingerPrint(instanceType, salt))
+    // }
+
+    return getFingerPrint(instanceType, salt);
+};
+
+let generateUUID = function () {
+    var d = Date.now();
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+        var r = (d + Math.random()*16)%16 | 0;
+        d = Math.floor(d/16);
+        return (c=='x' ? r : (r&0x3|0x8)).toString(16);
+    });
+};
+
+
+const janusDisplayDelimiter = ',';
+const decodeJanusDisplay = display => {
+    let output = { userId: null, role: "participant", start: Date.now(), displayName: "?" };
+    if(display && typeof display === "string") {
+        if(display.indexOf(janusDisplayDelimiter) >= 0) {
+            let values = display
+                .split( new RegExp(`\\${janusDisplayDelimiter}(?=(?:(?:[^"]*"){2})*[^"]*$)`, 'mi') )
+                .map(v => (v && v.startsWith('"') || v.endsWith('"')) ? v.substring(1, v.length-1) : ( /^\d+$/.test(v) ? parseInt(v) : v ));
+            Object.keys(output).forEach((key, i) => values[i] ? output[key] = values[i] : null);
+        } else {
+            output.userId = display;
+        }
+        return output;
+    } else if(display && typeof display === "object") {
+        return Object.assign({}, output, display);
+    }
+    return null;
+}
+
+const setExactTimeout = function(callback, duration, resolution) {
+    const start = (new Date()).getTime();
+    const timeout = setInterval(function(){
+        if ((new Date()).getTime() - start > duration) {
+            callback();
+            clearInterval(timeout);
+        }
+    }, resolution);
+
+    return timeout;
+};
+
+const clearExactTimeout = function(timeout) {
+    clearInterval(timeout);
+};
+
+
+const maxJitter = (x) => {
+    // A function that returns a value between 0.3 and 0.5 depending on the input x
+    // The function is based on a logistic curve with parameters a, b, c, and d
+    // The parameters are chosen such that f(30) = 0.3 and f(2) = 0.5
+    let a = 0.2; // The maximum value of the function
+    let b = -0.1; // The growth rate of the function
+    let c = 16; // The inflection point of the function
+    let d = 0.3; // The minimum value of the function
+    return a / (1 + Math.exp(-b * (x - c))) + d; // Fixed the typo here
+}
+
+const chunkArray = (array = [], chunkSize) => {
+    array = [...array];
+    if (!array?.length) return [[]];
+
+    let results = [];
+    while (array.length) {
+        results.push(array.splice(0, chunkSize));
+    }
+    return results;
+}
+
+
 const getUserMediaConstraints = ({
 
                             hasVideo,
@@ -52,126 +194,129 @@ const getUserMediaConstraints = ({
 
 };
 
-export default {
-    //TODO: add more constraints
-    applyConstraints({
-                         autoGainControl = false,
-                         echoCancellation = true,
-                         noiseSuppression = true,
-                         channelCount = 1,
-                         stream = null,
-                         width, height
-                     }) {
-
-        if(stream) {
-
-            let fullConstraints = getUserMediaConstraints({
-                hasVideo: true,
-                hasAudio: true,
-                autoGainControl, echoCancellation, noiseSuppression, channelCount, width, height
-            });
-            let returnPromises = [];
-
-            const videoTrack = stream.getVideoTracks()[0];
-            if(videoTrack) {
-                returnPromises.push(videoTrack.applyConstraints(fullConstraints.video));
-            }
-
-            const audioTrack = stream.getAudioTracks()[0];
-            if(audioTrack) {
-                returnPromises.push(audioTrack.applyConstraints(fullConstraints.audio));
-            }
-
-            return Promise.all(returnPromises).then(() => {
-                return stream;
-            });
-        }
 
-        else return Promise.resolve(null);
-
-
-    },
-    getUserStream({
-                      hasVideo,
-                      hasAudio = true,
-                      aDeviceId,
-                      vDeviceId,
-                      autoGainControl = false,
-                      echoCancellation = true,
-                      noiseSuppression = true,
-                      channelCount = 1,
-                      muteAudio = false,
-                      muteVideo = false,
-                      width = 1920,
-                      height = 1080
-                  } = {}
-    ) {
+const applyConstraints = ({
+    autoGainControl = false,
+    echoCancellation = true,
+    noiseSuppression = true,
+    channelCount = 1,
+    stream = null,
+    width, height
+}) => {
+
+    if(stream) {
 
         let fullConstraints = getUserMediaConstraints({
-            hasVideo, hasAudio, aDeviceId, vDeviceId, autoGainControl, echoCancellation, noiseSuppression, channelCount, width, height
+            hasVideo: true,
+            hasAudio: true,
+            autoGainControl, echoCancellation, noiseSuppression, channelCount, width, height
         });
+        let returnPromises = [];
 
-        return navigator.mediaDevices.getUserMedia(fullConstraints)
-            .then(stream => {
-                stream.getAudioTracks().forEach(track => track.enabled = !muteAudio);
-                stream.getVideoTracks().forEach(track => track.enabled = !muteVideo);
-                return stream;
-            });
-    },
-
-    getHostStream({
-                hasAudio,
-                hasVideo,
-                aDeviceId,
-                vDeviceId,
-                autoGainControl = false,
-                echoCancellation = false,
-                noiseSuppression = false,
-                channelCount = 1,
-                width = 1920,
-                height = 1080,
-    } = {}
-    ) {
-
-        let audioOnlyConstraints = {
-            audio: {
-                ...(aDeviceId && {deviceId: {exact:aDeviceId}}),
-                autoGainControl,
-                echoCancellation,
-                noiseSuppression,
-                channelCount
-            }
-        };
-
-        let videoOnlyConstraints = {
-            video: {
-                ...(vDeviceId && {deviceId: {exact:vDeviceId}}),
-                frameRate: {ideal: 30, max: 30},
-                width, height
-            }
-        };
-
-        let fullConstraints = {
-            ...(hasAudio ? audioOnlyConstraints : {audio: false}),
-            ...(hasVideo ? videoOnlyConstraints : {video: false})
-        };
-
-        return navigator.mediaDevices.getUserMedia(fullConstraints);
-    },
-
-    getDisplayMedia() {
-
-        const constraints = {
-            video: {
-                cursor: "always",
-                displaySurface: "monitor",
-                logicalSurface: false
-            },
-            surfaceSwitching: "include",
-            selfBrowserSurface: "exclude",
-            systemAudio: "exclude",
-        };
-
-        return navigator.mediaDevices.getDisplayMedia(constraints);
+        const videoTrack = stream.getVideoTracks()[0];
+        if(videoTrack) {
+            returnPromises.push(videoTrack.applyConstraints(fullConstraints.video));
+        }
+
+        const audioTrack = stream.getAudioTracks()[0];
+        if(audioTrack) {
+            returnPromises.push(audioTrack.applyConstraints(fullConstraints.audio));
+        }
+
+        return Promise.all(returnPromises).then(() => {
+            return stream;
+        });
     }
+
+    else return Promise.resolve(null);
+
+
+};
+const getUserStream = ({
+        hasVideo,
+        hasAudio = true,
+        aDeviceId,
+        vDeviceId,
+        autoGainControl = false,
+        echoCancellation = true,
+        noiseSuppression = true,
+        channelCount = 1,
+        muteAudio = false,
+        muteVideo = false,
+        width = 1920,
+        height = 1080
+    } = {}
+) => {
+
+    let fullConstraints = getUserMediaConstraints({
+        hasVideo, hasAudio, aDeviceId, vDeviceId, autoGainControl, echoCancellation, noiseSuppression, channelCount, width, height
+    });
+
+    return navigator.mediaDevices.getUserMedia(fullConstraints)
+        .then(stream => {
+            stream.getAudioTracks().forEach(track => track.enabled = !muteAudio);
+            stream.getVideoTracks().forEach(track => track.enabled = !muteVideo);
+            return stream;
+        });
+};
+const getHostStream = ({
+        hasAudio,
+        hasVideo,
+        aDeviceId,
+        vDeviceId,
+        autoGainControl = false,
+        echoCancellation = false,
+        noiseSuppression = false,
+        channelCount = 1,
+        width = 1920,
+        height = 1080,
+    } = {}
+) => {
+
+    let audioOnlyConstraints = {
+        audio: {
+            ...(aDeviceId && {deviceId: {exact:aDeviceId}}),
+            autoGainControl,
+            echoCancellation,
+            noiseSuppression,
+            channelCount
+        }
+    };
+
+    let videoOnlyConstraints = {
+        video: {
+            ...(vDeviceId && {deviceId: {exact:vDeviceId}}),
+            frameRate: {ideal: 30, max: 30},
+            width, height
+        }
+    };
+
+    let fullConstraints = {
+        ...(hasAudio ? audioOnlyConstraints : {audio: false}),
+        ...(hasVideo ? videoOnlyConstraints : {video: false})
+    };
+
+    return navigator.mediaDevices.getUserMedia(fullConstraints);
+};
+const getDisplayMedia = () =>{
+    const constraints = {
+        video: {
+            cursor: "always",
+            displaySurface: "monitor",
+            logicalSurface: false
+        },
+        surfaceSwitching: "include",
+        selfBrowserSurface: "exclude",
+        systemAudio: "exclude",
+    };
+
+    return navigator.mediaDevices.getDisplayMedia(constraints);
+};
+
+
+
+export {
+    //TODO: add more constraints
+    getDisplayMedia, getHostStream, getUserStream, applyConstraints,
+    wait, getBrowserFingerprint, generateUUID, decodeJanusDisplay, setExactTimeout, clearExactTimeout, median, maxJitter, chunkArray
 }