@observertc/observer-js 1.0.1-9d3744d.0 → 1.0.1-a6fb9d3.0

package/src/utils/MediasoupRemoteTrackResolver.ts

@@ -0,0 +1,155 @@
+import { ObservedCall } from '../ObservedCall';
+import { ObservedCallEventMonitor } from '../ObservedCallEventMonitor';
+import { ObservedInboundTrack } from '../webrtc/ObservedInboundTrack';
+import { ObservedOutboundTrack } from '../webrtc/ObservedOutboundTrack';
+import { RemoteTrackResolver } from './RemoteTrackResolver';
+
+export class MediasoupRemoteTrackResolver implements RemoteTrackResolver {
+	public readonly eventMonitor: ObservedCallEventMonitor<{
+		// empty
+	}>;
+
+	private _consumerIdToProducerId = new Map<string, string>();
+	private _producerIdToOutboundTrack = new Map<string, ObservedOutboundTrack>();
+	private _consumerIdToInboundTrack = new Map<string, ObservedInboundTrack>();
+	// private _producerIdToOutboundTrack = new Map<string, ObservedOutboundTrack>();
+
+	private _inboundTrackToConsumerId = new Map<string, string>();
+	private _producerIdToConsumerIds = new Map<string, string[]>();
+	private _outboundTrackToProducerId = new Map<string, string>();
+
+	public constructor(
+		public readonly observedCall: ObservedCall
+	) {
+		this.eventMonitor = this.observedCall.createEventMonitor({});
+
+		this.eventMonitor.onInboundTrackAdded = this._addInboundTrack.bind(this);
+		this.eventMonitor.onInboundTrackRemoved = this._removeInboundTrack.bind(this);
+		this.eventMonitor.onOutboundTrackAdded = this._addOutboundTrack.bind(this);
+		this.eventMonitor.onOutboundTrackRemoved = this._removeOutboundTrack.bind(this);
+
+		// this.eventMonitor.onClientEvent = (client, event) => {
+            
+		// };
+	}
+
+	public resolveRemoteOutboundTrack(inboundTrack: ObservedInboundTrack): ObservedOutboundTrack | undefined {
+		const consumerId = this._inboundTrackToConsumerId.get(inboundTrack.id);
+
+		if (!consumerId) return;
+        
+		const producerId = this._consumerIdToProducerId.get(consumerId);
+
+		if (!producerId) return;
+
+		return this._producerIdToOutboundTrack.get(producerId);
+	}
+
+	public resolveRemoteInboundTracks(outboundTrack: ObservedOutboundTrack): ObservedInboundTrack[] | undefined {
+		const producerId = this._outboundTrackToProducerId.get(outboundTrack.id);
+
+		if (!producerId) return;
+
+		const consumerIds = this._producerIdToConsumerIds.get(producerId);
+
+		if (!consumerIds) return;
+		
+		return consumerIds
+			.map((consumerId) => this._consumerIdToInboundTrack.get(consumerId))
+			.filter((inboundTrack) => Boolean(inboundTrack)) as ObservedInboundTrack[]
+		;     
+	}
+
+	private _addInboundTrack(inboundTrack: ObservedInboundTrack) {
+		const attachments = this._getInboundTrackAttachments(inboundTrack);
+
+		if (!attachments) return;
+
+		const {
+			producerId,
+			consumerId
+		} = attachments;
+
+		this._inboundTrackToConsumerId.set(inboundTrack.id, consumerId);
+		this._consumerIdToProducerId.set(consumerId, producerId);
+		this._consumerIdToInboundTrack.set(consumerId, inboundTrack);
+
+		let producerConsumers = this._producerIdToConsumerIds.get(producerId);
+
+		if (!producerConsumers) {
+			producerConsumers = [];
+			this._producerIdToConsumerIds.set(producerId, producerConsumers);
+		}
+		producerConsumers.push(consumerId);
+	}
+
+	private _removeInboundTrack(inboundTrack: ObservedInboundTrack) {
+		const consumerId = this._inboundTrackToConsumerId.get(inboundTrack.id);
+
+		if (!consumerId) return;
+
+		this._inboundTrackToConsumerId.delete(inboundTrack.id);
+		this._consumerIdToProducerId.delete(consumerId);
+		this._consumerIdToInboundTrack.delete(consumerId);
+        
+		const producerConsumers = this._producerIdToConsumerIds.get(consumerId);
+
+		if (!producerConsumers) return;
+
+		const filteredProducerConsumers = producerConsumers.filter((id) => id !== consumerId);
+
+		if (filteredProducerConsumers.length === 0) {
+			this._producerIdToConsumerIds.delete(consumerId);
+		} else {
+			this._producerIdToConsumerIds.set(consumerId, filteredProducerConsumers);
+		}
+	}
+
+	private _addOutboundTrack(outboundTrack: ObservedOutboundTrack) {
+		const attachments = this._getOutboundTrackAttachments(outboundTrack);
+
+		if (!attachments) return;
+
+		const {
+			producerId,
+		} = attachments;
+
+		this._producerIdToOutboundTrack.set(producerId, outboundTrack);
+		this._outboundTrackToProducerId.set(outboundTrack.id, producerId);
+	}
+
+	private _removeOutboundTrack(outboundTrack: ObservedOutboundTrack) {
+		const producerId = this._outboundTrackToProducerId.get(outboundTrack.id);
+
+		if (!producerId) return;
+
+		this._producerIdToOutboundTrack.delete(producerId);
+		this._outboundTrackToProducerId.delete(outboundTrack.id);
+	}
+
+	private _getInboundTrackAttachments(inboundTrack: ObservedInboundTrack) {
+		const {
+			producerId,
+			consumerId
+		} = inboundTrack.attachments ?? {};
+
+		if (!producerId || !consumerId || typeof producerId !== 'string' || typeof consumerId !== 'string') return;
+
+		return {
+			producerId,
+			consumerId
+		};
+	}
+
+	private _getOutboundTrackAttachments(outboundTrack: ObservedOutboundTrack) {
+		const {
+			producerId,
+		} = outboundTrack.attachments ?? {};
+
+		if (!producerId || typeof producerId !== 'string') return;
+
+		return {
+			producerId,
+		};
+	}
+}

