@reactoo/watchtogether-sdk-js 2.7.80 → 2.7.82

package/src/modules/sync-modules/sync-shaka-dash.js

@@ -1,11 +1,11 @@
-import {setExactTimeout} from "../wt-utils";
+import {setExactTimeout} from "../../models/utils";
 
 const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
-    
+
     //SYNC VARS
     let _libraryInstance = null;
     let _videoElement = null;
-    
+
     const syncDefaultWaitTime = 60000;
     const syncShortWaitTime = 10000;
     const maxSyncThreshold = 0.5;
@@ -15,45 +15,45 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
     let   syncNextWaitTime = null;
     let   stopFlag = false;
     let   isSyncing = false;
-    
+
     let playbackRate = 2;
     let isPlaying = false;
     let isPreloading = true;
     let isProgrammaticallySeeked = false;
     let shouldPropagateMaster = false;
-    
+
     const buffering = (event) => {
         if(event.buffering) {
             handleStalledWaiting();
         }
     };
-    
+
     const startSyncLoop = () => {
-        
+
         if(!isConnected()) {
             room._log('--- Sync loop will not start due to user not connected yet ---');
             return
         }
-        
+
         if(syncWaitId) {
             room._log('--- Sync loop already running ---');
             return
         }
-        
+
         room._log('--- Sync enabled ---');
-        
+
         stopFlag = false;
-        
+
         const loop = () => {
-            
+
             isSyncing = true;
             emitter.emit('playerSyncing', true);
-            
+
             sync().finally(() => {
-                
+
                 isSyncing = false;
                 emitter.emit('playerSyncing', false);
-                
+
                 if(isConnected() && !stopFlag) {
                     syncWaitId = setTimeout(loop, syncNextWaitTime);
                 }
@@ -61,36 +61,36 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
                     room._log('--- Automatic stop due to user not connected or stop flag enabled ---');
                     stopSyncLoop();
                 }
-                
+
             })
-            
+
         };
-        
+
         loop();
-        
+
     };
-    
+
     const stopSyncLoop = () => {
-        
+
         room._log('--- Sync disabled ---');
-        
+
         clearTimeout(syncWaitId);
         syncWaitId = null;
         currentSyncRetry = 0
         stopFlag = true;
-        
+
     };
-    
+
     const restartSyncLoop = () => {
-        
+
         room._log('--- Sync restarting ---');
         stopSyncLoop();
         startSyncLoop();
-        
+
     };
-    
+
     const setNextWaitTime = (didSyncFail = false) => {
-        
+
         if(!didSyncFail) {
             syncNextWaitTime = syncDefaultWaitTime;
             currentSyncRetry = 0
@@ -103,50 +103,50 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
                 syncNextWaitTime = syncShortWaitTime;
             }
         }
-        
+
         room._log('--- Next sync will occur in ' + syncNextWaitTime / 1000 + ' seconds ---');
-        
+
     }
