X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerFactory.ts;h=ae27d1dfd56fa5e0fd14d4daba074d35afb32c0c;hb=d9dc62924217cf334019aa04322a18e2e032d659;hp=a5b401a3698417887c77426f843d0cae48bd61f0;hpb=721646e902fa12d165d4a1da06fb963fb30dc9f2;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index a5b401a3..ae27d1df 100644
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,6 +1,4 @@
-import { type Worker, isMainThread } from 'node:worker_threads';
-
-import type { PoolOptions } from 'poolifier';
+import { isMainThread } from 'node:worker_threads';
 
 import type { WorkerAbstract } from './WorkerAbstract';
 import { WorkerConstants } from './WorkerConstants';
@@ -9,6 +7,15 @@ import { WorkerSet } from './WorkerSet';
 import { WorkerStaticPool } from './WorkerStaticPool';
 import { type WorkerData, type WorkerOptions, WorkerProcessType } from './WorkerTypes';
 
+const DEFAULT_WORKER_OPTIONS: 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: {},
+};
+
 export class WorkerFactory {
   private constructor() {
     // This is intentional
@@ -17,37 +24,21 @@ export class WorkerFactory {
   public static getWorkerImplementation<T extends WorkerData>(
     workerScript: string,
     workerProcessType: WorkerProcessType,
-    workerOptions?: WorkerOptions
+    workerOptions?: WorkerOptions,
   ): WorkerAbstract<T> | null {
     if (!isMainThread) {
       throw new Error('Cannot get a worker implementation outside the main thread');
     }
-    workerOptions = workerOptions ?? (WorkerConstants.EMPTY_OBJECT as WorkerOptions);
-    workerOptions.workerStartDelay =
-      workerOptions?.workerStartDelay ?? WorkerConstants.DEFAULT_WORKER_START_DELAY;
-    workerOptions.elementStartDelay =
-      workerOptions?.elementStartDelay ?? WorkerConstants.DEFAULT_ELEMENT_START_DELAY;
-    workerOptions.poolOptions =
-      workerOptions?.poolOptions ?? (WorkerConstants.EMPTY_OBJECT as PoolOptions<Worker>);
-    workerOptions?.messageHandler &&
-      (workerOptions.poolOptions.messageHandler = workerOptions.messageHandler);
+    workerOptions = { ...DEFAULT_WORKER_OPTIONS, ...workerOptions };
     let workerImplementation: WorkerAbstract<T> | null = null;
     switch (workerProcessType) {
       case WorkerProcessType.workerSet:
-        workerOptions.elementsPerWorker =
-          workerOptions?.elementsPerWorker ?? WorkerConstants.DEFAULT_ELEMENTS_PER_WORKER;
         workerImplementation = new WorkerSet(workerScript, workerOptions);
         break;
       case WorkerProcessType.staticPool:
-        workerOptions.poolMaxSize =
-          workerOptions?.poolMaxSize ?? WorkerConstants.DEFAULT_POOL_MAX_SIZE;
         workerImplementation = new WorkerStaticPool(workerScript, workerOptions);
         break;
       case WorkerProcessType.dynamicPool:
-        workerOptions.poolMinSize =
-          workerOptions?.poolMinSize ?? WorkerConstants.DEFAULT_POOL_MIN_SIZE;
-        workerOptions.poolMaxSize =
-          workerOptions?.poolMaxSize ?? WorkerConstants.DEFAULT_POOL_MAX_SIZE;
         workerImplementation = new WorkerDynamicPool(workerScript, workerOptions);
         break;
       default: