X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerAbstract.ts;h=cd4dedf992fca40ff0b7cb787e91468d28020d55;hb=6a4032b5d8f3cbaa18d3beddcdfe9d335c1cba90;hp=7d8eebd55204d129a0d25f554ab71dad017414a9;hpb=361c98f57255e5b91d123d5f2ba43ab533134b1a;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerAbstract.ts b/src/worker/WorkerAbstract.ts
index 7d8eebd5..cd4dedf9 100644
--- a/src/worker/WorkerAbstract.ts
+++ b/src/worker/WorkerAbstract.ts
@@ -1,10 +1,8 @@
-import type EventEmitterAsyncResource from 'node:events';
-import fs from 'node:fs';
-import type { Worker } from 'node:worker_threads';
+import type { EventEmitterAsyncResource } from 'node:events';
+import { existsSync } from 'node:fs';
 
-import type { ErrorHandler, ExitHandler, PoolInfo } from 'poolifier';
+import type { PoolInfo } from 'poolifier';
 
-import { WorkerConstants } from './WorkerConstants';
 import type { SetInfo, WorkerData, WorkerOptions } from './WorkerTypes';
 import { defaultErrorHandler, defaultExitHandler } from './WorkerUtils';
 
@@ -22,36 +20,25 @@ 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) {
+      throw new TypeError('Worker script is not defined');
     }
-  ) {
-    if (workerScript === null || workerScript === undefined) {
-      throw new Error('Worker script is not defined');
+    if (typeof workerScript !== 'string') {
+      throw new TypeError('Worker script must be a string');
     }
-    if (typeof workerScript === 'string' && workerScript.trim().length === 0) {
-      throw new Error('Worker script is empty');
+    if (workerScript.trim().length === 0) {
+      throw new Error('Worker script is an empty string');
     }
-    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>;
+    this.workerOptions.poolOptions!.errorHandler =
+      this.workerOptions.poolOptions?.errorHandler ?? defaultErrorHandler;
+    this.workerOptions.poolOptions!.exitHandler =
+      this.workerOptions.poolOptions?.exitHandler ?? defaultExitHandler;
   }
 
   /**