X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fworker-choice-strategy-context.ts;h=21c24f7c63799561f1b32e17ebda121b5a2464d3;hb=ace229a1b5029d3acaeeb4e8abdab415de5318f1;hp=e5fddc1b1fc5b400398b2e86bd0ac3b3fd6f97c9;hpb=a4958de2101f06e7096b83adbca82fcfd532a721;p=poolifier.git diff --git a/src/pools/selection-strategies/worker-choice-strategy-context.ts b/src/pools/selection-strategies/worker-choice-strategy-context.ts index e5fddc1b..21c24f7c 100644 --- a/src/pools/selection-strategies/worker-choice-strategy-context.ts +++ b/src/pools/selection-strategies/worker-choice-strategy-context.ts @@ -2,8 +2,8 @@ import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils' import type { IPool } from '../pool' import type { IWorker } from '../worker' import { FairShareWorkerChoiceStrategy } from './fair-share-worker-choice-strategy' -import { LessBusyWorkerChoiceStrategy } from './less-busy-worker-choice-strategy' -import { LessUsedWorkerChoiceStrategy } from './less-used-worker-choice-strategy' +import { LeastBusyWorkerChoiceStrategy } from './least-busy-worker-choice-strategy' +import { LeastUsedWorkerChoiceStrategy } from './least-used-worker-choice-strategy' import { RoundRobinWorkerChoiceStrategy } from './round-robin-worker-choice-strategy' import type { IWorkerChoiceStrategy, @@ -56,15 +56,15 @@ export class WorkerChoiceStrategyContext< ) ], [ - WorkerChoiceStrategies.LESS_USED, - new (LessUsedWorkerChoiceStrategy.bind(this))( + WorkerChoiceStrategies.LEAST_USED, + new (LeastUsedWorkerChoiceStrategy.bind(this))( pool, opts ) ], [ - WorkerChoiceStrategies.LESS_BUSY, - new (LessBusyWorkerChoiceStrategy.bind(this))( + WorkerChoiceStrategies.LEAST_BUSY, + new (LeastBusyWorkerChoiceStrategy.bind(this))( pool, opts ) @@ -115,7 +115,7 @@ export class WorkerChoiceStrategyContext< } /** - * Updates the worker choice strategy internals in the context. + * Updates the worker node key in the worker choice strategy internals in the context. * * @returns `true` if the update is successful, `false` otherwise. */ @@ -131,17 +131,22 @@ export class WorkerChoiceStrategyContext< * Executes the worker choice strategy algorithm in the context. * * @returns The key of the worker node. + * @throws {@link https://nodejs.org/api/errors.html#class-error} If the worker node key is null or undefined. */ public execute (): number { - return ( + const workerNodeKey = ( this.workerChoiceStrategies.get( this.workerChoiceStrategy ) as IWorkerChoiceStrategy ).choose() + if (workerNodeKey == null) { + throw new Error('Worker node key chosen is null or undefined') + } + return workerNodeKey } /** - * Removes a worker node key from the worker choice strategy in the context. + * Removes the worker node key from the worker choice strategy in the context. * * @param workerNodeKey - The key of the worker node. * @returns `true` if the removal is successful, `false` otherwise. @@ -160,8 +165,8 @@ export class WorkerChoiceStrategyContext< * @param opts - The worker choice strategy options. */ public setOptions (opts: WorkerChoiceStrategyOptions): void { - this.workerChoiceStrategies.forEach(workerChoiceStrategy => { + for (const workerChoiceStrategy of this.workerChoiceStrategies.values()) { workerChoiceStrategy.setOptions(opts) - }) + } } }