@observertc/observer-js 0.9.10-beta → 0.9.12-beta

package/src/middlewares/visitors/visitOutboundAudioTrack.ts

@@ -12,7 +12,7 @@ export function visitOutboundAudioTrack(
 	reports: ReportsCollector,
 	fetchSamples: boolean
 ) {
-	const { trackId } = observedOutboundAudioTrack;
+	const { trackId, sfuStreamId } = observedOutboundAudioTrack;
 
 	const { peerConnectionId } = observedOutboundAudioTrack.peerConnection;
 
@@ -33,10 +33,12 @@ export function visitOutboundAudioTrack(
 			roomId,
 			callId,
 			clientId,
+			kind: 'audio',
 			peerConnectionId,
 			mediaUnitId,
 			trackId,
-
+			
+			sfuStreamId,
 			userId,
 			marker,
 		});
@@ -57,6 +59,7 @@ export function visitOutboundAudioTrack(
 			roomId,
 			callId,
 			clientId,
+			userId,
 			mediaUnitId,
 			peerConnectionId,
 			...outboundAudioSample,
@@ -88,5 +91,6 @@ export function visitOutboundAudioTrack(
 			statsMap.set(ssrc, audioStats);
 		}
 	}
+	storedOutboundAudioTrack.ssrc = [...statsMap.keys()];
 	storedOutboundAudioTrack.audioStats = Array.from(statsMap.values());
 }

package/src/middlewares/visitors/visitOutboundVideoTarck.ts

@@ -12,7 +12,7 @@ export function visitOutboundVideoTrack(
 	reports: ReportsCollector,
 	fetchSamples: boolean
 ) {
-	const { trackId } = observedOutboundVideoTrack;
+	const { trackId, sfuStreamId } = observedOutboundVideoTrack;
 
 	const { peerConnectionId } = observedOutboundVideoTrack.peerConnection;
 
@@ -33,10 +33,12 @@ export function visitOutboundVideoTrack(
 			roomId,
 			callId,
 			clientId,
+			kind: 'video',
 			peerConnectionId,
 			mediaUnitId,
 			trackId,
 
+			sfuStreamId,
 			userId,
 			marker,
 		});
@@ -57,6 +59,7 @@ export function visitOutboundVideoTrack(
 			roomId,
 			callId,
 			clientId,
+			userId,
 			mediaUnitId,
 			peerConnectionId,
 			...outboundVideoSample,
@@ -90,5 +93,6 @@ export function visitOutboundVideoTrack(
 			statsMap.set(ssrc, videoStats);
 		}
 	}
+	storedOutboundVideoTrack.ssrc = [...statsMap.keys()];
 	storedOutboundVideoTrack.videoStats = Array.from(statsMap.values());
 }

package/src/middlewares/visitors/visitPeerConnection.ts

@@ -2,7 +2,7 @@ import { ObservedPeerConnection } from '../../samples/ObservedPeerConnection';
 import * as Models from '../../models/Models';
 import { ReportsCollector } from '../../common/ReportsCollector';
 import { logger } from '../VisitObservedCallsMiddleware';
