Refine error types thrown

[poolifier.git] / src / pools / abstract-pool.ts

diff --git a/src/pools/abstract-pool.ts b/src/pools/abstract-pool.ts
index 346eb6d1fdb02cdf992f84b91502ae21f465800e..72e830745558831db7933dfcfd5b6c8a03b35d78 100644 (file)
--- a/src/pools/abstract-pool.ts
+++ b/src/pools/abstract-pool.ts
@@ -5,8 +5,9 @@ import type {
 import { EMPTY_FUNCTION } from '../utils'
 import { isKillBehavior, KillBehaviors } from '../worker/worker-options'
 import type { PoolOptions } from './pool'
+import { PoolEmitter } from './pool'
 import type { IPoolInternal, TasksUsage } from './pool-internal'
-import { PoolEmitter, PoolType } from './pool-internal'
+import { PoolType } from './pool-internal'
 import type { IPoolWorker } from './pool-worker'
 import {
   WorkerChoiceStrategies,
@@ -14,9 +15,6 @@ import {
 } from './selection-strategies/selection-strategies-types'
 import { WorkerChoiceStrategyContext } from './selection-strategies/worker-choice-strategy-context'
 
-const WORKER_NOT_FOUND_TASKS_USAGE_MAP =
-  'Worker could not be found in worker tasks usage map'
-
 /**
  * Base class that implements some shared logic for all poolifier pools.
  *
@@ -41,9 +39,6 @@ export abstract class AbstractPool<
   /** @inheritDoc */
   public readonly emitter?: PoolEmitter
 
-  /** @inheritDoc */
-  public readonly max?: number
-
   /**
    * The promise map.
    *
@@ -131,11 +126,11 @@ export abstract class AbstractPool<
         'Cannot instantiate a pool without specifying the number of workers'
       )
     } else if (Number.isSafeInteger(numberOfWorkers) === false) {
-      throw new Error(
+      throw new TypeError(
         'Cannot instantiate a pool with a non integer number of workers'
       )
     } else if (numberOfWorkers < 0) {
-      throw new Error(
+      throw new RangeError(
         'Cannot instantiate a pool with a negative number of workers'
       )
     } else if (this.type === PoolType.FIXED && numberOfWorkers === 0) {
@@ -210,11 +205,13 @@ export abstract class AbstractPool<
   public execute (data: Data): Promise<Response> {
     // Configure worker to handle message with the specified task
     const worker = this.chooseWorker()
-    const messageId = ++this.nextMessageId
-    const res = this.internalExecute(worker, messageId)
+    const res = this.internalExecute(worker, this.nextMessageId)
     this.checkAndEmitBusy()
-    data = data ?? ({} as Data)
-    this.sendToWorker(worker, { data, id: messageId })
+    this.sendToWorker(worker, {
+      data: data ?? ({} as Data),
+      id: this.nextMessageId
+    })
+    ++this.nextMessageId
     return res
   }
 
@@ -370,9 +367,12 @@ export abstract class AbstractPool<
       if (message.id !== undefined) {
         const promise = this.promiseMap.get(message.id)
         if (promise !== undefined) {
+          if (message.error) {
+            promise.reject(message.error)
+          } else {
+            promise.resolve(message.data as Response)
+          }
           this.afterPromiseWorkerResponseHook(message, promise)
-          if (message.error) promise.reject(message.error)
-          else promise.resolve(message.data as Response)
           this.promiseMap.delete(message.id)
         }
       }
@@ -410,12 +410,10 @@ export abstract class AbstractPool<
    * @param step Number of running tasks step.
    */
   private stepWorkerRunningTasks (worker: Worker, step: number): void {
-    const tasksUsage = this.workersTasksUsage.get(worker)
-    if (tasksUsage !== undefined) {
+    if (this.checkWorkerTasksUsage(worker) === true) {
+      const tasksUsage = this.workersTasksUsage.get(worker) as TasksUsage
       tasksUsage.running = tasksUsage.running + step
       this.workersTasksUsage.set(worker, tasksUsage)
-    } else {
-      throw new Error(WORKER_NOT_FOUND_TASKS_USAGE_MAP)
     }
   }
 
@@ -426,12 +424,10 @@ export abstract class AbstractPool<
    * @param step Number of run tasks step.
    */
   private stepWorkerRunTasks (worker: Worker, step: number): void {
-    const tasksUsage = this.workersTasksUsage.get(worker)
-    if (tasksUsage !== undefined) {
+    if (this.checkWorkerTasksUsage(worker) === true) {
+      const tasksUsage = this.workersTasksUsage.get(worker) as TasksUsage
       tasksUsage.run = tasksUsage.run + step
       this.workersTasksUsage.set(worker, tasksUsage)
-    } else {
-      throw new Error(WORKER_NOT_FOUND_TASKS_USAGE_MAP)
     }
   }
 
@@ -447,19 +443,30 @@ export abstract class AbstractPool<
   ): void {
     if (
       this.workerChoiceStrategyContext.getWorkerChoiceStrategy()
-        .requiredStatistics.runTime === true
+        .requiredStatistics.runTime === true &&
+      this.checkWorkerTasksUsage(worker) === true
     ) {
-      const tasksUsage = this.workersTasksUsage.get(worker)
-      if (tasksUsage !== undefined) {
-        tasksUsage.runTime += taskRunTime ?? 0
-        if (tasksUsage.run !== 0) {
-          tasksUsage.avgRunTime = tasksUsage.runTime / tasksUsage.run
-        }
-        this.workersTasksUsage.set(worker, tasksUsage)
-      } else {
-        throw new Error(WORKER_NOT_FOUND_TASKS_USAGE_MAP)
+      const tasksUsage = this.workersTasksUsage.get(worker) as TasksUsage
+      tasksUsage.runTime += taskRunTime ?? 0
+      if (tasksUsage.run !== 0) {
+        tasksUsage.avgRunTime = tasksUsage.runTime / tasksUsage.run
       }
+      this.workersTasksUsage.set(worker, tasksUsage)
+    }
+  }
+
+  /**
+   * Checks if the given worker is registered in the workers tasks usage map.
+   *
+   * @param worker Worker to check.
+   * @returns `true` if the worker is registered in the workers tasks usage map. `false` otherwise.
+   */
+  private checkWorkerTasksUsage (worker: Worker): boolean {
+    const hasTasksUsage = this.workersTasksUsage.has(worker)
+    if (hasTasksUsage === false) {
+      throw new Error('Worker could not be found in workers tasks usage map')
     }
+    return hasTasksUsage
   }
 
   /**
@@ -467,7 +474,7 @@ export abstract class AbstractPool<
    *
    * @param worker The worker.
    */
-  initWorkerTasksUsage (worker: Worker): void {
+  private initWorkerTasksUsage (worker: Worker): void {
     this.workersTasksUsage.set(worker, {
       run: 0,
       running: 0,