refactor: cleanup ready message conditions check in worker code

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts
index 77d2e0076f58abbbdf05c33ae994ec4f7cadf44e..36b7d03e379415aa3ec24aa861ae40e12d7f268b 100644 (file)
--- a/src/worker/abstract-worker.ts
+++ b/src/worker/abstract-worker.ts
@@ -73,7 +73,7 @@ export abstract class AbstractWorker<
   public constructor (
     type: string,
     protected readonly isMain: boolean,
-    protected readonly mainWorker: MainWorker,
+    private readonly mainWorker: MainWorker,
     taskFunctions:
     | WorkerFunction<Data, Response>
     | TaskFunctions<Data, Response>,

diff --git a/src/worker/cluster-worker.ts b/src/worker/cluster-worker.ts
index c820641ddbb10319b454bf5b25154312703cc446..0e3bccd3a7c1dad88019f582e9d1cfe97be663cf 100644 (file)
--- a/src/worker/cluster-worker.ts
+++ b/src/worker/cluster-worker.ts
@@ -48,8 +48,8 @@ export class ClusterWorker<
 
   /** @inheritDoc */
   protected handleReadyMessage (message: MessageValue<Data>): void {
-    if (message.workerId === this.id && message.ready != null) {
-      !this.isMain && this.sendToMainWorker({ ready: true, workerId: this.id })
+    if (!this.isMain && message.workerId === this.id && message.ready != null) {
+      this.sendToMainWorker({ ready: true, workerId: this.id })
     }
   }
 

diff --git a/src/worker/thread-worker.ts b/src/worker/thread-worker.ts
index a8658f03a797ed649cbd583a14ed5d924949a235..98d58b5d98162ba2f09ca21a6abaca114123355d 100644 (file)
--- a/src/worker/thread-worker.ts
+++ b/src/worker/thread-worker.ts
@@ -55,15 +55,14 @@ export class ThreadWorker<
   /** @inheritDoc */
   protected handleReadyMessage (message: MessageValue<Data>): void {
     if (
+      !this.isMain &&
       message.workerId === this.id &&
       message.ready != null &&
       message.port != null
     ) {
-      if (!this.isMain) {
-        this.port = message.port
-        this.port.on('message', this.messageListener.bind(this))
-        this.sendToMainWorker({ ready: true, workerId: this.id })
-      }
+      this.port = message.port
+      this.port.on('message', this.messageListener.bind(this))
+      this.sendToMainWorker({ ready: true, workerId: this.id })
     }
   }