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

package/package.json

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

package/src/modules/wt-room.js

@@ -1789,79 +1789,163 @@ 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?.handle || participantStats.handle.handleId === this.handleId) continue;
+
+				const handle = this._getHandle(participantStats.handle.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;
+
+				for (const report of participantStats.stats) {
+					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;
+					}
 
-							stats.selectedSubstream = handle.webrtcStuff.selectedSubstream[participantStats.mid];
-							stats.desiredSubstream = defaultSelectedSubstream;
-							stats.simulcastMode  = simulcastMode;
+					if (report.type === 'candidate-pair') {
+						stats.roundTripTime = report.currentRoundTripTime;
+					}
 
-						});
+					if (report.type === 'local-candidate') {
+						stats.networkType = report.networkType;
+					}
+				}
 
-						// 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();
-						}
+				stats.selectedSubstream = handle.webrtcStuff.selectedSubstream[mid];
+				stats.desiredSubstream = defaultSelectedSubstream;
+				stats.simulcastMode = simulcastMode;
 
-						this.emit('rtcStats', {handleId: participantStats.handle.handleId, stats, userId: decodeJanusDisplay(participantStats.handle.userId)?.userId,  source: participantStats.source, mid: participantStats.mid});
-					}
+				handle.webrtcStuff.stats[mid].push(stats);
+
+				if (handle.webrtcStuff.stats[mid].length > this._statsMaxLength) {
+					handle.webrtcStuff.stats[mid].shift();
 				}
-			});
-		})
 
+				this.emit('rtcStats', {
+					handleId: participantStats.handle.handleId,
+					stats,
+					userId: decodeJanusDisplay(participantStats.handle.userId)?.userId,
+					source: participantStats.source,
+					mid
+				});
+			}
+		}
 	}
 
+	// _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 Promise.all(this._participants.map(participant => {
 			let mediaTrack = [];