@observertc/observer-js 0.30.6-beta → 0.40.1-beta

package/src/ObservedClient.ts

@@ -1,38 +1,30 @@
-import { ClientSample, IceLocalCandidate, IceRemoteCandidate } from '@observertc/sample-schemas-js';
+import { Browser, ClientSample, Engine, IceLocalCandidate, IceRemoteCandidate, OperationSystem, Platform } from '@observertc/sample-schemas-js';
 import { ObservedCall } from './ObservedCall';
-import * as Models from './models/Models';
-import { StorageProvider } from './storages/StorageProvider';
 import { EventEmitter } from 'events';
-import { createSingleExecutor } from './common/SingleExecutor';
 import { ObservedPeerConnection } from './ObservedPeerConnection';
 import { createLogger } from './common/logger';
 import { CallMetaType, createCallMetaReport } from './common/callMetaReports';
 // eslint-disable-next-line camelcase
-import { Samples_ClientSample_Browser, Samples_ClientSample_Engine, Samples_ClientSample_OperationSystem, Samples_ClientSample_Platform } from './models/samples_pb';
 import { isValidUuid } from './common/utils';
-import { createClientJoinedEventReport, createClientLeftEventReport } from './common/callEventReports';
+import { createClientLeftEventReport } from './common/callEventReports';
 import { CallEventType } from './common/CallEventType';
 
 const logger = createLogger('ObservedClient');
 
