X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fcluster-worker.ts;h=0fd9095625fa7ab6bf4bd9203cbf9b4e2ef03348;hb=7d0aa97362b17bdac43eea38934aaea3c91363c0;hp=9402ec1044e51ce9a42c8717e3c6c506dda1ac10;hpb=729c563db85562dd7d0f7733b1a3e2d98467134b;p=poolifier.git

diff --git a/src/worker/cluster-worker.ts b/src/worker/cluster-worker.ts
index 9402ec10..0fd90956 100644
--- a/src/worker/cluster-worker.ts
+++ b/src/worker/cluster-worker.ts
@@ -1,8 +1,8 @@
-import type { Worker } from 'cluster'
-import { isMaster, worker } from 'cluster'
-import type { JSONValue, MessageValue } from '../utility-types'
+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 { TaskFunction, TaskFunctions } from './task-functions'
 
 /**
  * A cluster worker used by a poolifier `ClusterPool`.
@@ -13,51 +13,59 @@ import type { WorkerOptions } from './worker-options'
  * If you use a `DynamicClusterPool` the extra workers that were created will be terminated,
  * but the minimum number of workers will be guaranteed.
  *
- * @template Data Type of data this worker receives from pool's execution.
- * @template Response Type of response the worker sends back to the main worker.
- *
+ * @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
  */
 export class ClusterWorker<
-  Data extends JSONValue = JSONValue,
-  Response extends JSONValue = JSONValue
+  Data = unknown,
+  Response = unknown
 > extends AbstractWorker<Worker, Data, Response> {
   /**
    * Constructs a new poolifier cluster worker.
    *
-   * @param fn Function processed by the worker when the pool's `execution` function is invoked.
-   * @param opts Options for the worker.
+   * @param taskFunctions - Task function(s) processed by the worker when the pool's `execution` function is invoked.
+   * @param opts - Options for the worker.
    */
-  public constructor (fn: (data: Data) => Response, opts: WorkerOptions = {}) {
-    super('worker-cluster-pool:pioardi', isMaster, fn, opts)
+  public constructor (
+    taskFunctions: TaskFunction<Data, Response> | TaskFunctions<Data, Response>,
+    opts: WorkerOptions = {}
+  ) {
+    super(
+      'poolifier:cluster-worker',
+      cluster.isPrimary,
+      cluster.worker as Worker,
+      taskFunctions,
+      opts
+    )
+  }
 
-    worker.on('message', (value: MessageValue<Data>) => {
-      if (value?.data && value.id) {
-        // here you will receive messages
-        // console.log('This is the main worker ' + isMaster)
-        if (this.async) {
-          this.runInAsyncScope(this.runAsync.bind(this), this, fn, value)
-        } else {
-          this.runInAsyncScope(this.run.bind(this), this, fn, value)
-        }
-      } else if (value.kill) {
-        // here is time to kill this worker, just clearing the interval
-        if (this.interval) clearInterval(this.interval)
-        this.emitDestroy()
+  /** @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()
+        })
       }
-    })
+    }
   }
 
-  protected getMainWorker (): Worker {
-    return worker
+  /** @inheritDoc */
+  protected get id (): number {
+    return this.getMainWorker().id
   }
 
+  /** @inheritDoc */
   protected sendToMainWorker (message: MessageValue<Response>): void {
-    this.getMainWorker().send(message)
-  }
-
-  protected handleError (e: Error | string): string {
-    return e instanceof Error ? e.message : e
+    this.getMainWorker().send({ ...message, workerId: this.id })
   }
 }