@reactoo/watchtogether-sdk-js 2.7.85 → 2.7.86-beta.1

package/package.json

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

package/src/modules/wt-room.js

@@ -264,11 +264,11 @@ class RoomSession {
 		this.isVideoEnabled = false;
 		this.isAudioEnabed = false;
 		this._statsMaxLength = 31;
-		this._upStatsLength = 30;
-		this._downStatsLength = 5;
+		this._upStatsLength = 10;
+		this._downStatsLength = 2;
 		this._statsTimeoutStopped = true;
 		this._statsTimeoutId = null;
-		this._statsInterval = 1000;
+		this._statsInterval = 3000;
 		this._aqInterval = 2500;
 		this._aqIntervalCounter = 0;
 		this._aqIntervalDivisor = 4;
@@ -1641,16 +1641,13 @@ class RoomSession {
 		}
 		this._statsTimeoutStopped = false;
 		const loop = () => {
-			let startTime = performance.now();
-			let endTime = null;
 			this._getStats('video')
 				.then(participantsStats => {
-					endTime = performance.now();
 					this._parseVideoStats(participantsStats);
 				})
 				.finally(() => {
 					if (!this._statsTimeoutStopped) {
-						this._statsTimeoutId = setTimeout(loop, this._statsInterval - Math.min((endTime - startTime), this._statsInterval));
+						this._statsTimeoutId = setTimeout(loop, this._statsInterval);
 					}
 				})
 		};
@@ -1789,106 +1786,242 @@ class RoomSession {
 		return medianStats;
 	}
 
+
 	_parseVideoStats(participantsStats) {
-		participantsStats.forEach(sourceStats => {
-			sourceStats.forEach(participantStats => {
-				if(participantStats !== null && participantStats?.handle?.handleId !== this.handleId) {
-					let handle = this._getHandle(participantStats.handle.handleId);
-					if(handle) {
-
-						if(!handle.webrtcStuff.stats[participantStats.mid]) {
-							handle.webrtcStuff.stats[participantStats.mid] = [];
-						}
+		for (const sourceStats of participantsStats) {
+
+			for (const participantStats of sourceStats) {
+
+				if (!participantStats?.handleId || participantStats.handleId === this.handleId) continue;
+
+				const handle = this._getHandle(participantStats.handleId);
+				if (!handle) continue;
+
+				const mid = participantStats.mid;
+				handle.webrtcStuff.stats[mid] ??= [];
+
+				const lastStats = handle.webrtcStuff.stats[mid][handle.webrtcStuff.stats[mid].length - 1];
+
+				const stats = {
+					framesPerSecond: null,
+					framesDropped: null,
+					totalFreezesDuration: null,
+					freezeDurationSinceLast: null,
+					freezeCount: null,
+					freezeCountSinceLast: null,
+					jitter: null,
+					packetsLost: null,
+					nackCount: null,
+					roundTripTime: null,
+					width: null,
+					height: null,
+					networkType: null,
+					powerEfficientDecoder: null,
+					selectedSubstream: null,
+					desiredSubstream: null,
+					simulcastMode: null
+				};
 
-						const stats = {
-							framesPerSecond: null,
-							framesDropped: null,
-							totalFreezesDuration: null,
-							freezeDurationSinceLast: null,
-							freezeCount: null,
-							jitter: null,
-							packetsLost: null,
-							nackCount: null,
-							roundTripTime: null,
-							width: null,
-							height: null,
-							networkType: null,
-							powerEfficientDecoder: null,
-						};
-						participantStats.stats.forEach(report => {
-
-							const simulcastConfigForSource = this._findSimulcastConfig(participantStats.source, this.simulcastSettings);
-							const defaultSelectedSubstream = handle.webrtcStuff?.overriddenSimulcastMode[participantStats.mid]?.defaultSubstream ?? simulcastConfigForSource?.defaultSubstream;
-							const simulcastMode = handle.webrtcStuff?.overriddenSimulcastMode[participantStats.mid]?.mode ?? simulcastConfigForSource?.mode ;
-
-							if(report.type === 'inbound-rtp' && report.kind === 'video') {
-								stats.framesPerSecond = report.framesPerSecond || 0;
-								stats.framesDropped = report.framesDropped || 0;
-								stats.totalFreezesDuration = report.totalFreezesDuration || 0;
-								stats.freezeDurationSinceLast = (report.totalFreezesDuration || 0) - (handle.webrtcStuff.stats?.[participantStats.mid]?.[handle.webrtcStuff.stats?.[participantStats.mid]?.length - 1]?.totalFreezesDuration || 0);
-								stats.freezeCount = report.freezeCount || 0;
-								stats.freezeCountSinceLast = (report.freezeCount || 0) - (handle.webrtcStuff.stats?.[participantStats.mid]?.[handle.webrtcStuff.stats?.[participantStats.mid]?.length - 1]?.freezeCount || 0);
-								stats.jitter = report.jitter;
-								stats.packetsLost = report.packetsLost;
-								stats.nackCount = report.nackCount;
-								stats.width = report.frameWidth;
-								stats.height = report.frameHeight;
-								stats.powerEfficientDecoder = report.powerEfficientDecoder;
-							}
-							if(report.type === 'candidate-pair') {
-								stats.roundTripTime = report.currentRoundTripTime;
-							}
-							if(report.type === 'local-candidate') {
-								stats.networkType = report.networkType;
-							}
+				const simulcastConfig = this._findSimulcastConfig(participantStats.source, this.simulcastSettings);
+				const defaultSelectedSubstream = handle.webrtcStuff?.overriddenSimulcastMode[mid]?.defaultSubstream ?? simulcastConfig?.defaultSubstream;
+				const simulcastMode = handle.webrtcStuff?.overriddenSimulcastMode[mid]?.mode ?? simulcastConfig?.mode;
+
+				participantStats.stats.forEach(report => {
+
+					if (report.type === 'inbound-rtp' && report.kind === 'video') {
+						stats.framesPerSecond = report.framesPerSecond || 0;
+						stats.framesDropped = report.framesDropped || 0;
+						stats.totalFreezesDuration = report.totalFreezesDuration || 0;
+						stats.freezeDurationSinceLast = (report.totalFreezesDuration || 0) - (lastStats?.totalFreezesDuration || 0);
+						stats.freezeCount = report.freezeCount || 0;
+						stats.freezeCountSinceLast = (report.freezeCount || 0) - (lastStats?.freezeCount || 0);
+						stats.jitter = report.jitter;
+						stats.packetsLost = report.packetsLost;
+						stats.nackCount = report.nackCount;
+						stats.width = report.frameWidth;
+						stats.height = report.frameHeight;
+						stats.powerEfficientDecoder = report.powerEfficientDecoder;
+					}
+
+					if (report.type === 'candidate-pair') {
+						stats.roundTripTime = report.currentRoundTripTime;
+					}
 
-							stats.selectedSubstream = handle.webrtcStuff.selectedSubstream[participantStats.mid];
-							stats.desiredSubstream = defaultSelectedSubstream;
-							stats.simulcastMode  = simulcastMode;
+					if (report.type === 'local-candidate') {
+						stats.networkType = report.networkType;
+					}
+				});
 
-						});
+				stats.selectedSubstream = handle.webrtcStuff.selectedSubstream[mid];
+				stats.desiredSubstream = defaultSelectedSubstream;
+				stats.simulcastMode = simulcastMode;
 
-						// pushing stats into handle stats array but keeping only 6 last stats
-						handle.webrtcStuff.stats[participantStats.mid].push(stats);
-						if(handle.webrtcStuff.stats[participantStats.mid].length > this._statsMaxLength) {
-							handle.webrtcStuff.stats[participantStats.mid].shift();
-						}
+				handle.webrtcStuff.stats[mid].push(stats);
 
-						this.emit('rtcStats', {handleId: participantStats.handle.handleId, stats, userId: decodeJanusDisplay(participantStats.handle.userId)?.userId,  source: participantStats.source, mid: participantStats.mid});
-					}
+				if (handle.webrtcStuff.stats[mid].length > this._statsMaxLength) {
+					handle.webrtcStuff.stats[mid].shift();
 				}
-			});
-		})
 
+				this.emit('rtcStats', {
+					handleId: participantStats.handleId,
+					stats,
+					userId: decodeJanusDisplay(handle.userId)?.userId,
+					source: participantStats.source,
+					mid
+				});
+			}
+		}
 	}
 
-	_getStats(type = null) {
-		return Promise.all(this._participants.map(participant => {
-			let mediaTrack = [];
-			if (type === 'video') {
-				mediaTrack = participant?.webrtcStuff?.stream?.getVideoTracks() || [];
-			} else if (type === 'audio') {
-				mediaTrack = participant?.webrtcStuff?.stream?.getAudioTracks() || [];
-			}
-			if(type !== null ) {
-				const transceivers = participant?.webrtcStuff?.pc?.getTransceivers();
-				return Promise.all(mediaTrack.map(track => {
-					const source = Object.keys(participant.webrtcStuff.streamMap).find(s => participant.webrtcStuff.streamMap[s].find(t => t === track.id));
-					const mid = transceivers.find(t => t.receiver?.track?.id === track.id || t.sender?.track?.id === track.id)?.mid;
-					return participant.webrtcStuff.pc.getStats(track)
-						.then(r =>({stats: r, source, mid, handle: participant}))
-						.catch(e => Promise.reject({stats: null, error: e, handle: participant, source, mid}))
-				}))
-			}
-			else {
-				return participant?.webrtcStuff?.pc?.getStats(null)
-					.then(r => ({handle: participant, stats: r}))
-					.catch(e => Promise.reject({handle: participant, error: e}))
-			}
-		}))
+	// _parseVideoStats(participantsStats) {
+	// 	participantsStats.forEach(sourceStats => {
+	// 		sourceStats.forEach(participantStats => {
+	// 			if(participantStats !== null && participantStats?.handle?.handleId !== this.handleId) {
+	// 				let handle = this._getHandle(participantStats.handle.handleId);
+	// 				if(handle) {
+	//
+	// 					if(!handle.webrtcStuff.stats[participantStats.mid]) {
+	// 						handle.webrtcStuff.stats[participantStats.mid] = [];
+	// 					}
+	//
+	// 					const stats = {
+	// 						framesPerSecond: null,
+	// 						framesDropped: null,
+	// 						totalFreezesDuration: null,
+	// 						freezeDurationSinceLast: null,
+	// 						freezeCount: null,
+	// 						jitter: null,
+	// 						packetsLost: null,
+	// 						nackCount: null,
+	// 						roundTripTime: null,
+	// 						width: null,
+	// 						height: null,
+	// 						networkType: null,
+	// 						powerEfficientDecoder: null,
+	// 					};
+	// 					participantStats.stats.forEach(report => {
+	//
+	// 						const simulcastConfigForSource = this._findSimulcastConfig(participantStats.source, this.simulcastSettings);
+	// 						const defaultSelectedSubstream = handle.webrtcStuff?.overriddenSimulcastMode[participantStats.mid]?.defaultSubstream ?? simulcastConfigForSource?.defaultSubstream;
+	// 						const simulcastMode = handle.webrtcStuff?.overriddenSimulcastMode[participantStats.mid]?.mode ?? simulcastConfigForSource?.mode ;
+	//
+	// 						if(report.type === 'inbound-rtp' && report.kind === 'video') {
+	// 							stats.framesPerSecond = report.framesPerSecond || 0;
+	// 							stats.framesDropped = report.framesDropped || 0;
+	// 							stats.totalFreezesDuration = report.totalFreezesDuration || 0;
+	// 							stats.freezeDurationSinceLast = (report.totalFreezesDuration || 0) - (handle.webrtcStuff.stats?.[participantStats.mid]?.[handle.webrtcStuff.stats?.[participantStats.mid]?.length - 1]?.totalFreezesDuration || 0);
+	// 							stats.freezeCount = report.freezeCount || 0;
+	// 							stats.freezeCountSinceLast = (report.freezeCount || 0) - (handle.webrtcStuff.stats?.[participantStats.mid]?.[handle.webrtcStuff.stats?.[participantStats.mid]?.length - 1]?.freezeCount || 0);
+	// 							stats.jitter = report.jitter;
+	// 							stats.packetsLost = report.packetsLost;
+	// 							stats.nackCount = report.nackCount;
+	// 							stats.width = report.frameWidth;
+	// 							stats.height = report.frameHeight;
+	// 							stats.powerEfficientDecoder = report.powerEfficientDecoder;
+	// 						}
+	// 						if(report.type === 'candidate-pair') {
+	// 							stats.roundTripTime = report.currentRoundTripTime;
+	// 						}
+	// 						if(report.type === 'local-candidate') {
+	// 							stats.networkType = report.networkType;
+	// 						}
+	//
+	// 						stats.selectedSubstream = handle.webrtcStuff.selectedSubstream[participantStats.mid];
+	// 						stats.desiredSubstream = defaultSelectedSubstream;
+	// 						stats.simulcastMode  = simulcastMode;
+	//
+	// 					});
+	//
+	// 					// pushing stats into handle stats array but keeping only 6 last stats
+	// 					handle.webrtcStuff.stats[participantStats.mid].push(stats);
+	// 					if(handle.webrtcStuff.stats[participantStats.mid].length > this._statsMaxLength) {
+	// 						handle.webrtcStuff.stats[participantStats.mid].shift();
+	// 					}
+	//
+	// 					this.emit('rtcStats', {handleId: participantStats.handle.handleId, stats, userId: decodeJanusDisplay(participantStats.handle.userId)?.userId,  source: participantStats.source, mid: participantStats.mid});
+	// 				}
+	// 			}
+	// 		});
+	// 	})
+	//
+	// }
 
 
-	}
+	_getStats(type = null) {
+		return this._participants.reduce((promise, participant) => {
+			return promise.then(results => {
+				let mediaTrack = [];
+				if (type === 'video') {
+					mediaTrack = participant?.webrtcStuff?.stream?.getVideoTracks() || [];
+				} else if (type === 'audio') {
+					mediaTrack = participant?.webrtcStuff?.stream?.getAudioTracks() || [];
+				}
+
+				if (type !== null) {
+					const transceivers = participant?.webrtcStuff?.pc?.getTransceivers();
+					return Promise.all(mediaTrack.map(track => {
+						const source = Object.keys(participant.webrtcStuff.streamMap).find(s =>
+							participant.webrtcStuff.streamMap[s].find(t => t === track.id)
+						);
+						const mid = transceivers.find(t =>
+							t.receiver?.track?.id === track.id || t.sender?.track?.id === track.id
+						)?.mid;
+
+						return participant.webrtcStuff.pc.getStats(track)
+							.then(r => ({
+								stats: r,
+								source,
+								mid,
+								handleId: participant.handleId
+							}))
+							.catch(e => Promise.reject({
+								stats: null,
+								error: e,
+								handleId: participant.handleId,
+								source,
+								mid
+							}));
+					})).then(participantResults => [...results, participantResults]);
+				} else {
+					return participant?.webrtcStuff?.pc?.getStats(null)
+						.then(r => [...results, {
+							handleId: participant.handleId,
+							stats: r
+						}])
+						.catch(e => [...results, {
+							handleId: participant.handleId,
+							error: e
+						}]);
+				}
+			});
+		}, Promise.resolve([]));
+	}
+
+	// _getStats(type = null) {
+	// 	return Promise.all(this._participants.map(participant => {
+	// 		let mediaTrack = [];
+	// 		if (type === 'video') {
+	// 			mediaTrack = participant?.webrtcStuff?.stream?.getVideoTracks() || [];
+	// 		} else if (type === 'audio') {
+	// 			mediaTrack = participant?.webrtcStuff?.stream?.getAudioTracks() || [];
+	// 		}
+	// 		if(type !== null ) {
+	// 			const transceivers = participant?.webrtcStuff?.pc?.getTransceivers();
+	// 			return Promise.all(mediaTrack.map(track => {
+	// 				const source = Object.keys(participant.webrtcStuff.streamMap).find(s => participant.webrtcStuff.streamMap[s].find(t => t === track.id));
+	// 				const mid = transceivers.find(t => t.receiver?.track?.id === track.id || t.sender?.track?.id === track.id)?.mid;
+	// 				return participant.webrtcStuff.pc.getStats(track)
+	// 					.then(r =>({stats: r, source, mid, handleId: participant.handleId}))
+	// 					.catch(e => Promise.reject({stats: null, error: e,handleId: participant.handleId, source, mid}))
+	// 			}))
+	// 		}
+	// 		else {
+	// 			return participant?.webrtcStuff?.pc?.getStats(null)
+	// 				.then(r => ({handleId: participant.handleId, stats: r}))
+	// 				.catch(e => Promise.reject({ handleId: participant.handleId, error: e}))
+	// 		}
+	// 	}))
+	// }
 
 	_resetStats(handleId, mid) {
 		let handle = this._getHandle(handleId);