refactor(event-listeners): clean up

weyoss · Jan 2, 2024 · d9195e4 · d9195e4
1 parent a7635c5
commit d9195e4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/lib/base.ts b/src/lib/base.ts
@@ -137,6 +137,10 @@ export abstract class Base extends EventEmitter<TRedisSMQEvent> {
     );
   };
 
+  protected hasEventListeners(): boolean {
+    return !!Configuration.getSetConfig().eventListeners.length;
+  }
+
   handleError(err: Error): void {
     if (this.powerSwitch.isGoingUp() || this.powerSwitch.isRunning()) {
       throw err;

diff --git a/src/lib/consumer/consumer.ts b/src/lib/consumer/consumer.ts
@@ -53,24 +53,23 @@ export class Consumer extends Base {
 
   protected override registerSystemEventListeners(): void {
     super.registerSystemEventListeners();
-    this.on('messageAcknowledged', (...args) => {
-      if (this.eventListeners.length)
+    if (this.hasEventListeners()) {
+      this.on('messageAcknowledged', (...args) => {
         this.eventListeners.forEach((i) =>
           i.emit('messageAcknowledged', ...args),
         );
-    });
-    this.on('messageUnacknowledged', (...args) => {
-      if (this.eventListeners.length)
+      });
+      this.on('messageUnacknowledged', (...args) => {
         this.eventListeners.forEach((i) =>
           i.emit('messageUnacknowledged', ...args),
         );
-    });
-    this.on('messageDeadLettered', (...args) => {
-      if (this.eventListeners.length)
+      });
+      this.on('messageDeadLettered', (...args) => {
         this.eventListeners.forEach((i) =>
           i.emit('messageDeadLettered', ...args),
         );
-    });
+      });
+    }
   }
 
   protected setUpHeartbeat = (cb: ICallback<void>): void => {

diff --git a/src/lib/producer/producer.ts b/src/lib/producer/producer.ts
@@ -34,10 +34,11 @@ import { ProducibleMessage } from '../message/producible-message';
 export class Producer extends Base {
   protected override registerSystemEventListeners(): void {
     super.registerSystemEventListeners();
-    this.on('messagePublished', (...args) => {
-      if (this.eventListeners.length)
+    if (this.hasEventListeners()) {
+      this.on('messagePublished', (...args) => {
         this.eventListeners.forEach((i) => i.emit('messagePublished', ...args));
-    });
+      });
+    }
   }
 
   protected enqueue(