refactor: untangle worker choosing code from worker creation code

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

diff --git a/src/pools/selection-strategies/less-used-worker-choice-strategy.ts b/src/pools/selection-strategies/less-used-worker-choice-strategy.ts
index 9cae4a54ae336204e4ab00f29b7789c280101682..364c54a1d3b5d6d0a5a1c853221a247c15cdd1fa 100644 (file)
--- a/src/pools/selection-strategies/less-used-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/less-used-worker-choice-strategy.ts
@@ -1,5 +1,6 @@
 import type { IPoolWorker } from '../pool-worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
+import type { IWorkerChoiceStrategy } from './selection-strategies-types'
 
 /**
  * Selects the less used worker.
@@ -9,23 +10,29 @@ import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
  * @typeParam Response - Type of response of execution. This can only be serializable data.
  */
 export class LessUsedWorkerChoiceStrategy<
-  Worker extends IPoolWorker,
-  Data,
-  Response
-> extends AbstractWorkerChoiceStrategy<Worker, Data, Response> {
-  /** {@inheritDoc} */
+    Worker extends IPoolWorker,
+    Data = unknown,
+    Response = unknown
+  >
+  extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
+  implements IWorkerChoiceStrategy {
+  /** @inheritDoc */
   public reset (): boolean {
     return true
   }
 
-  /** {@inheritDoc} */
+  /** @inheritDoc */
   public choose (): number {
+    const freeWorkerKey = this.pool.findFreeWorkerKey()
+    if (freeWorkerKey !== -1) {
+      return freeWorkerKey
+    }
     let minNumberOfTasks = Infinity
     let lessUsedWorkerKey!: number
     for (const [index, workerItem] of this.pool.workers.entries()) {
       const tasksUsage = workerItem.tasksUsage
-      const workerTasks = tasksUsage?.run + tasksUsage?.running
-      if (!this.isDynamicPool && workerTasks === 0) {
+      const workerTasks = tasksUsage.run + tasksUsage.running
+      if (workerTasks === 0) {
         return index
       } else if (workerTasks < minNumberOfTasks) {
         minNumberOfTasks = workerTasks
@@ -35,7 +42,7 @@ export class LessUsedWorkerChoiceStrategy<
     return lessUsedWorkerKey
   }
 
-  /** {@inheritDoc} */
+  /** @inheritDoc */
   public remove (workerKey: number): boolean {
     return true
   }