mediasoup-client 3.6.52 → 3.6.53

package/src/Transport.ts

@@ -9,7 +9,10 @@ import { Producer, ProducerOptions } from './Producer';
 import { Consumer, ConsumerOptions } from './Consumer';
 import { DataProducer, DataProducerOptions } from './DataProducer';
 import { DataConsumer, DataConsumerOptions } from './DataConsumer';
-import { SctpParameters } from './SctpParameters';
+import { RtpParameters, MediaKind } from './RtpParameters';
+import { SctpParameters, SctpStreamParameters } from './SctpParameters';
+
+const logger = new Logger('Transport');
 
 interface InternalTransportOptions extends TransportOptions
 {
@@ -29,7 +32,7 @@ class ConsumerCreationTask
 	constructor(consumerOptions: ConsumerOptions)
 	{
 		this.consumerOptions = consumerOptions;
-		this.promise = new Promise((resolve, reject) =>
+		this.promise = new Promise<Consumer>((resolve, reject) =>
 		{
 			this.resolve = resolve;
 			this.reject = reject;
@@ -148,9 +151,43 @@ export type PlainRtpParameters =
 	port: number;
 };
 
-const logger = new Logger('Transport');
+export type TransportEvents =
+{
+	connect: [{ dtlsParameters: DtlsParameters }, () => void, (error: Error) => void];
+	connectionstatechange: [ConnectionState];
+	produce:
+	[
+		{
+			kind: MediaKind;
+			rtpParameters: RtpParameters;
+			appData: Record<string, unknown>;
+		},
+		({ id }: { id: string }) => void,
+		(error: Error) => void
+	];
+	producedata:
+	[
+		{
+			sctpStreamParameters: SctpStreamParameters;
+			label?: string;
+			protocol?: string;
+			appData: Record<string, unknown>;
+		},
+		({ id }: { id: string }) => void,
+		(error: Error) => void
+	];
+};
 
-export class Transport extends EnhancedEventEmitter
+export type TransportObserverEvents =
+{
+	close: [];
+	newproducer: [Producer];
+	newconsumer: [Consumer];
+	newdataproducer: [DataProducer];
+	newdataconsumer: [DataConsumer];
+};
+
+export class Transport extends EnhancedEventEmitter<TransportEvents>
 {
 	// Id.
 	private readonly _id: string;
@@ -196,14 +233,8 @@ export class Transport extends EnhancedEventEmitter
 	// Consumer resume in progress flag.
 	private _consumerResumeInProgress = false;
 	// Observer instance.
-	protected readonly _observer = new EnhancedEventEmitter();
+	protected readonly _observer = new EnhancedEventEmitter<TransportObserverEvents>();
 
-	/**
-	 * @emits connect - (transportLocalParameters: any, callback: Function, errback: Function)
-	 * @emits connectionstatechange - (connectionState: ConnectionState)
-	 * @emits produce - (producerLocalParameters: any, callback: Function, errback: Function)
-	 * @emits producedata - (dataProducerLocalParameters: any, callback: Function, errback: Function)
-	 */
 	constructor(
 		{
 			direction,
@@ -321,15 +352,6 @@ export class Transport extends EnhancedEventEmitter
 		throw new Error('cannot override appData object');
 	}
 
-	/**
-	 * Observer.
-	 *
-	 * @emits close
-	 * @emits newproducer - (producer: Producer)
-	 * @emits newconsumer - (producer: Producer)
-	 * @emits newdataproducer - (dataProducer: DataProducer)
-	 * @emits newdataconsumer - (dataProducer: DataProducer)
-	 */
 	get observer(): EnhancedEventEmitter
 	{
 		return this._observer;
@@ -530,13 +552,19 @@ export class Transport extends EnhancedEventEmitter
 					// This will fill rtpParameters's missing fields with default values.
 					ortc.validateRtpParameters(rtpParameters);
 
-					const { id } = await this.safeEmitAsPromise(
-						'produce',
-						{
-							kind : track.kind,
-							rtpParameters,
-							appData
-						});
+					const { id } = await new Promise<{ id: string }>((resolve, reject) =>
+					{
+						this.safeEmit(
+							'produce',
+							{
+								kind : track.kind as MediaKind,
+								rtpParameters,
+								appData
+							},
+							resolve,
+							reject
+						);
+					});
 
 					const producer = new Producer(
 						{
@@ -692,14 +720,20 @@ export class Transport extends EnhancedEventEmitter
 				// This will fill sctpStreamParameters's missing fields with default values.
 				ortc.validateSctpStreamParameters(sctpStreamParameters);
 
-				const { id } = await this.safeEmitAsPromise(
-					'producedata',
-					{
-						sctpStreamParameters,
-						label,
-						protocol,
-						appData
-					});
+				const { id } = await new Promise<{ id: string }>((resolve, reject) =>
+				{
+					this.safeEmit(
+						'producedata',
+						{
+							sctpStreamParameters,
+							label,
+							protocol,
+							appData
+						},
+						resolve,
+						reject
+					);
+				});
 
 				const dataProducer =
 					new DataProducer({ id, dataChannel, sctpStreamParameters, appData });
@@ -983,8 +1017,8 @@ export class Transport extends EnhancedEventEmitter
 
 		handler.on('@connect', (
 			{ dtlsParameters }: { dtlsParameters: DtlsParameters },
-			callback: Function,
-			errback: Function
+			callback: () => void,
+			errback: (error: Error) => void
 		) =>
 		{
 			if (this._closed)
@@ -1058,7 +1092,7 @@ export class Transport extends EnhancedEventEmitter
 		producer.on('@getstats', (callback, errback) =>
 		{
 			if (this._closed)
-				return errback(new InvalidStateError('closed'));
+				return errback!(new InvalidStateError('closed'));
 
 			this._handler.getSenderStats(producer.localId)
 				.then(callback)
@@ -1122,7 +1156,7 @@ export class Transport extends EnhancedEventEmitter
 		consumer.on('@getstats', (callback, errback) =>
 		{
 			if (this._closed)
-				return errback(new InvalidStateError('closed'));
+				return errback!(new InvalidStateError('closed'));
 
 			this._handler.getReceiverStats(consumer.localId)
 				.then(callback)

package/src/handlers/Chrome55.ts

@@ -816,7 +816,15 @@ export class Chrome55 extends HandlerInterface
 			localDtlsRole === 'client' ? 'server' : 'client');
 
 		// Need to tell the remote transport about our parameters.
-		await this.safeEmitAsPromise('@connect', { dtlsParameters });
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@connect',
+				{ dtlsParameters },
+				resolve,
+				reject
+			);
+		});
 
 		this._transportReady = true;
 	}

package/src/handlers/Chrome67.ts

@@ -901,7 +901,15 @@ export class Chrome67 extends HandlerInterface
 			localDtlsRole === 'client' ? 'server' : 'client');
 
 		// Need to tell the remote transport about our parameters.
-		await this.safeEmitAsPromise('@connect', { dtlsParameters });
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@connect',
+				{ dtlsParameters },
+				resolve,
+				reject
+			);
+		});
 
 		this._transportReady = true;
 	}

package/src/handlers/Chrome70.ts

@@ -909,7 +909,15 @@ export class Chrome70 extends HandlerInterface
 			localDtlsRole === 'client' ? 'server' : 'client');
 
 		// Need to tell the remote transport about our parameters.
-		await this.safeEmitAsPromise('@connect', { dtlsParameters });
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@connect',
+				{ dtlsParameters },
+				resolve,
+				reject
+			);
+		});
 
 		this._transportReady = true;
 	}