-    
+
     const sync = () => {
-        
+
         return getSyncData()
             .then(syncData => {
-                
+
                 if(syncData.isMaster) {
                     if(_videoElement.paused) _videoElement.play();
                     setNextWaitTime(false);
                     return Promise.resolve();
                 }
-                
+
                 else if(shouldPropagateMaster) {
                     setNextWaitTime(false);
                     return propagateMasterFunc();
                 }
-                
+
                 else {
-                    
+
                     const syncStartTime = Date.now();
                     const {position, realPosition, isBufferSufficient} = calculateSyncDifferenceTime(syncData.masterFragmentSn, syncData.masterFragmentPos, syncData.ping);
                     const currentPosition = getCurrentSegmentPosition() / 1000;
-                    
-                    
+
+
                     if(position && Math.abs(position - currentPosition) <=  maxSyncThreshold) {
                         room._log(`We're within max sync threshold, no need to resync now`);
                         setNextWaitTime(false);
                         return Promise.resolve();
                     }
-                    
+
                     if(position !== null) {
                         return seekTo(position)
                             .then(() => {
                                 const seekDuration = (Date.now() - syncStartTime) / 1000;
                                 const syncPrecision =  Math.abs((realPosition + seekDuration) - (getCurrentSegmentPosition() / 1000))
-    
+
                                 room._log(`Insufficient buffer: `, !isBufferSufficient);
                                 room._log(`Seek duration is ${seekDuration}`);
                                 room._log(`Sync precision should be ${syncPrecision}`);
-                                
+
                                 const didSyncFail = syncPrecision > maxSyncThreshold
                                 setNextWaitTime(didSyncFail);
                                 return Promise.resolve();
@@ -165,7 +165,7 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
                 return Promise.reject();
             })
     }
-    
+
     const handleAddLocalParticipant = () => {
         if(shouldPropagateMaster) {
             propagateMasterFunc();
@@ -176,17 +176,17 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
             }, {once:true});
         }
     };
-    
+
     const handleAddRemoteParticipant = () => {
         if(shouldPropagateMaster) {
             propagateMasterFunc();
         }
     };
-    
+
     const isConnected = () => {
         return room._isDataChannelOpen && room.isConnected;
     };
-    
+
     const parseDataEvents = (msg = {}) => {
         if(msg.videoroom === 'sync_source_set' && msg.wt_channel_id != "") {
             emitter.emit('changePlayerSource', msg.wt_channel_id);
@@ -195,12 +195,12 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
             roomSyncSend(msg.sync_slave_id).catch(()=>{});
         }
     };
-    
+
     const getCurrentSegmentPosition = () => {
         let position = _videoElement && _videoElement.currentTime;
         return isNaN(position) ? 0 : position * 1000
     };
-    
+
     const calculateSyncDifferenceTime = (fragmentSn, fragmentPos, ping) => {
         let seekRanges = _videoElement.buffered;
         let seekRange = {};
@@ -226,7 +226,7 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
         } else
             return {position: null, realPosition: position, isBufferSufficient: false}
     };
-    
+
     const seekTo = (time) => {
         return new Promise((resolve, reject) => {
             if(_videoElement.currentTime !== time) {
@@ -278,7 +278,7 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
             } else resolve()
         });
     };
-    
+
     // const seekTo = (time) => {
     //     return new Promise((resolve, reject) => {
     //         if(_videoElement.currentTime !== time) {
@@ -293,7 +293,7 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
     //         } else resolve()
     //     });
     // };
-    
+
     const handlePlaying = () => {
         if(!isProgrammaticallySeeked) {
             room._log('Handle playing');
@@ -303,13 +303,13 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
         isPreloading = _videoElement.paused;
         isPlaying = !_videoElement.paused;
     };
-    
+
     const handlePause = () => {
         stopSyncLoop()
         clientPaused().catch(() => {});
         isPlaying = !_videoElement.paused;
     };
-    
+
     const handleStalledWaiting = () => {
         room._log('handleStalledWaiting');
         if(!isProgrammaticallySeeked) {
@@ -318,9 +318,9 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
             isPreloading = _videoElement.paused;
         }
     };
-    
+
     const roomSyncSend = (slaveId) => {
-        
+
         if(!_libraryInstance || !_videoElement) {
             room._log(
                 `I've been asked for position even if we don't have player attached.
@@ -328,12 +328,12 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
             );
             return Promise.resolve();
         }
-        
+
         let fragmentPosition = parseInt(getCurrentSegmentPosition());
-        
+
         room._log(`Sending my position to ${slaveId}`);
         room._log(`Current time: ${fragmentPosition}`);
-        
+
         return room.sendMessage(room.handleId, {
             body : {
                 request: "sync_response",
@@ -344,23 +344,23 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
                 slave_id: room.webrtcVersion > 1000 ? String(slaveId) : Number(slaveId)
             }});
     };
-    
+
     const getSyncData = () => {
-        
+
         room._log('Sending roomSync request');
         let roomId = room.roomId;
         let fragmentPosition = parseInt(getCurrentSegmentPosition());
-        
+
         return new Promise((resolve, reject) => {
-            
+
             let now = new Date().getTime();
             let ping = null;
-            
+
             let sid = setTimeout(() => {
                 room.off('data', fn, this);
                 reject('Timeout');
             }, 3000);
-            
+
             let body = {
                 request:  "sync",
                 room: roomId,
@@ -368,32 +368,32 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
                 fragment: String("0"),
                 fragment_pos: Number(fragmentPosition)
             };
-            
+
             let fn = (msg) => {
-                
+
                 if(msg.videoroom && ['sync', 'sync_response'].includes(msg.videoroom)) {
-                    
+
                     if(msg.sync_master_await) {
                         room._log('Waiting for master position');
                         if(!ping) {
                             ping = (new Date().getTime() - now);
                         }
                     }
-                    
+
                     else if(msg.sync_master_fragment || msg.sync_master_fragment_pos) {
                         room._log('Got master position data');
                         if(!ping) {
                             ping = (new Date().getTime() - now);
                         }
-                        
+
                         room._log(`I'm master: ${!!msg.sync_master_self}`);
                         room._log(`Ping: ${ping}`);
                         room._log(`Master fragment: ${msg.sync_master_fragment}`);
                         room._log(`Master fragment position: ${msg.sync_master_fragment_pos}`);
-                        
+
                         room.off('data', fn, this);
                         clearTimeout(sid);
-                        
+
                         resolve({
                             isMaster: !!msg.sync_master_self,
                             ping: ping,
@@ -401,7 +401,7 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
                             masterFragmentSn: parseInt(msg.sync_master_fragment),
                         });
                     }
-                    
+
                     else {
                         clearTimeout(sid);
                         reject('Master lost connection')
@@ -416,14 +416,14 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
             });
         });
     };
-    
+
     const clientPaused = () => {
         room._log('Sending client paused');
-        
+
         if(!isConnected()) {
             return Promise.resolve();
         }
-        
+
         return room.sendMessage(room.handleId, {
             body:{
                 request: "sync_paused",
@@ -433,7 +433,7 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
                 fragment_pos:0
             }});
     };
