refactor: code cleanups

Signed-off-by: Jérôme Benoit <[email protected]>

Author: jerome-benoit

src/pools/abstract-pool.ts

@@ -838,7 +838,7 @@ export abstract class AbstractPool<
       this.checkMessageWorkerId(message)
       if (message.taskFunctionOperationStatus != null) {
         responsesReceived.push(message)
-        if (responsesReceived.length === this.workerNodes.length) {
+        if (responsesReceived.length >= this.workerNodes.length) {
           if (
             responsesReceived.every(
               (msg) => msg.taskFunctionOperationStatus === true,

src/pools/selection-strategies/abstract-worker-choice-strategy.ts

@@ -124,8 +124,9 @@ export abstract class AbstractWorkerChoiceStrategy<
     workerNodeKey: number | undefined,
   ): number | undefined {
     if (
-      workerNodeKey != null &&
-      (workerNodeKey < 0 || !this.isWorkerNodeReady(workerNodeKey))
+      workerNodeKey == null ||
+      workerNodeKey < 0 ||
+      workerNodeKey >= this.pool.workerNodes.length
     ) {
       return undefined
     }

src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts

@@ -149,6 +149,11 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
         (this.nextWorkerNodeKey - 1 + this.pool.workerNodes.length) %
         this.pool.workerNodes.length
     }
+    if (this.workerNodeId >= workerNodeKey) {
+      this.workerNodeId =
+        (this.workerNodeId - 1 + this.pool.workerNodes.length) %
+        this.pool.workerNodes.length
+    }
     return true
   }
 

src/pools/selection-strategies/round-robin-worker-choice-strategy.ts

@@ -42,6 +42,9 @@ export class RoundRobinWorkerChoiceStrategy<
   public choose(): number | undefined {
     this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey)
     this.roundRobinNextWorkerNodeKey()
+    if (!this.isWorkerNodeReady(this.nextWorkerNodeKey!)) {
+      return undefined
+    }
     return this.checkWorkerNodeKey(this.nextWorkerNodeKey)
   }
 
@@ -57,6 +60,9 @@ export class RoundRobinWorkerChoiceStrategy<
       this.nextWorkerNodeKey =
         (this.nextWorkerNodeKey - 1 + this.pool.workerNodes.length) %
         this.pool.workerNodes.length
+      if (this.previousWorkerNodeKey >= workerNodeKey) {
+        this.previousWorkerNodeKey = this.nextWorkerNodeKey
+      }
     }
     return true
   }

src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts

@@ -68,6 +68,9 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
   public choose(): number | undefined {
     this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey)
     this.weightedRoundRobinNextWorkerNodeKey()
+    if (!this.isWorkerNodeReady(this.nextWorkerNodeKey!)) {
+      return undefined
+    }
     return this.checkWorkerNodeKey(this.nextWorkerNodeKey)
   }
 
@@ -86,6 +89,9 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
       this.nextWorkerNodeKey =
         (this.nextWorkerNodeKey - 1 + this.pool.workerNodes.length) %
         this.pool.workerNodes.length
+      if (this.previousWorkerNodeKey >= workerNodeKey) {
+        this.previousWorkerNodeKey = this.nextWorkerNodeKey
+      }
     }
     return true
   }

src/queues/abstract-fixed-queue.ts

@@ -72,10 +72,12 @@ export abstract class AbstractFixedQueue<T> implements IFixedQueue<T> {
       }
     }
     if (logicalIndex !== -1) {
-      let physicalShiftIndex = this.start + logicalIndex
-      if (physicalShiftIndex >= this.capacity) {
-        physicalShiftIndex -= this.capacity
+      if (logicalIndex === this.size - 1) {
+        this.nodeArray[currentPhysicalIndex] = undefined
+        --this.size
+        return true
       }
+      let physicalShiftIndex = currentPhysicalIndex
       for (let i = logicalIndex; i < this.size - 1; i++) {
         let nextPhysicalIndex = physicalShiftIndex + 1
         if (nextPhysicalIndex === this.capacity) {