X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fround-robin-worker-choice-strategy.ts;h=29b05fa507f0b3ca8a18a300ad1c6927d9b76a65;hb=17393ac83cbf0eacf68ea9efb0a577cc30a5c685;hp=0a9fbb7b0a386e1f2ec2f7a78c8f0bf61a9d8572;hpb=a6f7f1b40b3591b19a58f69b22e751c4c4311522;p=poolifier.git

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 0a9fbb7b..29b05fa5 100644
--- a/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts
@@ -1,36 +1,54 @@
 import type { IPoolWorker } from '../pool-worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
+import type { IWorkerChoiceStrategy } from './selection-strategies-types'
 
 /**
  * Selects the next worker in a round robin fashion.
  *
- * @template Worker Type of worker which manages the strategy.
- * @template Data Type of data sent to the worker. This can only be serializable data.
- * @template Response Type of response of execution. This can only be serializable data.
+ * @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.
  */
 export class RoundRobinWorkerChoiceStrategy<
-  Worker extends IPoolWorker,
-  Data,
-  Response
-> extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
+    Worker extends IPoolWorker,
+    Data = unknown,
+    Response = unknown
+  >
+  extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
+  implements IWorkerChoiceStrategy {
   /**
-   * Index for the next worker.
+   * Id of the next worker.
    */
-  private nextWorkerIndex: number = 0
+  private nextWorkerId: number = 0
 
   /** @inheritDoc */
   public reset (): boolean {
-    this.nextWorkerIndex = 0
+    this.nextWorkerId = 0
     return true
   }
 
   /** @inheritDoc */
-  public choose (): Worker {
-    const chosenWorker = this.pool.workers[this.nextWorkerIndex]
-    this.nextWorkerIndex =
-      this.nextWorkerIndex === this.pool.workers.length - 1
+  public choose (): number {
+    const chosenWorkerKey = this.nextWorkerId
+    this.nextWorkerId =
+      this.nextWorkerId === this.pool.workers.length - 1
         ? 0
-        : this.nextWorkerIndex + 1
-    return chosenWorker
+        : this.nextWorkerId + 1
+    return chosenWorkerKey
+  }
+
+  /** @inheritDoc */
+  public remove (workerKey: number): boolean {
+    if (this.nextWorkerId === workerKey) {
+      if (this.pool.workers.length === 0) {
+        this.nextWorkerId = 0
+      } else {
+        this.nextWorkerId =
+          this.nextWorkerId > this.pool.workers.length - 1
+            ? this.pool.workers.length - 1
+            : this.nextWorkerId
+      }
+    }
+    return true
   }
 }