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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.7.86-beta.0",
+  "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);
 					}
 				})
 		};
@@ -1792,10 +1789,12 @@ class RoomSession {
 
 	_parseVideoStats(participantsStats) {
 		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 (!participantStats?.handleId || participantStats.handleId === this.handleId) continue;
+
+				const handle = this._getHandle(participantStats.handleId);
 				if (!handle) continue;
 
 				const mid = participantStats.mid;
@@ -1827,7 +1826,8 @@ class RoomSession {
 				const defaultSelectedSubstream = handle.webrtcStuff?.overriddenSimulcastMode[mid]?.defaultSubstream ?? simulcastConfig?.defaultSubstream;
 				const simulcastMode = handle.webrtcStuff?.overriddenSimulcastMode[mid]?.mode ?? simulcastConfig?.mode;
 
-				for (const report of participantStats.stats) {
+				participantStats.stats.forEach(report => {
+
 					if (report.type === 'inbound-rtp' && report.kind === 'video') {
 						stats.framesPerSecond = report.framesPerSecond || 0;
 						stats.framesDropped = report.framesDropped || 0;
@@ -1850,7 +1850,7 @@ class RoomSession {
 					if (report.type === 'local-candidate') {
 						stats.networkType = report.networkType;
 					}
-				}
+				});
 
 				stats.selectedSubstream = handle.webrtcStuff.selectedSubstream[mid];
 				stats.desiredSubstream = defaultSelectedSubstream;
@@ -1863,9 +1863,9 @@ class RoomSession {
 				}
 
 				this.emit('rtcStats', {
-					handleId: participantStats.handle.handleId,
+					handleId: participantStats.handleId,
 					stats,
-					userId: decodeJanusDisplay(participantStats.handle.userId)?.userId,
+					userId: decodeJanusDisplay(handle.userId)?.userId,
 					source: participantStats.source,
 					mid
 				});
@@ -1946,33 +1946,82 @@ class RoomSession {
 	//
 	// }
 
-	_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}))
-			}
-		}))
 
+	_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);