@reactoo/watchtogether-sdk-js 2.7.80 → 2.7.82

package/src/modules/sync-modules/sync-hls-vod.js

@@ -1,14 +1,14 @@
-import {wait} from "../wt-utils";
+import {wait} from "../../models/utils";
 
 const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
-    
-    
+
+
     //SYNC VARS
     let _libraryInstance = null;
     let _videoElement = null;
     let _roomId = null;
     let _syncDisabled = false;
-    
+
     const syncDefaultWaitTime = 60000;
     const syncShortWaitTime = 10000;
     const maxSyncThreshold = 0.5;
@@ -20,42 +20,42 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
     let   isSyncing = false;
     let   seekingDebounceId = null
     let   seekingDebounceTimeout = 300;
-    
+
     let isPlaying = false;
     let isProgrammaticallySeeked = false;
     let isForcedMaster = false;
-    
+
     const startSyncLoop = () => {
-    
+
         if(_syncDisabled) {
             room._log('--- Sync loop will not start due to sync force disabled ---');
             return
         }
-        
+
         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);
                 }
@@ -63,36 +63,36 @@ const syncVodHlsJs = 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
@@ -105,54 +105,54 @@ const syncVodHlsJs = 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 || stopFlag) {
                     setNextWaitTime(false);
                     return Promise.resolve();
                 }
-                
+
                 else if(isForcedMaster) {
                     setNextWaitTime(false);
                     return propagateMasterFunc();
                 }
-                
+
                 else {
-                    
+
                     const syncStartTime = Date.now();
                     const {position, isBufferSufficient} = calculateSyncDifferenceTime(syncData.masterFragmentSn, syncData.masterFragmentPos, syncData.ping);
                     const currentPosition = getCurrentSegmentPosition() / 1000;
-    
+
                     if(syncData.masterFragmentSn) {
                         playMedia()
                     } else {
                         pauseMedia()
                     }
-                    
+
                     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((position + (isPlaying ? seekDuration : 0)) - (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();
@@ -170,7 +170,7 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
                 setNextWaitTime(true);
             })
     }
-    
+
     const handleAddLocalParticipant = () => {
         if(isForcedMaster) {
             propagateMasterFunc();
@@ -184,7 +184,7 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
             }, 1000);
         }
     };
-    
+
     const handleAddRemoteParticipant = () => {
         if(isForcedMaster) {
             propagateMasterFunc();
@@ -206,22 +206,22 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
             handleStalledWaiting();
         }
     };
-    
+
     const executePlayerIotEvents = (data) => {
         let rid = _roomId || room.roomId;
         if(data.attributeName === 'playerReplay' && (!rid || data?.roomId === rid)) {
             seekTo(0).then(() => playMedia());
         }
-    
+
         if(data.attributeName === 'playerPlay' && (!rid || data?.roomId === rid)) {
             playMedia();
         }
-    
+
         if(data.attributeName === 'playerPause' && (!rid || data?.roomId === rid)) {
             pauseMedia();
         }
     };
-    
+
     const parseIotEvents = (data) => {
         if(data.event === 'template_updated') {
             if(data.operation === 'multi') {
@@ -236,9 +236,9 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
             }
         }
     };
