@observertc/observer-js 1.0.1-57a1811.0 → 1.0.1-c3edea3.0

package/src/ObservedCall.ts

@@ -43,20 +43,6 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 	public remoteTrackResolver?: RemoteTrackResolver;
 	public callUpdater?: CallUpdater;
 	
-	public totalAudioBytesSent = 0;
-	public totalAudioBytesReceived = 0;
-	public totalVideoBytesSent = 0;
-	public totalVideoBytesReceived = 0;
-	public totalDataChannelBytesSent = 0;
-	public totalDataChannelBytesReceived = 0;
-
-	public numberOfPeerConnections = 0;
-	public numberOfInboundRtpStreams = 0;
-	public numberOfOutboundRtpStreams = 0;
-	public numberOfDataChannels = 0;
-
-	public maxNumberOfClients = 0;
-
 	public appData?: AppData;
 	public closed = false;
 	public started?: number;
@@ -90,10 +76,6 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 		}
 	}
 
-	public get numberOfClients() {
-		return this.observedClients.size;
-	}
-
 	public get score() { 
 		return this.calculatedScore.value; 
 	}
@@ -119,7 +101,7 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 
 		const result = new ObservedClient<ClientAppData>(settings, this);
 		const wasEmpty = this.observedClients.size === 0;
-		const onUpdate = () => this._onClientUpdate(result);
+		const onUpdate = () => this.callUpdater?.onClientUpdate(result);
 
 		result.once('close', () => {
 			result.off('update', onUpdate);
@@ -132,7 +114,6 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 		result.on('update', onUpdate);
 
 		this.observedClients.set(settings.clientId, result);
-		this.maxNumberOfClients = Math.max(this.maxNumberOfClients, this.observedClients.size);
 
 		this.emit('newclient', result);
 
@@ -144,33 +125,9 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 	}
 
 	public update() {
-		if (this.closed) return;
-		
-		this.numberOfInboundRtpStreams = 0;
-		this.numberOfOutboundRtpStreams = 0;
-		this.numberOfPeerConnections = 0;
-		this.numberOfDataChannels = 0;
-
-		for (const client of this.observedClients.values()) {
-			this.numberOfInboundRtpStreams += client.numberOfInboundRtpStreams;
-			this.numberOfOutboundRtpStreams += client.numberOfOutboundRtpStreams;
-			this.numberOfPeerConnections += client.numberOfPeerConnections;
-			this.numberOfDataChannels += client.numberOfDataChannels;
-		}
 		this.detectors.update();
 		this.scoreCalculator.update();
 
 		this.emit('update');
 	}
-
-	private _onClientUpdate(client: ObservedClient) {
-		this.callUpdater?.onClientUpdate(client);
-
-		this.totalAudioBytesReceived = client.deltaReceivedAudioBytes;
-		this.totalAudioBytesSent = client.deltaSentAudioBytes;
-		this.totalVideoBytesReceived = client.deltaReceivedVideoBytes;
-		this.totalVideoBytesSent = client.deltaSentVideoBytes;
-		this.totalDataChannelBytesReceived = client.deltaDataChannelBytesReceived;
-		this.totalDataChannelBytesSent = client.deltaDataChannelBytesSent;
-	}
 }

package/src/ObservedClient.ts

@@ -3,10 +3,10 @@ import { ObservedPeerConnection } from './ObservedPeerConnection';
 import { createLogger } from './common/logger';
 // eslint-disable-next-line camelcase
 import { ClientEvent, ClientMetaData, ClientSample, PeerConnectionSample, ClientIssue, ExtensionStat } from './schema/ClientSample';
-import * as MetaData from './schema/ClientMetaTypes';
-import { ClientEventTypes } from './schema/ClientEventTypes';
+import * as MetaData from './schema/metaTypes';
+import { ClientEventType } from './schema/eventTypes';
 import { ObservedCall } from './ObservedCall';
