X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fabstract-worker.ts;h=8122f909af89d93e76d5a0c1730e19323b3391da;hb=fb1a03c56c9285f28d04940fad413cfa0132acf7;hp=92d68bcb6e9d4f38fdb3cc87170a038c4f226722;hpb=48487131ad37630e3021c3e4feee1b311d8bcd11;p=poolifier.git

diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts
index 92d68bcb..8122f909 100644
--- a/src/worker/abstract-worker.ts
+++ b/src/worker/abstract-worker.ts
@@ -145,13 +145,20 @@ export abstract class AbstractWorker<
    * @param message - Message received.
    */
   protected messageListener (message: MessageValue<Data, Data>): void {
-    if (message.statistics != null) {
+    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) {
+    } 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) {
+    } else if (
+      message.id != null &&
+      message.data != null &&
+      message.workerId === this.id
+    ) {
       // Task message received
       const fn = this.getTaskFunction(message.name)
       if (isAsyncFunction(fn)) {
@@ -159,13 +166,20 @@ export abstract class AbstractWorker<
       } else {
         this.runInAsyncScope(this.runSync.bind(this), this, fn, message)
       }
-    } else if (message.kill === true) {
+    } else if (message.kill === true && message.workerId === this.id) {
       // Kill message received
       this.stopCheckAlive()
       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.
    */
@@ -193,7 +207,7 @@ export abstract class AbstractWorker<
       performance.now() - this.lastTaskTimestamp >
       (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME)
     ) {
-      this.sendToMainWorker({ kill: this.opts.killBehavior })
+      this.sendToMainWorker({ kill: this.opts.killBehavior, workerId: this.id })
     }
   }
 
@@ -252,10 +266,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 {
@@ -291,10 +305,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
         })
       })