Remove Logger from EnhancedEventEmitter

versatica · Nov 9, 2024 · dc614c1 · dc614c1
1 parent 7dd9e61
commit dc614c1
Show file tree

Hide file tree

Showing 18 changed files with 142 additions and 16 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -90,6 +90,7 @@ const config = tsEslint.config(
 				2,
 				{ vars: 'all', args: 'after-used', caughtErrors: 'none' },
 			],
+			'no-unused-private-class-members': 2,
 			'no-use-before-define': 0,
 			'no-useless-call': 2,
 			'no-useless-computed-key': 2,

diff --git a/node/src/ActiveSpeakerObserver.ts b/node/src/ActiveSpeakerObserver.ts
@@ -40,6 +40,7 @@ export class ActiveSpeakerObserverImpl<
 		super(options, observer);
 
 		this.handleWorkerNotifications();
+		this.handleListenerError();
 	}
 
 	/**
@@ -85,4 +86,13 @@ export class ActiveSpeakerObserverImpl<
 			}
 		);
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
diff --git a/node/src/AudioLevelObserver.ts b/node/src/AudioLevelObserver.ts
@@ -42,6 +42,7 @@ export class AudioLevelObserverImpl<
 		super(options, observer);
 
 		this.handleWorkerNotifications();
+		this.handleListenerError();
 	}
 
 	/**
@@ -108,6 +109,15 @@ export class AudioLevelObserverImpl<
 			}
 		);
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 function parseVolume(binary: FbsAudioLevelObserver.Volume): {

diff --git a/node/src/Consumer.ts b/node/src/Consumer.ts
@@ -131,6 +131,7 @@ export class ConsumerImpl<ConsumerAppData extends AppData = AppData>
 		this.#appData = appData ?? ({} as ConsumerAppData);
 
 		this.handleWorkerNotifications();
+		this.handleListenerError();
 	}
 
 	get id(): string {
@@ -598,6 +599,15 @@ export class ConsumerImpl<ConsumerAppData extends AppData = AppData>
 			}
 		);
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 export function parseTraceEventData(

diff --git a/node/src/DataConsumer.ts b/node/src/DataConsumer.ts
@@ -98,6 +98,7 @@ export class DataConsumerImpl<DataConsumerAppData extends AppData = AppData>
 		this.#appData = appData ?? ({} as DataConsumerAppData);
 
 		this.handleWorkerNotifications();
+		this.handleListenerError();
 	}
 
 	get id(): string {
@@ -554,6 +555,15 @@ export class DataConsumerImpl<DataConsumerAppData extends AppData = AppData>
 			}
 		);
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 export function dataConsumerTypeToFbs(

diff --git a/node/src/DataProducer.ts b/node/src/DataProducer.ts
@@ -82,6 +82,7 @@ export class DataProducerImpl<DataProducerAppData extends AppData = AppData>
 		this.#appData = appData ?? ({} as DataProducerAppData);
 
 		this.handleWorkerNotifications();
+		this.handleListenerError();
 	}
 
 	get id(): string {
@@ -333,6 +334,15 @@ export class DataProducerImpl<DataProducerAppData extends AppData = AppData>
 	private handleWorkerNotifications(): void {
 		// No need to subscribe to any event.
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 export function dataProducerTypeToFbs(

diff --git a/node/src/DirectTransport.ts b/node/src/DirectTransport.ts
@@ -65,6 +65,7 @@ export class DirectTransportImpl<
 		};
 
 		this.handleWorkerNotifications();
+		this.handleListenerError();
 	}
 
 	get observer(): DirectTransportObserver {
@@ -214,6 +215,15 @@ export class DirectTransportImpl<
 			}
 		);
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 export function parseDirectTransportDumpResponse(

diff --git a/node/src/Logger.ts b/node/src/Logger.ts
@@ -1,5 +1,5 @@
 import debug from 'debug';
-import { EnhancedEventEmitter } from './enhancedEvents';
+import type { EnhancedEventEmitter } from './enhancedEvents';
 
 const APP_NAME = 'mediasoup';
 

diff --git a/node/src/PipeTransport.ts b/node/src/PipeTransport.ts
@@ -89,6 +89,7 @@ export class PipeTransportImpl<PipeTransportAppData extends AppData = AppData>
 		};
 
 		this.handleWorkerNotifications();
+		this.handleListenerError();
 	}
 
 	get observer(): PipeTransportObserver {
@@ -328,6 +329,15 @@ export class PipeTransportImpl<PipeTransportAppData extends AppData = AppData>
 			}
 		);
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 /*

diff --git a/node/src/PlainTransport.ts b/node/src/PlainTransport.ts
@@ -82,6 +82,7 @@ export class PlainTransportImpl<PlainTransportAppData extends AppData = AppData>
 		};
 
 		this.handleWorkerNotifications();
+		this.handleListenerError();
 	}
 
 	get observer(): PlainTransportObserver {
@@ -294,6 +295,15 @@ export class PlainTransportImpl<PlainTransportAppData extends AppData = AppData>
 			}
 		);
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 export function parsePlainTransportDumpResponse(

diff --git a/node/src/Producer.ts b/node/src/Producer.ts
@@ -95,6 +95,7 @@ export class ProducerImpl<ProducerAppData extends AppData = AppData>
 		this.#appData = appData ?? ({} as ProducerAppData);
 
 		this.handleWorkerNotifications();
+		this.handleListenerError();
 	}
 
 	get id(): string {
@@ -397,6 +398,15 @@ export class ProducerImpl<ProducerAppData extends AppData = AppData>
 			}
 		);
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 export function producerTypeFromFbs(type: FbsRtpParameters.Type): ProducerType {

diff --git a/node/src/Router.ts b/node/src/Router.ts
@@ -152,6 +152,8 @@ export class RouterImpl<RouterAppData extends AppData = AppData>
 		this.#data = data;
 		this.#channel = channel;
 		this.#appData = appData ?? ({} as RouterAppData);
+
+		this.handleListenerError();
 	}
 
 	get id(): string {
@@ -1364,6 +1366,15 @@ export class RouterImpl<RouterAppData extends AppData = AppData>
 			return false;
 		}
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 export function parseRouterDumpResponse(

diff --git a/node/src/Transport.ts b/node/src/Transport.ts
@@ -1421,7 +1421,7 @@ function createProduceRequest({
 	producerId: string;
 	kind: MediaKind;
 	rtpParameters: RtpParameters;
-	rtpMapping: ortc.RtpMapping;
+	rtpMapping: ortc.RtpCodecsEncodingsMapping;
 	keyFrameRequestDelay?: number;
 	paused: boolean;
 }): number {

diff --git a/node/src/WebRtcServer.ts b/node/src/WebRtcServer.ts
@@ -63,6 +63,8 @@ export class WebRtcServerImpl<WebRtcServerAppData extends AppData = AppData>
 		this.#internal = internal;
 		this.#channel = channel;
 		this.#appData = appData ?? ({} as WebRtcServerAppData);
+
+		this.handleListenerError();
 	}
 
 	get id(): string {
@@ -179,6 +181,15 @@ export class WebRtcServerImpl<WebRtcServerAppData extends AppData = AppData>
 			this.#observer.safeEmit('webrtctransportunhandled', webRtcTransport);
 		});
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 function parseIpPort(binary: FbsWebRtcServer.IpPort): IpPort {

diff --git a/node/src/WebRtcTransport.ts b/node/src/WebRtcTransport.ts
@@ -108,6 +108,7 @@ export class WebRtcTransportImpl<
 		};
 
 		this.handleWorkerNotifications();
+		this.handleListenerError();
 	}
 
 	get observer(): WebRtcTransportObserver {
@@ -395,6 +396,15 @@ export class WebRtcTransportImpl<
 			}
 		);
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 function iceStateFromFbs(fbsIceState: FbsIceState): IceState {

diff --git a/node/src/Worker.ts b/node/src/Worker.ts
@@ -299,6 +299,8 @@ export class WorkerImpl<WorkerAppData extends AppData = AppData>
 				}
 			}
 		});
+
+		this.handleListenerError();
 	}
 
 	get pid(): number {
@@ -584,6 +586,15 @@ export class WorkerImpl<WorkerAppData extends AppData = AppData>
 		// Emit observer event.
 		this.#observer.safeEmit('close');
 	}
+
+	private handleListenerError(): void {
+		this.on('listenererror', (eventName, error) => {
+			logger.error(
+				`event listener threw an error [eventName:${eventName}]:`,
+				error
+			);
+		});
+	}
 }
 
 export function parseWorkerDumpResponse(

diff --git a/node/src/enhancedEvents.ts b/node/src/enhancedEvents.ts
@@ -1,7 +1,4 @@
 import { EventEmitter, once } from 'node:events';
-import { Logger } from './Logger';
-
-const enhancedEventEmitterLogger = new Logger('EnhancedEventEmitter');
 
 type Events = Record<string, any[]>;
 
@@ -10,6 +7,7 @@ export class EnhancedEventEmitter<
 > extends EventEmitter {
 	constructor() {
 		super();
+
 		this.setMaxListeners(Infinity);
 	}
 
@@ -24,11 +22,6 @@ export class EnhancedEventEmitter<
 		try {
 			return super.emit(eventName, ...args);
 		} catch (error) {
-			enhancedEventEmitterLogger.error(
-				`safeEmit() | event listener threw an error [eventName:${eventName}]:`,
-				error as Error
-			);
-
 			try {
 				super.emit('listenererror', eventName, error);
 			} catch (error2) {