X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fcluster-worker.ts;h=325b7a410b6cb7686ebee51f1d37b06043622fad;hb=ecde6ea8c439bbdd9dc2ca118731b5006a1a9884;hp=35899e794f5b373aa5bca3ec5b3dbe2d1f5cd4c3;hpb=a5d152043363ea21ec667205c88e0b9f2a6ff04e;p=poolifier.git diff --git a/src/worker/cluster-worker.ts b/src/worker/cluster-worker.ts index 35899e79..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 { TaskFunction, TaskFunctions } from './task-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`. @@ -32,30 +33,22 @@ export class ClusterWorker< taskFunctions: TaskFunction | TaskFunctions, opts: WorkerOptions = {} ) { - super( - 'worker-cluster-pool:poolifier', - cluster.isPrimary, - cluster.worker as Worker, - taskFunctions, - opts - ) + super(cluster.isPrimary, cluster.worker, taskFunctions, opts) } /** @inheritDoc */ protected handleReadyMessage (message: MessageValue): void { if (message.workerId === this.id && message.ready === false) { try { - this.getMainWorker()?.on('message', this.messageListener.bind(this)) + this.getMainWorker().on('message', this.messageListener.bind(this)) this.sendToMainWorker({ ready: true, - taskFunctions: this.listTaskFunctions(), - workerId: this.id + taskFunctionNames: this.listTaskFunctionNames() }) } catch { this.sendToMainWorker({ ready: false, - taskFunctions: this.listTaskFunctions(), - workerId: this.id + taskFunctionNames: this.listTaskFunctionNames() }) } } @@ -67,7 +60,12 @@ export class ClusterWorker< } /** @inheritDoc */ - protected sendToMainWorker (message: MessageValue): void { - this.getMainWorker().send(message) + protected readonly sendToMainWorker = ( + message: MessageValue + ): void => { + this.getMainWorker().send({ + ...message, + workerId: this.id + } satisfies MessageValue) } }