-export type ObservedClientConfig<AppData extends Record<string, unknown> = Record<string, unknown>> = {
-	callId: string;
+export type ObservedClientModel= {
 	clientId: string;
 	mediaUnitId: string;
-	appData: AppData;
-	overflowingProcessingThreshold?: number;
-	joined?: number,
-
-	/**
-	 * before client-monitor-js 3.4.0 the client joined event was generated by the observer, this flag is to keep the compatibility with the old behavior
-	 */
-	addJoinAndDetachClientEvent?: boolean;
+	userId?: string,
+	marker?: string,
+	operationSystem?: OperationSystem,
+	engine?: Engine,
+	platform?: Platform,
+	browser?: Browser,
 };
 
 export type ObservedClientEvents = {
 	update: [],
 	close: [],
-	'processing-sample-overflow': [],
 	newpeerconnection: [ObservedPeerConnection],
 	iceconnectionstatechange: [{
 		peerConnection: ObservedPeerConnection,
@@ -63,61 +55,18 @@ export declare interface ObservedClient<AppData extends Record<string, unknown>
 }
 
 export class ObservedClient<AppData extends Record<string, unknown> = Record<string, unknown>> extends EventEmitter {
-	public static async create<T extends Record<string, unknown> = Record<string, unknown>>(
-		config: ObservedClientConfig<T>,
-		call: ObservedCall,
-		storageProvider: StorageProvider,
-	) {
-		const { callId, clientId, mediaUnitId } = config;
-
-		const model = new Models.Client({
-			roomId: call.roomId,
-			serviceId: call.serviceId,
-			callId,
-			clientId,
-			mediaUnitId,
-			peerConnectionIds: [],
-			joined: BigInt(config.joined ?? Date.now()),
-		});
-
-		const result = new ObservedClient<T>(model, call, storageProvider, config.appData);
-
-		const alreadyInserted = await storageProvider.clientStorage.insert(clientId, model);
-
-		if (alreadyInserted) throw new Error(`Client with id ${clientId} already exists`);
-
-		result._overflowingProcessingThreshold = config.overflowingProcessingThreshold ?? 0;
-
-		if (config.addJoinAndDetachClientEvent) {
-			call.reports.addCallEventReport(createClientJoinedEventReport(
-				call.serviceId,
-				result.mediaUnitId,
-				call.roomId,
-				call.callId,
-				result.clientId,
-				result.joined,
-				result.userId,
-				result.marker,
-			));
-		}
-
-		return result;
-	}
-
-	public created = Date.now();
+	
+	public readonly created = Date.now();
+	public _updated = Date.now();
 
 	private readonly _peerConnections = new Map<string, ObservedPeerConnection>();
-	private readonly _execute = createSingleExecutor();
 	
-	private _overflowingProcessingThreshold = 0;
 	private _closed = false;
-	private _updated = Date.now();
+	
 	private _acceptedSample = 0;
-	private _processingSample = 0;
 	private _timeZoneOffsetInHours?: number;
 	private _left?: number;
-	private _numberOfAcceptedUpdates = 0;
-
+	
 	public usingTURN = false;
 	public availableOutgoingBitrate = 0;
 	public availableIncomingBitrate = 0;
@@ -140,20 +89,14 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 	public readonly ωpendingCreatedTracksTimestamp = new Map<string, number>();
 	public readonly ωpendingCreatedPeerConnectionTimestamp = new Map<string, number>();
 	
-	private constructor(
-		private readonly _model: Models.Client,
+	public constructor(
+		private readonly _model: ObservedClientModel,
 		public readonly call: ObservedCall,
-		private readonly _storageProvider: StorageProvider,
 		public readonly appData: AppData
 	) {
 		super();
 	}
 
-	public get joined(): number {
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		return Number(this._model.joined!);
-	}
-
 	public get clientId(): string {
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 		return this._model.clientId!;
@@ -161,17 +104,17 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 
 	public get roomId() {
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		return this._model.roomId!;
+		return this.call.roomId!;
 	}
 
 	public get serviceId() {
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		return this._model.serviceId!;
+		return this.call.serviceId!;
 	}
 
 	public get callId() {
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		return this._model.callId!;
+		return this.call.callId!;
 	}
 
 	public get mediaUnitId() {
@@ -219,20 +162,6 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		return this._updated;
 	}
 
-	public get numberOfAcceptedUpdates() {
-		return this._numberOfAcceptedUpdates;
-	}
-
-	public get uptimeInMs() {
-		return this._updated - this.created;
-	}
-
-	public get durationInMs(): number | undefined {
-		if (!this._left) return;
-		
-		return this._left - this.joined;
-	}
-
 	public get closed() {
 		return this._closed;
 	}
@@ -245,600 +174,546 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		if (this._closed) return;
 		this._closed = true;
 
-		!this._left && this._addClientLeftReport();
+		if (!this._left) {
+			this._addClientLeftReport();
+		}
 
 		Array.from(this._peerConnections.values()).forEach((peerConnection) => peerConnection.close());
 
-		this._execute(() => this._storageProvider.clientStorage.remove(this.clientId))
-			.catch(() => void 0)
-			.finally(() => this.emit('close'));
+		this.emit('close');
 	}
 
-	public async accept(sample: ClientSample): Promise<void> {
+	public accept(sample: ClientSample): void {
 		if (this._closed) throw new Error(`Client ${this.clientId} is closed`);
 		if (sample.clientId && sample.clientId !== 'NULL' && sample.clientId !== this.clientId) {
 			throw new Error(`Sample client id (${sample.clientId}) does not match the client id of the observed client (${this.clientId})`);
 		}
+		const now = Date.now();
+
 		++this._acceptedSample;
-		++this._processingSample;
 		
-		if (0 < this._overflowingProcessingThreshold && this._overflowingProcessingThreshold < this._processingSample) {
-			this.emit('processing-sample-overflow');
+		for (const peerConnection of this._peerConnections.values()) {
+			if (peerConnection.closed) continue;
+			peerConnection.resetMetrics();
 		}
 
-		return this._execute(async () => {
-			++this._numberOfAcceptedUpdates;
-			
-			for (const peerConnection of this._peerConnections.values()) {
-				if (peerConnection.closed) continue;
-				peerConnection.resetMetrics();
-			}
-
-			let executeSave = false;
-
-			if (this.userId !== sample.userId) {
-				this._model.userId = sample.userId;
-				executeSave = true;
-			}
-			if (this._model.marker !== sample.marker) {
-				this._model.marker = sample.marker;
-				executeSave = true;
-			}
+		if (this.userId !== sample.userId) {
+			this._model.userId = sample.userId;
+		}
+		if (this._model.marker !== sample.marker) {
+			this._model.marker = sample.marker;
+		}
 
-			if (this._timeZoneOffsetInHours !== sample.timeZoneOffsetInHours) {
-				this._timeZoneOffsetInHours = sample.timeZoneOffsetInHours;
-				executeSave = true;
-			}
+		if (this._timeZoneOffsetInHours !== sample.timeZoneOffsetInHours) {
+			this._timeZoneOffsetInHours = sample.timeZoneOffsetInHours;
+		}
 
-			if (sample.os && (
-				this._model.operationSystem?.name !== sample.os.name || 
+		if (sample.os && (
+			this._model.operationSystem?.name !== sample.os.name || 
 				this._model.operationSystem?.version !== sample.os.version ||
 				this._model.operationSystem?.versionName !== sample.os.versionName
-			)) {
-				this._model.operationSystem = new Samples_ClientSample_OperationSystem({
-					...sample.os,
-				});
+		)) {
+			this._model.operationSystem = sample.os;
 				
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, 
-					{
-						type: CallMetaType.OPERATION_SYSTEM,
-						payload: sample.os,
-					}, this.userId);
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, 
+				{
+					type: CallMetaType.OPERATION_SYSTEM,
+					payload: sample.os,
+				}, this.userId);
 	
-				this.reports.addCallMetaReport(callMetaReport);
-				executeSave = true;
-			}
+			this.reports.addCallMetaReport(callMetaReport);
+		}
 
-			if (sample.engine && (
-				this._model.engine?.name !== sample.engine.name || 
+		if (sample.engine && (
+			this._model.engine?.name !== sample.engine.name || 
 				this._model.engine?.version !== sample.engine.version
-			)) {
-				this._model.engine = new Samples_ClientSample_Engine({
-					...sample.engine,
-				});
+		)) {
+			this._model.engine = sample.engine;
 	
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, 
-					{
-						type: CallMetaType.ENGINE,
-						payload: sample.engine,
-					}, this.userId);
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, 
+				{
+					type: CallMetaType.ENGINE,
+					payload: sample.engine,
+				}, this.userId);
 	
-				this.reports.addCallMetaReport(callMetaReport);
-				executeSave = true;
-			}
+			this.reports.addCallMetaReport(callMetaReport);
+		}
 
-			if (sample.platform && (
-				this._model.platform?.model !== sample.platform.model || 
+		if (sample.platform && (
+			this._model.platform?.model !== sample.platform.model || 
 				this._model.platform?.type !== sample.platform.type ||
 				this._model.platform?.vendor !== sample.platform.vendor
-			)) {
-				this._model.platform = new Samples_ClientSample_Platform({
-					...sample.platform,
-				});
+		)) {
+			this._model.platform = sample.platform;
 	
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, 
-					{
-						type: CallMetaType.PLATFORM,
-						payload: sample.platform,
-					}, this.userId);
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, 
+				{
+					type: CallMetaType.PLATFORM,
+					payload: sample.platform,
+				}, this.userId);
 	
-				this.reports.addCallMetaReport(callMetaReport);
-				executeSave = true;
-			}
+			this.reports.addCallMetaReport(callMetaReport);
+		}
 
-			if (sample.browser && (
-				this._model.browser?.name !== sample.browser.name || 
+		if (sample.browser && (
+			this._model.browser?.name !== sample.browser.name || 
 				this._model.browser?.version !== sample.browser.version
-			)) {
-				this._model.browser = new Samples_ClientSample_Browser({
-					...sample.browser,
-				});
+		)) {
+			this._model.browser = sample.browser;
 	
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, 
-					{
-						type: CallMetaType.BROWSER,
-						payload: sample.browser,
-					}, this.userId);
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, 
+				{
+					type: CallMetaType.BROWSER,
+					payload: sample.browser,
+				}, this.userId);
 	
-				this.reports.addCallMetaReport(callMetaReport);
-				executeSave = true;
-			}
-
-			for (const mediaConstraint of sample.mediaConstraints ?? []) {
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, 
-					{
-						type: CallMetaType.MEDIA_CONSTRAINT,
-						payload: mediaConstraint,
-					}, this.userId);
-
-				this.reports.addCallMetaReport(callMetaReport);
-			}
+			this.reports.addCallMetaReport(callMetaReport);
+		}
 
-			for (const localSDP of sample.localSDPs ?? []) {
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, 
-					{
-						type: CallMetaType.LOCAL_SDP,
-						payload: localSDP,
-					}, this.userId);
-
-				this.reports.addCallMetaReport(callMetaReport);
-			}
+		for (const mediaConstraint of sample.mediaConstraints ?? []) {
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, 
+				{
+					type: CallMetaType.MEDIA_CONSTRAINT,
+					payload: mediaConstraint,
+				}, this.userId);
+
+			this.reports.addCallMetaReport(callMetaReport);
+		}
 
