From 826f42eee1b3f700fd2abce2f246713e7f4ab233 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Sun, 9 Jul 2023 03:47:54 +0200
Subject: [PATCH 1/1] refactor: cleanup message handler conditions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 src/worker/abstract-worker.ts | 46 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts
index 8122f909..138719a1 100644
--- a/src/worker/abstract-worker.ts
+++ b/src/worker/abstract-worker.ts
@@ -145,31 +145,29 @@ export abstract class AbstractWorker<
    * @param message - Message received.
    */
   protected messageListener (message: MessageValue<Data, Data>): void {
-    if (message.ready != null && message.workerId === this.id) {
-      // Startup message received
-      this.workerReady()
-    } else if (message.statistics != null && message.workerId === this.id) {
-      // Statistics message received
-      this.statistics = message.statistics
-    } else if (message.checkAlive != null && message.workerId === this.id) {
-      // Check alive message received
-      message.checkAlive ? this.startCheckAlive() : this.stopCheckAlive()
-    } else if (
-      message.id != null &&
-      message.data != null &&
-      message.workerId === this.id
-    ) {
-      // Task message received
-      const fn = this.getTaskFunction(message.name)
-      if (isAsyncFunction(fn)) {
-        this.runInAsyncScope(this.runAsync.bind(this), this, fn, message)
-      } else {
-        this.runInAsyncScope(this.runSync.bind(this), this, fn, message)
+    if (message.workerId === this.id) {
+      if (message.ready != null) {
+        // Startup message received
+        this.workerReady()
+      } else if (message.statistics != null) {
+        // Statistics message received
+        this.statistics = message.statistics
+      } else if (message.checkAlive != null) {
+        // Check alive message received
+        message.checkAlive ? this.startCheckAlive() : this.stopCheckAlive()
+      } else if (message.id != null && message.data != null) {
+        // Task message received
+        const fn = this.getTaskFunction(message.name)
+        if (isAsyncFunction(fn)) {
+          this.runInAsyncScope(this.runAsync.bind(this), this, fn, message)
+        } else {
+          this.runInAsyncScope(this.runSync.bind(this), this, fn, message)
+        }
+      } else if (message.kill === true) {
+        // Kill message received
+        this.stopCheckAlive()
+        this.emitDestroy()
       }
-    } else if (message.kill === true && message.workerId === this.id) {
-      // Kill message received
-      this.stopCheckAlive()
-      this.emitDestroy()
     }
   }
 
-- 
2.34.1