X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fcluster-worker.ts;h=201a516c56e1d8ab2a3d2d569c4d54d7f0fd484d;hb=4608939f425568da5553db1f5bf883d4cca18e02;hp=2a3961b37f02836d52c7972f98ee150c02904281;hpb=a788de39a01b042deb0707c2e92af99181b933d2;p=poolifier.git

diff --git a/src/worker/cluster-worker.ts b/src/worker/cluster-worker.ts
index 2a3961b3..201a516c 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`.
@@ -13,8 +13,8 @@ import type { TaskFunctions, WorkerFunction } from './worker-functions'
  * If you use a `DynamicClusterPool` the extra workers that were created will be terminated,
  * but the minimum number of workers will be guaranteed.
  *
- * @typeParam Data - Type of data this worker receives from pool's execution. This can only be serializable data.
- * @typeParam Response - Type of response the worker sends back to the main worker. This can only be serializable data.
+ * @typeParam Data - Type of data this worker receives from pool's execution. This can only be structured-cloneable data.
+ * @typeParam Response - Type of response the worker sends back to the main worker. This can only be structured-cloneable data.
  * @author [Christopher Quadflieg](https://github.com/Shinigami92)
  * @since 2.0.0
  */
@@ -29,27 +29,43 @@ 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',
       cluster.isPrimary,
+      cluster.worker as Worker,
       taskFunctions,
-      cluster.worker,
       opts
     )
   }
 
   /** @inheritDoc */
-  protected sendToMainWorker (message: MessageValue<Response>): void {
-    this.getMainWorker().send(message)
+  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()
+        })
+      }
+    }
   }
 
   /** @inheritDoc */
-  protected handleError (e: Error | string): string {
-    return e instanceof Error ? e.message : e
+  protected get id (): number {
+    return this.getMainWorker().id
+  }
+
+  /** @inheritDoc */
+  protected sendToMainWorker (message: MessageValue<Response>): void {
+    this.getMainWorker().send({ ...message, workerId: this.id })
   }
 }