@reactoo/watchtogether-sdk-js 2.5.60 → 2.5.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.5.60",
+  "version": "2.5.63",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",

package/src/models/room-session.js

@@ -184,11 +184,15 @@ let roomSession = function ({roomId, pinHash, role}, room, wt) {
 				} else if (msg.user_action === 'chat_message') {
 					emitter.emit('chatMessage', msg);
 				} else if (msg.user_action === 'remote_muted') {
-					if (msg.from !== room.userId) {
-						emitter.emit('remoteMuted', {userId: decodeJanusDisplay(msg.from)?.userId, ...(msg.text && JSON.parse(msg.text))})
+					const fromUserId = decodeJanusDisplay(msg.from)?.userId;
+					const ownUserId = decodeJanusDisplay(room.userId)?.userId;
+					if (fromUserId !== ownUserId) {
+						emitter.emit('remoteMuted', {role: decodeJanusDisplay(msg.from)?.role, userId: decodeJanusDisplay(msg.from)?.userId, ...(msg.text && JSON.parse(msg.text))})
 					}
 				} else if (msg.user_action === 'remote_muted_request') {
-					if (msg.from !== room.userId) {
+					const fromUserId = decodeJanusDisplay(msg.from)?.userId;
+					const ownUserId = decodeJanusDisplay(room.userId)?.userId;
+					if (fromUserId !== ownUserId) {
 						this.__sendMuteStatus();
 					}
 				}

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

@@ -15,7 +15,7 @@ const syncModule = function ({room, emitter} = {}) {
 	};
 	const syncDefaultWaitTime = 60000;
 	const syncShortWaitTime = 10000;
-	const maxSyncThreshold = 0.4;
+	const maxSyncThreshold = 0.5;
 	const maxSyncTries = 3;
 	const waitForPlayingEventAfterSeek = 5000;
 	const fastForwardThreshold = 4
@@ -71,11 +71,13 @@ const syncModule = function ({room, emitter} = {}) {
 		
 	};
 	
-	const stopSyncLoop = () => {
+	const stopSyncLoop = (doNotResetRetryCount) => {
 		room._log('--- Sync disabled ---');
 		clearTimeout(syncWaitId);
 		syncWaitId = null;
-		currentSyncRetry = 0
+		if(!doNotResetRetryCount) {
+			currentSyncRetry = 0
+		}
 		stopFlag = true;
 	};
 	
@@ -137,14 +139,14 @@ const syncModule = function ({room, emitter} = {}) {
 					if(position !== null && !isNaN(position)) {
 						return seekBy(position)
 							.then(() => {
-								const seekDuration = (Date.now() - syncStartTime) / 1000;
+								const seekDuration = (Date.now() - syncStartTime);
 								const {position, realPosition, isBufferSufficient} = _playerInterface.getTimeDifference
 									? _playerInterface.getTimeDifference(syncData.masterFragmentSn, syncData.masterFragmentPos + seekDuration, syncData.ping)
 									:  getTimeDifference(syncData.masterFragmentSn, syncData.masterFragmentPos + seekDuration, syncData.ping);
 
 								const syncPrecision =  Math.abs(realPosition);
 								room._log(`Insufficient buffer: `, !isBufferSufficient)
-								room._log(`Seek duration is ${seekDuration} seconds`);
+								room._log(`Seek duration is ${seekDuration / 1000} seconds`);
 								room._log(`Sync precision should be ${syncPrecision}`);
 								
 								const didSyncFail = syncPrecision > maxSyncThreshold;
@@ -374,7 +376,7 @@ const syncModule = function ({room, emitter} = {}) {
 	const handleBuffering = () => {
 		room._log('handleBuffering');
 		if(!isProgrammaticallySeeked) {
-			stopSyncLoop();
+			stopSyncLoop(true);
 			clientPaused().catch(() => {});
 			isPreloading = _playerInterface.isPaused;
 		}