X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fround-robin-worker-choice-strategy.ts;h=1f5c499e0103dcddf612fe8e540d92c570d91656;hb=3a5027122ca6401ae1d755843b20f714c61e3240;hp=2d08cff20621ba564bb0b424c32a4bcd904f53bb;hpb=c426b04af6b85ef3ec6859929eb906bcea4fcaf7;p=poolifier.git diff --git a/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts index 2d08cff2..1f5c499e 100644 --- a/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts @@ -1,14 +1,13 @@ -import type { IPool } from '../pool' -import type { IWorker } from '../worker' -import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' +import type { IPool } from '../pool.js' +import type { IWorker } from '../worker.js' +import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy.js' import type { IWorkerChoiceStrategy, - InternalWorkerChoiceStrategyOptions -} from './selection-strategies-types' + WorkerChoiceStrategyOptions, +} from './selection-strategies-types.js' /** * Selects the next worker in a round robin fashion. - * * @typeParam Worker - Type of worker which manages the strategy. * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data. * @typeParam Response - Type of execution response. This can only be structured-cloneable data. @@ -23,7 +22,7 @@ export class RoundRobinWorkerChoiceStrategy< /** @inheritDoc */ public constructor ( pool: IPool, - opts: InternalWorkerChoiceStrategyOptions + opts?: WorkerChoiceStrategyOptions ) { super(pool, opts) } @@ -44,7 +43,7 @@ export class RoundRobinWorkerChoiceStrategy< const chosenWorkerNodeKey = this.nextWorkerNodeKey this.setPreviousWorkerNodeKey(chosenWorkerNodeKey) this.roundRobinNextWorkerNodeKey() - this.checkNextWorkerNodeReadiness() + this.checkNextWorkerNodeKey() return chosenWorkerNodeKey } @@ -52,6 +51,7 @@ export class RoundRobinWorkerChoiceStrategy< public remove (workerNodeKey: number): boolean { if (this.pool.workerNodes.length === 0) { this.reset() + return true } if ( this.nextWorkerNodeKey === workerNodeKey &&