refactor: remove old emitter handling from EventEmitterService and clean up init function (#318)

Author: ggazzo

packages/federation-sdk/src/index.ts

@@ -1,6 +1,5 @@
 import 'reflect-metadata';
 
-import { Emitter } from '@rocket.chat/emitter';
 import type { EventStagingStore } from '@rocket.chat/federation-core';
 import type {
 	EventID,
@@ -140,10 +139,8 @@ export {
 } from '@rocket.chat/federation-room';
 
 export async function init({
-	emitter,
 	dbConfig,
 }: {
-	emitter?: Emitter<HomeserverEventSignatures>;
 	dbConfig: {
 		uri: string;
 		poolSize: number;
@@ -187,10 +184,6 @@ export async function init({
 			'rocketchat_federation_state_graphs',
 		),
 	});
-	const eventEmitterService = container.resolve(EventEmitterService);
-	if (emitter) {
-		eventEmitterService.setEmitter(emitter);
-	}
 	// this is required to initialize the listener and register the queue handler
 	container.resolve(StagingAreaListener);
 

packages/federation-sdk/src/services/event-emitter.service.ts

@@ -13,13 +13,6 @@ import type { HomeserverEventSignatures } from '..';
 export class EventEmitterService {
 	private emitter: AsyncDispatcher<HomeserverEventSignatures> =
 		new AsyncDispatcher<HomeserverEventSignatures>();
-	private oldEmitter: Emitter<HomeserverEventSignatures> =
-		new Emitter<HomeserverEventSignatures>();
-
-	public setEmitter(emitter: Emitter<HomeserverEventSignatures>): void {
-		this.oldEmitter = emitter;
-		logger.info('EventEmitterService: External emitter injected');
-	}
 
 	public async emit<K extends keyof HomeserverEventSignatures>(
 		event: K,
@@ -28,46 +21,27 @@ export class EventEmitterService {
 			: [EventOf<HomeserverEventSignatures, K>]
 	): Promise<void> {
 		await this.emitter.emit(event, ...([data] as any));
-		if (this.oldEmitter) {
-			await this.oldEmitter.emit(event, ...([data] as any));
-		}
 		logger.debug({ msg: `Event emitted: ${event}`, event, data });
 	}
 
 	public on<K extends keyof HomeserverEventSignatures>(
 		event: K,
 		handler: EventHandlerOf<HomeserverEventSignatures, K>,
 	): (() => void) | undefined {
-		const [handler1, handler2] = [
-			this.emitter.on(event, handler),
-			this.oldEmitter.on(event, handler),
-		];
-		return () => {
-			handler1();
-			handler2();
-		};
+		return this.emitter.on(event, handler);
 	}
 
 	public once<K extends keyof HomeserverEventSignatures>(
 		event: K,
 		handler: EventHandlerOf<HomeserverEventSignatures, K>,
 	): (() => void) | undefined {
-		const [handler1, handler2] = [
-			this.emitter.once(event, handler),
-			this.oldEmitter.once(event, handler),
-		];
-		return () => {
-			handler1();
-			handler2();
-		};
+		return this.emitter.once(event, handler);
 	}
 
 	public off<K extends keyof HomeserverEventSignatures>(
 		event: K,
 		handler: EventHandlerOf<HomeserverEventSignatures, K>,
 	): void {
 		this.emitter.off(event, handler);
-
-		this.oldEmitter.off(event, handler);
 	}
 }