X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerStaticPool.ts;h=8a717ad8b81f7010d27bd4a6f83ae0b781e8f836;hb=62340a29089d0753f45b57dc3e5b8d4871c7d736;hp=cbc62fb63bfe45be928c5810c67c22bb862297de;hpb=0045cef5dae3be8131969d08f70c10748922524e;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerStaticPool.ts b/src/worker/WorkerStaticPool.ts
index cbc62fb6..8a717ad8 100644
--- a/src/worker/WorkerStaticPool.ts
+++ b/src/worker/WorkerStaticPool.ts
@@ -1,34 +1,42 @@
-import { FixedThreadPool, PoolOptions } from 'poolifier';
+import type { Worker } from 'node:worker_threads';
 
-import Utils from '../utils/Utils';
-import { Worker } from 'worker_threads';
-import WorkerAbstract from './WorkerAbstract';
-import { WorkerData } from '../types/Worker';
+import { type ErrorHandler, type ExitHandler, FixedThreadPool } from 'poolifier';
+
+import { WorkerAbstract } from './WorkerAbstract';
+import type { WorkerData, WorkerOptions } from './WorkerTypes';
 import { WorkerUtils } from './WorkerUtils';
 
-export default class WorkerStaticPool<T> extends WorkerAbstract {
-  private pool: FixedThreadPool<WorkerData>;
+export class WorkerStaticPool extends WorkerAbstract<WorkerData> {
+  private readonly pool: FixedThreadPool<WorkerData>;
 
   /**
    * Create a new `WorkerStaticPool`.
    *
-   * @param workerScript
-   * @param numberOfThreads
-   * @param startWorkerDelay
-   * @param opts
+   * @param workerScript -
+   * @param workerOptions -
    */
-  constructor(workerScript: string, numberOfThreads: number, startWorkerDelay?: number, opts?: PoolOptions<Worker>) {
-    super(workerScript, startWorkerDelay);
-    opts.exitHandler = opts?.exitHandler ?? WorkerUtils.defaultExitHandler;
-    this.pool = new FixedThreadPool(numberOfThreads, this.workerScript, opts);
+  constructor(workerScript: string, workerOptions?: WorkerOptions) {
+    super(workerScript, workerOptions);
+    this.workerOptions.poolOptions.errorHandler = (
+      this.workerOptions?.poolOptions?.errorHandler ?? WorkerUtils.defaultErrorHandler
+    ).bind(this) as ErrorHandler<Worker>;
+    this.workerOptions.poolOptions.exitHandler = (
+      this.workerOptions?.poolOptions?.exitHandler ?? WorkerUtils.defaultExitHandler
+    ).bind(this) as ExitHandler<Worker>;
+    this.workerOptions.poolOptions.messageHandler.bind(this);
+    this.pool = new FixedThreadPool(
+      this.workerOptions.poolMaxSize,
+      this.workerScript,
+      this.workerOptions.poolOptions
+    );
   }
 
   get size(): number {
     return this.pool.workers.length;
   }
 
-  get maxElementsPerWorker(): number | null {
-    return null;
+  get maxElementsPerWorker(): number | undefined {
+    return undefined;
   }
 
   /**
@@ -51,13 +59,14 @@ export default class WorkerStaticPool<T> extends WorkerAbstract {
 
   /**
    *
-   * @param elementData
+   * @param elementData -
    * @returns
    * @public
    */
-  public async addElement(elementData: T): Promise<void> {
+  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 WorkerUtils.sleep(this.workerOptions.elementStartDelay));
   }
 }