package/src/utils/RemoteTrackResolver.ts

@@ -1,5 +1,5 @@
-import { ObservedInboundTrack } from '../ObservedInboundTrack';
-import { ObservedOutboundTrack } from '../ObservedOutboundTrack';
+import { ObservedInboundTrack } from '../webrtc/ObservedInboundTrack';
+import { ObservedOutboundTrack } from '../webrtc/ObservedOutboundTrack';
 
 export interface RemoteTrackResolver {
 	resolveRemoteOutboundTrack(

package/src/{ObservedCertificate.ts → webrtc/ObservedCertificate.ts}

@@ -1,5 +1,5 @@
 import { ObservedPeerConnection } from './ObservedPeerConnection';
-import { CertificateStats } from './schema/ClientSample';
+import { CertificateStats } from '../schema/ClientSample';
 
 export class ObservedCertificate implements CertificateStats {
 	public appData?: Record<string, unknown>;

package/src/{ObservedCodec.ts → webrtc/ObservedCodec.ts}

@@ -1,5 +1,5 @@
 import { ObservedPeerConnection } from './ObservedPeerConnection';
-import { CodecStats } from './schema/ClientSample';
+import { CodecStats } from '../schema/ClientSample';
 
 export class ObservedCodec implements CodecStats {
 	private _visited = false;

package/src/{ObservedDataChannel.ts → webrtc/ObservedDataChannel.ts}

@@ -1,5 +1,5 @@
 import { ObservedPeerConnection } from './ObservedPeerConnection';
-import { DataChannelStats } from './schema/ClientSample';
+import { DataChannelStats } from '../schema/ClientSample';
 
 export type ObservedDataChannelState = 'connecting' | 'open' | 'closing' | 'closed';
 
@@ -16,6 +16,9 @@ export class ObservedDataChannel implements DataChannelStats	{
 	bytesReceived?: number | undefined;
 	attachments?: Record<string, unknown> | undefined;
 
+	public addedAt?: number | undefined;
+	public removedAt?: number | undefined;
+	
 	public deltaBytesSent = 0;
 	public deltaBytesReceived = 0;
 	public deltaMessagesSent = 0;

package/src/{ObservedIceCandidate.ts → webrtc/ObservedIceCandidate.ts}

@@ -1,5 +1,5 @@
 import { ObservedPeerConnection } from './ObservedPeerConnection';
-import { IceCandidateStats } from './schema/ClientSample';
+import { IceCandidateStats } from '../schema/ClientSample';
 
 export class ObservedIceCandidate implements IceCandidateStats {
 	private _visited = false;

package/src/{ObservedIceCandidatePair.ts → webrtc/ObservedIceCandidatePair.ts}

@@ -1,5 +1,5 @@
 import { ObservedPeerConnection } from './ObservedPeerConnection';
-import { IceCandidatePairStats } from './schema/ClientSample';
+import { IceCandidatePairStats } from '../schema/ClientSample';
 
 export class ObservedIceCandidatePair implements IceCandidatePairStats {
 	private _visited = false;
@@ -8,7 +8,7 @@ export class ObservedIceCandidatePair implements IceCandidatePairStats {
 	transportId?: string | undefined;
 	localCandidateId?: string | undefined;
 	remoteCandidateId?: string | undefined;
-	state?: 'new' | 'inProgress' | 'failed' | 'succeeded' | undefined;
+	state?: 'new' | 'in-progress' | 'waiting' | 'failed' | 'succeeded' | undefined;
 	nominated?: boolean | undefined;
 	packetsSent?: number | undefined;
 	packetsReceived?: number | undefined;
@@ -93,7 +93,7 @@ export class ObservedIceCandidatePair implements IceCandidatePairStats {
 		this.transportId = stats.transportId;
 		this.localCandidateId = stats.localCandidateId;
 		this.remoteCandidateId = stats.remoteCandidateId;
-		this.state = stats.state;
+		this.state = this._convertState(stats.state);
 		this.nominated = stats.nominated;
 		this.packetsSent = stats.packetsSent;
 		this.packetsReceived = stats.packetsReceived;
@@ -115,4 +115,20 @@ export class ObservedIceCandidatePair implements IceCandidatePairStats {
 		this.attachments = stats.attachments;
 	}
 
+	private _convertState(state: string | undefined) {
+		switch (state) {
+			case 'new':
+			case 'in-progress':
+			case 'waiting':
+			case 'failed':
+			case 'succeeded':
+				return state;
+			case 'cancelled':
+				return 'failed';
+			case 'inprogress':
+				return 'in-progress';
+			default:
+				return undefined;
+		}
+	}
 }

package/src/{ObservedIceTransport.ts → webrtc/ObservedIceTransport.ts}

@@ -1,5 +1,5 @@
 import { ObservedPeerConnection } from './ObservedPeerConnection';
-import { IceTransportStats } from './schema/ClientSample';
+import { IceTransportStats } from '../schema/ClientSample';
 
 export class ObservedIceTransport implements IceTransportStats {
 	private _visited = false;

package/src/{ObservedInboundRtp.ts → webrtc/ObservedInboundRtp.ts}

@@ -1,6 +1,6 @@
-import { MediaKind } from './common/types';
+import { MediaKind } from '../common/types';
 import { ObservedPeerConnection } from './ObservedPeerConnection';
-import { InboundRtpStats } from './schema/ClientSample';
+import { InboundRtpStats } from '../schema/ClientSample';
 
 export class ObservedInboundRtp implements InboundRtpStats {
 	public appData?: Record<string, unknown>;

package/src/{ObservedInboundTrack.ts → webrtc/ObservedInboundTrack.ts}

@@ -1,7 +1,7 @@
-import { CalculatedScore } from './scores/CalculatedScore';
-import { MediaKind } from './common/types';
-import { InboundTrackSample } from './schema/ClientSample';
-import { Detectors } from './detectors/Detectors';
+import { CalculatedScore } from '../scores/CalculatedScore';
+import { MediaKind } from '../common/types';
+import { InboundTrackSample } from '../schema/ClientSample';
+import { Detectors } from '../detectors/Detectors';
 import { ObservedPeerConnection } from './ObservedPeerConnection';
 import { ObservedInboundRtp } from './ObservedInboundRtp';
 import { ObservedMediaPlayout } from './ObservedMediaPlayout';
@@ -16,6 +16,11 @@ export class ObservedInboundTrack implements InboundTrackSample {
 
 	private _visited = false;
 
+	public addedAt?: number | undefined;
+	public removedAt?: number | undefined;
+
+	public muted?: boolean;
+	
 	attachments?: Record<string, unknown> | undefined;
 
 	constructor(

package/src/{ObservedMediaPlayout.ts → webrtc/ObservedMediaPlayout.ts}

@@ -1,6 +1,6 @@
-import { MediaKind } from './common/types';
+import { MediaKind } from '../common/types';
 import { ObservedPeerConnection } from './ObservedPeerConnection';
-import { MediaPlayoutStats } from './schema/ClientSample';
+import { MediaPlayoutStats } from '../schema/ClientSample';
 
 export class ObservedMediaPlayout implements MediaPlayoutStats {
 	private _visited = false;

package/src/{ObservedMediaSource.ts → webrtc/ObservedMediaSource.ts}

@@ -1,6 +1,6 @@
-import { MediaKind } from './common/types';
+import { MediaKind } from '../common/types';
 import { ObservedPeerConnection } from './ObservedPeerConnection';
-import { MediaSourceStats } from './schema/ClientSample';
+import { MediaSourceStats } from '../schema/ClientSample';
 
 export class ObservedMediaSource implements MediaSourceStats {
 	private _visited = false;

package/src/{ObservedOutboundRtp.ts → webrtc/ObservedOutboundRtp.ts}

@@ -1,6 +1,6 @@
-import { MediaKind } from './common/types';
+import { MediaKind } from '../common/types';
 import { ObservedPeerConnection } from './ObservedPeerConnection';
-import { OutboundRtpStats, QualityLimitationDurations } from './schema/ClientSample';
+import { OutboundRtpStats, QualityLimitationDurations } from '../schema/ClientSample';
 
 export class ObservedOutboundRtp implements OutboundRtpStats {
 	private _visited = false;

package/src/{ObservedOutboundTrack.ts → webrtc/ObservedOutboundTrack.ts}

@@ -1,7 +1,7 @@
-import { CalculatedScore } from './scores/CalculatedScore';
-import { MediaKind } from './common/types';
-import { OutboundTrackSample } from './schema/ClientSample';
-import { Detectors } from './detectors/Detectors';
+import { CalculatedScore } from '../scores/CalculatedScore';
+import { MediaKind } from '../common/types';
+import { OutboundTrackSample } from '../schema/ClientSample';
+import { Detectors } from '../detectors/Detectors';
 import { ObservedPeerConnection } from './ObservedPeerConnection';
 import { ObservedOutboundRtp } from './ObservedOutboundRtp';
 import { ObservedMediaSource } from './ObservedMediaSource';
@@ -15,6 +15,11 @@ export class ObservedOutboundTrack implements OutboundTrackSample {
 		value: undefined,
 	};
 
+	public addedAt?: number | undefined;
+	public removedAt?: number | undefined;
+
+	public muted?: boolean;
+
 	attachments?: Record<string, unknown> | undefined;
 
 	constructor(