@observertc/observer-js 0.9.21-beta → 0.9.23-beta

package/src/middlewares/visitors/visitPeerConnection.ts

@@ -1,9 +1,15 @@
+/* eslint-disable camelcase */
 import { ObservedPeerConnection } from '../../samples/ObservedPeerConnection';
 import * as Models from '../../models/Models';
 import { ReportsCollector } from '../../common/ReportsCollector';
 import { logger } from '../VisitObservedCallsMiddleware';
 import { IceCandidatePairReport, PeerConnectionTransportReport } from '@observertc/report-schemas-js';
-import { Samples_ClientSample_IceCandidatePair, Samples_ClientSample_IceLocalCandidate, Samples_ClientSample_IceRemoteCandidate, Samples_ClientSample_PeerConnectionTransport } from '../../models/samples_pb';
+import { 
+	Samples_ClientSample_IceCandidatePair, 
+	Samples_ClientSample_IceLocalCandidate, 
+	Samples_ClientSample_IceRemoteCandidate, 
+	Samples_ClientSample_PeerConnectionTransport 
+} from '../../models/samples_pb';
 
 export function visitPeerConnection(
 	observedPeerConnection: ObservedPeerConnection,
@@ -19,6 +25,7 @@ export function visitPeerConnection(
 	const { serviceId, roomId, callId } = observedPeerConnection.client.call;
 
 	let storedPeerConnection = storedPeerConnections.get(peerConnectionId);
+
 	if (!storedPeerConnection) {
 		storedPeerConnection = new Models.PeerConnection({
 			serviceId,
@@ -37,7 +44,7 @@ export function visitPeerConnection(
 		if (!storedClient.peerConnectionIds.find((pcId) => pcId === peerConnectionId)) {
 			storedClient.peerConnectionIds.push(peerConnectionId);
 		} else {
-			logger.warn(``);
+			logger.warn('');
 		}
 	}
 
@@ -53,6 +60,7 @@ export function visitPeerConnection(
 			timestamp,
 			sampleSeq: -1, // deprecated
 		};
+
 		reports.addPeerConnectionTransportReports(report);
 	}
 
@@ -68,6 +76,7 @@ export function visitPeerConnection(
 			timestamp,
 			sampleSeq: -1, // deprecated
 		};
+
 		reports.addIceCandidatePairReport(report);
 	}
 
@@ -78,6 +87,7 @@ export function visitPeerConnection(
 				priority,
 				...sample
 			} = iceLocalCandidate;
+
 			storedPeerConnection.icelocalCandidates.push(new Samples_ClientSample_IceLocalCandidate({
 				...sample,
 				priority: BigInt(priority ?? -1)
@@ -90,6 +100,7 @@ export function visitPeerConnection(
 				priority,
 				...sample
 			} = iceRemoteCandidate;
+
 			storedPeerConnection.iceRemoteCandidates.push(new Samples_ClientSample_IceRemoteCandidate({
 				...sample,
 				priority: BigInt(priority ?? -1)
@@ -106,6 +117,7 @@ export function visitPeerConnection(
 				lastPacketSentTimestamp,
 				...sample
 			} = iceCandidatePair;
+
 			storedPeerConnection.iceCandidatePairs.push(new Samples_ClientSample_IceCandidatePair({
 				...sample,
 				bytesDiscardedOnSend: BigInt(bytesDiscardedOnSend ?? -1),
@@ -123,6 +135,7 @@ export function visitPeerConnection(
 				bytesSent,
 				...sample
 			} = pcTransport;
+
 			storedPeerConnection.transports.push(new Samples_ClientSample_PeerConnectionTransport({
 				...sample,
 				bytesReceived: BigInt(bytesReceived ?? -1),

package/src/middlewares/visitors/visitSfu.ts

@@ -10,8 +10,10 @@ export function visitSfu(
 ) {
 	const { mediaUnitId, serviceId, sfuId, timeZoneId, marker } = observedSfu;
 	let storedSfu = storedSfus.get(sfuId);
+
 	if (!storedSfu) {
 		const timestamp = Date.now();
+
 		storedSfu = new Models.Sfu({
 			serviceId,
 			sfuId,
@@ -26,7 +28,7 @@ export function visitSfu(
 		reports.addSfuEventReport({
 			serviceId,
 			mediaUnitId,
-			name: "SFU_JOINED",
+			name: 'SFU_JOINED',
 			sfuId,
 			timestamp,
 			marker,
@@ -60,5 +62,9 @@ export function visitSfu(
 				});
 			}
 		}
+
+		if (fetchSamples) {
+			// empty
+		}
 	}
 }

package/src/middlewares/visitors/visitSfuInboundRtpPad.ts

@@ -14,10 +14,10 @@ export function visitSfuInboundRtpPad(
 
 	const { transportId: sfuTransportId } = observedSfuInboundRtpPad.sfuTransport;
 
-	const { serviceId, sfuId, mediaUnitId,  marker, minTimestamp: timestamp } = observedSfuInboundRtpPad.sfuTransport.sfu;
-
+	const { serviceId, sfuId, mediaUnitId, marker, minTimestamp: timestamp } = observedSfuInboundRtpPad.sfuTransport.sfu;
 
 	let storedSfuInboundRtpPad = storedSfuInboundRtpPads.get(rtpPadId);
+
 	if (!storedSfuInboundRtpPad) {
 		storedSfuInboundRtpPad = new Models.SfuInboundRtpPad({
 			serviceId,
@@ -42,9 +42,11 @@ export function visitSfuInboundRtpPad(
 			sfuStreamId: sfuInboundRtpPad.streamId,
 			timestamp,
 		};
+
 		reports.addSfuTransportReport(report);
 	}
 
 	if (fetchSamples) {
+		// empty
 	}
 }

package/src/middlewares/visitors/visitSfuOutboundRtpPad.ts

@@ -1,7 +1,6 @@
 import * as Models from '../../models/Models';
 import { ReportsCollector } from '../../common/ReportsCollector';
 import { SfuOutboundRtpPadReport } from '@observertc/report-schemas-js';
-import { ObservedSfuTransport } from '../../samples/ObservedSfuTransport';
 import { ObservedSfuOutboundRtpPad } from '../../samples/ObservedSfuOutboundRtpPad';
 
 export function visitSfuOutboundRtpPad(
@@ -18,6 +17,7 @@ export function visitSfuOutboundRtpPad(
 	const { serviceId, sfuId, mediaUnitId, marker, minTimestamp: timestamp } = observedSfuOutboundRtpPad.sfuTransport.sfu;
 
 	let storedSfuOutboundRtpPad = storedSfuOutboundRtpPads.get(rtpPadId);
+
 	if (!storedSfuOutboundRtpPad) {
 		storedSfuOutboundRtpPad = new Models.SfuOutboundRtpPad({
 			serviceId,
@@ -43,9 +43,11 @@ export function visitSfuOutboundRtpPad(
 			sfuSinkId: sfuOutboundRtpPad.sinkId,
 			timestamp,
 		};
+
 		reports.addSfuTransportReport(report);
 	}
 
 	if (fetchSamples) {
+		// empty
 	}
 }

package/src/middlewares/visitors/visitSfuSctpChannel.ts

@@ -9,7 +9,7 @@ export function visitSfuSctpChannel(
 	storedSfuSctpChannels: Map<string, Models.SfuSctpChannel>,
 	reports: ReportsCollector,
 	fetchSamples: boolean
-  ) {
+) {
 	const { channelId } = observedSfuSctpChannel;
   
 	const { transportId: sfuTransportId } = observedSfuSctpChannel.sfuTransport;
@@ -17,32 +17,34 @@ export function visitSfuSctpChannel(
 	const { serviceId, sfuId, mediaUnitId, marker, minTimestamp: timestamp } = observedSfuSctpChannel.sfuTransport.sfu;
   
 	let storedSfuSctpChannel = storedSfuSctpChannels.get(channelId);
+
 	if (!storedSfuSctpChannel) {
-	  storedSfuSctpChannel = new Models.SfuSctpChannel({
-		serviceId,
-		sfuId,
-		mediaUnitId,
-		sfuTransportId,
-		opened: BigInt(Date.now()),
-		marker,
-	  });
-	  storedSfuSctpChannels.set(channelId, storedSfuSctpChannel);
+		storedSfuSctpChannel = new Models.SfuSctpChannel({
+			serviceId,
+			sfuId,
+			mediaUnitId,
+			sfuTransportId,
+			opened: BigInt(Date.now()),
+			marker,
+		});
+		storedSfuSctpChannels.set(channelId, storedSfuSctpChannel);
   
-	  storedSfuTransport.sctpChannelIds.push(channelId);
+		storedSfuTransport.sctpChannelIds.push(channelId);
 	}
   
 	for (const sfuSctpChannel of observedSfuSctpChannel.samples()) {
-	  const report: SfuSctpStreamReport = {
-		serviceId,
-		sfuId,
-		mediaUnitId,
-		...sfuSctpChannel,
-		timestamp,
-	  };
-	  reports.addSfuTransportReport(report);
+		const report: SfuSctpStreamReport = {
+			serviceId,
+			sfuId,
+			mediaUnitId,
+			...sfuSctpChannel,
+			timestamp,
+		};
+
+		reports.addSfuTransportReport(report);
 	}
   
 	if (fetchSamples) {
+		// empty
 	}
-  }
-  
+}

package/src/middlewares/visitors/visitSfuTransport.ts

@@ -14,8 +14,8 @@ export function visitSfuTransport(
 
 	const { serviceId, sfuId, mediaUnitId, marker, minTimestamp: timestamp } = observedSfuTransport.sfu;
 
-
 	let storedSfuTransport = storedSfuTransports.get(transportId);
+
 	if (!storedSfuTransport) {
 		storedSfuTransport = new Models.SfuTransport({
 			serviceId,
@@ -40,9 +40,11 @@ export function visitSfuTransport(
 			...sfuTransport,
 			timestamp,
 		};
+
 		reports.addSfuTransportReport(report);
 	}
 
 	if (fetchSamples) {
+		// empty
 	}
 }

package/src/processes/closePeerConnectionProcess.ts

@@ -20,6 +20,7 @@ export function createClosePeerConnectionProcess(
 		const { peerConnectionStorage } = storageProvider;
 		const peerConnectionIds = closedPeerConnections.map((c) => c.peerConnectionId);
 		const peerConnections = await peerConnectionStorage.getAll(peerConnectionIds);
+
 		await peerConnectionStorage.removeAll(peerConnectionIds);
 
 		if (recursive) {
@@ -37,6 +38,7 @@ export function createClosePeerConnectionProcess(
 						trackId,
 					};
 				});
+
 			await Promise.all([
 				removeInboundTracks({
 					removedTracks: inboundTrackIds,
@@ -47,5 +49,6 @@ export function createClosePeerConnectionProcess(
 			]);
 		}
 	};
+	
 	return process;
 }

package/src/processes/detachClientProcess.ts

@@ -7,7 +7,6 @@ import { createClosePeerConnectionProcess, ClosePeerConnectionProcessInput } fro
 import { createLogger } from '../common/logger';
 import { ObservedClientSourceConfig } from '../sources/ObservedClientSource';
 import { Writable } from '../common/utils';
-import { Semaphore } from '../common/Semaphore';
 
 const logger = createLogger('ClientLeftProcess');
 
@@ -38,10 +37,11 @@ export function createDetachClientProcess(
 
 		for (const client of clients.values()) {
 			const { callId, clientId } = client;
+
 			if (!callId || !clientId) {
 				continue;
 			}
-			callToClientIds.set(callId, [...(callToClientIds.get(callId) ?? []), clientId]);
+			callToClientIds.set(callId, [ ...(callToClientIds.get(callId) ?? []), clientId ]);
 		}
 
 		const peerConnectionCloseProcessInput: ClosePeerConnectionProcessInput = {
@@ -49,16 +49,19 @@ export function createDetachClientProcess(
 			recursive,
 		};
 		const callDetaches = new Map<string, number>();
+
 		await clientStorage.removeAll(clientIds).then((deletedClientIds) => {
 			for (const { clientId, detached } of detachedClients) {
 				if (!deletedClientIds.has(clientId)) {
 					continue;
 				}
 				const deletedClient = clients.get(clientId);
+
 				if (!deletedClient) {
 					continue;
 				}
 				const { roomId, serviceId, mediaUnitId, marker, callId, userId } = deletedClient;
+
 				if (!roomId || !serviceId || !mediaUnitId || !callId) {
 					continue;
 				}
@@ -83,18 +86,21 @@ export function createDetachClientProcess(
 		});
 		if (recursive && 0 < peerConnectionCloseProcessInput.closedPeerConnections.length) {
 			await peerConnectionClosedProcess(peerConnectionCloseProcessInput).catch((err) => {
-				logger.error(`Error occurred while closing peer connections`, err);
+				logger.error('Error occurred while closing peer connections', err);
 			});
 		}
 
 		const calls = await callStorage.getAll(callToClientIds.keys());
 		const updatedCalls = new Map<string, Models.Call>();
 		const removedCallIds: string[] = [];
+
 		for (const call of calls.values()) {
 			const { callId, serviceId, roomId } = call;
+
 			if (!callId || !roomId || !serviceId) continue;
 
 			const removedClientIds = callToClientIds.get(callId) ?? [];
+
 			call.clientIds = call.clientIds.filter((clientId) => !removedClientIds.includes(clientId));
 			if (call.clientIds.length < 1) {
 				removedCallIds.push(callId);
@@ -107,12 +113,14 @@ export function createDetachClientProcess(
 		}
 		if (0 < removedCallIds.length) {
 			await callStorage.removeAll(removedCallIds).then((deletedCalls) => {
-				for (const [callId, deletedCall] of deletedCalls) {
+				for (const [ callId, deletedCall ] of deletedCalls) {
 					const { serviceId, roomId } = deletedCall;
+
 					if (!serviceId || !roomId || !callId) continue;
 
 					const ended = callDetaches.get(callId) ?? Date.now();
 					const callEvent = createCallEndedEventReport(serviceId, roomId, callId, ended);
+
 					reports.addCallEventReport(callEvent);
 
 					evaluatorContext?.endedCalls.push({
@@ -123,5 +131,6 @@ export function createDetachClientProcess(
 			});
 		}
 	};
+	
 	return process;
 }

package/src/processes/findRemoteMatches.ts

@@ -1,45 +1,51 @@
-import { createLogger } from "../common/logger";
-import { Client, InboundTrack, OutboundTrack, PeerConnection } from "../models/Models";
-import { StorageProvider } from "../storages/StorageProvider";
+import { createLogger } from '../common/logger';
+import { Client, InboundTrack, OutboundTrack, PeerConnection } from '../models/Models';
+import { StorageProvider } from '../storages/StorageProvider';
 
 export const logger = createLogger('findRemoteMatches');
 
 function groupToMap<T>(input: ReadonlyMap<string, T>, getGroupKey: (value: T) => string | undefined) {
 	const result = new Map<string, T[]>();
-	for (const [key, value] of input.entries()) {
+
+	// eslint-disable-next-line @typescript-eslint/no-unused-vars
+	for (const [ key, value ] of input.entries()) {
 		const groupKey = getGroupKey(value);
+
 		if (!groupKey) continue;
 
-			let group = result.get(groupKey);
+		let group = result.get(groupKey);
+
 		if (group === undefined) {
 			group = [];
 			result.set(groupKey, group);
 		}
-			group.push(value);
+		group.push(value);
 	}
+	
 	return result;
 }
 
-
 export async function findRemoteMatches(
 	storages: StorageProvider, 
 	clients: ReadonlyMap<string, Client>,
 	inboundTracks: ReadonlyMap<string, InboundTrack>,
 ) {
-	const NOT_EXISTS = "NotExists";
+	const NOT_EXISTS = 'NotExists';
 	const remoteTrackIds = new Map<string, string>();
 	const remotePeerConnectionIds = new Map<string, string>();
 	const remoteClientIds = new Map<string, string>();
 
 	async function setupMatches(callId: string, callClients: Client[], callIboundTracks: InboundTrack[]) {
-		const peerConnectionIds = Array.from(callClients.values()).flatMap(client => client.peerConnectionIds);
-		const peerConnections = await storages.peerConnectionStorage.getAll(peerConnectionIds).catch(err => {
-			logger.warn(`Error while fetching for remote matching peer connections for call ${callId} `, err)
+		const peerConnectionIds = Array.from(callClients.values()).flatMap((client) => client.peerConnectionIds);
+		const peerConnections = await storages.peerConnectionStorage.getAll(peerConnectionIds).catch((err) => {
+			logger.warn(`Error while fetching for remote matching peer connections for call ${callId} `, err);
+			
 			return new Map<string, PeerConnection>() as ReadonlyMap<string, PeerConnection>;
 		});
-		const outboundTrackIds = Array.from(peerConnections.values()).flatMap(pc => pc.outboundTrackIds);
-		const outboundTracks = await storages.outboundTrackStorage.getAll(outboundTrackIds).catch(err => {
-			logger.warn(`Error while fetching for remote matching outbound tracks for call ${callId} `, err)
+		const outboundTrackIds = Array.from(peerConnections.values()).flatMap((pc) => pc.outboundTrackIds);
+		const outboundTracks = await storages.outboundTrackStorage.getAll(outboundTrackIds).catch((err) => {
+			logger.warn(`Error while fetching for remote matching outbound tracks for call ${callId} `, err);
+			
 			return new Map<string, OutboundTrack>() as ReadonlyMap<string, OutboundTrack>;
 		});
 		
@@ -47,6 +53,7 @@ export async function findRemoteMatches(
 
 		const ssrcToOutb = new Map<bigint, OutboundTrack>();
 		const sfuStreamToTrackIds = new Map<string, OutboundTrack>();
+
 		for (const outbTrack of outboundTracks.values()) {
 			if (outbTrack.sfuStreamId) {
 				sfuStreamToTrackIds.set(outbTrack.sfuStreamId, outbTrack);
@@ -57,10 +64,11 @@ export async function findRemoteMatches(
 		}
 		for (const inbTrack of callIboundTracks) {
 			let outbTrack: OutboundTrack | undefined;
+
 			if (inbTrack.sfuStreamId) {
 				outbTrack = sfuStreamToTrackIds.get(inbTrack.sfuStreamId);
 			} else {
-				outbTrack = inbTrack.ssrc.map(ssrc => ssrcToOutb.get(ssrc)).find(outb => outb !== undefined);
+				outbTrack = inbTrack.ssrc.map((ssrc) => ssrcToOutb.get(ssrc)).find((outb) => outb !== undefined);
 			}
 			if (outbTrack) {
 				remoteTrackIds.set(inbTrack.trackId ?? NOT_EXISTS, outbTrack.trackId ?? NOT_EXISTS);
@@ -69,25 +77,28 @@ export async function findRemoteMatches(
 			}
 		}
 	}
-	const callsClients = groupToMap<Client>(clients, client => client.callId);
-	const callsInbTracks = groupToMap<InboundTrack>(inboundTracks, inbTrack => inbTrack.callId)
+	const callsClients = groupToMap<Client>(clients, (client) => client.callId);
+	const callsInbTracks = groupToMap<InboundTrack>(inboundTracks, (inbTrack) => inbTrack.callId);
 	
 	const promises: Promise<void>[] = [];
-	for (const [callId, callClients] of callsClients) {
+
+	for (const [ callId, callClients ] of callsClients) {
 		const callIboundTracks = callsInbTracks.get(callId) ?? [];
 		const promise = setupMatches(
 			callId,
 			callClients,
 			callIboundTracks
 		);
+
 		promises.push(promise);
 	}
-	await Promise.all(promises).catch(err => {
-		logger.warn(`Error occurred while fetching remote pair matches`, err);
+	await Promise.all(promises).catch((err) => {
+		logger.warn('Error occurred while fetching remote pair matches', err);
 	});
+	
 	return {
 		remoteTrackIds,
 		remotePeerConnectionIds,
 		remoteClientIds
-	}
+	};
 }

package/src/processes/inboundTrackRemoved.ts

@@ -14,7 +14,9 @@ export function createInboundTrackRemoveProcess(
 		const { removedTracks } = input;
 		const { inboundTrackStorage } = storageProvider;
 		const inboundTrackIds = removedTracks.map((c) => c.trackId);
+
 		await inboundTrackStorage.removeAll(inboundTrackIds);
 	};
+	
 	return process;
 }

package/src/processes/joinClientProcess.ts

@@ -21,6 +21,7 @@ export function createJoinClientProcess(
 ): (input: JoinClientProcessInput) => Promise<void> {
 	const process = async (context: JoinClientProcessInput) => {
 		const { clients: joinedClients, evaluatorContext } = context;
+
 		if (joinedClients.length < 1) {
 			return;
 		}
@@ -30,10 +31,12 @@ export function createJoinClientProcess(
 		const existingCalls = await callStorage.getAll(callIds);
 		const newCalls = new Map<string, Models.Call>();
 		const newClients = new Map<string, Models.Client>();
+
 		for (const joinedClient of joinedClients) {
 			const { serviceId, mediaUnitId, roomId, callId, clientId, joined: timestamp, timeZoneId, marker } = joinedClient;
 
 			let call = existingCalls.get(callId);
+
 			if (!call) {
 				call = new Models.Call({
 					serviceId,
@@ -71,7 +74,7 @@ export function createJoinClientProcess(
 		const alreadyInsertedCalls =
 			0 < newCalls.size ? await callStorage.insertAll(newCalls) : new Map<string, Models.Call>();
 
-		for (const [callId, newCall] of newCalls) {
+		for (const [ callId, newCall ] of newCalls) {
 			if (alreadyInsertedCalls.has(callId)) {
 				continue;
 			}
@@ -82,6 +85,7 @@ export function createJoinClientProcess(
 			}
 
 			const callEvent = createCallStartedEventReport(serviceId, roomId, callId, Number(started));
+
 			reports.addCallEventReport(callEvent);
 			evaluatorContext?.startedCallIds.push(callId);
 		}
@@ -93,7 +97,7 @@ export function createJoinClientProcess(
 		if (0 < newClients.size) {
 			await clientStorage.setAll(newClients);
 		}
-		for (const [clientId, client] of newClients) {
+		for (const [ clientId, client ] of newClients) {
 			const {
 				serviceId,
 				mediaUnitId,
@@ -120,9 +124,11 @@ export function createJoinClientProcess(
 				userId,
 				marker
 			);
+
 			reports.addCallEventReport(callEvent);
 			evaluatorContext?.joinedClientIds.push(clientId);
 		}
 	};
+	
 	return process;
 }

package/src/processes/outboundTrackRemoved.ts

@@ -14,7 +14,9 @@ export function createOutboundTrackRemoveProcess(
 		const { removedTracks } = input;
 		const { outboundTrackStorage } = storageProvider;
 		const outboundTrackIds = removedTracks.map((c) => c.trackId);
+
 		await outboundTrackStorage.removeAll(outboundTrackIds);
 	};
+	
 	return process;
 }

package/src/samples/ObservedCall.ts

@@ -17,11 +17,14 @@ export class ObservedCallBuilder {
 		configSupplier: () => ConstructorParameters<typeof ObservedClientBuilder>[0]
 	) {
 		let result = this._observedClientBuilders.get(clientId);
+
 		if (!result) {
 			const config = configSupplier();
+
 			result = new ObservedClientBuilder(config);
 			this._observedClientBuilders.set(clientId, result);
 		}
+		
 		return result;
 	}
 
@@ -33,10 +36,13 @@ export class ObservedCallBuilder {
 			observedClients: () => observedClients.values(),
 			getObservedClient: (clientId) => observedClients.get(clientId),
 		};
+
 		for (const observedClientBuilder of this._observedClientBuilders.values()) {
 			const observedClient = observedClientBuilder.build(observedCall);
+
 			observedClients.set(observedClient.clientId, observedClient);
 		}
+		
 		return observedCall;
 	}
 }

package/src/samples/ObservedCalls.ts

@@ -25,25 +25,28 @@ export class ObservedCallsBuilder {
 		configSupplier: () => ConstructorParameters<typeof ObservedCallBuilder>[0]
 	) {
 		let result = this._builders.get(callId);
+
 		if (!result) {
 			const config = configSupplier();
+
 			result = new ObservedCallBuilder(config);
 			this._builders.set(callId, result);
 		}
+		
 		return result;
 	}
 
 	public build(): ObservedCalls {
 		const observedCalls = new Map<string, ObservedCall>();
 
-		const callIdsGenerator = function* () {
+		const callIdsGenerator = function *() {
 			for (const observedCall of observedCalls.values()) {
 				yield observedCall.callId;
 			}
 		};
 		const callIds = () => iteratorConverter<string>(callIdsGenerator());
 
-		const clientIdsGenerator = function* () {
+		const clientIdsGenerator = function *() {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					yield observedClient.clientId;
@@ -52,7 +55,7 @@ export class ObservedCallsBuilder {
 		};
 		const clientIds = () => iteratorConverter<string>(clientIdsGenerator());
 
-		const peerConnectionIdsGenerator = function* () {
+		const peerConnectionIdsGenerator = function *() {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					for (const observedPeerConnection of observedClient.observedPeerConnections()) {
@@ -63,7 +66,7 @@ export class ObservedCallsBuilder {
 		};
 		const peerConnectionIds = () => iteratorConverter<string>(peerConnectionIdsGenerator());
 
-		const inboundAudioTrackIdsGenerator = function* () {
+		const inboundAudioTrackIdsGenerator = function *() {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					for (const observedPeerConnection of observedClient.observedPeerConnections()) {
@@ -76,7 +79,7 @@ export class ObservedCallsBuilder {
 		};
 		const inboundAudioTrackIds = () => iteratorConverter<string>(inboundAudioTrackIdsGenerator());
 
-		const inboundVideoTrackIdsGenerator = function* () {
+		const inboundVideoTrackIdsGenerator = function *() {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					for (const observedPeerConnection of observedClient.observedPeerConnections()) {
@@ -89,7 +92,7 @@ export class ObservedCallsBuilder {
 		};
 		const inboundVideoTrackIds = () => iteratorConverter<string>(inboundVideoTrackIdsGenerator());
 
-		const outboundAudioTrackIdsGenerator = function* () {
+		const outboundAudioTrackIdsGenerator = function *() {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					for (const observedPeerConnection of observedClient.observedPeerConnections()) {
@@ -102,7 +105,7 @@ export class ObservedCallsBuilder {
 		};
 		const outboundAudioTrackIds = () => iteratorConverter<string>(outboundAudioTrackIdsGenerator());
 
-		const outboundVideoTrackIdsGenerator = function* () {
+		const outboundVideoTrackIdsGenerator = function *() {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					for (const observedPeerConnection of observedClient.observedPeerConnections()) {
@@ -126,11 +129,14 @@ export class ObservedCallsBuilder {
 			observedCalls: () => observedCalls.values(),
 			getObservedCall: (callId) => observedCalls.get(callId),
 		};
+
 		for (const builder of this._builders.values()) {
 			const observedCall = builder.build();
+
 			observedCalls.set(observedCall.callId, observedCall);
 		}
 		this._builders.clear();
+		
 		return result;
 	}