build(deps-dev): apply updates

[poolifier.git] / src / pools / selection-strategies / weighted-round-robin-worker-choice-strategy.ts

diff --git a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
index 22bf458febd3734a7f147c27172b486acdde5169..5338b320b0586bab67195ed5b93e23a0e74cd2f0 100644 (file)
--- a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
@@ -1,14 +1,11 @@
 import type { IWorker } from '../worker'
 import type { IPool } from '../pool'
-import {
-  DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
-  DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
-} from '../../utils'
+import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../../utils'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
 import type {
   IWorkerChoiceStrategy,
-  TaskStatisticsRequirements,
-  WorkerChoiceStrategyOptions
+  InternalWorkerChoiceStrategyOptions,
+  TaskStatisticsRequirements
 } from './selection-strategies-types'
 
 /**
@@ -37,10 +34,6 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
     elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS
   }
 
-  /**
-   * Default worker weight.
-   */
-  private readonly defaultWorkerWeight: number
   /**
    * Worker node virtual task runtime.
    */
@@ -49,11 +42,10 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
   /** @inheritDoc */
   public constructor (
     pool: IPool<Worker, Data, Response>,
-    opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
+    opts: InternalWorkerChoiceStrategyOptions
   ) {
     super(pool, opts)
     this.setTaskStatisticsRequirements(this.opts)
-    this.defaultWorkerWeight = this.computeDefaultWorkerWeight()
   }
 
   /** @inheritDoc */
@@ -71,7 +63,9 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
   /** @inheritDoc */
   public choose (): number | undefined {
     this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey)
-    return this.weightedRoundRobinNextWorkerNodeKey()
+    this.weightedRoundRobinNextWorkerNodeKey()
+    this.checkNextWorkerNodeReadiness()
+    return this.nextWorkerNodeKey
   }
 
   /** @inheritDoc */
@@ -95,25 +89,22 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
   }
 
   private weightedRoundRobinNextWorkerNodeKey (): number | undefined {
-    do {
-      const workerWeight =
-        this.opts.weights?.[
+    const workerWeight = this.opts.weights?.[
+      this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
+    ] as number
+    if (this.workerNodeVirtualTaskRunTime < workerWeight) {
+      this.workerNodeVirtualTaskRunTime =
+        this.workerNodeVirtualTaskRunTime +
+        this.getWorkerNodeTaskRunTime(
           this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
-        ] ?? this.defaultWorkerWeight
-      if (this.workerNodeVirtualTaskRunTime < workerWeight) {
-        this.workerNodeVirtualTaskRunTime =
-          this.workerNodeVirtualTaskRunTime +
-          this.getWorkerNodeTaskRunTime(
-            this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
-          )
-      } else {
-        this.nextWorkerNodeKey =
-          this.nextWorkerNodeKey === this.pool.workerNodes.length - 1
-            ? 0
-            : (this.nextWorkerNodeKey ?? this.previousWorkerNodeKey) + 1
-        this.workerNodeVirtualTaskRunTime = 0
-      }
-    } while (!this.isWorkerNodeReady(this.nextWorkerNodeKey as number))
+        )
+    } else {
+      this.nextWorkerNodeKey =
+        this.nextWorkerNodeKey === this.pool.workerNodes.length - 1
+          ? 0
+          : (this.nextWorkerNodeKey ?? this.previousWorkerNodeKey) + 1
+      this.workerNodeVirtualTaskRunTime = 0
+    }
     return this.nextWorkerNodeKey
   }
 }