@observertc/observer-js 1.0.1-b52220e.0 → 1.0.1-c2558cc.0

package/src/updaters/{OnAnyCallObserverUpdater_.ts → OnAnyCallObserverUpdater.ts}

@@ -5,7 +5,8 @@ import { Updater } from './Updater';
 export class OnAnyCallObserverUpdater implements Updater {
 	public readonly name = 'OnAnyCallObserverUpdater';
 	public readonly description = 'Call Observer\'s update() method on any of the ObservedCall is updated';
-	
+	public closed = false;
+
 	public constructor(
 		private observver: Observer
 	) {
@@ -17,12 +18,20 @@ export class OnAnyCallObserverUpdater implements Updater {
 		this.observver.on('newcall', this._onNewObservedCall);
 	}
 
-	close(): void {
+	public close(): void {
+		if (this.closed) return;
+		this.closed = true;
 		// do nothing, because we unsubscribe once close is emitted from observer
 	}
 
 	private _onNewObservedCall(observedCall: ObservedCall) {
-		const onUpdate = () => this.observver.update();
+		if (this.closed) return;
+		
+		const onUpdate = () => {
+			if (this.closed) return;
+
+			this.observver.update();
+		};
 
 		observedCall.once('close', () => {
 			observedCall.off('update', onUpdate);

package/src/updaters/OnAnyClientCallUpdater.ts

@@ -5,6 +5,7 @@ import { Updater } from './Updater';
 export class OnAnyClientCallUpdater implements Updater {
 	readonly name = 'OnAnyClientCallUpdater';
 	readonly description = 'Call the update() method of the ObservedCall when any of the client has been updated';
+	public closed = false;
 
 	public constructor(
 		private _observedCall: ObservedCall
@@ -18,11 +19,17 @@ export class OnAnyClientCallUpdater implements Updater {
 	}
 	
 	public close(): void {
-		// do nothing, as close once emitted unsubscription happened
+		if (this.closed) return;
+		this.closed = true;
 	}
 
 	private _onNewObservedClient(observedClient: ObservedClient) {
-		const onUpdate = () => this._observedCall.update();
+		if (this.closed) return;
+		
+		const onUpdate = () => {
+			if (this.closed) return;
+			this._observedCall.update();
+		};
 
 		observedClient.once('close', () => {
 			observedClient.off('update', onUpdate);

package/src/utils/MediasoupRemoteTrackResolver.ts

@@ -0,0 +1,155 @@
+import { ObservedCall } from '../ObservedCall';
+import { ObservedCallEventMonitor } from '../ObservedCallEventMonitor';
+import { ObservedInboundTrack } from '../ObservedInboundTrack';
+import { ObservedOutboundTrack } from '../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/lib/updaters/OnAllCallObserverUpdater_.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OnAllCallObserverUpdater_.d.ts","sourceRoot":"","sources":["../../src/updaters/OnAllCallObserverUpdater_.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAa,wBAAyB,YAAW,OAAO;IAOtD,OAAO,CAAC,QAAQ;IANjB,SAAgB,IAAI,8BAA8B;IAClD,SAAgB,WAAW,+EAAgF;IAE3G,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;gBAG1C,QAAQ,EAAE,QAAQ;IAU3B,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,sBAAsB;CAU9B"}

package/lib/updaters/OnAnyCallObserverUpdater_.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OnAnyCallObserverUpdater_.d.ts","sourceRoot":"","sources":["../../src/updaters/OnAnyCallObserverUpdater_.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAa,wBAAyB,YAAW,OAAO;IAKtD,OAAO,CAAC,SAAS;IAJlB,SAAgB,IAAI,8BAA8B;IAClD,SAAgB,WAAW,2EAA4E;gBAG9F,SAAS,EAAE,QAAQ;IAU5B,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,kBAAkB;CAQ1B"}