X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fcluster-worker.ts;h=325b7a410b6cb7686ebee51f1d37b06043622fad;hb=e334515bf28581c234d6b9f5239425c9a0c6a7ec;hp=16dddd2969bd50193c4fb43e762d607f08f4ca08;hpb=bb4e9c3d36509745767905e4577d000087a23288;p=poolifier.git diff --git a/src/worker/cluster-worker.ts b/src/worker/cluster-worker.ts index 16dddd29..325b7a41 100644 --- 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 - | TaskFunctions, + taskFunctions: TaskFunction | TaskFunctions, 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): 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): 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 + ): void => { + this.getMainWorker().send({ + ...message, + workerId: this.id + } satisfies MessageValue) } }