X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerFactory.ts;h=70bcc3862c4fca8c42a66d7e0f52e7568bfbef80;hb=6fee1791db82bd4605b180612fe642a7e2c4caa0;hp=b5cf327c12d57ab7935b27aefb4a26cf2b79ca05;hpb=8df3f0a9d9fb9796c093a0e040b13dca8aaa3234;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index b5cf327c..70bcc386 100644
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,41 +1,60 @@
-import { WorkerOptions, WorkerProcessType } from '../types/Worker';
+import { Worker, isMainThread } from 'worker_threads';
+import { WorkerData, WorkerOptions, WorkerProcessType } from '../types/Worker';
 
-import Constants from '../utils/Constants';
-import WorkerAbstract from './WorkerAbstract';
+import { PoolOptions } from 'poolifier';
+import type WorkerAbstract from './WorkerAbstract';
+import WorkerConstants from './WorkerConstants';
 import WorkerDynamicPool from './WorkerDynamicPool';
 import WorkerSet from './WorkerSet';
 import WorkerStaticPool from './WorkerStaticPool';
-import { isMainThread } from 'worker_threads';
 
 export default class WorkerFactory {
-  private static workerImplementation: WorkerAbstract | null;
-
-  private constructor() {}
+  private constructor() {
+    // This is intentional
+  }
 
-  public static getWorkerImplementation<T>(workerScript: string, workerProcessType: WorkerProcessType, options?: WorkerOptions, forceInstantiation = false): WorkerAbstract | null {
+  public static getWorkerImplementation<T extends WorkerData>(
+    workerScript: string,
+    workerProcessType: WorkerProcessType,
+    workerOptions?: WorkerOptions
+  ): WorkerAbstract<T> | null {
     if (!isMainThread) {
       throw new Error('Trying to get a worker implementation outside the main thread');
     }
-    if (!WorkerFactory.workerImplementation || forceInstantiation) {
-      options = options ?? {} as WorkerOptions;
-      options.startDelay = options.startDelay ?? Constants.WORKER_START_DELAY;
-      WorkerFactory.workerImplementation = null;
-      switch (workerProcessType) {
-        case WorkerProcessType.WORKER_SET:
-          options.elementsPerWorker = options.elementsPerWorker ?? Constants.DEFAULT_CHARGING_STATIONS_PER_WORKER;
-          WorkerFactory.workerImplementation = new WorkerSet<T>(workerScript, options.elementsPerWorker, options.startDelay);
-          break;
-        case WorkerProcessType.STATIC_POOL:
-          options.poolMaxSize = options.poolMaxSize ?? Constants.DEFAULT_WORKER_POOL_MAX_SIZE;
-          WorkerFactory.workerImplementation = new WorkerStaticPool<T>(workerScript, options.poolMaxSize, options.startDelay, options.poolOptions);
-          break;
-        case WorkerProcessType.DYNAMIC_POOL:
-          options.poolMinSize = options.poolMinSize ?? Constants.DEFAULT_WORKER_POOL_MIN_SIZE;
-          options.poolMaxSize = options.poolMaxSize ?? Constants.DEFAULT_WORKER_POOL_MAX_SIZE;
-          WorkerFactory.workerImplementation = new WorkerDynamicPool<T>(workerScript, options.poolMinSize, options.poolMaxSize, options.startDelay, options.poolOptions);
-          break;
-      }
+    workerOptions = workerOptions ?? ({} as WorkerOptions);
+    workerOptions.workerStartDelay =
+      workerOptions?.workerStartDelay ?? WorkerConstants.DEFAULT_WORKER_START_DELAY;
+    workerOptions.elementStartDelay =
+      workerOptions?.elementStartDelay ?? WorkerConstants.DEFAULT_ELEMENT_START_DELAY;
+    workerOptions.poolOptions = workerOptions?.poolOptions ?? ({} as PoolOptions<Worker>);
+    workerOptions?.messageHandler &&
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      (workerOptions.poolOptions.messageHandler = workerOptions.messageHandler);
+    console.log('before');
+    let workerImplementation: WorkerAbstract<T> = null;
+    console.log(workerImplementation);
+    switch (workerProcessType) {
+      case WorkerProcessType.WORKER_SET:
+        workerOptions.elementsPerWorker =
+          workerOptions?.elementsPerWorker ?? WorkerConstants.DEFAULT_ELEMENTS_PER_WORKER;
+        workerImplementation = new WorkerSet(workerScript, workerOptions);
+        break;
+      case WorkerProcessType.STATIC_POOL:
+        workerOptions.poolMaxSize =
+          workerOptions?.poolMaxSize ?? WorkerConstants.DEFAULT_POOL_MAX_SIZE;
+        workerImplementation = new WorkerStaticPool(workerScript, workerOptions);
+        break;
+      case WorkerProcessType.DYNAMIC_POOL:
+        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:
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        throw new Error(`Worker implementation type '${workerProcessType}' not found`);
     }
-    return WorkerFactory.workerImplementation;
+    return workerImplementation;
   }
 }