mediasoup-client 3.6.52 → 3.6.55

package/src/Consumer.ts

@@ -3,6 +3,8 @@ import { EnhancedEventEmitter } from './EnhancedEventEmitter';
 import { InvalidStateError } from './errors';
 import { MediaKind, RtpParameters } from './RtpParameters';
 
+const logger = new Logger('Consumer');
+
 export type ConsumerOptions =
 {
 	id?: string;
@@ -12,9 +14,26 @@ export type ConsumerOptions =
 	appData?: Record<string, unknown>;
 }
 
-const logger = new Logger('Consumer');
+export type ConsumerEvents =
+{
+	transportclose: [];
+	trackended: [];
+	// Private events.
+	'@getstats': [(stats: RTCStatsReport) => void, (error: Error) => void];
+	'@close': [];
+	'@pause': [];
+	'@resume': [];
+}
+
+export type ConsumerObserverEvents =
+{
+	close: [];
+	pause: [];
+	resume: [];
+	trackended: [];
+}
 
-export class Consumer extends EnhancedEventEmitter
+export class Consumer extends EnhancedEventEmitter<ConsumerEvents>
 {
 	// Id.
 	private readonly _id: string;
@@ -35,16 +54,8 @@ export class Consumer extends EnhancedEventEmitter
 	// App custom data.
 	private readonly _appData: Record<string, unknown>;
 	// Observer instance.
-	protected readonly _observer = new EnhancedEventEmitter();
+	protected readonly _observer = new EnhancedEventEmitter<ConsumerObserverEvents>();
 
-	/**
-	 * @emits transportclose
-	 * @emits trackended
-	 * @emits @getstats
-	 * @emits @close
-	 * @emits @pause
-	 * @emits @resume
-	 */
 	constructor(
 		{
 			id,
@@ -172,14 +183,6 @@ export class Consumer extends EnhancedEventEmitter
 		throw new Error('cannot override appData object');
 	}
 
-	/**
-	 * Observer.
-	 *
-	 * @emits close
-	 * @emits pause
-	 * @emits resume
-	 * @emits trackended
-	 */
 	get observer(): EnhancedEventEmitter
 	{
 		return this._observer;
@@ -233,7 +236,14 @@ export class Consumer extends EnhancedEventEmitter
 		if (this._closed)
 			throw new InvalidStateError('closed');
 
-		return this.safeEmitAsPromise('@getstats');
+		return new Promise<RTCStatsReport>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@getstats',
+				resolve,
+				reject
+			);
+		});
 	}
 
 	/**
@@ -250,6 +260,13 @@ export class Consumer extends EnhancedEventEmitter
 			return;
 		}
 
+		if (this._paused)
+		{
+			logger.debug('pause() | Consumer is already paused');
+
+			return;
+		}
+
 		this._paused = true;
 		this._track.enabled = false;
 
@@ -273,6 +290,13 @@ export class Consumer extends EnhancedEventEmitter
 			return;
 		}
 
+		if (!this._paused)
+		{
+			logger.debug('resume() | Consumer is already resumed');
+
+			return;
+		}
+
 		this._paused = false;
 		this._track.enabled = true;
 

package/src/DataConsumer.ts

@@ -2,6 +2,8 @@ import { Logger } from './Logger';
 import { EnhancedEventEmitter } from './EnhancedEventEmitter';
 import { SctpStreamParameters } from './SctpParameters';
 
+const logger = new Logger('DataConsumer');
+
 export type DataConsumerOptions =
 {
 	id?: string;
@@ -12,9 +14,23 @@ export type DataConsumerOptions =
 	appData?: Record<string, unknown>;
 }
 
-const logger = new Logger('DataConsumer');
+export type DataConsumerEvents =
+{
+	transportclose: [];
+	open: [];
+	error: [Error];
+	close: [];
+	message: [any];
+	// Private events.
+	'@close': [];
+}
+
+export type DataConsumerObserverEvents =
+{
+	close: [];
+}
 
-export class DataConsumer extends EnhancedEventEmitter
+export class DataConsumer extends EnhancedEventEmitter<DataConsumerEvents>
 {
 	// Id.
 	private readonly _id: string;
@@ -29,16 +45,8 @@ export class DataConsumer extends EnhancedEventEmitter
 	// App custom data.
 	private readonly _appData: Record<string, unknown>;
 	// Observer instance.
-	protected readonly _observer = new EnhancedEventEmitter();
+	protected readonly _observer = new EnhancedEventEmitter<DataConsumerObserverEvents>();
 
-	/**
-	 * @emits transportclose
-	 * @emits open
-	 * @emits error - (error: Error)
-	 * @emits close
-	 * @emits message - (message: any)
-	 * @emits @close
-	 */
 	constructor(
 		{
 			id,
@@ -158,11 +166,6 @@ export class DataConsumer extends EnhancedEventEmitter
 		throw new Error('cannot override appData object');
 	}
 
-	/**
-	 * Observer.
-	 *
-	 * @emits close
-	 */
 	get observer(): EnhancedEventEmitter
 	{
 		return this._observer;

package/src/DataProducer.ts

@@ -3,6 +3,8 @@ import { EnhancedEventEmitter } from './EnhancedEventEmitter';
 import { InvalidStateError } from './errors';
 import { SctpStreamParameters } from './SctpParameters';
 
+const logger = new Logger('DataProducer');
+
 export type DataProducerOptions =
 {
 	ordered?: boolean;
@@ -13,9 +15,23 @@ export type DataProducerOptions =
 	appData?: Record<string, unknown>;
 }
 
-const logger = new Logger('DataProducer');
+export type DataProducerEvents =
+{
+	transportclose: [];
+	open: [];
+	error: [Error];
+	close: [];
+	bufferedamountlow: [];
+	// Private events.
+	'@close': [];
+}
 
-export class DataProducer extends EnhancedEventEmitter
+export type DataProducerObserverEvents =
+{
+	close: [];
+}
+
+export class DataProducer extends EnhancedEventEmitter<DataProducerEvents>
 {
 	// Id.
 	private readonly _id: string;
@@ -28,16 +44,8 @@ export class DataProducer extends EnhancedEventEmitter
 	// App custom data.
 	private readonly _appData: Record<string, unknown>;
 	// Observer instance.
-	protected readonly _observer = new EnhancedEventEmitter();
+	protected readonly _observer = new EnhancedEventEmitter<DataProducerObserverEvents>();
 
-	/**
-	 * @emits transportclose
-	 * @emits open
-	 * @emits error - (error: Error)
-	 * @emits close
-	 * @emits bufferedamountlow
-	 * @emits @close
-	 */
 	constructor(
 		{
 			id,
@@ -154,11 +162,6 @@ export class DataProducer extends EnhancedEventEmitter
 		throw new Error('cannot override appData object');
 	}
 
-	/**
-	 * Observer.
-	 *
-	 * @emits close
-	 */
 	get observer(): EnhancedEventEmitter
 	{
 		return this._observer;

package/src/Device.ts

@@ -179,6 +179,11 @@ export function detectDevice(): BuiltinHandlerName | undefined
 	}
 }
 
+export type DeviceObserverEvents =
+{
+	newtransport: [Transport];
+}
+
 export class Device
 {
 	// RTC handler factory.
@@ -197,7 +202,7 @@ export class Device
 	// Local SCTP capabilities.
 	private _sctpCapabilities?: SctpCapabilities;
 	// Observer instance.
-	protected readonly _observer = new EnhancedEventEmitter();
+	protected readonly _observer = new EnhancedEventEmitter<DeviceObserverEvents>();
 
 	/**
 	 * Create a new Device to connect to mediasoup server.
@@ -340,11 +345,6 @@ export class Device
 		return this._sctpCapabilities!;
 	}
 
-	/**
-	 * Observer.
-	 *
-	 * @emits newtransport - (transport: Transport)
-	 */
 	get observer(): EnhancedEventEmitter
 	{
 		return this._observer;

package/src/EnhancedEventEmitter.ts

@@ -3,7 +3,9 @@ import { Logger } from './Logger';
 
 const logger = new Logger('EnhancedEventEmitter');
 
-export class EnhancedEventEmitter extends EventEmitter
+type Events = Record<string, any[]>
+
+export class EnhancedEventEmitter<E extends Events = Events> extends EventEmitter
 {
 	constructor()
 	{
@@ -11,40 +13,121 @@ export class EnhancedEventEmitter extends EventEmitter
 		this.setMaxListeners(Infinity);
 	}
 
-	safeEmit(event: string, ...args: any[]): boolean
+	emit<K extends keyof E & string>(eventName: K, ...args: E[K]): boolean
+	{
+		return super.emit(eventName, ...args);
+	}
+
+	/**
+	 * Special addition to the EventEmitter API.
+	 */
+	safeEmit<K extends keyof E & string>(eventName: K, ...args: E[K]): boolean
 	{
-		const numListeners = this.listenerCount(event);
+		const numListeners = super.listenerCount(eventName);
 
 		try
 		{
-			return this.emit(event, ...args);
+			return super.emit(eventName, ...args);
 		}
 		catch (error)
 		{
 			logger.error(
-				'safeEmit() | event listener threw an error [event:%s]:%o',
-				event, error);
+				'safeEmit() | event listener threw an error [eventName:%s]:%o',
+				eventName, error);
 
 			return Boolean(numListeners);
 		}
 	}
 
-	async safeEmitAsPromise(event: string, ...args: any[]): Promise<any>
+	on<K extends keyof E & string>(
+		eventName: K,
+		listener: (...args: E[K]) => void
+	): this
 	{
-		return new Promise((resolve, reject) =>
-		{
-			try
-			{
-				this.emit(event, ...args, resolve, reject);
-			}
-			catch (error)
-			{
-				logger.error(
-					'safeEmitAsPromise() | event listener threw an error [event:%s]:%o',
-					event, error);
-
-				reject(error);
-			}
-		});
+		super.on(eventName, listener as (...args: any[]) => void);
+
+		return this;
+	}
+
+	off<K extends keyof E & string>(
+		eventName: K,
+		listener: (...args: E[K]) => void
+	): this
+	{
+		super.off(eventName, listener as (...args: any[]) => void);
+
+		return this;
+	}
+
+	addListener<K extends keyof E & string>(
+		eventName: K,
+		listener: (...args: E[K]) => void
+	): this
+	{
+		super.on(eventName, listener as (...args: any[]) => void);
+
+		return this;
+	}
+
+	prependListener<K extends keyof E & string>(
+		eventName: K,
+		listener: (...args: E[K]) => void
+	): this
+	{
+		super.prependListener(eventName, listener as (...args: any[]) => void);
+
+		return this;
+	}
+
+	once<K extends keyof E & string>(
+		eventName: K,
+		listener: (...args: E[K]) => void
+	): this
+	{
+		super.once(eventName, listener as (...args: any[]) => void);
+
+		return this;
+	}
+
+	prependOnceListener<K extends keyof E & string>(
+		eventName: K,
+		listener: (...args: E[K]) => void
+	): this
+	{
+		super.prependOnceListener(eventName, listener as (...args: any[]) => void);
+
+		return this;
+	}
+
+	removeListener<K extends keyof E & string>(
+		eventName: K,
+		listener: (...args: E[K]) => void
+	): this
+	{
+		super.off(eventName, listener as (...args: any[]) => void);
+
+		return this;
+	}
+
+	removeAllListeners<K extends keyof E & string>(eventName?: K): this
+	{
+		super.removeAllListeners(eventName);
+
+		return this;
+	}
+
+	listenerCount<K extends keyof E & string>(eventName: K): number
+	{
+		return super.listenerCount(eventName);
+	}
+
+	listeners<K extends keyof E & string>(eventName: K): Function[]
+	{
+		return super.listeners(eventName);
+	}
+
+	rawListeners<K extends keyof E & string>(eventName: K): Function[]
+	{
+		return super.rawListeners(eventName);
 	}
 }

package/src/Producer.ts

@@ -8,6 +8,8 @@ import {
 	RtpEncodingParameters
 } from './RtpParameters';
 
+const logger = new Logger('Producer');
+
 export type ProducerOptions =
 {
 	track?: MediaStreamTrack;
@@ -34,9 +36,50 @@ export type ProducerCodecOptions =
 	videoGoogleMinBitrate?: number;
 }
 
-const logger = new Logger('Producer');
+export type ProducerEvents =
+{
+	transportclose: [];
+	trackended: [];
+	// Private events.
+	'@pause': [
+		() => void,
+		(error: Error) => void
+	];
+	'@resume': [
+		() => void,
+		(error: Error) => void
+	];
+	'@replacetrack':
+	[
+		MediaStreamTrack | null,
+		() => void,
+		(error: Error) => void
+	];
+	'@setmaxspatiallayer':
+	[
+		number,
+		() => void,
+		(error: Error) => void
+	];
+	'@setrtpencodingparameters':
+	[
+		RTCRtpEncodingParameters,
+		() => void,
+		(error: Error) => void
+	];
+	'@getstats': [(stats: RTCStatsReport) => void, (error: Error) => void];
+	'@close': [];
+}
 
-export class Producer extends EnhancedEventEmitter
+export type ProducerObserverEvents =
+{
+	close: [];
+	pause: [];
+	resume: [];
+	trackended: [];
+}
+
+export class Producer extends EnhancedEventEmitter<ProducerEvents>
 {
 	// Id.
 	private readonly _id: string;
@@ -65,17 +108,8 @@ export class Producer extends EnhancedEventEmitter
 	// App custom data.
 	private readonly _appData: Record<string, unknown>;
 	// Observer instance.
-	protected readonly _observer = new EnhancedEventEmitter();
+	protected readonly _observer = new EnhancedEventEmitter<ProducerObserverEvents>();
 
-	/**
-	 * @emits transportclose
-	 * @emits trackended
-	 * @emits @replacetrack - (track: MediaStreamTrack | null)
-	 * @emits @setmaxspatiallayer - (spatialLayer: string)
-	 * @emits @setrtpencodingparameters - (params: any)
-	 * @emits @getstats
-	 * @emits @close
-	 */
 	constructor(
 		{
 			id,
@@ -216,14 +250,6 @@ export class Producer extends EnhancedEventEmitter
 		throw new Error('cannot override appData object');
 	}
 
-	/**
-	 * Observer.
-	 *
-	 * @emits close
-	 * @emits pause
-	 * @emits resume
-	 * @emits trackended
-	 */
 	get observer(): EnhancedEventEmitter
 	{
 		return this._observer;
@@ -277,7 +303,14 @@ export class Producer extends EnhancedEventEmitter
 		if (this._closed)
 			throw new InvalidStateError('closed');
 
-		return this.safeEmitAsPromise('@getstats');
+		return new Promise<RTCStatsReport>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@getstats',
+				resolve,
+				reject
+			);
+		});
 	}
 
 	/**
@@ -303,8 +336,14 @@ export class Producer extends EnhancedEventEmitter
 
 		if (this._zeroRtpOnPause)
 		{
-			this.safeEmitAsPromise('@replacetrack', null)
-				.catch(() => {});
+			new Promise<void>((resolve, reject) =>
+			{
+				this.safeEmit(
+					'@pause',
+					resolve,
+					reject
+				);
+			}).catch(() => {});
 		}
 
 		// Emit observer event.
@@ -334,8 +373,14 @@ export class Producer extends EnhancedEventEmitter
 
 		if (this._zeroRtpOnPause)
 		{
-			this.safeEmitAsPromise('@replacetrack', this._track)
-				.catch(() => {});
+			new Promise<void>((resolve, reject) =>
+			{
+				this.safeEmit(
+					'@resume',
+					resolve,
+					reject
+				);
+			}).catch(() => {});
 		}
 
 		// Emit observer event.
@@ -376,7 +421,15 @@ export class Producer extends EnhancedEventEmitter
 
 		if (!this._zeroRtpOnPause || !this._paused)
 		{
-			await this.safeEmitAsPromise('@replacetrack', track);
+			await new Promise<void>((resolve, reject) =>
+			{
+				this.safeEmit(
+					'@replacetrack',
+					track,
+					resolve,
+					reject
+				);
+			});
 		}
 
 		// Destroy the previous track.
@@ -414,14 +467,19 @@ export class Producer extends EnhancedEventEmitter
 		if (spatialLayer === this._maxSpatialLayer)
 			return;
 
-		await this.safeEmitAsPromise('@setmaxspatiallayer', spatialLayer);
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@setmaxspatiallayer',
+				spatialLayer,
+				resolve,
+				reject
+			);
+		}).catch(() => {});
 
 		this._maxSpatialLayer = spatialLayer;
 	}
 
-	/**
-	 * Sets the DSCP value.
-	 */
 	async setRtpEncodingParameters(
 		params: RTCRtpEncodingParameters
 	): Promise<void>
@@ -431,7 +489,15 @@ export class Producer extends EnhancedEventEmitter
 		else if (typeof params !== 'object')
 			throw new TypeError('invalid params');
 
-		await this.safeEmitAsPromise('@setrtpencodingparameters', params);
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@setrtpencodingparameters',
+				params,
+				resolve,
+				reject
+			);
+		});
 	}
 
 	private _onTrackEnded(): void