refactor: remove unneeded encapsulation around tasks usage handling

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

diff --git a/src/pools/pool-internal.ts b/src/pools/pool-internal.ts
index e0d0534f83a846cbfac77eb87e305e0975c49abf..9da6495266ab6c6e4654def94eca460b4630cb24 100644 (file)
--- a/src/pools/pool-internal.ts
+++ b/src/pools/pool-internal.ts
@@ -19,6 +19,16 @@ export interface TasksUsage {
   avgRunTime: number
 }
 
+/**
+ * Internal worker type.
+ *
+ * @typeParam Worker - Type of worker which manages this pool.
+ */
+export interface WorkerType<Worker extends IPoolWorker> {
+  worker: Worker
+  tasksUsage: TasksUsage
+}
+
 /**
  * Internal contract definition for a poolifier pool.
  *
@@ -32,17 +42,9 @@ export interface IPoolInternal<
   Response = unknown
 > extends IPool<Data, Response> {
   /**
-   * List of currently available workers.
-   */
-  readonly workers: Worker[]
-
-  /**
-   * The workers tasks usage map.
-   *
-   *  `key`: The `Worker`
-   *  `value`: Worker tasks usage statistics.
+   * Pool workers map.
    */
-  readonly workersTasksUsage: Map<Worker, TasksUsage>
+  readonly workers: Map<number, WorkerType<Worker>>
 
   /**
    * Pool type.
@@ -75,26 +77,10 @@ export interface IPoolInternal<
   findFreeWorker: () => Worker | false
 
   /**
-   * Gets worker index.
-   *
-   * @param worker - The worker.
-   * @returns The worker index.
-   */
-  getWorkerIndex: (worker: Worker) => number
-
-  /**
-   * Gets worker running tasks.
-   *
-   * @param worker - The worker.
-   * @returns The number of tasks currently running on the worker.
-   */
-  getWorkerRunningTasks: (worker: Worker) => number | undefined
-
-  /**
-   * Gets worker average tasks runtime.
+   * Gets worker tasks usage.
    *
    * @param worker - The worker.
-   * @returns The average tasks runtime on the worker.
+   * @returns The tasks usage on the worker.
    */
-  getWorkerAverageTasksRunTime: (worker: Worker) => number | undefined
+  getWorkerTasksUsage: (worker: Worker) => TasksUsage | undefined
 }