feat: ensure charging station add op return its station info

[e-mobility-charging-stations-simulator.git] / src / worker / WorkerFactory.ts

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index b5cf327c12d57ab7935b27aefb4a26cf2b79ca05..73bcd56dc62467c7bb942157d88554014b8240af 100644 (file)
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,41 +1,39 @@
-import { WorkerOptions, WorkerProcessType } from '../types/Worker';
+import { isMainThread } from 'node:worker_threads'
 
-import Constants from '../utils/Constants';
-import WorkerAbstract from './WorkerAbstract';
-import WorkerDynamicPool from './WorkerDynamicPool';
-import WorkerSet from './WorkerSet';
-import WorkerStaticPool from './WorkerStaticPool';
-import { isMainThread } from 'worker_threads';
+import { mergeDeepRight } from 'rambda'
 
-export default class WorkerFactory {
-  private static workerImplementation: WorkerAbstract | null;
+import type { WorkerAbstract } from './WorkerAbstract.js'
+import { DEFAULT_WORKER_OPTIONS } from './WorkerConstants.js'
+import { WorkerDynamicPool } from './WorkerDynamicPool.js'
+import { WorkerFixedPool } from './WorkerFixedPool.js'
+import { WorkerSet } from './WorkerSet.js'
+import { type WorkerData, type WorkerOptions, WorkerProcessType } from './WorkerTypes.js'
 
-  private constructor() {}
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+export class WorkerFactory {
+  private constructor () {
+    // This is intentional
+  }
 
-  public static getWorkerImplementation<T>(workerScript: string, workerProcessType: WorkerProcessType, options?: WorkerOptions, forceInstantiation = false): WorkerAbstract | null {
+  public static getWorkerImplementation<D extends WorkerData, R extends WorkerData>(
+    workerScript: string,
+    workerProcessType: WorkerProcessType,
+    workerOptions?: WorkerOptions
+  ): WorkerAbstract<D, R> {
     if (!isMainThread) {
-      throw new Error('Trying to get a worker implementation outside the main thread');
+      throw new Error('Cannot 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 = mergeDeepRight<WorkerOptions>(DEFAULT_WORKER_OPTIONS, workerOptions ?? {})
+    switch (workerProcessType) {
+      case WorkerProcessType.workerSet:
+        return new WorkerSet<D, R>(workerScript, workerOptions)
+      case WorkerProcessType.fixedPool:
+        return new WorkerFixedPool<D, R>(workerScript, workerOptions)
+      case WorkerProcessType.dynamicPool:
+        return new WorkerDynamicPool<D, R>(workerScript, workerOptions)
+      default:
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        throw new Error(`Worker implementation type '${workerProcessType}' not found`)
     }
-    return WorkerFactory.workerImplementation;
   }
 }