X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerDynamicPool.ts;h=b7b39819e82ed7e67e45acafec8bd3b419f61686;hb=962a8159b104d06b945fc28143c4468ff1c913d9;hp=570e5d1bcb2bded02486202787a876d32f251d88;hpb=1e924543e08745cfa9642dca53d303390d391f00;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerDynamicPool.ts b/src/worker/WorkerDynamicPool.ts
index 570e5d1b..b7b39819 100644
--- a/src/worker/WorkerDynamicPool.ts
+++ b/src/worker/WorkerDynamicPool.ts
@@ -1,70 +1,64 @@
-import { DynamicThreadPool, DynamicThreadPoolOptions } from 'poolifier';
+import type EventEmitterAsyncResource from 'node:events';
+import type { Worker } from 'node:worker_threads';
 
-import Constants from '../utils/Constants';
-import Utils from '../utils/Utils';
-import { WorkerData } from '../types/Worker';
-import Wrk from './Wrk';
+import { DynamicThreadPool, type ErrorHandler, type ExitHandler } from 'poolifier';
 
-export default class WorkerDynamicPool extends Wrk {
-  private pool: DynamicPool;
+import { WorkerAbstract } from './WorkerAbstract';
+import type { WorkerData, WorkerOptions } from './WorkerTypes';
+import { defaultErrorHandler, defaultExitHandler, sleep } from './WorkerUtils';
+
+export class WorkerDynamicPool extends WorkerAbstract<WorkerData> {
+  private readonly pool: DynamicThreadPool<WorkerData>;
 
   /**
    * Create 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.workerOptions.poolOptions.errorHandler = (
+      this.workerOptions?.poolOptions?.errorHandler ?? defaultErrorHandler
+    ).bind(this) as ErrorHandler<Worker>;
+    this.workerOptions.poolOptions.exitHandler = (
+      this.workerOptions?.poolOptions?.exitHandler ?? defaultExitHandler
+    ).bind(this) as ExitHandler<Worker>;
+    this.workerOptions.poolOptions.messageHandler.bind(this);
+    this.pool = new DynamicThreadPool<WorkerData>(
+      this.workerOptions.poolMinSize,
+      this.workerOptions.poolMaxSize,
+      this.workerScript,
+      this.workerOptions.poolOptions
+    );
   }
 
   get size(): number {
-    return this.pool.workers.length;
+    return this.pool.workerNodes.length;
   }
 
-  get maxElementsPerWorker(): number {
-    return 1;
+  get maxElementsPerWorker(): number | undefined {
+    return undefined;
   }
 
-  /**
-   *
-   * @return {Promise<void>}
-   * @public
-   */
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  public async start(): Promise<void> { }
-
-  /**
-   *
-   * @return {Promise<void>}
-   * @public
-   */
-  public async addElement(elementData: WorkerData): 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, filename: string, opts?: DynamicThreadPoolOptions) {
-    super(min, max, filename, opts);
+  /** @inheritDoc */
+  public async stop(): Promise<void> {
+    return this.pool.destroy();
   }
 
-  public static getInstance(min: number, max: number, filename: string): DynamicPool {
-    if (!DynamicPool.instance) {
-      DynamicPool.instance = new DynamicPool(min, max, filename,
-        {
-          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(this.workerOptions.elementStartDelay));
   }
 }