X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerAbstract.ts;h=59610667ef063bbc0c8801d420729c6135d3690f;hb=b2b606263e2676354259164d532ff9aa91ccdf87;hp=d42f629db3ff0b5ced69039c28c2b180dab7731b;hpb=b779c0f8db458a7d53e702fbb50ce23a2fe01d39;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerAbstract.ts b/src/worker/WorkerAbstract.ts
index d42f629d..59610667 100644
--- a/src/worker/WorkerAbstract.ts
+++ b/src/worker/WorkerAbstract.ts
@@ -1,10 +1,12 @@
-import type EventEmitterAsyncResource from 'node:events';
-import fs from 'node:fs';
+import type { EventEmitter } from 'node:events';
+import { existsSync } from 'node:fs';
+import type { Worker } from 'node:worker_threads';
 
-import type { PoolInfo } from 'poolifier';
+import type { ErrorHandler, ExitHandler, PoolEmitter, PoolInfo } from 'poolifier';
 
 import { WorkerConstants } from './WorkerConstants';
 import type { SetInfo, WorkerData, WorkerOptions } from './WorkerTypes';
+import { defaultErrorHandler, defaultExitHandler } from './WorkerUtils';
 
 export abstract class WorkerAbstract<T extends WorkerData> {
   protected readonly workerScript: string;
@@ -12,7 +14,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: EventEmitterAsyncResource | undefined;
+  public abstract readonly emitter: EventEmitter | PoolEmitter | undefined;
 
   /**
    * `WorkerAbstract` constructor.
@@ -29,7 +31,6 @@ export abstract class WorkerAbstract<T extends WorkerData> {
       poolMaxSize: WorkerConstants.DEFAULT_POOL_MAX_SIZE,
       elementsPerWorker: WorkerConstants.DEFAULT_ELEMENTS_PER_WORKER,
       poolOptions: {},
-      messageHandler: WorkerConstants.EMPTY_FUNCTION,
     }
   ) {
     if (workerScript === null || workerScript === undefined) {
@@ -38,23 +39,31 @@ export abstract class WorkerAbstract<T extends WorkerData> {
     if (typeof workerScript === 'string' && workerScript.trim().length === 0) {
       throw new Error('Worker script is empty');
     }
-    if (!fs.existsSync(workerScript)) {
+    if (!existsSync(workerScript)) {
       throw new Error('Worker script file does not exist');
     }
     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>;
   }
 
   /**
-   * Start the worker pool/set.
+   * Starts the worker pool/set.
    */
   public abstract start(): Promise<void>;
   /**
-   * Stop the worker pool/set.
+   * Stops the worker pool/set.
    */
   public abstract stop(): Promise<void>;
   /**
-   * Add a task element to the worker pool/set.
+   * Adds a task element to the worker pool/set.
    *
    * @param elementData -
    */