-			for (const extensionStats of sample.extensionStats ?? []) {
-				this.reports.addClientExtensionReport({
-					serviceId: this.serviceId,
-					mediaUnitId: this.mediaUnitId,
-					roomId: this.roomId,
-					callId: this.callId,
-					clientId: this.clientId,
-					userId: this.userId,
-					timestamp: Date.now(),
-					payload: extensionStats.payload,
-					extensionType: extensionStats.type,
-				});
-			}
+		for (const localSDP of sample.localSDPs ?? []) {
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, 
+				{
+					type: CallMetaType.LOCAL_SDP,
+					payload: localSDP,
+				}, this.userId);
+
+			this.reports.addCallMetaReport(callMetaReport);
+		}
 
-			for (const { timestamp, ...callEvent } of sample.customCallEvents ?? []) {
-				const peerConnection = this._peerConnections.get(callEvent.peerConnectionId ?? '');
-				
-				switch (callEvent.name) {
-					case CallEventType.CLIENT_JOINED:
-						if (timestamp) {
-							this.created = timestamp;
-							this._model.joined = BigInt(timestamp);
-							await this._save();
-						}
-						
-						break;
-					case CallEventType.CLIENT_LEFT:
-						this._left = timestamp ?? Date.now();
-						break;
-					case CallEventType.ICE_CONNECTION_STATE_CHANGED: 
-						peerConnection && callEvent.value && this.emit('iceconnectionstatechange', {
-							peerConnection,
-							state: callEvent.value,
-						});
-						break;
-					case CallEventType.ICE_GATHERING_STATE_CHANGED:
-						peerConnection && callEvent.value && this.emit('icegatheringstatechange', {
-							peerConnection,
-							state: callEvent.value,
-						});
-						break;
-					case CallEventType.PEER_CONNECTION_STATE_CHANGED:
-						peerConnection && callEvent.value && this.emit('connectionstatechange', {
-							peerConnection,
-							state: callEvent.value,
-						});
-						break;
-					case CallEventType.PEER_CONNECTION_OPENED: {
-						if (!callEvent.peerConnectionId) break;
-						if (peerConnection) {
-							peerConnection.created = timestamp ?? peerConnection.created;
-						} else {
-							this.ωpendingCreatedPeerConnectionTimestamp.set(callEvent.peerConnectionId, timestamp ?? Date.now());
-						}
-						break;
-					}
-					case CallEventType.MEDIA_TRACK_ADDED: {
-						if (!callEvent.mediaTrackId) break;
-						const track = peerConnection?.getTrack(callEvent.mediaTrackId);
-
-						if (track) {
-							track.created = timestamp ?? track.created;
-						} else {
-							this.ωpendingCreatedTracksTimestamp.set(callEvent.mediaTrackId, timestamp ?? Date.now());
-						}
-					}
+		for (const extensionStats of sample.extensionStats ?? []) {
+			this.reports.addClientExtensionReport({
+				serviceId: this.serviceId,
+				mediaUnitId: this.mediaUnitId,
+				roomId: this.roomId,
+				callId: this.callId,
+				clientId: this.clientId,
+				userId: this.userId,
+				timestamp: Date.now(),
+				payload: extensionStats.payload,
+				extensionType: extensionStats.type,
+			});
+		}
 
+		for (const { timestamp, ...callEvent } of sample.customCallEvents ?? []) {
+			switch (callEvent.name) {
+				case CallEventType.CLIENT_LEFT: {
+					this._left = timestamp;
+					break;
 				}
-
-				this.reports.addCallEventReport({
-					serviceId: this.serviceId,
-					mediaUnitId: this.mediaUnitId,
-					roomId: this.roomId,
-					callId: this.callId,
-					clientId: this.clientId,
-					userId: this.userId,
-					timestamp: timestamp ?? Date.now(),
-					...callEvent,
-				});
 			}
+			this.reports.addCallEventReport({
+				serviceId: this.serviceId,
+				mediaUnitId: this.mediaUnitId,
+				roomId: this.roomId,
+				callId: this.callId,
+				clientId: this.clientId,
+				userId: this.userId,
+				timestamp: timestamp ?? Date.now(),
+				...callEvent,
+			});
+		}
 
-			for (const userMediaError of sample.userMediaErrors ?? []) {
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, {
-						type: CallMetaType.USER_MEDIA_ERROR,
-						payload: userMediaError,
-					}, this.userId);
-
-				this.reports.addCallMetaReport(callMetaReport);
-				this.userMediaErrors.push(userMediaError);
-			}
+		for (const userMediaError of sample.userMediaErrors ?? []) {
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, {
+					type: CallMetaType.USER_MEDIA_ERROR,
+					payload: userMediaError,
+				}, this.userId);
+
+			this.reports.addCallMetaReport(callMetaReport);
+			this.userMediaErrors.push(userMediaError);
+		}
 
