X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerDynamicPool.ts;h=9527d67b60bd9b68ff81d4c96b8b415af6d30b61;hb=42b8cf5cdca8eaab1e7442f7c92c2a5ed97434f6;hp=d30f9b7a9bb4d2725c8f904099ee5db2af949fb9;hpb=63b19acd0a16da3d348fd5aff8d4172e12fba954;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerDynamicPool.ts b/src/worker/WorkerDynamicPool.ts
index d30f9b7a..9527d67b 100644
--- a/src/worker/WorkerDynamicPool.ts
+++ b/src/worker/WorkerDynamicPool.ts
@@ -1,80 +1,61 @@
-import { DynamicThreadPool, PoolOptions } from 'poolifier';
+import type { EventEmitterAsyncResource } from 'node:events';
 
-import Constants from '../utils/Constants';
-import Utils from '../utils/Utils';
-import { Worker } from 'worker_threads';
-import { WorkerData } from '../types/Worker';
-import Wrk from './Wrk';
+import { DynamicThreadPool, type PoolInfo } from 'poolifier';
 
-export default class WorkerDynamicPool<T> extends Wrk {
-  private pool: DynamicPool;
+import { WorkerAbstract } from './WorkerAbstract';
+import type { WorkerData, WorkerOptions } from './WorkerTypes';
+import { randomizeDelay, sleep } from './WorkerUtils';
+
+export class WorkerDynamicPool extends WorkerAbstract<WorkerData> {
+  private readonly pool: DynamicThreadPool<WorkerData>;
 
   /**
-   * Create a new `WorkerDynamicPool`.
+   * Creates a new `WorkerDynamicPool`.
    *
-   * @param {string} workerScript
+   * @param workerScript -
+   * @param workerOptions -
    */
-  constructor(workerScript: string, min: number, max: number,) {
-    super(workerScript);
-    this.pool = DynamicPool.getInstance(min, max, this.workerScript);
+  constructor(workerScript: string, workerOptions: WorkerOptions) {
+    super(workerScript, workerOptions);
+    this.pool = new DynamicThreadPool<WorkerData>(
+      this.workerOptions.poolMinSize,
+      this.workerOptions.poolMaxSize,
+      this.workerScript,
+      this.workerOptions.poolOptions,
+    );
   }
 
-  get size(): number {
-    return this.pool.workers.length;
+  get info(): PoolInfo {
+    return this.pool.info;
   }
 
-  get maxElementsPerWorker(): number {
-    return 1;
+  get size(): number {
+    return this.pool.info.workerNodes;
   }
 
-  /**
-   *
-   * @return {Promise<void>}
-   * @public
-   */
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  public async start(): Promise<void> { }
-
-  /**
-   *
-   * @return {Promise<void>}
-   * @public
-   */
-  public async stop(): Promise<void> {
-    return this.pool.destroy();
+  get maxElementsPerWorker(): number | undefined {
+    return undefined;
   }
 
-  /**
-   *
-   * @return {Promise<void>}
-   * @public
-   */
-  public async addElement(elementData: T): Promise<void> {
-    await this.pool.execute(elementData);
-    // Start worker sequentially to optimize memory at startup
-    await Utils.sleep(Constants.START_WORKER_DELAY);
+  get emitter(): EventEmitterAsyncResource | undefined {
+    return this.pool?.emitter;
   }
-}
 
-class DynamicPool extends DynamicThreadPool<WorkerData> {
-  private static instance: DynamicPool;
+  /** @inheritDoc */
+  public async start(): Promise<void> {
+    // This is intentional
+  }
 
-  private constructor(min: number, max: number, workerScript: string, opts?: PoolOptions<Worker>) {
-    super(min, max, workerScript, opts);
+  /** @inheritDoc */
+  public async stop(): Promise<void> {
+    return this.pool.destroy();
   }
 
-  public static getInstance(min: number, max: number, workerScript: string): DynamicPool {
-    if (!DynamicPool.instance) {
-      DynamicPool.instance = new DynamicPool(min, max, workerScript,
-        {
-          exitHandler: (code) => {
-            if (code !== 0) {
-              console.error(`Worker stopped with exit code ${code}`);
-            }
-          }
-        }
-      );
-    }
-    return DynamicPool.instance;
+  /** @inheritDoc */
+  public async addElement(elementData: WorkerData): Promise<void> {
+    await this.pool.execute(elementData);
+    // Start element sequentially to optimize memory at startup
+    this.workerOptions.elementStartDelay! > 0 &&
+      (await sleep(randomizeDelay(this.workerOptions.elementStartDelay!)));
   }
 }