refactor: add PoolEvents/PoolEvent types

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

diff --git a/src/pools/selection-strategies/worker-choice-strategy-context.ts b/src/pools/selection-strategies/worker-choice-strategy-context.ts
index 2d33738731c661e0df84a74a0ffa043e9e3b4e69..826a89d9d6ce19c3f362f918785653c3056ba42e 100644 (file)
--- a/src/pools/selection-strategies/worker-choice-strategy-context.ts
+++ b/src/pools/selection-strategies/worker-choice-strategy-context.ts
@@ -26,7 +26,7 @@ export class WorkerChoiceStrategyContext<
 > {
   private readonly workerChoiceStrategies: Map<
   WorkerChoiceStrategy,
-  IWorkerChoiceStrategy<Worker, Data, Response>
+  IWorkerChoiceStrategy
   >
 
   /**
@@ -38,13 +38,12 @@ export class WorkerChoiceStrategyContext<
    */
   public constructor (
     pool: IPoolInternal<Worker, Data, Response>,
-    private readonly createWorkerCallback: () => number,
     private workerChoiceStrategyType: WorkerChoiceStrategy = WorkerChoiceStrategies.ROUND_ROBIN
   ) {
     this.execute.bind(this)
     this.workerChoiceStrategies = new Map<
     WorkerChoiceStrategy,
-    IWorkerChoiceStrategy<Worker, Data, Response>
+    IWorkerChoiceStrategy
     >([
       [
         WorkerChoiceStrategies.ROUND_ROBIN,
@@ -78,7 +77,7 @@ export class WorkerChoiceStrategyContext<
     return (
       this.workerChoiceStrategies.get(
         this.workerChoiceStrategyType
-      ) as IWorkerChoiceStrategy<Worker, Data, Response>
+      ) as IWorkerChoiceStrategy
     ).requiredStatistics
   }
 
@@ -88,14 +87,12 @@ export class WorkerChoiceStrategyContext<
    * @param workerChoiceStrategy - The worker choice strategy to set.
    */
   public setWorkerChoiceStrategy (
-    pool: IPoolInternal<Worker, Data, Response>,
     workerChoiceStrategy: WorkerChoiceStrategy
   ): void {
-    if (this.workerChoiceStrategyType === workerChoiceStrategy) {
-      this.workerChoiceStrategies.get(workerChoiceStrategy)?.reset()
-    } else {
+    if (this.workerChoiceStrategyType !== workerChoiceStrategy) {
       this.workerChoiceStrategyType = workerChoiceStrategy
     }
+    this.workerChoiceStrategies.get(this.workerChoiceStrategyType)?.reset()
   }
 
   /**
@@ -104,17 +101,11 @@ export class WorkerChoiceStrategyContext<
    * @returns The key of the chosen one.
    */
   public execute (): number {
-    const workerChoiceStrategy = this.workerChoiceStrategies.get(
-      this.workerChoiceStrategyType
-    ) as IWorkerChoiceStrategy<Worker, Data, Response>
-    if (
-      workerChoiceStrategy.isDynamicPool &&
-      !workerChoiceStrategy.pool.full &&
-      workerChoiceStrategy.pool.findFreeWorkerKey() === -1
-    ) {
-      return this.createWorkerCallback()
-    }
-    return workerChoiceStrategy.choose()
+    return (
+      this.workerChoiceStrategies.get(
+        this.workerChoiceStrategyType
+      ) as IWorkerChoiceStrategy
+    ).choose()
   }
 
   /**
@@ -127,7 +118,7 @@ export class WorkerChoiceStrategyContext<
     return (
       this.workerChoiceStrategies.get(
         this.workerChoiceStrategyType
-      ) as IWorkerChoiceStrategy<Worker, Data, Response>
+      ) as IWorkerChoiceStrategy
     ).remove(workerKey)
   }
 }