X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Finterleaved-weighted-round-robin-worker-choice-strategy.ts;h=b1abe98772d88ce295b17aa6be653a332dd11b04;hb=e334515bf28581c234d6b9f5239425c9a0c6a7ec;hp=0f718e9817159bd6aedb5012e3246786d4696f50;hpb=ab3bb4a4fd6b09465fb97ec4f412e57448f94306;p=poolifier.git

diff --git a/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts
index 0f718e98..b1abe987 100644
--- a/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts
@@ -1,12 +1,12 @@
-import type { IWorker } from '../worker'
-import type { IPool } from '../pool'
-import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../../utils'
-import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
+import type { IPool } from '../pool.js'
+import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../utils.js'
+import type { IWorker } from '../worker.js'
+import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy.js'
 import type {
   IWorkerChoiceStrategy,
-  InternalWorkerChoiceStrategyOptions,
-  TaskStatisticsRequirements
-} from './selection-strategies-types'
+  TaskStatisticsRequirements,
+  WorkerChoiceStrategyOptions
+} from './selection-strategies-types.js'
 
 /**
  * Selects the next worker with an interleaved weighted round robin scheduling algorithm.
@@ -36,27 +36,28 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   /**
    * Round id.
    */
-  private roundId: number = 0
+  private roundId = 0
   /**
    * Round weights.
    */
-  private roundWeights!: number[]
+  private roundWeights: number[]
   /**
    * Worker node id.
    */
-  private workerNodeId: number = 0
+  private workerNodeId = 0
   /**
    * Worker node virtual task runtime.
    */
-  private workerNodeVirtualTaskRunTime: number = 0
+  private workerNodeVirtualTaskRunTime = 0
 
   /** @inheritDoc */
   public constructor (
     pool: IPool<Worker, Data, Response>,
-    opts: InternalWorkerChoiceStrategyOptions
+    opts?: WorkerChoiceStrategyOptions
   ) {
     super(pool, opts)
-    this.setOptions(this.opts)
+    this.setTaskStatisticsRequirements(this.opts)
+    this.roundWeights = this.getRoundWeights()
   }
 
   /** @inheritDoc */
@@ -93,7 +94,8 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
         ) {
           this.workerNodeVirtualTaskRunTime = 0
         }
-        const workerWeight = this.opts.weights?.[workerNodeKey] as number
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const workerWeight = this.opts!.weights![workerNodeKey]
         if (
           this.isWorkerNodeReady(workerNodeKey) &&
           workerWeight >= this.roundWeights[roundIndex] &&
@@ -112,7 +114,9 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   }
 
   private interleavedWeightedRoundRobinNextWorkerNodeId (): void {
-    if (
+    if (this.pool.workerNodes.length === 0) {
+      this.workerNodeId = 0
+    } else if (
       this.roundId === this.roundWeights.length - 1 &&
       this.workerNodeId === this.pool.workerNodes.length - 1
     ) {
@@ -129,7 +133,10 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   /** @inheritDoc */
   public remove (workerNodeKey: number): boolean {
     if (this.pool.workerNodes.length === 0) {
-      this.reset()
+      this.resetWorkerNodeKeyProperties()
+      this.workerNodeId = 0
+      this.workerNodeVirtualTaskRunTime = 0
+      return true
     }
     if (
       this.workerNodeId === workerNodeKey &&
@@ -147,7 +154,7 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   }
 
   /** @inheritDoc */
-  public setOptions (opts: InternalWorkerChoiceStrategyOptions): void {
+  public setOptions (opts: WorkerChoiceStrategyOptions | undefined): void {
     super.setOptions(opts)
     this.roundWeights = this.getRoundWeights()
   }
@@ -155,7 +162,8 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   private getRoundWeights (): number[] {
     return [
       ...new Set(
-        Object.values(this.opts.weights as Record<number, number>)
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        Object.values(this.opts!.weights!)
           .slice()
           .sort((a, b) => a - b)
       )