Merge pull request #2164 from poolifier/dependabot/npm_and_yarn/tatami-ng-0.3.0

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

diff --git a/src/worker/cluster-worker.ts b/src/worker/cluster-worker.ts
index 16dddd2969bd50193c4fb43e762d607f08f4ca08..325b7a410b6cb7686ebee51f1d37b06043622fad 100644 (file)
--- a/src/worker/cluster-worker.ts
+++ b/src/worker/cluster-worker.ts
@@ -1,8 +1,9 @@
 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 { MessageValue } from '../utility-types.js'
+import { AbstractWorker } from './abstract-worker.js'
+import type { TaskFunction, TaskFunctions } from './task-functions.js'
+import type { WorkerOptions } from './worker-options.js'
 
 /**
  * A cluster worker used by a poolifier `ClusterPool`.
@@ -29,36 +30,42 @@ 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,
-      taskFunctions,
-      cluster.worker as Worker,
-      opts
-    )
-    if (!this.isMain) {
-      this.sendToMainWorker({ workerId: this.id, started: true })
-    }
+    super(cluster.isPrimary, cluster.worker, taskFunctions, opts)
   }
 
   /** @inheritDoc */
-  protected get id (): number {
-    return this.getMainWorker().id
+  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 sendToMainWorker (message: MessageValue<Response>): void {
-    console.log('sending message to main worker(cluster)', message)
-    this.getMainWorker().send(message)
+  protected get id (): number {
+    return this.getMainWorker().id
   }
 
   /** @inheritDoc */
-  protected handleError (e: Error | string): string {
-    return e instanceof Error ? e.message : e
+  protected readonly sendToMainWorker = (
+    message: MessageValue<Response>
+  ): void => {
+    this.getMainWorker().send({
+      ...message,
+      workerId: this.id
+    } satisfies MessageValue<Response>)
   }
 }