X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fcluster-worker.ts;h=0fd9095625fa7ab6bf4bd9203cbf9b4e2ef03348;hb=97cf8c0ddbe1fdba4fde9f94e5b781eeec4d71b5;hp=16dddd2969bd50193c4fb43e762d607f08f4ca08;hpb=76aa2b0f39bd376383f2fdc79046328693719590;p=poolifier.git

diff --git a/src/worker/cluster-worker.ts b/src/worker/cluster-worker.ts
index 16dddd29..0fd90956 100644
--- a/src/worker/cluster-worker.ts
+++ b/src/worker/cluster-worker.ts
@@ -2,7 +2,7 @@ import cluster, { type Worker } from 'node:cluster'
 import type { MessageValue } from '../utility-types'
 import { AbstractWorker } from './abstract-worker'
 import type { WorkerOptions } from './worker-options'
-import type { TaskFunctions, WorkerFunction } from './worker-functions'
+import type { TaskFunction, TaskFunctions } from './task-functions'
 
 /**
  * A cluster worker used by a poolifier `ClusterPool`.
@@ -29,20 +29,33 @@ export class ClusterWorker<
    * @param opts - Options for the worker.
    */
   public constructor (
-    taskFunctions:
-    | WorkerFunction<Data, Response>
-    | TaskFunctions<Data, Response>,
+    taskFunctions: TaskFunction<Data, Response> | TaskFunctions<Data, Response>,
     opts: WorkerOptions = {}
   ) {
     super(
-      'worker-cluster-pool:poolifier',
+      'poolifier:cluster-worker',
       cluster.isPrimary,
-      taskFunctions,
       cluster.worker as Worker,
+      taskFunctions,
       opts
     )
-    if (!this.isMain) {
-      this.sendToMainWorker({ workerId: this.id, started: true })
+  }
+
+  /** @inheritDoc */
+  protected handleReadyMessage (message: MessageValue<Data>): void {
+    if (message.workerId === this.id && message.ready === false) {
+      try {
+        this.getMainWorker().on('message', this.messageListener.bind(this))
+        this.sendToMainWorker({
+          ready: true,
+          taskFunctionNames: this.listTaskFunctionNames()
+        })
+      } catch {
+        this.sendToMainWorker({
+          ready: false,
+          taskFunctionNames: this.listTaskFunctionNames()
+        })
+      }
     }
   }
 
@@ -53,12 +66,6 @@ export class ClusterWorker<
 
   /** @inheritDoc */
   protected sendToMainWorker (message: MessageValue<Response>): void {
-    console.log('sending message to main worker(cluster)', message)
-    this.getMainWorker().send(message)
-  }
-
-  /** @inheritDoc */
-  protected handleError (e: Error | string): string {
-    return e instanceof Error ? e.message : e
+    this.getMainWorker().send({ ...message, workerId: this.id })
   }
 }