X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerDynamicPool.ts;h=e2dd3b1e9bdd76cededb0762401561ebca952e75;hb=71068fb926ca5fea4b811159ca958891d345ef38;hp=9141c2f0b2f05ae3beb4c597731e4e256f326187;hpb=101196c654ddcd686e4992f58864f591ceea6c00;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerDynamicPool.ts b/src/worker/WorkerDynamicPool.ts
index 9141c2f0..e2dd3b1e 100644
--- a/src/worker/WorkerDynamicPool.ts
+++ b/src/worker/WorkerDynamicPool.ts
@@ -4,22 +4,24 @@ import Utils from '../utils/Utils';
 import { Worker } from 'worker_threads';
 import WorkerAbstract from './WorkerAbstract';
 import { WorkerData } from '../types/Worker';
+import { WorkerUtils } from './WorkerUtils';
 
 export default class WorkerDynamicPool<T> extends WorkerAbstract {
-  private pool: DynamicPool;
+  private readonly pool: DynamicThreadPool<WorkerData>;
 
   /**
    * Create a new `WorkerDynamicPool`.
    *
-   * @param {string} workerScript
-   * @param {number} min
-   * @param {number} max
-   * @param {number} workerStartDelay
-   * @param {PoolOptions} opts
+   * @param workerScript
+   * @param min
+   * @param max
+   * @param workerStartDelay
+   * @param opts
    */
   constructor(workerScript: string, min: number, max: number, workerStartDelay?: number, opts?: PoolOptions<Worker>) {
     super(workerScript, workerStartDelay);
-    this.pool = DynamicPool.getInstance(min, max, this.workerScript, opts);
+    opts.exitHandler = opts?.exitHandler ?? WorkerUtils.defaultExitHandler;
+    this.pool = new DynamicThreadPool<WorkerData>(min, max, this.workerScript, opts);
   }
 
   get size(): number {
@@ -32,26 +34,26 @@ export default class WorkerDynamicPool<T> extends WorkerAbstract {
 
   /**
    *
-   * @returns {Promise<void>}
+   * @returns
    * @public
    */
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  public async start(): Promise<void> { }
+  public async start(): Promise<void> {
+    // This is intentional
+  }
 
   /**
    *
-   * @returns {Promise<void>}
+   * @returns
    * @public
    */
-  // eslint-disable-next-line @typescript-eslint/require-await
   public async stop(): Promise<void> {
     return this.pool.destroy();
   }
 
   /**
    *
-   * @param {T} elementData
-   * @returns {Promise<void>}
+   * @param elementData
+   * @returns
    * @public
    */
   public async addElement(elementData: T): Promise<void> {
@@ -60,23 +62,3 @@ export default class WorkerDynamicPool<T> extends WorkerAbstract {
     await Utils.sleep(this.workerStartDelay);
   }
 }
-
-class DynamicPool extends DynamicThreadPool<WorkerData> {
-  private static instance: DynamicPool;
-
-  private constructor(min: number, max: number, workerScript: string, opts?: PoolOptions<Worker>) {
-    super(min, max, workerScript, opts);
-  }
-
-  public static getInstance(min: number, max: number, workerScript: string, opts?: PoolOptions<Worker>): DynamicPool {
-    if (!DynamicPool.instance) {
-      opts.exitHandler = opts?.exitHandler ?? ((code) => {
-        if (code !== 0) {
-          console.error(`Worker stopped with exit code ${code}`);
-        }
-      });
-      DynamicPool.instance = new DynamicPool(min, max, workerScript, opts);
-    }
-    return DynamicPool.instance;
-  }
-}