X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerFactory.ts;h=8b979d06ca2d76f8e4d0220132b03dafd8a6bf84;hb=2f79b4478e28ed922581029adf341210da6149b4;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..8b979d06 100644
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,41 +1,44 @@
+import { Worker, isMainThread } from 'worker_threads';
 import { WorkerOptions, WorkerProcessType } from '../types/Worker';
 
 import Constants from '../utils/Constants';
+import { PoolOptions } from 'poolifier';
 import WorkerAbstract from './WorkerAbstract';
 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>(workerScript: string, workerProcessType: WorkerProcessType, options?: WorkerOptions): WorkerAbstract | 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;
-      }
+    options = options ?? {} as WorkerOptions;
+    options.startDelay = options?.startDelay ?? Constants.WORKER_START_DELAY;
+    options.poolOptions = options?.poolOptions ?? {} as PoolOptions<Worker>;
+    options?.messageHandler && (options.poolOptions.messageHandler = options.messageHandler);
+    let workerImplementation: WorkerAbstract = null;
+    switch (workerProcessType) {
+      case WorkerProcessType.WORKER_SET:
+        options.elementsPerWorker = options.elementsPerWorker ?? Constants.DEFAULT_CHARGING_STATIONS_PER_WORKER;
+        workerImplementation = new WorkerSet<T>(workerScript, options.elementsPerWorker, options.startDelay, options);
+        break;
+      case WorkerProcessType.STATIC_POOL:
+        options.poolMaxSize = options.poolMaxSize ?? Constants.DEFAULT_WORKER_POOL_MAX_SIZE;
+        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;
+        workerImplementation = new WorkerDynamicPool<T>(workerScript, options.poolMinSize, options.poolMaxSize, options.startDelay, options.poolOptions);
+        break;
+      default:
+        throw new Error(`Worker implementation type '${workerProcessType}' not found`);
     }
-    return WorkerFactory.workerImplementation;
+    return workerImplementation;
   }
 }