-			for (const certificate of sample.certificates ?? []) {
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, {
-						type: CallMetaType.CERTIFICATE,
-						payload: certificate,
-					}, this.userId);
-
-				this.reports.addCallMetaReport(callMetaReport);
-			}
+		for (const certificate of sample.certificates ?? []) {
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, {
+					type: CallMetaType.CERTIFICATE,
+					payload: certificate,
+				}, this.userId);
+
+			this.reports.addCallMetaReport(callMetaReport);
+		}
 	
-			for (const codec of sample.codecs ?? []) {
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, {
-						type: CallMetaType.CODEC,
-						payload: codec,
-					}, this.userId);
-
-				this.reports.addCallMetaReport(callMetaReport);
-				codec.mimeType && this.codecs.push(codec.mimeType);
-			}
+		for (const codec of sample.codecs ?? []) {
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, {
+					type: CallMetaType.CODEC,
+					payload: codec,
+				}, this.userId);
+
+			this.reports.addCallMetaReport(callMetaReport);
+			codec.mimeType && this.codecs.push(codec.mimeType);
+		}
 	
-			for (const iceServer of sample.iceServers ?? []) {
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, {
-						type: CallMetaType.ICE_SERVER,
-						payload: iceServer,
-					}, this.userId);
-
-				this.reports.addCallMetaReport(callMetaReport);
-			}
+		for (const iceServer of sample.iceServers ?? []) {
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, {
+					type: CallMetaType.ICE_SERVER,
+					payload: iceServer,
+				}, this.userId);
+
+			this.reports.addCallMetaReport(callMetaReport);
+		}
 	
-			for (const mediaDevice of sample.mediaDevices ?? []) {
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, {
-						type: CallMetaType.MEDIA_DEVICE,
-						payload: mediaDevice,
-					}, this.userId);
-
-				this.reports.addCallMetaReport(callMetaReport);
-				mediaDevice.label && this.mediaDevices.push(mediaDevice.label);
-			}
+		for (const mediaDevice of sample.mediaDevices ?? []) {
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, {
+					type: CallMetaType.MEDIA_DEVICE,
+					payload: mediaDevice,
+				}, this.userId);
+
+			this.reports.addCallMetaReport(callMetaReport);
+			mediaDevice.label && this.mediaDevices.push(mediaDevice.label);
+		}
 			
-			for (const mediaSource of sample.mediaSources ?? []) {
-				const callMetaReport = createCallMetaReport(
-					this.serviceId, 
-					this.mediaUnitId, 
-					this.roomId, 
-					this.callId, 
-					this.clientId, {
-						type: CallMetaType.MEDIA_SOURCE,
-						payload: mediaSource,
-					}, this.userId);
-
-				this.reports.addCallMetaReport(callMetaReport);
-			}
+		for (const mediaSource of sample.mediaSources ?? []) {
+			const callMetaReport = createCallMetaReport(
+				this.serviceId, 
+				this.mediaUnitId, 
+				this.roomId, 
+				this.callId, 
+				this.clientId, {
+					type: CallMetaType.MEDIA_SOURCE,
+					payload: mediaSource,
+				}, this.userId);
+
+			this.reports.addCallMetaReport(callMetaReport);
+		}
 
