refactor: cleanup message handler conditions

[poolifier.git] / src / worker / abstract-worker.ts

diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts
index ba74409e2b5c53aa7ddb3c9a3b34ad8ec2515b11..138719a14f024657558ad81fafb6c4e2bc438ed4 100644 (file)
--- a/src/worker/abstract-worker.ts
+++ b/src/worker/abstract-worker.ts
@@ -145,27 +145,42 @@ export abstract class AbstractWorker<
    * @param message - Message received.
    */
   protected messageListener (message: MessageValue<Data, Data>): void {
-    if (message.statistics != null) {
-      // Statistics message received
-      this.statistics = message.statistics
-    } else if (message.dynamic === true) {
-      // Worker dynamic message received
-      this.startCheckAlive()
-    } 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)
+    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 != null) {
-      // Kill message received
-      this.aliveInterval != null && clearInterval(this.aliveInterval)
-      this.emitDestroy()
     }
   }
 
+  /**
+   * Notifies the main worker that this worker is ready to process tasks.
+   */
+  protected workerReady (): void {
+    !this.isMain && this.sendToMainWorker({ ready: true, workerId: this.id })
+  }
+
+  /**
+   * Starts the worker alive check interval.
+   */
   private startCheckAlive (): void {
     this.lastTaskTimestamp = performance.now()
     this.aliveInterval = setInterval(
@@ -175,6 +190,25 @@ export abstract class AbstractWorker<
     this.checkAlive.bind(this)()
   }
 
+  /**
+   * Stops the worker alive check interval.
+   */
+  private stopCheckAlive (): void {
+    this.aliveInterval != null && clearInterval(this.aliveInterval)
+  }
+
+  /**
+   * Checks if the worker should be terminated, because its living too long.
+   */
+  private checkAlive (): void {
+    if (
+      performance.now() - this.lastTaskTimestamp >
+      (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME)
+    ) {
+      this.sendToMainWorker({ kill: this.opts.killBehavior, workerId: this.id })
+    }
+  }
+
   /**
    * Returns the main worker.
    *
@@ -196,18 +230,6 @@ export abstract class AbstractWorker<
     message: MessageValue<Response, Data>
   ): void
 
-  /**
-   * Checks if the worker should be terminated, because its living too long.
-   */
-  protected checkAlive (): void {
-    if (
-      performance.now() - this.lastTaskTimestamp >
-      (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME)
-    ) {
-      this.sendToMainWorker({ kill: this.opts.killBehavior })
-    }
-  }
-
   /**
    * Handles an error and convert it to a string so it can be sent back to the main worker.
    *
@@ -242,10 +264,10 @@ export abstract class AbstractWorker<
       const errorMessage = this.handleError(e as Error | string)
       this.sendToMainWorker({
         taskError: {
-          workerId: this.id,
           message: errorMessage,
           data: message.data
         },
+        workerId: this.id,
         id: message.id
       })
     } finally {
@@ -281,10 +303,10 @@ export abstract class AbstractWorker<
         const errorMessage = this.handleError(e as Error | string)
         this.sendToMainWorker({
           taskError: {
-            workerId: this.id,
             message: errorMessage,
             data: message.data
           },
+          workerId: this.id,
           id: message.id
         })
       })