@tsed/event-emitter 7.28.0 → 7.29.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/event-emitter",
-  "version": "7.28.0",
+  "version": "7.29.1",
   "description": "EventEmitter package for Ts.ED framework",
   "source": "./src/index.ts",
   "main": "./lib/cjs/index.js",
@@ -25,11 +25,11 @@
   },
   "private": false,
   "devDependencies": {
-    "@tsed/common": "7.28.0",
-    "@tsed/core": "7.28.0",
-    "@tsed/di": "7.28.0",
-    "@tsed/eslint": "7.28.0",
-    "@tsed/typescript": "7.28.0",
+    "@tsed/common": "7.29.1",
+    "@tsed/core": "7.29.1",
+    "@tsed/di": "7.29.1",
+    "@tsed/eslint": "7.29.1",
+    "@tsed/typescript": "7.29.1",
     "eslint": "^8.12.0",
     "eventemitter2": "^6.4.4"
   },

package/src/EventEmitterModule.ts

@@ -7,7 +7,7 @@ import {EventEmitterService} from "./services/EventEmitterFactory";
 @Module()
 export class EventEmitterModule {
   @Constant("eventEmitter.disableSummary", false)
-  disableSummary: boolean;
+  private disableSummary: boolean;
 
   @Inject()
   protected logger: Logger;
@@ -21,10 +21,15 @@ export class EventEmitterModule {
   @Constant("eventEmitter.enabled", false)
   private loadEventEmitter: boolean;
 
-  async $afterListen(): Promise<any> {
+  $onInit() {
+    if (this.loadEventEmitter) {
+      const providers = this.injector.getProviders();
+      providers.forEach((provider) => this.bindEventListeners(provider));
+    }
+  }
+
+  $onReady() {
     if (this.loadEventEmitter) {
-      const providers = this.getProviders();
-      providers.forEach((provider) => this.addEventListenerForProvider(provider));
       if (!this.disableSummary) {
         this.printEvents();
       }
@@ -37,6 +42,7 @@ export class EventEmitterModule {
   public printEvents() {
     const list = this.eventEmitter.eventNames().map((eventName) => {
       const listenerCount = this.eventEmitter.listenerCount(eventName).toString();
+
       return {
         eventName,
         listenerCount
@@ -56,28 +62,33 @@ export class EventEmitterModule {
     this.logger.info("\n" + str.trim());
   }
 
-  protected getProviders(): Provider<any>[] {
-    return Array.from(this.injector.getProviders());
+  private bindEventListeners(provider: Provider<any>) {
+    this.bindOn(provider);
+    this.bindOnAny(provider);
   }
 
-  private addEventListenerForProvider(provider: Provider<any>) {
-    const store = provider.store.get<EventEmitterStore | undefined>("eventEmitter");
+  private getListener(provider: Provider<any>, propertyKey: string) {
+    const instance = this.injector.get(provider.token);
+    return instance[propertyKey].bind(instance) as ListenerFn;
+  }
 
-    const eventListenerDefinitions = Object.entries(store?.onEvent || {});
+  private bindOn(provider: Provider) {
+    const store = provider.store.get<EventEmitterStore | undefined>("eventEmitter");
 
-    for (const [propertyKey, {event, options}] of eventListenerDefinitions) {
-      const instance = this.injector.get(provider.token);
+    Object.entries(store?.onEvent || {}).forEach(([propertyKey, {event, options}]) => {
+      const listenerFn = this.getListener(provider, propertyKey);
 
-      const listenerFn: ListenerFn = instance[propertyKey].bind(instance) as ListenerFn;
       this.eventEmitter.on(event, listenerFn, options);
-    }
+    });
+  }
 
-    const anyEventListenerDefinitions = Object.keys(store?.onAny || {});
-    for (const propertyKey of anyEventListenerDefinitions) {
-      const instance = this.injector.get(provider.token);
+  private bindOnAny(provider: Provider) {
+    const store = provider.store.get<EventEmitterStore | undefined>("eventEmitter");
+
+    Object.keys(store?.onAny || {}).forEach((propertyKey) => {
+      const listenerFn = this.getListener(provider, propertyKey);
 
-      const listenerFn: ListenerFn = instance[propertyKey].bind(instance) as ListenerFn;
       this.eventEmitter.onAny(listenerFn);
-    }
+    });
   }
 }