X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerAbstract.ts;h=912f5256575bb2ca9a5b486bb8ed0cce8cd5bd9e;hb=42b8cf5cdca8eaab1e7442f7c92c2a5ed97434f6;hp=2f9093f294de59fa3ddc1363f9310de9d98c70b5;hpb=5edd8ba0f8978cfb3ca9d80f299d9748c6c5970e;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerAbstract.ts b/src/worker/WorkerAbstract.ts
index 2f9093f2..912f5256 100644
--- a/src/worker/WorkerAbstract.ts
+++ b/src/worker/WorkerAbstract.ts
@@ -1,10 +1,8 @@
-import type { EventEmitter } from 'node:events';
+import type { EventEmitterAsyncResource } from 'node:events';
 import { existsSync } from 'node:fs';
-import type { Worker } from 'node:worker_threads';
 
-import type { ErrorHandler, ExitHandler, PoolEmitter, PoolInfo } from 'poolifier';
+import type { PoolInfo } from 'poolifier';
 
-import { WorkerConstants } from './WorkerConstants';
 import type { SetInfo, WorkerData, WorkerOptions } from './WorkerTypes';
 import { defaultErrorHandler, defaultExitHandler } from './WorkerUtils';
 
@@ -14,7 +12,7 @@ export abstract class WorkerAbstract<T extends WorkerData> {
   public abstract readonly info: PoolInfo | SetInfo;
   public abstract readonly size: number;
   public abstract readonly maxElementsPerWorker: number | undefined;
-  public abstract readonly emitter: EventEmitter | PoolEmitter | undefined;
+  public abstract readonly emitter: EventEmitterAsyncResource | undefined;
 
   /**
    * `WorkerAbstract` constructor.
@@ -22,17 +20,7 @@ export abstract class WorkerAbstract<T extends WorkerData> {
    * @param workerScript -
    * @param workerOptions -
    */
-  constructor(
-    workerScript: string,
-    workerOptions: WorkerOptions = {
-      workerStartDelay: WorkerConstants.DEFAULT_WORKER_START_DELAY,
-      elementStartDelay: WorkerConstants.DEFAULT_ELEMENT_START_DELAY,
-      poolMinSize: WorkerConstants.DEFAULT_POOL_MIN_SIZE,
-      poolMaxSize: WorkerConstants.DEFAULT_POOL_MAX_SIZE,
-      elementsPerWorker: WorkerConstants.DEFAULT_ELEMENTS_PER_WORKER,
-      poolOptions: {},
-    },
-  ) {
+  constructor(workerScript: string, workerOptions: WorkerOptions) {
     if (workerScript === null || workerScript === undefined) {
       throw new Error('Worker script is not defined');
     }
@@ -44,14 +32,10 @@ export abstract class WorkerAbstract<T extends WorkerData> {
     }
     this.workerScript = workerScript;
     this.workerOptions = workerOptions;
-    this.workerOptions.poolOptions?.messageHandler?.bind(this);
-    this.workerOptions.poolOptions.errorHandler = (
-      this.workerOptions?.poolOptions?.errorHandler ?? defaultErrorHandler
-    ).bind(this) as ErrorHandler<Worker>;
-    this.workerOptions.poolOptions?.onlineHandler?.bind(this);
-    this.workerOptions.poolOptions.exitHandler = (
-      this.workerOptions?.poolOptions?.exitHandler ?? defaultExitHandler
-    ).bind(this) as ExitHandler<Worker>;
+    this.workerOptions.poolOptions!.errorHandler =
+      this.workerOptions.poolOptions?.errorHandler ?? defaultErrorHandler;
+    this.workerOptions.poolOptions!.exitHandler =
+      this.workerOptions.poolOptions?.exitHandler ?? defaultExitHandler;
   }
 
   /**