X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerDynamicPool.ts;h=eebc8fbbd34a280d10cdd9462e96abcb11914719;hb=f26233c0fd267bc2ef00636ca7531a0877bb5dbe;hp=0e1cd4cde877caf86cf4896fcf31271efeb4b53a;hpb=81797102d5214fea2fc58eff2666fe8b8d9a5a11;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerDynamicPool.ts b/src/worker/WorkerDynamicPool.ts
index 0e1cd4cd..eebc8fbb 100644
--- a/src/worker/WorkerDynamicPool.ts
+++ b/src/worker/WorkerDynamicPool.ts
@@ -1,68 +1,58 @@
-import { DynamicThreadPool, PoolOptions } from 'poolifier';
+import { DynamicThreadPool, type PoolEmitter, type PoolInfo } from 'poolifier';
 
-import Utils from '../utils/Utils';
-import { Worker } from 'worker_threads';
-import WorkerAbstract from './WorkerAbstract';
-import { WorkerData } from '../types/Worker';
-import { WorkerUtils } from './WorkerUtils';
+import { WorkerAbstract } from './WorkerAbstract';
+import type { WorkerData, WorkerOptions } from './WorkerTypes';
+import { sleep } from './WorkerUtils';
 
-export default class WorkerDynamicPool<T> extends WorkerAbstract {
-  private pool: DynamicThreadPool<WorkerData>;
+export class WorkerDynamicPool extends WorkerAbstract<WorkerData> {
+  private readonly pool: DynamicThreadPool<WorkerData>;
 
   /**
-   * Create a new `WorkerDynamicPool`.
+   * Creates a new `WorkerDynamicPool`.
    *
-   * @param workerScript
-   * @param min
-   * @param max
-   * @param workerStartDelay
-   * @param opts
-   * @param messageListenerCallback
+   * @param workerScript -
+   * @param workerOptions -
    */
-  constructor(workerScript: string, min: number, max: number, workerStartDelay?: number, opts?: PoolOptions<Worker>,
-      messageListenerCallback: (message: any) => void = () => { /* This is intentional */ }) {
-    super(workerScript, workerStartDelay, messageListenerCallback);
-    opts.exitHandler = opts?.exitHandler ?? WorkerUtils.defaultExitHandler;
-    this.pool = new DynamicThreadPool<WorkerData>(min, max, this.workerScript, opts);
+  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 info(): PoolInfo {
+    return this.pool.info;
   }
 
   get size(): number {
-    return this.pool.workers.length;
+    return this.pool.info.workerNodes;
   }
 
-  get maxElementsPerWorker(): number | null {
-    return null;
+  get maxElementsPerWorker(): number | undefined {
+    return undefined;
   }
 
-  /**
-   *
-   * @returns
-   * @public
-   */
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  get emitter(): PoolEmitter | undefined {
+    return this.pool?.emitter;
+  }
+
+  /** @inheritDoc */
   public async start(): Promise<void> {
     // This is intentional
   }
 
-  /**
-   *
-   * @returns
-   * @public
-   */
-  // eslint-disable-next-line @typescript-eslint/require-await
+  /** @inheritDoc */
   public async stop(): Promise<void> {
     return this.pool.destroy();
   }
 
-  /**
-   *
-   * @param elementData
-   * @returns
-   * @public
-   */
-  public async addElement(elementData: T): Promise<void> {
+  /** @inheritDoc */
+  public async addElement(elementData: WorkerData): Promise<void> {
     await this.pool.execute(elementData);
-    // Start worker sequentially to optimize memory at startup
-    await Utils.sleep(this.workerStartDelay);
+    // Start element sequentially to optimize memory at startup
+    this.workerOptions.elementStartDelay > 0 && (await sleep(this.workerOptions.elementStartDelay));
   }
 }