Merge branch 'master' of github.com:jerome-benoit/poolifier

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

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 5ee219202aff6c7ec44f1af67b1264cdd16e8b40..80e958a406fa2209ce1c20eded5b8e9b79e9ca0b 100644 (file)
--- a/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts
@@ -1,4 +1,4 @@
-import type { IPoolWorker } from '../pool-worker'
+import type { IWorker } from '../worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
 import type { IWorkerChoiceStrategy } from './selection-strategies-types'
 
@@ -7,43 +7,47 @@ import type { IWorkerChoiceStrategy } from './selection-strategies-types'
  *
  * @typeParam Worker - Type of worker which manages the strategy.
  * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
- * @typeParam Response - Type of response of execution. This can only be serializable data.
+ * @typeParam Response - Type of execution response. This can only be serializable data.
  */
 export class RoundRobinWorkerChoiceStrategy<
-    Worker extends IPoolWorker,
-    Data,
-    Response
+    Worker extends IWorker,
+    Data = unknown,
+    Response = unknown
   >
   extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
-  implements IWorkerChoiceStrategy<Worker, Data, Response> {
+  implements IWorkerChoiceStrategy {
   /**
-   * Id of the next worker.
+   * Id of the next worker node.
    */
-  private nextWorkerId: number = 0
+  private nextWorkerNodeId: number = 0
 
-  /** {@inheritDoc} */
+  /** @inheritDoc */
   public reset (): boolean {
-    this.nextWorkerId = 0
+    this.nextWorkerNodeId = 0
     return true
   }
 
-  /** {@inheritDoc} */
+  /** @inheritDoc */
   public choose (): number {
-    const chosenWorkerKey = this.nextWorkerId
-    this.nextWorkerId =
-      this.nextWorkerId === this.pool.workers.length - 1
+    const chosenWorkerNodeKey = this.nextWorkerNodeId
+    this.nextWorkerNodeId =
+      this.nextWorkerNodeId === this.pool.workerNodes.length - 1
         ? 0
-        : this.nextWorkerId + 1
-    return chosenWorkerKey
+        : this.nextWorkerNodeId + 1
+    return chosenWorkerNodeKey
   }
 
-  /** {@inheritDoc} */
-  public remove (workerKey: number): boolean {
-    if (this.nextWorkerId === workerKey) {
-      this.nextWorkerId =
-        this.nextWorkerId > this.pool.workers.length - 1
-          ? this.pool.workers.length - 1
-          : this.nextWorkerId
+  /** @inheritDoc */
+  public remove (workerNodeKey: number): boolean {
+    if (this.nextWorkerNodeId === workerNodeKey) {
+      if (this.pool.workerNodes.length === 0) {
+        this.nextWorkerNodeId = 0
+      } else {
+        this.nextWorkerNodeId =
+          this.nextWorkerNodeId > this.pool.workerNodes.length - 1
+            ? this.pool.workerNodes.length - 1
+            : this.nextWorkerNodeId
+      }
     }
     return true
   }