package/src/handlers/Chrome74.ts

@@ -950,7 +950,15 @@ export class Chrome74 extends HandlerInterface
 			localDtlsRole === 'client' ? 'server' : 'client');
 
 		// Need to tell the remote transport about our parameters.
-		await this.safeEmitAsPromise('@connect', { dtlsParameters });
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@connect',
+				{ dtlsParameters },
+				resolve,
+				reject
+			);
+		});
 
 		this._transportReady = true;
 	}

package/src/handlers/Edge11.ts

@@ -605,7 +605,15 @@ export class Edge11 extends HandlerInterface
 		dtlsParameters.role = localDtlsRole;
 
 		// Need to tell the remote transport about our parameters.
-		await this.safeEmitAsPromise('@connect', { dtlsParameters });
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@connect',
+				{ dtlsParameters },
+				resolve,
+				reject
+			);
+		});
 
 		// Start the RTCIceTransport.
 		this._iceTransport.start(

package/src/handlers/FakeHandler.ts

@@ -18,7 +18,8 @@ import {
 import {
 	IceParameters,
 	DtlsParameters,
-	DtlsRole
+	DtlsRole,
+	ConnectionState
 } from '../Transport';
 import { RtpCapabilities, RtpParameters } from '../RtpParameters';
 import { SctpCapabilities } from '../SctpParameters';
@@ -126,7 +127,7 @@ export class FakeHandler extends HandlerInterface
 	}
 
 	// NOTE: Custom method for simulation purposes.
-	setConnectionState(connectionState: string): void
+	setConnectionState(connectionState: ConnectionState): void
 	{
 		this.emit('@connectionstatechange', connectionState);
 	}
@@ -422,7 +423,7 @@ export class FakeHandler extends HandlerInterface
 		this.emit('@connectionstatechange', 'connecting');
 
 		// Need to tell the remote transport about our parameters.
-		await new Promise((resolve, reject) => (
+		await new Promise<void>((resolve, reject) => (
 			this.emit('@connect', { dtlsParameters }, resolve, reject)
 		));
 

package/src/handlers/Firefox60.ts

@@ -931,7 +931,15 @@ export class Firefox60 extends HandlerInterface
 			localDtlsRole === 'client' ? 'server' : 'client');
 
 		// Need to tell the remote transport about our parameters.
-		await this.safeEmitAsPromise('@connect', { dtlsParameters });
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@connect',
+				{ dtlsParameters },
+				resolve,
+				reject
+			);
+		});
 
 		this._transportReady = true;
 	}

