X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Ffixed.ts;h=545238b0136fc5f0b1ae8d4c43710a302d087f8d;hb=refs%2Ftags%2Fv3.1.9;hp=fe920f8a48126529a31dafc2d0c9f31bb4c0e4cf;hpb=658b9aa08266ed9a8ae3c0fc947d237fa2674f09;p=poolifier.git diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts index fe920f8a..545238b0 100644 --- a/src/pools/cluster/fixed.ts +++ b/src/pools/cluster/fixed.ts @@ -1,4 +1,4 @@ -import cluster, { type ClusterSettings, type Worker } from 'node:cluster' +import cluster, { type Worker } from 'node:cluster' import type { MessageValue } from '../../utility-types' import { AbstractPool } from '../abstract-pool' import { type PoolOptions, type PoolType, PoolTypes } from '../pool' @@ -7,20 +7,7 @@ import { type WorkerType, WorkerTypes } from '../worker' /** * Options for a poolifier cluster pool. */ -export interface ClusterPoolOptions extends PoolOptions { - /** - * Key/value pairs to add to worker process environment. - * - * @see https://nodejs.org/api/cluster.html#cluster_cluster_fork_env - */ - env?: Record - /** - * Cluster settings. - * - * @see https://nodejs.org/api/cluster.html#cluster_cluster_settings - */ - settings?: ClusterSettings -} +export type ClusterPoolOptions = PoolOptions /** * A cluster pool with a fixed number of workers. @@ -44,9 +31,10 @@ export class FixedClusterPool< public constructor ( numberOfWorkers: number, filePath: string, - protected readonly opts: ClusterPoolOptions = {} + opts: ClusterPoolOptions = {}, + maximumNumberOfWorkers?: number ) { - super(numberOfWorkers, filePath, opts) + super(numberOfWorkers, filePath, opts, maximumNumberOfWorkers) } /** @inheritDoc */ @@ -60,42 +48,55 @@ export class FixedClusterPool< } /** @inheritDoc */ - protected destroyWorker (worker: Worker): void { - this.sendToWorker(worker, { kill: 1 }) - worker.on('disconnect', () => { - worker.kill() + protected sendToWorker ( + workerNodeKey: number, + message: MessageValue + ): void { + this.workerNodes[workerNodeKey].worker.send({ + ...message, + workerId: this.getWorkerInfo(workerNodeKey).id as number }) - worker.disconnect() } /** @inheritDoc */ - protected sendToWorker (worker: Worker, message: MessageValue): void { - worker.send(message) + protected sendStartupMessageToWorker (workerNodeKey: number): void { + this.sendToWorker(workerNodeKey, { + ready: false + }) } /** @inheritDoc */ - protected createWorker (): Worker { - return cluster.fork(this.opts.env) + protected registerWorkerMessageListener( + workerNodeKey: number, + listener: (message: MessageValue) => void + ): void { + this.workerNodes[workerNodeKey].worker.on('message', listener) } /** @inheritDoc */ - protected get type (): PoolType { - return PoolTypes.fixed + protected registerOnceWorkerMessageListener( + workerNodeKey: number, + listener: (message: MessageValue) => void + ): void { + this.workerNodes[workerNodeKey].worker.once('message', listener) } /** @inheritDoc */ - protected get worker (): WorkerType { - return WorkerTypes.cluster + protected deregisterWorkerMessageListener( + workerNodeKey: number, + listener: (message: MessageValue) => void + ): void { + this.workerNodes[workerNodeKey].worker.off('message', listener) } /** @inheritDoc */ - protected get minSize (): number { - return this.numberOfWorkers + protected get type (): PoolType { + return PoolTypes.fixed } /** @inheritDoc */ - protected get maxSize (): number { - return this.numberOfWorkers + protected get worker (): WorkerType { + return WorkerTypes.cluster } /** @inheritDoc */