-    
+
     const parseDataEvents = (msg = {}) => {
-        
+
         if(msg.videoroom === 'sync_source_set' && msg.wt_channel_id != "") {
             emitter.emit('changePlayerSource', msg.wt_channel_id);
         }
@@ -246,20 +246,20 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
             roomSyncSend(msg.sync_slave_id).catch(()=>{});
         }
         else if(msg.videoroom === 'message') {
-            
+
             // ignoring non studio commands if master
             if(isForcedMaster && msg.from !== null) {
                 return;
             }
-    
+
             if(_syncDisabled) {
                 return;
             }
-            
+
             if(msg.user_action === 'sync_seeking') {
                 seekMedia(msg)
                     .catch(() => {
-                    
+
                     });
             }
             else if(msg.user_action === 'sync_seeked') {
@@ -543,22 +543,22 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
         __events: ['playerSyncing'],
 
         initialize: ({hlsInstance, libraryInstance, propagateMaster = false, isStudio = false, roomId, syncDisabled} = {}) => {
-    
+
             _libraryInstance = hlsInstance || libraryInstance; // backwards comp;
             _videoElement = _libraryInstance.media
             _roomId = roomId;
             _syncDisabled = syncDisabled;
-            
+
             if(!_libraryInstance) {
                 room._log('No hls.js player instance!');
                 return;
             }
 
             emitter.emit('playerSyncing', false);
-    
+
             isForcedMaster = propagateMaster;
             isPlaying = _videoElement.paused === false;
-            
+
             room.on('disconnect', stopSyncLoop);
             room.on('addLocalParticipant', handleAddLocalParticipant);
             room.on('removeLocalParticipant', stopSyncLoop);
@@ -566,11 +566,11 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
             room.on('removeRemoteParticipant', handleRemoveRemoteParticipant);
             room.on('data', parseDataEvents);
             wt.iot.$on('message', parseIotEvents);
-    
+
             if(isForcedMaster) {
                 propagateMasterFunc().catch(() => {});
             }
-    
+
             if(_libraryInstance && _videoElement) {
                 (
                     propagateMaster || isStudio ?
@@ -589,9 +589,9 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
         },
 
         destroy: () => {
-    
+
             stopSyncLoop();
-    
+
             room.off('disconnect', stopSyncLoop);
             room.off('addLocalParticipant', handleAddLocalParticipant);
             room.off('removeLocalParticipant', stopSyncLoop);
@@ -599,11 +599,11 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
             room.off('removeRemoteParticipant', handleRemoveRemoteParticipant);
             room.off('data', parseDataEvents);
             wt.iot.$off('message', parseIotEvents);
-    
+
             if(_libraryInstance) {
                 _libraryInstance.off('hlsError', buffering);
             }
-    
+
             if(_videoElement) {
                 _videoElement.removeEventListener('playing', handlePlaying);
                 _videoElement.removeEventListener('pause', handlePause);
@@ -611,7 +611,7 @@ const syncVodHlsJs = function ({room, wt, roomSession, emitter} = {}) {
                 _videoElement.removeEventListener('seeked', handleSeeked);
                 _videoElement.removeEventListener('ended', handleEnded);
             }
-            
+
             _libraryInstance = null;
             _videoElement = null;
         }

package/src/modules/sync-modules/sync-hls.js

@@ -17,15 +17,15 @@
  * */
 
 
-import {setExactTimeout} from "../wt-utils";
+import {setExactTimeout} from "../../models/utils";
 
 const syncHlsJs = function ({room, wt, roomSession, emitter} = {}) {
-    
+
     //SYNC VARS
     let _libraryInstance = null;
     let _videoElement = null;
     let currentFragmentSn = null;
-    
+
     const syncDefaultWaitTime = 60000;
     const syncShortWaitTime = 10000;
     const maxSyncThreshold = 0.5;
@@ -35,39 +35,39 @@ const syncHlsJs = 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 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);
                 }
@@ -75,36 +75,36 @@ const syncHlsJs = 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
@@ -117,49 +117,49 @@ const syncHlsJs = 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, isBufferSufficient} = calculateSyncDifferenceTime(syncData.masterFragmentSn, syncData.masterFragmentPos, syncData.ping);
-                    
+
                     if(position && Math.abs(position) <=  maxSyncThreshold) {
                         room._log(`We're within max sync threshold, no need to resync now`);
                         setNextWaitTime(false);
                         return Promise.resolve();
                     }
-                    
+
                     if(position !== null) {
                         return seekBy(position)
                             .then(() => {
                                 const seekDuration = (Date.now() - syncStartTime);
                                 const {position, isBufferSufficient} = calculateSyncDifferenceTime(syncData.masterFragmentSn, syncData.masterFragmentPos + seekDuration, syncData.ping);
                                 const syncPrecision =  Math.abs(position);
-    
+
                                 room._log(`Insufficient buffer: `, !isBufferSufficient);
                                 room._log(`Seek duration is ${seekDuration / 1000}`);
                                 room._log(`Sync precision should be ${syncPrecision}`);
-                                
+
                                 const didSyncFail = syncPrecision > maxSyncThreshold
                                 setNextWaitTime(didSyncFail);
                                 return Promise.resolve();
@@ -178,7 +178,7 @@ const syncHlsJs = function ({room, wt, roomSession, emitter} = {}) {
                 return Promise.reject();
             })
     }
-    
+
     const handleAddLocalParticipant = () => {
         if(shouldPropagateMaster) {
             propagateMasterFunc();
@@ -205,7 +205,7 @@ const syncHlsJs = function ({room, wt, roomSession, emitter} = {}) {
             handleStalledWaiting();
         }
     };
-    
+
     const hlsFragChanged = (event, data) => {
         currentFragmentSn = data.frag.sn;
     };
@@ -577,14 +577,14 @@ const syncHlsJs = 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",
@@ -594,7 +594,7 @@ const syncHlsJs = function ({room, wt, roomSession, emitter} = {}) {
                 fragment_pos:0
             }});
     };
-    
+
     const propagateMasterFunc = () => {
         room._log('Propagating master');
         if(!isConnected()) {
@@ -616,34 +616,34 @@ const syncHlsJs = function ({room, wt, roomSession, emitter} = {}) {
         __events: ['playerSyncing'],
 
         initialize: ({hlsInstance, libraryInstance, propagateMaster = false} = {}) => {
-    
+
             _libraryInstance = hlsInstance || libraryInstance; // backwards comp;
             _videoElement = _libraryInstance.media
-            
+
 			if(!_libraryInstance) {
                 room._log('No hls.js player instance!');
 				return;
 			}
-    
+
             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) {
                 _libraryInstance.once('hlsFragChanged', () => {
                     restartSyncLoop();
                 });
             }
-    
+
             _libraryInstance.on('hlsError', buffering);
             _libraryInstance.on('hlsFragChanged', hlsFragChanged);
             _videoElement.addEventListener('playing', handlePlaying);
@@ -652,27 +652,27 @@ const syncHlsJs = function ({room, wt, roomSession, emitter} = {}) {
         },
 
         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.off('hlsError', buffering);
                 _libraryInstance.off('hlsFragChanged', hlsFragChanged);
             }
-    
+
             if(_videoElement) {
                 _videoElement.removeEventListener('playing', handlePlaying);
                 _videoElement.removeEventListener('pause', handlePause);
             }
-    
+
             _libraryInstance = null;
-            
+
         }
     };
 };