-import { PeerConnectionTransportReport } from '@observertc/report-schemas-js';
+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';
 
 export function visitPeerConnection(
@@ -47,6 +47,7 @@ export function visitPeerConnection(
 			roomId,
 			callId,
 			clientId,
+			userId,
 			mediaUnitId,
 			...pcTransport,
 			timestamp,
@@ -55,6 +56,21 @@ export function visitPeerConnection(
 		reports.addPeerConnectionTransportReports(report);
 	}
 
+	for (const iceCandidatePair of observedPeerConnection.iceCandidatePairs()) {
+		const report: IceCandidatePairReport = {
+			serviceId,
+			roomId,
+			callId,
+			userId,
+			clientId,
+			mediaUnitId,
+			...iceCandidatePair,
+			timestamp,
+			sampleSeq: -1, // deprecated
+		};
+		reports.addIceCandidatePairReport(report);
+	}
+
 	if (fetchSamples) {
 		storedPeerConnection.icelocalCandidates = [];
 		for (const iceLocalCandidate of observedPeerConnection.iceLocalCandidates()) {

package/src/models/Models.ts

@@ -273,6 +273,11 @@ export class PeerConnection extends Message<PeerConnection> {
    */
   transports: Samples_ClientSample_PeerConnectionTransport[] = [];
 
+  /**
+   * @generated from field: optional uint64 touched = 17;
+   */
+  touched?: bigint;
+
   constructor(data?: PartialMessage<PeerConnection>) {
     super();
     proto2.util.initPartial(data, this);
@@ -297,6 +302,7 @@ export class PeerConnection extends Message<PeerConnection> {
     { no: 14, name: "iceRemoteCandidates", kind: "message", T: Samples_ClientSample_IceRemoteCandidate, repeated: true },
     { no: 15, name: "iceCandidatePairs", kind: "message", T: Samples_ClientSample_IceCandidatePair, repeated: true },
     { no: 16, name: "transports", kind: "message", T: Samples_ClientSample_PeerConnectionTransport, repeated: true },
+    { no: 17, name: "touched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): PeerConnection {
@@ -386,15 +392,25 @@ export class InboundTrack extends Message<InboundTrack> {
   sfuStreamId?: string;
 
   /**
-   * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.InboundAudioTrack audioStats = 14;
+   * @generated from field: repeated int64 ssrc = 14;
+   */
+  ssrc: bigint[] = [];
+
+  /**
+   * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.InboundAudioTrack audioStats = 15;
    */
   audioStats: Samples_ClientSample_InboundAudioTrack[] = [];
 
   /**
-   * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.InboundVideoTrack videoStats = 15;
+   * @generated from field: repeated org.observertc.schemas.protobuf.Samples.ClientSample.InboundVideoTrack videoStats = 16;
    */
   videoStats: Samples_ClientSample_InboundVideoTrack[] = [];
 
+  /**
+   * @generated from field: optional uint64 touched = 17;
+   */
+  touched?: bigint;
+
   constructor(data?: PartialMessage<InboundTrack>) {
     super();
     proto2.util.initPartial(data, this);
@@ -416,8 +432,10 @@ export class InboundTrack extends Message<InboundTrack> {
     { no: 11, name: "marker", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 12, name: "sfuSinkId", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 13, name: "sfuStreamId", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
-    { no: 14, name: "audioStats", kind: "message", T: Samples_ClientSample_InboundAudioTrack, repeated: true },
-    { no: 15, name: "videoStats", kind: "message", T: Samples_ClientSample_InboundVideoTrack, repeated: true },
+    { no: 14, name: "ssrc", kind: "scalar", T: 3 /* ScalarType.INT64 */, repeated: true },
+    { no: 15, name: "audioStats", kind: "message", T: Samples_ClientSample_InboundAudioTrack, repeated: true },
+    { no: 16, name: "videoStats", kind: "message", T: Samples_ClientSample_InboundVideoTrack, repeated: true },
+    { no: 17, name: "touched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): InboundTrack {
@@ -516,6 +534,11 @@ export class OutboundTrack extends Message<OutboundTrack> {
    */
   videoStats: Samples_ClientSample_OutboundVideoTrack[] = [];
 
+  /**
+   * @generated from field: optional uint64 touched = 16;
+   */
+  touched?: bigint;
+
   constructor(data?: PartialMessage<OutboundTrack>) {
     super();
     proto2.util.initPartial(data, this);
@@ -539,6 +562,7 @@ export class OutboundTrack extends Message<OutboundTrack> {
     { no: 13, name: "ssrc", kind: "scalar", T: 3 /* ScalarType.INT64 */, repeated: true },
     { no: 14, name: "audioStats", kind: "message", T: Samples_ClientSample_OutboundAudioTrack, repeated: true },
     { no: 15, name: "videoStats", kind: "message", T: Samples_ClientSample_OutboundVideoTrack, repeated: true },
+    { no: 16, name: "touched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): OutboundTrack {
@@ -703,9 +727,9 @@ export class SfuTransport extends Message<SfuTransport> {
   sctpChannelIds: string[] = [];
 
   /**
-   * @generated from field: optional uint64 serverTouched = 12;
+   * @generated from field: optional uint64 touched = 12;
    */
-  serverTouched?: bigint;
+  touched?: bigint;
 
   constructor(data?: PartialMessage<SfuTransport>) {
     super();
@@ -726,7 +750,7 @@ export class SfuTransport extends Message<SfuTransport> {
     { no: 9, name: "inboundRtpPadIds", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
     { no: 10, name: "outboundRtpPadIds", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
     { no: 11, name: "sctpChannelIds", kind: "scalar", T: 9 /* ScalarType.STRING */, repeated: true },
-    { no: 12, name: "serverTouched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
+    { no: 12, name: "touched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): SfuTransport {
@@ -791,9 +815,9 @@ export class SfuInboundRtpPad extends Message<SfuInboundRtpPad> {
   added?: bigint;
 
   /**
-   * @generated from field: optional uint64 sampleTouched = 9;
+   * @generated from field: optional uint64 touched = 9;
    */
-  sampleTouched?: bigint;
+  touched?: bigint;
 
   /**
    * @generated from field: optional string mediaUnitId = 10;
@@ -805,11 +829,6 @@ export class SfuInboundRtpPad extends Message<SfuInboundRtpPad> {
    */
   marker?: string;
 
-  /**
-   * @generated from field: optional uint64 serverTouched = 12;
-   */
-  serverTouched?: bigint;
-
   constructor(data?: PartialMessage<SfuInboundRtpPad>) {
     super();
     proto2.util.initPartial(data, this);
@@ -826,10 +845,9 @@ export class SfuInboundRtpPad extends Message<SfuInboundRtpPad> {
     { no: 6, name: "ssrc", kind: "scalar", T: 3 /* ScalarType.INT64 */ },
     { no: 7, name: "internal", kind: "scalar", T: 8 /* ScalarType.BOOL */, default: false },
     { no: 8, name: "added", kind: "scalar", T: 4 /* ScalarType.UINT64 */ },
-    { no: 9, name: "sampleTouched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
+    { no: 9, name: "touched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
     { no: 10, name: "mediaUnitId", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 11, name: "marker", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
-    { no: 12, name: "serverTouched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): SfuInboundRtpPad {
@@ -899,9 +917,9 @@ export class SfuOutboundRtpPad extends Message<SfuOutboundRtpPad> {
   added?: bigint;
 
   /**
-   * @generated from field: optional uint64 sampleTouched = 10;
+   * @generated from field: optional uint64 touched = 10;
    */
-  sampleTouched?: bigint;
+  touched?: bigint;
 
   /**
    * @generated from field: optional string mediaUnitId = 11;
@@ -913,11 +931,6 @@ export class SfuOutboundRtpPad extends Message<SfuOutboundRtpPad> {
    */
   marker?: string;
 
-  /**
-   * @generated from field: optional uint64 serverTouched = 13;
-   */
-  serverTouched?: bigint;
-
   constructor(data?: PartialMessage<SfuOutboundRtpPad>) {
     super();
     proto2.util.initPartial(data, this);
@@ -935,10 +948,9 @@ export class SfuOutboundRtpPad extends Message<SfuOutboundRtpPad> {
     { no: 7, name: "ssrc", kind: "scalar", T: 3 /* ScalarType.INT64 */ },
     { no: 8, name: "internal", kind: "scalar", T: 8 /* ScalarType.BOOL */, default: false },
     { no: 9, name: "added", kind: "scalar", T: 4 /* ScalarType.UINT64 */ },
-    { no: 10, name: "sampleTouched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
+    { no: 10, name: "touched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
     { no: 11, name: "mediaUnitId", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 12, name: "marker", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
-    { no: 13, name: "serverTouched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): SfuOutboundRtpPad {
@@ -993,9 +1005,9 @@ export class SfuSctpChannel extends Message<SfuSctpChannel> {
   opened?: bigint;
 
   /**
-   * @generated from field: optional uint64 sampleTouched = 7;
+   * @generated from field: optional uint64 touched = 7;
    */
-  sampleTouched?: bigint;
+  touched?: bigint;
 
   /**
    * @generated from field: optional string mediaUnitId = 8;
@@ -1007,11 +1019,6 @@ export class SfuSctpChannel extends Message<SfuSctpChannel> {
    */
   marker?: string;
 
-  /**
-   * @generated from field: optional uint64 serverTouched = 10;
-   */
-  serverTouched?: bigint;
-
   constructor(data?: PartialMessage<SfuSctpChannel>) {
     super();
     proto2.util.initPartial(data, this);
@@ -1026,10 +1033,9 @@ export class SfuSctpChannel extends Message<SfuSctpChannel> {
     { no: 4, name: "sfuSctpStreamId", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 5, name: "sfuSctpChannelId", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 6, name: "opened", kind: "scalar", T: 4 /* ScalarType.UINT64 */ },
-    { no: 7, name: "sampleTouched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
+    { no: 7, name: "touched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
     { no: 8, name: "mediaUnitId", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 9, name: "marker", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
-    { no: 10, name: "serverTouched", kind: "scalar", T: 4 /* ScalarType.UINT64 */, opt: true },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): SfuSctpChannel {

package/src/processes/findRemoteMatches.ts

@@ -0,0 +1,94 @@
+import { InboundAudioTrack, InboundVideoTrack } from "@observertc/sample-schemas-js";
+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()) {
+		const groupKey = getGroupKey(value);
+		if (!groupKey) continue;
+
+	  	let group = result.get(groupKey);
+		if (group === undefined) {
+			group = [];
+			result.set(groupKey, group);
+		}
+	  	group.push(value);
+	}
+	return result;
+};
+
+
+export async function findRemoteMatches(
+	storages: StorageProvider, 
+	clients: ReadonlyMap<string, Client>,
+	inboundTracks: ReadonlyMap<string, InboundTrack>,
+) {
+	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)
+			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)
+			return new Map<string, OutboundTrack>() as ReadonlyMap<string, OutboundTrack>;
+		});
+		
+		// console.warn("setupMatches", peerConnectionIds, outboundTrackIds, callsClients, callsInbTracks);
+
+		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);
+			}
+			for (const ssrc of outbTrack.ssrc) {
+				ssrcToOutb.set(ssrc, outbTrack);
+			}
+		}
+		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);
+			}
+			if (outbTrack) {
+				remoteTrackIds.set(inbTrack.trackId ?? NOT_EXISTS, outbTrack.trackId ?? NOT_EXISTS);
+				remotePeerConnectionIds.set(inbTrack.trackId ?? NOT_EXISTS, outbTrack.peerConnectionId ?? NOT_EXISTS);
+				remoteClientIds.set(inbTrack.trackId ?? NOT_EXISTS, outbTrack.clientId ?? NOT_EXISTS);
+			}
+		}
+	}
+	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) {
+		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);
+	});
+	return {
+		remoteTrackIds,
+		remotePeerConnectionIds,
+		remoteClientIds
+	}
+}

package/src/processes/joinClientProcess.ts

@@ -3,11 +3,9 @@ import { StorageProvider } from '../storages/StorageProvider';
 import * as Models from '../models/Models';
 import { createCallStartedEventReport, createClientJoinedEventReport } from '../sinks/callEventReports';
 import { ReportsCollector } from '../common/ReportsCollector';
-import { createClosePeerConnectionProcess } from './closePeerConnectionProcess';
 import { createLogger } from '../common/logger';
 import { ObservedClientSourceConfig } from '../sources/ObservedClientSource';
 import { Writable } from '../common/utils';
-import { Semaphore } from '../common/Semaphore';
 
 const logger = createLogger('ClientLeftProcess');
 
@@ -21,7 +19,6 @@ export function createJoinClientProcess(
 	storageProvider: StorageProvider,
 	reports: ReportsCollector
 ): (input: JoinClientProcessInput) => Promise<void> {
-	const peerConnectionClosedProcess = createClosePeerConnectionProcess(storageProvider);
 	const process = async (context: JoinClientProcessInput) => {
 		const { clients: joinedClients, evaluatorContext } = context;
 		if (joinedClients.length < 1) {
@@ -60,6 +57,7 @@ export function createJoinClientProcess(
 					roomId,
 					callId,
 					clientId,
+					joined: BigInt(timestamp),
 					timeZoneId,
 					marker,
 				})

package/src/samples/ObservedCalls.ts

@@ -1,3 +1,4 @@
+import { iteratorConverter } from '../common/utils';
 import { ObservedCall, ObservedCallBuilder } from './ObservedCall';
 
 export interface ObservedCalls {
@@ -35,21 +36,23 @@ export class ObservedCallsBuilder {
 	public build(): ObservedCalls {
 		const observedCalls = new Map<string, ObservedCall>();
 
-		const callIds = function* (): IterableIterator<string> {
+		const callIdsGenerator = function* () {
 			for (const observedCall of observedCalls.values()) {
 				yield observedCall.callId;
 			}
 		};
+		const callIds = () => iteratorConverter<string>(callIdsGenerator());
 
-		const clientIds = function* (): IterableIterator<string> {
+		const clientIdsGenerator = function* () {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					yield observedClient.clientId;
 				}
 			}
 		};
+		const clientIds = () => iteratorConverter<string>(clientIdsGenerator());
 
-		const peerConnectionIds = function* (): IterableIterator<string> {
+		const peerConnectionIdsGenerator = function* () {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					for (const observedPeerConnection of observedClient.observedPeerConnections()) {
@@ -58,8 +61,9 @@ export class ObservedCallsBuilder {
 				}
 			}
 		};
+		const peerConnectionIds = () => iteratorConverter<string>(peerConnectionIdsGenerator());
 
-		const inboundAudioTrackIds = function* (): IterableIterator<string> {
+		const inboundAudioTrackIdsGenerator = function* () {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					for (const observedPeerConnection of observedClient.observedPeerConnections()) {
@@ -70,8 +74,9 @@ export class ObservedCallsBuilder {
 				}
 			}
 		};
+		const inboundAudioTrackIds = () => iteratorConverter<string>(inboundAudioTrackIdsGenerator());
 
-		const inboundVideoTrackIds = function* (): IterableIterator<string> {
+		const inboundVideoTrackIdsGenerator = function* () {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					for (const observedPeerConnection of observedClient.observedPeerConnections()) {
@@ -82,8 +87,9 @@ export class ObservedCallsBuilder {
 				}
 			}
 		};
+		const inboundVideoTrackIds = () => iteratorConverter<string>(inboundVideoTrackIdsGenerator());
 
-		const outboundAudioTrackIds = function* (): IterableIterator<string> {
+		const outboundAudioTrackIdsGenerator = function* () {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					for (const observedPeerConnection of observedClient.observedPeerConnections()) {
@@ -94,8 +100,9 @@ export class ObservedCallsBuilder {
 				}
 			}
 		};
+		const outboundAudioTrackIds = () => iteratorConverter<string>(outboundAudioTrackIdsGenerator());
 
-		const outboundVideoTrackIds = function* (): IterableIterator<string> {
+		const outboundVideoTrackIdsGenerator = function* () {
 			for (const observedCall of observedCalls.values()) {
 				for (const observedClient of observedCall.observedClients()) {
 					for (const observedPeerConnection of observedClient.observedPeerConnections()) {
@@ -106,6 +113,7 @@ export class ObservedCallsBuilder {
 				}
 			}
 		};
+		const outboundVideoTrackIds = () => iteratorConverter<string>(outboundVideoTrackIdsGenerator());
 
 		const result: ObservedCalls = {
 			callIds,
@@ -122,6 +130,8 @@ export class ObservedCallsBuilder {
 			const observedCall = builder.build();
 			observedCalls.set(observedCall.callId, observedCall);
 		}
+		this._builders.clear();
 		return result;
 	}
+
 }

package/src/samples/ObservedInboundAudioTrack.ts

@@ -4,6 +4,8 @@ import { ObservedPeerConnection } from './ObservedPeerConnection';
 export interface ObservedInboundAudioTrack {
 	readonly peerConnection: ObservedPeerConnection;
 	readonly trackId: string;
+	readonly sfuStreamId?: string,
+	readonly sfuSinkId?: string,
 
 	samples(): IterableIterator<InboundAudioTrack>;
 }

package/src/samples/ObservedInboundVideoTrack.ts

@@ -4,7 +4,9 @@ import { ObservedPeerConnection } from './ObservedPeerConnection';
 export interface ObservedInboundVideoTrack {
 	readonly peerConnection: ObservedPeerConnection;
 	readonly trackId: string;
-
+	readonly sfuStreamId?: string,
+	readonly sfuSinkId?: string,
+	
 	samples(): IterableIterator<InboundVideoTrack>;
 }
 

package/src/samples/ObservedOutboundAudioTrack.ts

@@ -4,7 +4,8 @@ import { ObservedPeerConnection } from './ObservedPeerConnection';
 export interface ObservedOutboundAudioTrack {
 	readonly peerConnection: ObservedPeerConnection;
 	readonly trackId: string;
-
+	readonly sfuStreamId?: string,
+	
 	samples(): IterableIterator<OutboundAudioTrack>;
 }
 

package/src/samples/ObservedOutboundVideoTrack.ts

@@ -4,7 +4,8 @@ import { ObservedPeerConnection } from './ObservedPeerConnection';
 export interface ObservedOutboundVideoTrack {
 	readonly peerConnection: ObservedPeerConnection;
 	readonly trackId: string;
-
+	readonly sfuStreamId?: string,
+	
 	samples(): IterableIterator<OutboundVideoTrack>;
 }
 

package/src/samples/ObservedPeerConnection.ts

@@ -66,7 +66,11 @@ export class ObservedPeerConnectionBuilder {
 
 	public addInboundAudioTrack(inboundAudioTrackSample: InboundAudioTrack) {
 		if (inboundAudioTrackSample.trackId) {
-			const builder = this._getInboundAudioTrackBuilder(inboundAudioTrackSample.trackId);
+			const builder = this._getInboundAudioTrackBuilder(
+				inboundAudioTrackSample.trackId,
+				inboundAudioTrackSample.sfuStreamId,
+				inboundAudioTrackSample.sfuSinkId
+			);
 			builder.addSample(inboundAudioTrackSample);
 		}
 	}
@@ -81,28 +85,35 @@ export class ObservedPeerConnectionBuilder {
 		this._iceLocalCandidates.push(iceLocalCandidate);
 	}
 
-	private _getInboundAudioTrackBuilder(trackId: string): ObservedInboundAudioTrackBuilder {
+	private _getInboundAudioTrackBuilder(trackId: string, sfuStreamId?: string, sfuSinkId?: string): ObservedInboundAudioTrackBuilder {
 		let result = this._inboundAudioTracks.get(trackId);
 		if (!result) {
 			result = new ObservedInboundAudioTrackBuilder({
 				trackId,
+				sfuStreamId,
+				sfuSinkId,
 			});
+			this._inboundAudioTracks.set(trackId, result);
 		}
 		return result;
 	}
 
 	public addOutboundAudioTrack(outboundAudioTrackSample: OutboundAudioTrack) {
 		if (outboundAudioTrackSample.trackId) {
-			const builder = this._getOutboundAudioTrackBuilder(outboundAudioTrackSample.trackId);
+			const builder = this._getOutboundAudioTrackBuilder(
+				outboundAudioTrackSample.trackId,
+				outboundAudioTrackSample.sfuStreamId,
+			);
 			builder.addSample(outboundAudioTrackSample);
 		}
 	}
 
-	private _getOutboundAudioTrackBuilder(trackId: string): ObservedOutboundAudioTrackBuilder {
+	private _getOutboundAudioTrackBuilder(trackId: string, sfuStreamId?: string): ObservedOutboundAudioTrackBuilder {
 		let result = this._outboundAudioTracks.get(trackId);
 		if (!result) {
 			result = new ObservedOutboundAudioTrackBuilder({
 				trackId,
+				sfuStreamId
 			});
 			this._outboundAudioTracks.set(trackId, result);
 		}
@@ -111,16 +122,22 @@ export class ObservedPeerConnectionBuilder {
 
 	public addInboundVideoTrack(inboundVideoTrackSample: InboundVideoTrack) {
 		if (inboundVideoTrackSample.trackId) {
-			const builder = this._getInboundVideoTrackBuilder(inboundVideoTrackSample.trackId);
+			const builder = this._getInboundVideoTrackBuilder(
+				inboundVideoTrackSample.trackId,
+				inboundVideoTrackSample.sfuStreamId,
+				inboundVideoTrackSample.sfuSinkId,
+			);
 			builder.addSample(inboundVideoTrackSample);
 		}
 	}
 
-	private _getInboundVideoTrackBuilder(trackId: string): ObservedInboundVideoTrackBuilder {
+	private _getInboundVideoTrackBuilder(trackId: string, sfuStreamId?: string, sfuSinkId?: string): ObservedInboundVideoTrackBuilder {
 		let result = this._inboundVideoTracks.get(trackId);
 		if (!result) {
 			result = new ObservedInboundVideoTrackBuilder({
 				trackId,
+				sfuStreamId,
+				sfuSinkId,
 			});
 			this._inboundVideoTracks.set(trackId, result);
 		}
@@ -129,16 +146,20 @@ export class ObservedPeerConnectionBuilder {
 
 	public addOutboundVideoTrack(outboundVideoTrackSample: OutboundVideoTrack) {
 		if (outboundVideoTrackSample.trackId) {
-			const builder = this._getOutboundVideoTrackBuilder(outboundVideoTrackSample.trackId);
+			const builder = this._getOutboundVideoTrackBuilder(
+				outboundVideoTrackSample.trackId,
+				outboundVideoTrackSample.sfuStreamId,
+			);
 			builder.addSample(outboundVideoTrackSample);
 		}
 	}
 
-	private _getOutboundVideoTrackBuilder(trackId: string): ObservedOutboundVideoTrackBuilder {
+	private _getOutboundVideoTrackBuilder(trackId: string, sfuStreamId?: string): ObservedOutboundVideoTrackBuilder {
 		let result = this._outboundVideoTracks.get(trackId);
 		if (!result) {
 			result = new ObservedOutboundVideoTrackBuilder({
 				trackId,
+				sfuStreamId,
 			});
 			this._outboundVideoTracks.set(trackId, result);
 		}