-			for (const transport of sample.pcTransports ?? []) {
-				try {
-					const peerConnection = this._peerConnections.get(transport.transportId) ?? await this._createPeerConnection(transport.peerConnectionId);
+		for (const transport of sample.pcTransports ?? []) {
+			try {
+				const peerConnection = this._peerConnections.get(transport.transportId) ?? this._createPeerConnection(transport.peerConnectionId);
 
-					await peerConnection.update(transport, sample.timestamp); 
-				} catch (err) {
-					logger.error(`Error creating peer connection: ${(err as Error)?.message}`);
-				}
-				
+				!peerConnection.label && transport.label && (peerConnection.label = transport.label);
+				peerConnection.update(transport, sample.timestamp); 
+			} catch (err) {
+				logger.error(`Error creating peer connection: ${(err as Error)?.message}`);
 			}
+				
+		}
 
-			for (const track of sample.inboundAudioTracks ?? []) {
-				if (!track.peerConnectionId || !track.trackId) {
-					logger.warn(`InboundAudioTrack without peerConnectionId or trackId: ${JSON.stringify(track)}`);
+		for (const track of sample.inboundAudioTracks ?? []) {
+			if (!track.peerConnectionId || !track.trackId) {
+				logger.warn(`InboundAudioTrack without peerConnectionId or trackId: ${JSON.stringify(track)}`);
 
-					continue;
-				}
+				continue;
+			}
 
-				try {
-					const peerConnection = this._peerConnections.get(track.peerConnectionId) ?? await this._createPeerConnection(track.peerConnectionId);
+			try {
+				const peerConnection = this._peerConnections.get(track.peerConnectionId) ?? this._createPeerConnection(track.peerConnectionId);
 
-					if (!peerConnection) continue;
+				if (!peerConnection) continue;
 	
-					const inboundAudioTrack = peerConnection.inboundAudioTracks.get(track.trackId) ?? await peerConnection.createInboundAudioTrack({
-						trackId: track.trackId,
-						sfuStreamId: track.sfuStreamId,
-						sfuSinkId: track.sfuSinkId,
-					});
+				const inboundAudioTrack = peerConnection.inboundAudioTracks.get(track.trackId) ?? peerConnection.createInboundAudioTrack({
+					trackId: track.trackId,
+					sfuStreamId: track.sfuStreamId,
+					sfuSinkId: track.sfuSinkId,
+				});
 	
-					await inboundAudioTrack.update(track, sample.timestamp);
+				inboundAudioTrack.update(track, sample.timestamp);
 	
-					const remoteOutboundTrack = this.call.sfuStreamIdToOutboundAudioTrack.get(track.sfuStreamId ?? '');
+				const remoteOutboundTrack = this.call.sfuStreamIdToOutboundAudioTrack.get(track.sfuStreamId ?? '');
 	
-					if (remoteOutboundTrack && inboundAudioTrack.sfuStreamId && !remoteOutboundTrack.remoteInboundTracks.has(inboundAudioTrack.sfuStreamId)) {
-						remoteOutboundTrack.connectInboundTrack(inboundAudioTrack);
-					}
-				} catch (err) {
-					logger.error(`Error creating inbound audio track: ${(err as Error)?.message}`);
+				if (remoteOutboundTrack && inboundAudioTrack.sfuStreamId && !remoteOutboundTrack.remoteInboundTracks.has(inboundAudioTrack.sfuStreamId)) {
+					remoteOutboundTrack.connectInboundTrack(inboundAudioTrack);
 				}
+			} catch (err) {
+				logger.error(`Error creating inbound audio track: ${(err as Error)?.message}`);
 			}
+		}
 
-			for (const track of sample.inboundVideoTracks ?? []) {
-				if (!track.peerConnectionId || !track.trackId) {
-					logger.warn(`InboundVideoTrack without peerConnectionId or trackId: ${JSON.stringify(track)}`);
+		for (const track of sample.inboundVideoTracks ?? []) {
+			if (!track.peerConnectionId || !track.trackId) {
+				logger.warn(`InboundVideoTrack without peerConnectionId or trackId: ${JSON.stringify(track)}`);
 
-					continue;
-				}
-				if (isValidUuid(track.trackId) === false) {
-					// mediasoup-probator trackId is not a valid UUID, no need to warn about it
-					if (track.trackId === 'probator') continue;
-					logger.warn(`InboundVideoTrack with invalid trackId: ${track.trackId}`);
-					continue;
-				}
+				continue;
+			}
+			if (isValidUuid(track.trackId) === false) {
+				// mediasoup-probator trackId is not a valid UUID, no need to warn about it
+				if (track.trackId === 'probator') continue;
+				logger.warn(`InboundVideoTrack with invalid trackId: ${track.trackId}`);
+				continue;
+			}
 
-				try {
-					const peerConnection = this._peerConnections.get(track.peerConnectionId) ?? await this._createPeerConnection(track.peerConnectionId);
+			try {
+				const peerConnection = this._peerConnections.get(track.peerConnectionId) ?? this._createPeerConnection(track.peerConnectionId);
 
-					if (!peerConnection) continue;
+				if (!peerConnection) continue;
 	
-					const inboundVideoTrack = peerConnection.inboundVideoTracks.get(track.trackId) ?? await peerConnection.createInboundVideoTrack({
-						trackId: track.trackId,
-						sfuStreamId: track.sfuStreamId,
-						sfuSinkId: track.sfuSinkId,
-					});
+				const inboundVideoTrack = peerConnection.inboundVideoTracks.get(track.trackId) ?? peerConnection.createInboundVideoTrack({
+					trackId: track.trackId,
+					sfuStreamId: track.sfuStreamId,
+					sfuSinkId: track.sfuSinkId,
+				});
 	
-					await inboundVideoTrack.update(track, sample.timestamp);
+				inboundVideoTrack.update(track, sample.timestamp);
 					
-					const remoteOutboundTrack = this.call.sfuStreamIdToOutboundVideoTrack.get(inboundVideoTrack.sfuStreamId ?? '');
+				const remoteOutboundTrack = this.call.sfuStreamIdToOutboundVideoTrack.get(inboundVideoTrack.sfuStreamId ?? '');
 	
-					if (remoteOutboundTrack && inboundVideoTrack.sfuStreamId && !remoteOutboundTrack.remoteInboundTracks.has(inboundVideoTrack.sfuStreamId)) {
-						remoteOutboundTrack.connectInboundTrack(inboundVideoTrack);
-					}
-				} catch (err) {
-					logger.error(`Error creating inbound video track: ${(err as Error)?.message}`);
+				if (remoteOutboundTrack && inboundVideoTrack.sfuStreamId && !remoteOutboundTrack.remoteInboundTracks.has(inboundVideoTrack.sfuStreamId)) {
+					remoteOutboundTrack.connectInboundTrack(inboundVideoTrack);
 				}
+			} catch (err) {
+				logger.error(`Error creating inbound video track: ${(err as Error)?.message}`);
 			}
+		}
 
-			for (const track of sample.outboundAudioTracks ?? []) {
-				if (!track.peerConnectionId || !track.trackId) {
-					logger.warn(`OutboundAudioTrack without peerConnectionId or trackId: ${JSON.stringify(track)}`);
+		for (const track of sample.outboundAudioTracks ?? []) {
+			if (!track.peerConnectionId || !track.trackId) {
+				logger.warn(`OutboundAudioTrack without peerConnectionId or trackId: ${JSON.stringify(track)}`);
 
-					continue;
-				}
+				continue;
+			}
 
-				try {
-					const peerConnection = this._peerConnections.get(track.peerConnectionId) ?? await this._createPeerConnection(track.peerConnectionId);
+			try {
+				const peerConnection = this._peerConnections.get(track.peerConnectionId) ?? this._createPeerConnection(track.peerConnectionId);
 
-					if (!peerConnection) continue;
+				if (!peerConnection) continue;
 	
-					const outboundAudioTrack = peerConnection.outboundAudioTracks.get(track.trackId) ?? await peerConnection.createOutboundAudioTrack({
-						trackId: track.trackId,
-						sfuStreamId: track.sfuStreamId,
-					});
-
-					await outboundAudioTrack.update(track, sample.timestamp);
-				} catch (err) {
-					logger.error(`Error creating outbound audio track: ${(err as Error)?.message}`);
-				}
-				
+				const outboundAudioTrack = peerConnection.outboundAudioTracks.get(track.trackId) ?? peerConnection.createOutboundAudioTrack({
+					trackId: track.trackId,
+					sfuStreamId: track.sfuStreamId,
+				});
+
+				outboundAudioTrack.update(track, sample.timestamp);
+			} catch (err) {
+				logger.error(`Error creating outbound audio track: ${(err as Error)?.message}`);
 			}
+				
+		}
 
-			for (const track of sample.outboundVideoTracks ?? []) {
-				if (!track.peerConnectionId || !track.trackId) {
-					logger.warn(`OutboundVideoTrack without peerConnectionId or trackId: ${JSON.stringify(track)}`);
+		for (const track of sample.outboundVideoTracks ?? []) {
+			if (!track.peerConnectionId || !track.trackId) {
+				logger.warn(`OutboundVideoTrack without peerConnectionId or trackId: ${JSON.stringify(track)}`);
 
-					continue;
-				}
+				continue;
+			}
 
-				try {
-					const peerConnection = this._peerConnections.get(track.peerConnectionId) ?? await this._createPeerConnection(track.peerConnectionId);
+			try {
+				const peerConnection = this._peerConnections.get(track.peerConnectionId) ?? this._createPeerConnection(track.peerConnectionId);
 
-					if (!peerConnection) continue;
+				if (!peerConnection) continue;
 	
-					const outboundVideoTrack = peerConnection.outboundVideoTracks.get(track.trackId) ?? await peerConnection.createOutboundVideoTrack({
-						trackId: track.trackId,
-						sfuStreamId: track.sfuStreamId,
-					});
+				const outboundVideoTrack = peerConnection.outboundVideoTracks.get(track.trackId) ?? peerConnection.createOutboundVideoTrack({
+					trackId: track.trackId,
+					sfuStreamId: track.sfuStreamId,
+				});
 	
-					await outboundVideoTrack.update(track, sample.timestamp);
+				outboundVideoTrack.update(track, sample.timestamp);
 
-				} catch (err) {
-					logger.error(`Error creating outbound video track: ${(err as Error)?.message}`);
-				}
+			} catch (err) {
+				logger.error(`Error creating outbound video track: ${(err as Error)?.message}`);
 			}
+		}
 
-			for (const iceLocalCandidate of sample.iceLocalCandidates ?? []) {
-				if (!iceLocalCandidate.peerConnectionId) {
-					logger.warn(`Local ice candidate without peerConnectionId: ${JSON.stringify(iceLocalCandidate)}`);
-					continue;
-				}
-				const peerConnection = this._peerConnections.get(iceLocalCandidate.peerConnectionId);
-
-				if (!peerConnection) {
-					logger.debug(`Peer connection ${iceLocalCandidate.peerConnectionId} not found for ice local candidate ${iceLocalCandidate.id}`);
-					continue;
-				}
+		for (const iceLocalCandidate of sample.iceLocalCandidates ?? []) {
+			if (!iceLocalCandidate.peerConnectionId) {
+				logger.warn(`Local ice candidate without peerConnectionId: ${JSON.stringify(iceLocalCandidate)}`);
+				continue;
+			}
+			const peerConnection = this._peerConnections.get(iceLocalCandidate.peerConnectionId);
 
-				peerConnection.ICE.addLocalCandidate(iceLocalCandidate);
+			if (!peerConnection) {
+				logger.debug(`Peer connection ${iceLocalCandidate.peerConnectionId} not found for ice local candidate ${iceLocalCandidate.id}`);
+				continue;
 			}
+
+			peerConnection.ICE.addLocalCandidate(iceLocalCandidate);
+		}
 	
-			for (const iceRemoteCandidate of sample.iceRemoteCandidates ?? []) {
-				if (!iceRemoteCandidate.peerConnectionId) {
-					logger.warn(`Remote ice candidate without peerConnectionId: ${JSON.stringify(iceRemoteCandidate)}`);
-					continue;
-				}
-				const peerConnection = this._peerConnections.get(iceRemoteCandidate.peerConnectionId);
+		for (const iceRemoteCandidate of sample.iceRemoteCandidates ?? []) {
+			if (!iceRemoteCandidate.peerConnectionId) {
+				logger.warn(`Remote ice candidate without peerConnectionId: ${JSON.stringify(iceRemoteCandidate)}`);
+				continue;
+			}
+			const peerConnection = this._peerConnections.get(iceRemoteCandidate.peerConnectionId);
 
-				if (!peerConnection) {
-					logger.debug(`Peer connection ${iceRemoteCandidate.peerConnectionId} not found for ice remote candidate ${iceRemoteCandidate.id}`);
-					continue;
-				}
+			if (!peerConnection) {
+				logger.debug(`Peer connection ${iceRemoteCandidate.peerConnectionId} not found for ice remote candidate ${iceRemoteCandidate.id}`);
+				continue;
+			}
+
+			peerConnection.ICE.addRemoteCandidate(iceRemoteCandidate);
+		}
 
-				peerConnection.ICE.addRemoteCandidate(iceRemoteCandidate);
+		for (const candidatePair of sample.iceCandidatePairs ?? []) {
+			const peerConnection = this._peerConnections.get(candidatePair.peerConnectionId);
+
+			if (!peerConnection) {
+				logger.debug(`Peer connection ${candidatePair.peerConnectionId} not found for ice candidate pair ${candidatePair.localCandidateId}, ${candidatePair.remoteCandidateId}`);
+
+				continue;
 			}
 
-			for (const candidatePair of sample.iceCandidatePairs ?? []) {
-				const peerConnection = this._peerConnections.get(candidatePair.peerConnectionId);
+			peerConnection.ICE.update(candidatePair, sample.timestamp);
+		}
 
-				if (!peerConnection) {
-					logger.debug(`Peer connection ${candidatePair.peerConnectionId} not found for ice candidate pair ${candidatePair.localCandidateId}, ${candidatePair.remoteCandidateId}`);
+		for (const dataChannel of sample.dataChannels ?? []) {
+			if (!dataChannel.peerConnectionId || !dataChannel.dataChannelIdentifier) {
+				logger.warn(`DataChannel without peerConnectionId or dataChannelIdentifier: ${JSON.stringify(dataChannel)}`);
 
-					continue;
-				}
+				continue;
+			}
+
+			try {
+				const peerConnection = this._peerConnections.get(dataChannel.peerConnectionId) ?? this._createPeerConnection(dataChannel.peerConnectionId);
 
-				peerConnection.ICE.update(candidatePair, sample.timestamp);
+				if (!peerConnection) continue;
+	
+				const observedDataChannel = peerConnection.dataChannels.get(dataChannel.dataChannelIdentifier) ?? peerConnection.createDataChannel(dataChannel.dataChannelIdentifier);
+	
+				observedDataChannel.update(dataChannel, sample.timestamp);
+			} catch (err) {
+				logger.error(`Error creating data channel: ${(err as Error)?.message}`);
 			}
+		}
 
-			// close entries that are idle for too long
-			if (this.call.observer.config.maxEntryIdleTimeInMs && this._updated < sample.timestamp) {
+		// close entries that are idle for too long
+		if (this.call.observer.config.maxEntryIdleTimeInMs && this._updated < sample.timestamp) {
 
-				for (const peerConnection of this._peerConnections.values()) {
-					if (this.call.observer.config.maxEntryIdleTimeInMs < sample.timestamp - peerConnection.updated) {
-						logger.debug(`Closing peer connection ${peerConnection.peerConnectionId} due to inactivity`);
-						peerConnection.close();
+			for (const peerConnection of this._peerConnections.values()) {
+				if (this.call.observer.config.maxEntryIdleTimeInMs < peerConnection.created - peerConnection.updated) {
+					logger.debug(`Closing peer connection ${peerConnection.peerConnectionId} due to inactivity`);
+					peerConnection.close();
 
-						continue;
+					continue;
+				}
+				for (const track of peerConnection.inboundAudioTracks.values()) {
+					if (this.call.observer.config.maxEntryIdleTimeInMs < track.created - track.updated) {
+						logger.debug(`Closing inbound audio track ${track.trackId} due to inactivity`);
+						track.close();
 					}
-					for (const track of peerConnection.inboundAudioTracks.values()) {
-						if (this.call.observer.config.maxEntryIdleTimeInMs < sample.timestamp - track.updated) {
-							logger.debug(`Closing inbound audio track ${track.trackId} due to inactivity`);
-							track.close();
-						}
+				}
+				for (const track of peerConnection.inboundVideoTracks.values()) {
+					if (this.call.observer.config.maxEntryIdleTimeInMs < track.created - track.updated) {
+						logger.debug(`Closing inbound video track ${track.trackId} due to inactivity`);
+						track.close();
 					}
-					for (const track of peerConnection.inboundVideoTracks.values()) {
-						if (this.call.observer.config.maxEntryIdleTimeInMs < sample.timestamp - track.updated) {
-							logger.debug(`Closing inbound video track ${track.trackId} due to inactivity`);
-							track.close();
-						}
+				}
+				for (const track of peerConnection.outboundAudioTracks.values()) {
+					if (this.call.observer.config.maxEntryIdleTimeInMs < track.created - track.updated) {
+						logger.debug(`Closing outbound audio track ${track.trackId} due to inactivity`);
+						track.close();
 					}
-					for (const track of peerConnection.outboundAudioTracks.values()) {
-						if (this.call.observer.config.maxEntryIdleTimeInMs < sample.timestamp - track.updated) {
-							logger.debug(`Closing outbound audio track ${track.trackId} due to inactivity`);
-							track.close();
-						}
+				}
+				for (const dataChannel of peerConnection.dataChannels.values()) {
+					if (this.call.observer.config.maxEntryIdleTimeInMs < dataChannel.created - dataChannel.updated) {
+						logger.debug(`Closing DataChannel ${dataChannel.channelId} due to inactivity`);
+						dataChannel.close();
 					}
 				}
 			}
+		}
 
-			// update metrics
-			const wasUsingTURN = this.usingTURN;
-
-			this.usingTURN = false;
-			this.availableIncomingBitrate = 0;
-			this.availableOutgoingBitrate = 0;
-			this.totalSentBytes = 0;
-			this.totalReceivedBytes = 0;
-			this.totalOutboundPacketsSent = 0;
-			this.totalInboundPacketsReceived = 0;
-			this.totalInboundPacketsLost = 0;
-			this.totalDataChannelBytesSent = 0;
-			this.totalDataChannelBytesReceived = 0;
-			this.sendingBitrate = 0;
-			this.receivingBitrate = 0;
-			let sumRttInMs = 0;
-
-			for (const peerConnection of this._peerConnections.values()) {
-				if (peerConnection.closed) continue;
-				peerConnection.updateMetrics();
-				this.totalSentBytes += peerConnection.totalSentAudioBytes + peerConnection.totalSentVideoBytes;
-				this.totalReceivedBytes += peerConnection.totalReceivedAudioBytes + peerConnection.totalReceivedVideoBytes;
-				this.totalOutboundPacketsSent += peerConnection.totalOutboundPacketsSent;
-				this.totalInboundPacketsReceived += peerConnection.totalInboundPacketsReceived;
-				this.totalInboundPacketsLost += peerConnection.totalInboundPacketsLost;
-				this.totalDataChannelBytesSent += peerConnection.totalDataChannelBytesSent;
-				this.totalDataChannelBytesReceived += peerConnection.totalDataChannelBytesReceived;
-				this.sendingBitrate += peerConnection.sendingAudioBitrate + peerConnection.sendingVideoBitrate;
-				this.receivingBitrate += peerConnection.receivingAudioBitrate + peerConnection.receivingVideoBitrate;
-				this.availableIncomingBitrate += peerConnection.availableIncomingBitrate ?? 0;
-				this.availableOutgoingBitrate += peerConnection.availableOutgoingBitrate ?? 0;
-				sumRttInMs += peerConnection.avgRttInMs ?? 0;
-
-				if (peerConnection.usingTURN) this.usingTURN = true;
-			}
+		// update metrics
+		const wasUsingTURN = this.usingTURN;
+
+		this.usingTURN = false;
+		this.availableIncomingBitrate = 0;
+		this.availableOutgoingBitrate = 0;
+		this.totalSentBytes = 0;
+		this.totalReceivedBytes = 0;
+		this.totalOutboundPacketsSent = 0;
+		this.totalInboundPacketsReceived = 0;
+		this.totalInboundPacketsLost = 0;
+		this.totalDataChannelBytesSent = 0;
+		this.totalDataChannelBytesReceived = 0;
+		this.sendingBitrate = 0;
+		this.receivingBitrate = 0;
+		let sumRttInMs = 0;
+
+		for (const peerConnection of this._peerConnections.values()) {
+			if (peerConnection.closed) continue;
+			peerConnection.updateMetrics();
+			this.totalSentBytes += peerConnection.totalSentAudioBytes + peerConnection.totalSentVideoBytes;
+			this.totalReceivedBytes += peerConnection.totalReceivedAudioBytes + peerConnection.totalReceivedVideoBytes;
+			this.totalOutboundPacketsSent += peerConnection.totalOutboundPacketsSent;
+			this.totalInboundPacketsReceived += peerConnection.totalInboundPacketsReceived;
+			this.totalInboundPacketsLost += peerConnection.totalInboundPacketsLost;
+			this.totalDataChannelBytesSent += peerConnection.totalDataChannelBytesSent;
+			this.totalDataChannelBytesReceived += peerConnection.totalDataChannelBytesReceived;
+			this.sendingBitrate += peerConnection.sendingAudioBitrate + peerConnection.sendingVideoBitrate;
+			this.receivingBitrate += peerConnection.receivingAudioBitrate + peerConnection.receivingVideoBitrate;
+			this.availableIncomingBitrate += peerConnection.availableIncomingBitrate ?? 0;
+			this.availableOutgoingBitrate += peerConnection.availableOutgoingBitrate ?? 0;
+			sumRttInMs += peerConnection.avgRttInMs ?? 0;
+
+			if (peerConnection.usingTURN) this.usingTURN = true;
+		}
 
-			this.avgRttInMs = this._peerConnections.size ? sumRttInMs / this._peerConnections.size : undefined;
+		this.avgRttInMs = this._peerConnections.size ? sumRttInMs / this._peerConnections.size : undefined;
 			
-			if (executeSave) await this._save();
-			if (wasUsingTURN !== this.usingTURN) this.emit('usingturn', this.usingTURN);
+		if (wasUsingTURN !== this.usingTURN) this.emit('usingturn', this.usingTURN);
 
-			this._updated = sample.timestamp;
-			this.emit('update');
-		}).finally(() => {
-			--this._processingSample;
-		});
+		this._updated = now;
+		this.emit('update');
 	}
 
-	private async _createPeerConnection(peerConnectionId: string): Promise<ObservedPeerConnection> {
-		const result = await ObservedPeerConnection.create({
+	private _createPeerConnection(peerConnectionId: string, label?: string): ObservedPeerConnection {
+		const result = new ObservedPeerConnection({
 			peerConnectionId,
-		}, this, this._storageProvider);
-
-		const pendingTracksTimestamp = this.ωpendingCreatedTracksTimestamp.get(peerConnectionId);
-
-		if (pendingTracksTimestamp) {
-			result.created = pendingTracksTimestamp;
-			this.ωpendingCreatedTracksTimestamp.delete(peerConnectionId);
-		}
+			label,
+		}, this);
 
 		const onNewSelectedCandidatePair = ({ localCandidate, remoteCandidate }: { localCandidate: IceLocalCandidate, remoteCandidate: IceRemoteCandidate }) => {
 			this.emit('selectedcandidatepair', {
@@ -851,25 +726,15 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 		result.once('close', () => {
 			result.ICE.off('new-selected-candidate-pair', onNewSelectedCandidatePair);
 			this._peerConnections.delete(peerConnectionId);
-			this._model.peerConnectionIds = this._model.peerConnectionIds.filter((id) => id !== peerConnectionId);
-			this._save().catch(() => void 0);
 		});
 		result.ICE.on('new-selected-candidate-pair', onNewSelectedCandidatePair);
 		this._peerConnections.set(peerConnectionId, result);
-		this._model.peerConnectionIds.push(peerConnectionId);
-		await this._save();
 
 		this.emit('newpeerconnection', result);
 
 		return result;
 	}
 
-	private async _save() {
-		if (this._closed) throw new Error(`Client ${this.clientId} is closed`);
-		
-		return this._storageProvider.clientStorage.set(this.clientId, this._model);
-	}
-
 	private _addClientLeftReport() {
 		if (this._left) return;
 		this._left = Date.now();
@@ -880,7 +745,7 @@ export class ObservedClient<AppData extends Record<string, unknown> = Record<str
 			this.roomId,
 			this.callId,
 			this.clientId,
-			this.joined,
+			this._left,
 			this.userId,
 			this.marker,
 		));