X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerStaticPool.ts;h=b1cc718949b4d0ea94d3c338315bf8284cd45e43;hb=c1c97db8708f26af10385f6e86af7cd933891bb8;hp=af611b6387777843d9d9fc3ef98d3dfdfd047360;hpb=962a8159b104d06b945fc28143c4468ff1c913d9;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerStaticPool.ts b/src/worker/WorkerStaticPool.ts
index af611b63..b1cc7189 100644
--- a/src/worker/WorkerStaticPool.ts
+++ b/src/worker/WorkerStaticPool.ts
@@ -1,46 +1,40 @@
-import type EventEmitterAsyncResource from 'node:events';
-import type { Worker } from 'node:worker_threads';
-
-import { type ErrorHandler, type ExitHandler, FixedThreadPool } from 'poolifier';
+import { FixedThreadPool, type PoolEmitter, type PoolInfo } from 'poolifier';
 
 import { WorkerAbstract } from './WorkerAbstract';
 import type { WorkerData, WorkerOptions } from './WorkerTypes';
-import { defaultErrorHandler, defaultExitHandler, sleep } from './WorkerUtils';
+import { sleep } from './WorkerUtils';
 
 export class WorkerStaticPool extends WorkerAbstract<WorkerData> {
   private readonly pool: FixedThreadPool<WorkerData>;
 
   /**
-   * Create a new `WorkerStaticPool`.
+   * Creates a new `WorkerStaticPool`.
    *
    * @param workerScript -
    * @param workerOptions -
    */
   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 FixedThreadPool(
       this.workerOptions.poolMaxSize,
       this.workerScript,
-      this.workerOptions.poolOptions
+      this.workerOptions.poolOptions,
     );
   }
 
+  get info(): PoolInfo {
+    return this.pool.info;
+  }
+
   get size(): number {
-    return this.pool.workerNodes.length;
+    return this.pool.info.workerNodes;
   }
 
   get maxElementsPerWorker(): number | undefined {
     return undefined;
   }
 
-  get emitter(): EventEmitterAsyncResource | undefined {
+  get emitter(): PoolEmitter | undefined {
     return this.pool?.emitter;
   }
 
@@ -58,6 +52,7 @@ export class WorkerStaticPool extends WorkerAbstract<WorkerData> {
   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));
+    this.workerOptions.elementStartDelay! > 0 &&
+      (await sleep(this.workerOptions.elementStartDelay!));
   }
 }