-import { ClientMetaTypes } from './schema/ClientMetaTypes';
+import { ClientMetaType } from './schema/metaTypes';
 import { parseJsonAs } from './common/utils';
 import { CalculatedScore } from './scores/CalculatedScore';
 import { Detectors } from './detectors/Detectors';
@@ -27,8 +27,6 @@ export type ObservedClientEvents = {
 	];
 	close: [];
 	joined: [];
-	issue: [ClientIssue];
-	metaData: [ClientMetaData];
 	rejoined: [timestamp: number];
 	left: [];
 	usingturn: [boolean];
@@ -74,43 +72,33 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 	public usingTURN = false;
 	public availableOutgoingBitrate = 0;
 	public availableIncomingBitrate = 0;
-	public totalInboundPacketsLost = 0;
-	public totalInboundPacketsReceived = 0;
-	public totalOutboundPacketsSent = 0;
-	public totalDataChannelBytesSent = 0;
-	public totalDataChannelBytesReceived = 0;
-	public totalDataChannelMessagesSent = 0;
-	public totalDataChannelMessagesReceived = 0;
-	public totalSentBytes = 0;
-	public totalReceivedBytes = 0;
-	public totalReceivedAudioBytes = 0;
-	public totalReceivedVideoBytes = 0;
-	public totalSentAudioBytes = 0;
-	public totalSentVideoBytes = 0;
-
-	public deltaReceivedAudioBytes = 0;
-	public deltaReceivedVideoBytes = 0;
-	public deltaSentAudioBytes = 0;
-	public deltaSentVideoBytes = 0;
-	public deltaDataChannelBytesSent = 0;
-	public deltaDataChannelBytesReceived = 0;
-	public deltaDataChannelMessagesSent = 0;
-	public deltaDataChannelMessagesReceived = 0;
-	public deltaInboundPacketsLost = 0;
-	public deltaInboundPacketsReceived = 0;
-	public deltaOutboundPacketsSent = 0;
+	// public totalInboundPacketsLost = 0;
+	// public totalInboundPacketsReceived = 0;
+	// public totalOutboundPacketsSent = 0;
+	// public totalDataChannelBytesSent = 0;
+	// public totalDataChannelBytesReceived = 0;
+	// public totalSentBytes = 0;
+	// public totalReceivedBytes = 0;
+	// public totalReceivedAudioBytes = 0;
+	// public totalReceivedVideoBytes = 0;
+	// public totalSentAudioBytes = 0;
+	// public totalSentVideoBytes = 0;
+
+	// public deltaReceivedAudioBytes = 0;
+	// public deltaReceivedVideoBytes = 0;
+	// public deltaSentAudioBytes = 0;
+	// public deltaSentVideoBytes = 0;
+	// public deltaDataChannelBytesSent = 0;
+	// public deltaDataChannelBytesReceived = 0;
+	// public deltaInboundPacketsLost = 0;
+	// public deltaInboundPacketsReceived = 0;
+	// public deltaOutboundPacketsSent = 0;
 
 	public avgRttInMs?: number;
-	public sendingAudioBitrate = 0;
-	public sendingVideoBitrate = 0;
-	public receivingAudioBitrate = 0;
-	public receivingVideoBitrate = 0;
-
-	public numberOfInboundRtpStreams = 0;
-	public numberOfInbundTracks = 0;
-	public numberOfOutboundRtpStreams = 0;
-	public numberOfOutboundTracks = 0;
-	public numberOfDataChannels = 0;
+	public outboundAudioBitrate?: number;
+	public outboundVideoBitrate?: number;
+	public inboundAudioBitrate?: number;
+	public inboundVideoBitrate?: number;
 
 	public readonly mediaDevices: MetaData.MediaDeviceInfo[] = [];
 	public issues: ClientIssue[] = [];
@@ -124,10 +112,6 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		this.detectors = new Detectors();
 	}
 
-	public get numberOfPeerConnections() {
-		return this.observedPeerConnections.size;
-	}
-
 	public get score() { 
 		return this.calculatedScore.value; 
 	}