package/src/handlers/HandlerInterface.ts

@@ -3,7 +3,8 @@ import { ProducerCodecOptions } from '../Producer';
 import {
 	IceParameters,
 	IceCandidate,
-	DtlsParameters
+	DtlsParameters,
+	ConnectionState
 } from '../Transport';
 import {
 	RtpCapabilities,
@@ -82,16 +83,19 @@ export type HandlerReceiveDataChannelResult =
 	dataChannel: RTCDataChannel;
 }
 
-export abstract class HandlerInterface extends EnhancedEventEmitter
+export type HandlerEvents =
+{
+	'@connect':
+	[
+		{ dtlsParameters: DtlsParameters },
+		() => void,
+		(error: Error) => void
+	];
+	'@connectionstatechange': [ConnectionState];
+}
+
+export abstract class HandlerInterface extends EnhancedEventEmitter<HandlerEvents>
 {
-	/**
-	 * @emits @connect - (
-	 *     { dtlsParameters: DtlsParameters },
-	 *     callback: Function,
-	 *     errback: Function
-	 *   )
-	 * @emits @connectionstatechange - (connectionState: ConnectionState)
-	 */
 	constructor()
 	{
 		super();

package/src/handlers/ReactNative.ts

@@ -836,7 +836,15 @@ export class ReactNative extends HandlerInterface
 			localDtlsRole === 'client' ? 'server' : 'client');
 
 		// Need to tell the remote transport about our parameters.
-		await this.safeEmitAsPromise('@connect', { dtlsParameters });
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@connect',
+				{ dtlsParameters },
+				resolve,
+				reject
+			);
+		});
 
 		this._transportReady = true;
 	}

package/src/handlers/Safari11.ts

@@ -894,7 +894,15 @@ export class Safari11 extends HandlerInterface
 			localDtlsRole === 'client' ? 'server' : 'client');
 
 		// Need to tell the remote transport about our parameters.
-		await this.safeEmitAsPromise('@connect', { dtlsParameters });
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@connect',
+				{ dtlsParameters },
+				resolve,
+				reject
+			);
+		});
 
 		this._transportReady = true;
 	}

package/src/handlers/Safari12.ts

@@ -900,7 +900,15 @@ export class Safari12 extends HandlerInterface
 			localDtlsRole === 'client' ? 'server' : 'client');
 
 		// Need to tell the remote transport about our parameters.
-		await this.safeEmitAsPromise('@connect', { dtlsParameters });
+		await new Promise<void>((resolve, reject) =>
+		{
+			this.safeEmit(
+				'@connect',
+				{ dtlsParameters },
+				resolve,
+				reject
+			);
+		});
 
 		this._transportReady = true;
 	}

package/src/utils.ts

@@ -3,7 +3,6 @@
  */
 export function clone(data: any, defaultValue: any): any
 {
-
 	if (typeof data === 'undefined')
 		return defaultValue;