-    
+
     const propagateMasterFunc = () => {
         room._log('Propagating master');
         if(!isConnected()) {
@@ -449,65 +449,65 @@ const syncDaznDash = function ({room, wt, roomSession, emitter} = {}) {
                 fragment_pos:0
             }});
     };
-    
+
     return {
-        
+
         __events: ['playerSyncing'],
-        
+
         initialize: ({libraryInstance, shakaInstance, propagateMaster = false} = {}) => {
-            
+
             _libraryInstance = libraryInstance || shakaInstance;
             _videoElement = _libraryInstance.getMediaElement();
-            
+
             shouldPropagateMaster = propagateMaster;
             isPlaying = _videoElement.paused === false;
-            
+
             room.on('disconnect', stopSyncLoop);
             room.on('removeLocalParticipant', stopSyncLoop);
             room.on('addLocalParticipant', handleAddLocalParticipant);
             room.on('addRemoteParticipant', handleAddRemoteParticipant);
             room.on('data', parseDataEvents);
-            
+
             if(shouldPropagateMaster) {
                 propagateMasterFunc().catch(() => {});
             }
-            
+
             if(_videoElement && _videoElement.paused === false) {
                 _videoElement.addEventListener('progress', () => {
                     restartSyncLoop();
                 }, {once:true});
             }
-    
+
             _libraryInstance.addEventListener('buffering', buffering);
             _videoElement.addEventListener('playing', handlePlaying);
             _videoElement.addEventListener('pause', handlePause);
-            
-            
+
+
         },
-        
+
         destroy: () => {
-            
+
             stopSyncLoop();
-            
+
             room.off('disconnect', stopSyncLoop);
             room.off('removeLocalParticipant', stopSyncLoop);
             room.off('addLocalParticipant', handleAddLocalParticipant);
             room.off('addRemoteParticipant', handleAddRemoteParticipant);
             room.off('data', parseDataEvents);
-            
+
             if(_libraryInstance) {
                 _libraryInstance.removeEventListener('buffering', buffering);
             }
-            
+
             if(_videoElement) {
                 _videoElement.removeEventListener('playing', handlePlaying);
                 _videoElement.removeEventListener('pause', handlePause);
             }
-            
+
             _libraryInstance = null;
         }
     };
-    
+
 };
 
 export default syncDaznDash;

package/src/modules/wt-iot.js

@@ -1,5 +1,5 @@
 import emitter from './wt-emitter';
-import { decodeJanusDisplay } from "./wt-utils";
+import { decodeJanusDisplay } from "../models/utils";
 import { mqtt, iot } from 'aws-iot-device-sdk-v2';
 
 class Iot {

package/src/modules/wt-iot2.js

@@ -1,5 +1,5 @@
 import emitter from './wt-emitter';
-import { decodeJanusDisplay } from "./wt-utils";
+import { decodeJanusDisplay } from "../models/utils";
 import Worker from './wt-iot-worker.worker.js';
 
 class Iot {

package/src/modules/wt-room.js

@@ -2,7 +2,7 @@
 
 import adapter from 'webrtc-adapter';
 import emitter from './wt-emitter';
-import {decodeJanusDisplay, generateUUID, maxJitter, median, wait} from "./wt-utils";
+import {decodeJanusDisplay, generateUUID, maxJitter, median, wait} from "../models/utils";
 
 class Room {
 
@@ -260,7 +260,7 @@ class RoomSession {
 		this._aqIntervalCounter = 0;
 		this._aqIntervalDivisor = 4;
 		this._aqTimeoutId = null;
-		this._sendMessageTimeout = 5000;
+		this._sendMessageTimeout = 10000;
 		this._retries = 0;
 		this._maxRetries = 5;
 		this._keepAliveId = null;
@@ -498,6 +498,7 @@ class RoomSession {
 		}
 
 		if (this._retries < this._maxRetries) {
+			//TODO: clear this timeout
 			setTimeout(() => {
 				this._retries++;
 				this._reconnect().catch(e => {
@@ -1872,8 +1873,8 @@ class RoomSession {
 					.catch(e => Promise.reject({handle: participant, error: e}))
 			}
 		}))
-		
-		
+
+
 	}
 
 	_resetStats(handleId, mid) {

package/src/modules/wt-utils.js

@@ -1,142 +0,0 @@
-// import FingerprintJs from "@fingerprintjs/fingerprintjs";
-// import FingerprintJsPro from "@fingerprintjs/fingerprintjs-pro";
-import {getFingerPrint} from "./wt-fingerprint";
-
-let wait = function(ms) { return new Promise(resolve => setTimeout(resolve, ms))};
-
-let 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)
-//         })
-// }
-
-
-let 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;
-}
-
-export {wait, getBrowserFingerprint, generateUUID, decodeJanusDisplay, setExactTimeout, clearExactTimeout, median, maxJitter, chunkArray}