X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerDynamicPool.ts;h=9527d67b60bd9b68ff81d4c96b8b415af6d30b61;hb=94327d938c08c347d44ea685e38cb05ff9c3e548;hp=ec5ffc372b9ee0f24ea97f4e8f611677ff17af9b;hpb=4bfd80fa794b4b2f89427ef9f5944664ce3bdade;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerDynamicPool.ts b/src/worker/WorkerDynamicPool.ts
index ec5ffc37..9527d67b 100644
--- a/src/worker/WorkerDynamicPool.ts
+++ b/src/worker/WorkerDynamicPool.ts
@@ -1,64 +1,61 @@
-import { DynamicThreadPool, PoolOptions } from 'poolifier';
-import { WorkerData, WorkerStartOptions } from '../types/Worker';
+import type { EventEmitterAsyncResource } from 'node:events';
 
-import Utils from '../utils/Utils';
-import { Worker } from 'worker_threads';
-import WorkerAbstract from './WorkerAbstract';
-import { WorkerUtils } from './WorkerUtils';
+import { DynamicThreadPool, type PoolInfo } from 'poolifier';
 
-export default class WorkerDynamicPool extends WorkerAbstract<WorkerData> {
+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 workerScript
-   * @param min
-   * @param max
-   * @param workerStartOptions
-   * @param opts
+   * @param workerScript -
+   * @param workerOptions -
    */
-  constructor(workerScript: string, min: number, max: number, workerStartOptions?: WorkerStartOptions, opts?: PoolOptions<Worker>) {
-    super(workerScript, workerStartOptions);
-    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
-   */
+  get emitter(): EventEmitterAsyncResource | undefined {
+    return this.pool?.emitter;
+  }
+
+  /** @inheritDoc */
   public async start(): Promise<void> {
     // This is intentional
   }
 
-  /**
-   *
-   * @returns
-   * @public
-   */
+  /** @inheritDoc */
   public async stop(): Promise<void> {
     return this.pool.destroy();
   }
 
-  /**
-   *
-   * @param elementData
-   * @returns
-   * @public
-   */
+  /** @inheritDoc */
   public async addElement(elementData: WorkerData): Promise<void> {
     await this.pool.execute(elementData);
     // Start element sequentially to optimize memory at startup
-    this.elementStartDelay > 0 && await Utils.sleep(this.elementStartDelay);
+    this.workerOptions.elementStartDelay! > 0 &&
+      (await sleep(randomizeDelay(this.workerOptions.elementStartDelay!)));
   }
 }