@@ -145,57 +129,16 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		if (this.closed) throw new Error(`Client ${this.clientId} is closed`);
 
 		const now = Date.now();
-		const elapsedInMs = now - this.updated;
-		const elapsedInSeconds = elapsedInMs / 1000;
-
-		++this.acceptedSamples;
-		
-		this.availableIncomingBitrate = 0;
-		this.availableOutgoingBitrate = 0;
-		this.deltaDataChannelBytesReceived = 0;
-		this.deltaDataChannelBytesSent = 0;
-		this.deltaDataChannelMessagesReceived = 0;
-		this.deltaDataChannelMessagesSent = 0;
-		this.deltaInboundPacketsLost = 0;
-		this.deltaInboundPacketsReceived = 0;
-		this.deltaOutboundPacketsSent = 0;
-		this.deltaReceivedAudioBytes = 0;
-		this.deltaReceivedVideoBytes = 0;
-		this.deltaSentAudioBytes = 0;
-		this.deltaSentVideoBytes = 0;
-
-		this.numberOfDataChannels = 0;
-		this.numberOfInboundRtpStreams = 0;
-		this.numberOfInbundTracks = 0;
-		this.numberOfOutboundRtpStreams = 0;
-		this.numberOfOutboundTracks = 0;
 
 		sample.clientEvents?.forEach(this._processClientEvent.bind(this));
 		sample.clientMetaItems?.forEach(this.processMetadata.bind(this));
-		sample.clientIssues?.forEach(this.addIssue.bind(this));
+		sample.clientIssues?.forEach(this.processIssue.bind(this));
 		sample.peerConnections?.forEach(this._updatePeerConnection.bind(this));
-		sample.extensionStats?.forEach(this.addExtensionStats.bind(this));
+		sample.extensionStats?.forEach(this.processExtensionStats.bind(this));
 
 		// emit new attachments?
 		this.attachments = sample.attachments;
 
-		this.totalDataChannelBytesReceived += this.deltaDataChannelBytesReceived;
-		this.totalDataChannelBytesSent += this.deltaDataChannelBytesSent;
-		this.totalDataChannelMessagesReceived += this.deltaDataChannelMessagesReceived;
-		this.totalDataChannelMessagesSent += this.deltaDataChannelMessagesSent;
-		this.totalInboundPacketsLost += this.deltaInboundPacketsLost;
-		this.totalInboundPacketsReceived += this.deltaInboundPacketsReceived;
-		this.totalOutboundPacketsSent += this.deltaOutboundPacketsSent;
-		this.totalReceivedAudioBytes += this.deltaReceivedAudioBytes;
-		this.totalReceivedVideoBytes += this.deltaReceivedVideoBytes;
-		this.totalSentAudioBytes += this.deltaSentAudioBytes;
-		this.totalSentVideoBytes += this.deltaSentVideoBytes;
-
-		this.receivingAudioBitrate = (this.deltaReceivedAudioBytes * 8) / (elapsedInSeconds);
-		this.receivingVideoBitrate = (this.totalReceivedVideoBytes * 8) / (elapsedInSeconds);
-		this.sendingAudioBitrate = (this.deltaSentAudioBytes * 8) / (elapsedInSeconds);
-		this.sendingVideoBitrate = (this.deltaSentVideoBytes * 8) / (elapsedInSeconds);
-
 		this.calculatedScore.value = sample.score;
 		this.detectors.update();
 
@@ -209,15 +152,15 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 
 	private _processClientEvent(event: ClientEvent) {
 		switch (event.type) {
-			case ClientEventTypes.CALL_STARTED: {
+			case ClientEventType.CALL_STARTED: {
 				// update call timestamp if it's the first time
 				break;
 			}
-			case ClientEventTypes.CALL_ENDED: {
+			case ClientEventType.CALL_ENDED: {
 				// update call timestamp if it's the first time
 				break;
 			}
-			case ClientEventTypes.CLIENT_JOINED: {
+			case ClientEventType.CLIENT_JOINED: {
 				if (event.timestamp) {
 					if (!this.joinedAt) {
 						this.joinedAt = event.timestamp;
@@ -231,7 +174,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				}
 				break;
 			}
-			case ClientEventTypes.CLIENT_LEFT: {
+			case ClientEventType.CLIENT_LEFT: {
 				if (event.timestamp) {
 					if (!this.leftAt) {
 						this.leftAt = event.timestamp;
@@ -242,39 +185,54 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 			}
 		}
 
-		this.call.observer.emit('client-event', this, event);
+		this.call.observer.processors.events.process({
+			call: this.call,
+			client: this,
+			data: event,
+		});
 	}
 
 	public processMetadata(metadata: ClientMetaData) {
 		switch (metadata.type) {
-			case ClientMetaTypes.BROWSER: {
+			case ClientMetaType.BROWSER: {
 				this.browser = parseJsonAs(metadata.payload);
 				break;
 			}
-			case ClientMetaTypes.ENGINE: {
+			case ClientMetaType.ENGINE: {
 				this.engine = parseJsonAs(metadata.payload);
 				break;
 			}
-			case ClientMetaTypes.PLATFORM: {
+			case ClientMetaType.PLATFORM: {
 				this.platform = parseJsonAs(metadata.payload);
 				break;
 			}
-			case ClientMetaTypes.OPERATION_SYSTEM: {
+			case ClientMetaType.OPERATION_SYSTEM: {
 				this.operationSystem = parseJsonAs(metadata.payload);
 				break;
 			}
 		}
 
-		this.call.observer.emit('client-metadata', this, metadata);
+		this.call.observer.processors.metaData.process({
+			call: this.call,
+			client: this,
+			data: metadata,
+		});
 	}
 
-	public addIssue(issue: ClientIssue) {
-		this.emit('issue', issue);
-		this.call.observer.emit('client-issue', this, issue);
+	public processIssue(issue: ClientIssue) {
+		this.call.observer.processors.issues.process({
+			call: this.call,
+			client: this,
+			data: issue,
+		});
 	}
 
-	public addExtensionStats(stats: ExtensionStat) {
-		this.call.observer.emit('client-extension-stats', this, stats);
+	public processExtensionStats(stats: ExtensionStat) {
+		this.call.observer.processors.extensionStats.process({
+			call: this.call,
+			client: this,
+			data: stats,
+		});
 	}
 
 	private _updatePeerConnection(sample: PeerConnectionSample) {
@@ -294,31 +252,8 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 				this.observedPeerConnections.delete(sample.peerConnectionId);
 			});
 			this.observedPeerConnections.set(sample.peerConnectionId, observedPeerConnection);
-			
-			this.emit('newpeerconnection', observedPeerConnection);
 		}
 
 		observedPeerConnection.accept(sample);
-
-		this.deltaDataChannelBytesReceived += observedPeerConnection.deltaDataChannelBytesReceived;
-		this.deltaDataChannelBytesSent += observedPeerConnection.deltaDataChannelBytesSent;
-		this.deltaDataChannelMessagesReceived += observedPeerConnection.deltaDataChannelMessagesReceived;
-		this.deltaDataChannelMessagesSent += observedPeerConnection.deltaDataChannelMessagesSent;
-		this.deltaInboundPacketsLost += observedPeerConnection.deltaInboundPacketsLost;
-		this.deltaInboundPacketsReceived += observedPeerConnection.deltaInboundPacketsReceived;
-		this.deltaOutboundPacketsSent += observedPeerConnection.deltaOutboundPacketsSent;
-		this.deltaReceivedAudioBytes += observedPeerConnection.deltaReceivedAudioBytes;
-		this.deltaReceivedVideoBytes += observedPeerConnection.deltaReceivedVideoBytes;
-		this.deltaSentAudioBytes += observedPeerConnection.deltaSentAudioBytes;
-		this.deltaSentVideoBytes += observedPeerConnection.deltaSentVideoBytes;
-
-		this.availableIncomingBitrate += observedPeerConnection.availableIncomingBitrate;
-		this.availableOutgoingBitrate += observedPeerConnection.availableOutgoingBitrate;
-
-		this.numberOfDataChannels += observedPeerConnection.observedDataChannels.size;
-		this.numberOfInbundTracks += observedPeerConnection.observedInboundTracks.size;
-		this.numberOfOutboundRtpStreams += observedPeerConnection.observedOutboundRtps.size;
-		this.numberOfOutboundTracks += observedPeerConnection.observedOutboundTracks.size;
-		this.numberOfInboundRtpStreams += observedPeerConnection.observedInboundRtps.size;
 	}
 }

package/src/ObservedDataChannel.ts

@@ -16,11 +16,6 @@ export class ObservedDataChannel implements DataChannelStats	{
 	bytesReceived?: number | undefined;
 	attachments?: Record<string, unknown> | undefined;
 
-	public deltaBytesSent = 0;
-	public deltaBytesReceived = 0;
-	public deltaMessagesSent = 0;
-	public deltaMessagesReceived = 0;
-
 	public appData?: Record<string, unknown>;
 
 	public constructor(
@@ -45,30 +40,6 @@ export class ObservedDataChannel implements DataChannelStats	{
 	public update(stats: DataChannelStats) {
 		this._visited = true;
 
-		if (this.messagesSent && stats.messagesSent && stats.messagesSent >= this.messagesSent) {
-			this.deltaMessagesSent = stats.messagesSent - this.messagesSent;
-		} else {
-			this.deltaMessagesSent = 0;
-		}
-
-		if (this.messagesReceived && stats.messagesReceived && stats.messagesReceived >= this.messagesReceived) {
-			this.deltaMessagesReceived = stats.messagesReceived - this.messagesReceived;
-		} else {
-			this.deltaMessagesReceived = 0;
-		}
-
-		if (this.bytesSent && stats.bytesSent && stats.bytesSent >= this.bytesSent) {
-			this.deltaBytesSent = stats.bytesSent - this.bytesSent;
-		} else {
-			this.deltaBytesSent = 0;
-		}
-
-		if (this.bytesReceived && stats.bytesReceived && stats.bytesReceived >= this.bytesReceived) {
-			this.deltaBytesReceived = stats.bytesReceived - this.bytesReceived;
-		} else {
-			this.deltaBytesReceived = 0;
-		}
-
 		this.label = stats.label;
 		this.protocol = stats.protocol;
 		this.dataChannelIdentifier = stats.dataChannelIdentifier;

package/src/ObservedIceCandidatePair.ts

@@ -29,11 +29,6 @@ export class ObservedIceCandidatePair implements IceCandidatePairStats {
 	bytesDiscardedOnSend?: number | undefined;
 	attachments?: Record<string, unknown> | undefined;
 
-	public deltaBytesSent = 0;
-	public deltaBytesReceived = 0;
-	public deltaPacketsSent = 0;
-	public deltaPacketsReceived = 0;
-
 	public constructor(
 		public timestamp: number,
 		public id: string,
@@ -68,27 +63,6 @@ export class ObservedIceCandidatePair implements IceCandidatePairStats {
 	public update(stats: IceCandidatePairStats) {
 		this._visited = true;
 
-		if (this.packetsSent && stats.packetsSent && stats.packetsSent >= this.packetsSent) {
-			this.deltaPacketsSent = stats.packetsSent - this.packetsSent;
-		} else {
-			this.deltaPacketsSent = 0;
-		}
-		if (this.packetsReceived && stats.packetsReceived && stats.packetsReceived >= this.packetsReceived) {
-			this.deltaPacketsReceived = stats.packetsReceived - this.packetsReceived;
-		} else {
-			this.deltaPacketsReceived = 0;
-		}
-		if (this.bytesSent && stats.bytesSent && stats.bytesSent >= this.bytesSent) {
-			this.deltaBytesSent = stats.bytesSent - this.bytesSent;
-		} else {
-			this.deltaBytesSent = 0;
-		}
-		if (this.bytesReceived && stats.bytesReceived && stats.bytesReceived >= this.bytesReceived) {
-			this.deltaBytesReceived = stats.bytesReceived - this.bytesReceived;
-		} else {
-			this.deltaBytesReceived = 0;
-		}
-
 		this.timestamp = stats.timestamp;
 		this.transportId = stats.transportId;
 		this.localCandidateId = stats.localCandidateId;

package/src/ObservedPeerConnection.ts

@@ -19,7 +19,6 @@ import { ObservedRemoteOutboundRtp } from './ObservedRemoteOutboundRtp';
 import { ObservedInboundTrack } from './ObservedInboundTrack';
 import { ObservedOutboundTrack } from './ObservedOutboundTrack';
 import { CalculatedScore } from './scores/CalculatedScore';
-import { ObservedTurnServer } from './ObservedTurnServer';
 
 const logger = createLogger('ObservedPeerConnection');
 
@@ -71,7 +70,7 @@ export type ObservedPeerConnectionEvents = {
 	'removed-peer-connection-transport': [ObservedPeerConnectionTransport];
 	'removed-remote-inbound-rtp': [ObservedRemoteInboundRtp];
 	'removed-remote-outbound-rtp': [ObservedRemoteOutboundRtp];
-	'update': [],
+
 	close: [];
 };
 
@@ -107,15 +106,11 @@ export class ObservedPeerConnection extends EventEmitter {
 	public closedAt?: number;
 	public updated = Date.now();
 
-	public availableIncomingBitrate = 0;
-	public availableOutgoingBitrate = 0;
 	public totalInboundPacketsLost = 0;
 	public totalInboundPacketsReceived = 0;
 	public totalOutboundPacketsSent = 0;
 	public totalDataChannelBytesSent = 0;
 	public totalDataChannelBytesReceived = 0;
-	public totalDataChannelMessagesSent = 0;
-	public totalDataChannelMessagesReceived = 0;
 
 	public totalSentAudioBytes = 0;
 	public totalSentVideoBytes = 0;
@@ -131,8 +126,6 @@ export class ObservedPeerConnection extends EventEmitter {
 	public deltaOutboundPacketsSent = 0;
 	public deltaDataChannelBytesSent = 0;
 	public deltaDataChannelBytesReceived = 0;
-	public deltaDataChannelMessagesSent = 0;
-	public deltaDataChannelMessagesReceived = 0;
 	public deltaInboundReceivedBytes = 0;
 	public deltaOutboundSentBytes = 0;
 
@@ -156,7 +149,6 @@ export class ObservedPeerConnection extends EventEmitter {
 	public usingTCP = false;
 	public usingTURN = false;
 
-	public observedTurnServer?: ObservedTurnServer;
 	public readonly observedCertificates = new Map<string, ObservedCertificate>();
 	public readonly observedCodecs = new Map<string, ObservedCodec>();
 	public readonly observedDataChannels = new Map<string, ObservedDataChannel>();
@@ -247,14 +239,6 @@ export class ObservedPeerConnection extends EventEmitter {
 			.filter((pair) => pair !== undefined) as ObservedIceCandidatePair[];
 	}
 
-	public get selectedIceCandiadtePairForTurn() {
-		return this.selectedIceCandidatePairs
-			.filter((pair) => 
-				pair.getLocalCandidate()?.candidateType === 'relay' && 
-				pair.getRemoteCandidate()?.url?.startsWith('turn:')
-			);
-	}
-
 	public close() {
 		if (this.closed) return;
 		this.closed = true;
@@ -275,8 +259,6 @@ export class ObservedPeerConnection extends EventEmitter {
 		this.observedRemoteInboundRtps.clear();
 		this.observedRemoteOutboundRtps.clear();
 
-		this.client.call.observer.observedTURN.removePeerConnection(this);
-		
 		this.emit('close');
 	}
 
@@ -284,8 +266,6 @@ export class ObservedPeerConnection extends EventEmitter {
 		if (this.closed) return;
 		this._visited = true;
 
-		this.availableIncomingBitrate = 0;
-		this.availableOutgoingBitrate = 0;
 		this.deltaInboundPacketsLost = 0;
 		this.deltaInboundPacketsReceived = 0;
 		this.deltaOutboundPacketsSent = 0;
@@ -307,8 +287,6 @@ export class ObservedPeerConnection extends EventEmitter {
 		const now = Date.now();
 		const elapsedTimeInMs = now - this.updated;
 		const elapsedTimeInSec = elapsedTimeInMs / 1000;
-		const rttMeasurementsInSec: number[] = [];
-		const jitterMeasurements: number[] = [];
 
 		if (sample.certificates) {
 			for (const certificate of sample.certificates) {
@@ -322,14 +300,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		}
 		if (sample.dataChannels) {
 			for (const dataChannel of sample.dataChannels) {
-				const observedDataChannel = this._updateDataChannelStats(dataChannel);
-
-				if (!observedDataChannel) continue;
-
-				this.deltaDataChannelBytesSent += observedDataChannel.deltaBytesSent;
-				this.deltaDataChannelBytesReceived += observedDataChannel.deltaBytesReceived;
-				this.deltaDataChannelMessagesSent += observedDataChannel.deltaMessagesSent;
-				this.deltaDataChannelMessagesReceived += observedDataChannel.deltaMessagesReceived;
+				this._updateDataChannelStats(dataChannel);
 			}
 		}
 		if (sample.iceCandidates) {
@@ -339,19 +310,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		}
 		if (sample.iceCandidatePairs) {
 			for (const iceCandidatePair of sample.iceCandidatePairs) {
-				const observedCandidatePair = this._updateIceCandidatePairStats(iceCandidatePair);
-
-				if (!observedCandidatePair) continue;
-
-				if (observedCandidatePair.currentRoundTripTime) {
-					rttMeasurementsInSec.push(observedCandidatePair.currentRoundTripTime);
-				}
-				if (observedCandidatePair.availableIncomingBitrate) {
-					this.availableIncomingBitrate += observedCandidatePair.availableIncomingBitrate;
-				}
-				if (observedCandidatePair.availableOutgoingBitrate) {
-					this.availableOutgoingBitrate += observedCandidatePair.availableOutgoingBitrate;
-				}
+				this._updateIceCandidatePairStats(iceCandidatePair);
 			}
 		}
 		if (sample.iceTransports) {
@@ -379,10 +338,6 @@ export class ObservedPeerConnection extends EventEmitter {
 						this.deltaReceivedVideoPackets += observedInboundRtp.deltaReceivedPackets;
 						break;
 				}
-
-				if (observedInboundRtp.jitter) {
-					jitterMeasurements.push(observedInboundRtp.jitter);
-				}
 			}
 		}
 		if (sample.mediaPlayouts) {
@@ -424,13 +379,7 @@ export class ObservedPeerConnection extends EventEmitter {
 		}
 		if (sample.remoteInboundRtps) {
 			for (const remoteInboundRtp of sample.remoteInboundRtps) {
-				const observedRemoteInboundRtp = this._updateRemoteInboundRtpStats(remoteInboundRtp);
-
-				if (!observedRemoteInboundRtp) continue;
-
-				if (observedRemoteInboundRtp.roundTripTime) {
-					rttMeasurementsInSec.push(observedRemoteInboundRtp.roundTripTime);
-				}
+				this._updateRemoteInboundRtpStats(remoteInboundRtp);
 			}
 		}
 		if (sample.remoteOutboundRtps) {
@@ -459,8 +408,6 @@ export class ObservedPeerConnection extends EventEmitter {
 		this.totalOutboundPacketsSent += this.deltaOutboundPacketsSent;
 		this.totalDataChannelBytesSent += this.deltaDataChannelBytesSent;
 		this.totalDataChannelBytesReceived += this.deltaDataChannelBytesReceived;
-		this.totalDataChannelMessagesSent += this.deltaDataChannelMessagesSent;
-		this.totalDataChannelMessagesReceived += this.deltaDataChannelMessagesReceived;
 		this.totalReceivedAudioBytes += this.deltaReceivedAudioBytes;
 		this.totalReceivedVideoBytes += this.deltaReceivedVideoBytes;
 		this.totalSentAudioBytes += this.deltaSentAudioBytes;
@@ -472,47 +419,20 @@ export class ObservedPeerConnection extends EventEmitter {
 
 		this.receivingPacketsPerSecond = this.deltaInboundPacketsReceived / elapsedTimeInSec;
 		this.sendingPacketsPerSecond = this.deltaOutboundPacketsSent / elapsedTimeInSec;
-		this.sendingAudioBitrate = (this.deltaSentAudioBytes * 8) / elapsedTimeInSec;
-		this.sendingVideoBitrate = (this.deltaSentVideoBytes * 8) / elapsedTimeInSec;
-		this.receivingAudioBitrate = (this.deltaReceivedAudioBytes * 8) / elapsedTimeInSec;
-		this.receivingVideoBitrate = (this.deltaReceivedVideoBytes * 8) / elapsedTimeInSec;
-
-		if (rttMeasurementsInSec.length > 0) {
-			this.avgRttInMs = rttMeasurementsInSec.reduce((acc, val) => acc + val, 0) / rttMeasurementsInSec.length;
-		} else {
-			this.avgRttInMs = undefined;
-		}
-		if (jitterMeasurements.length > 0) {
-			this.avgJitter = jitterMeasurements.reduce((acc, val) => acc + val, 0) / jitterMeasurements.length;
-		} else {
-			this.avgJitter = undefined;
-		}
+		this.sendingAudioBitrate = this.deltaSentAudioBytes * 8 / elapsedTimeInSec;
+		this.sendingVideoBitrate = this.deltaSentVideoBytes * 8 / elapsedTimeInSec;
+		this.receivingAudioBitrate = this.deltaReceivedAudioBytes * 8 / elapsedTimeInSec;
+		this.receivingVideoBitrate = this.deltaReceivedVideoBytes * 8 / elapsedTimeInSec;
 
 		const selectedIceCandidatePairs = this.selectedIceCandidatePairs;
-		const selectedCandidatePairForTurn = selectedIceCandidatePairs.filter((pair) =>
-			pair.getLocalCandidate()?.candidateType === 'relay' &&
-			pair.getRemoteCandidate()?.url?.startsWith('turn:')
-		);
-		const wasUsingTURN = this.usingTURN;
 
 		this.usingTCP = selectedIceCandidatePairs.some((pair) => pair.getLocalCandidate()?.protocol === 'tcp');
-		this.usingTURN = 0 < selectedCandidatePairForTurn.length;
+		this.usingTURN = selectedIceCandidatePairs.some((pair) => pair.getLocalCandidate()?.candidateType === 'relay') &&
+			selectedIceCandidatePairs.some((pair) => pair.getRemoteCandidate()?.url?.startsWith('turn:'));
 
-		if (this.usingTURN) {
-			if (!this.observedTurnServer) {
-				this.observedTurnServer = this.client.call.observer.observedTURN.addPeerConnection(this);
-			}
-			this.observedTurnServer?.updateTurnUsage(...selectedCandidatePairForTurn);
-		} else if (wasUsingTURN) {
-			if (!this.usingTURN) {
-				this.client.call.observer.observedTURN.removePeerConnection(this);
-			}
-		}
 		this.calculatedScore.value = sample.score;
 		this.updated = now;
 		this._checkVisited();
-
-		this.emit('update');
 	}
 
 	private _checkVisited() {