X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fworker%2FWorkerFactory.ts;h=833c939f1767e832b021f152a5d2725caf221f72;hb=f0bede86574750d1d894d16a86ef63f83948e7a0;hp=2d923daab084bb95b77a783509053bed4b519a7a;hpb=a4624c96a6c159b4885f5d0baaf592ceec0bab30;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index 2d923daa..833c939f 100644
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,21 +1,42 @@
-import Configuration from '../utils/Configuration';
-import WorkerDynamicPool from './WorkerDynamicPool';
-import { WorkerProcessType } from '../types/Worker';
-import WorkerSet from './WorkerSet';
-import WorkerStaticPool from './WorkerStaticPool';
-import Wrk from './Wrk';
+import { isMainThread } from 'node:worker_threads'
 
-export default class WorkerFactory {
-  public static getWorkerImpl(workerScript: string): Wrk {
-    switch (Configuration.getWorkerProcess()) {
-      case WorkerProcessType.WORKER_SET:
-        return new WorkerSet(workerScript, Configuration.getChargingStationsPerWorker());
-      case WorkerProcessType.STATIC_POOL:
-        return new WorkerStaticPool(workerScript, Configuration.getWorkerPoolMaxSize());
-      case WorkerProcessType.DYNAMIC_POOL:
-        return new WorkerDynamicPool(workerScript, Configuration.getWorkerPoolMinSize(), Configuration.getWorkerPoolMaxSize());
+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'
+
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+export class WorkerFactory {
+  private constructor () {
+    // This is intentional
+  }
+
+  public static getWorkerImplementation<T extends WorkerData>(
+    workerScript: string,
+    workerProcessType: WorkerProcessType,
+    workerOptions?: WorkerOptions
+  ): WorkerAbstract<T> | undefined {
+    if (!isMainThread) {
+      throw new Error('Cannot get a worker implementation outside the main thread')
+    }
+    workerOptions = { ...DEFAULT_WORKER_OPTIONS, ...workerOptions }
+    let workerImplementation: WorkerAbstract<T>
+    switch (workerProcessType) {
+      case WorkerProcessType.workerSet:
+        workerImplementation = new WorkerSet(workerScript, workerOptions)
+        break
+      case WorkerProcessType.fixedPool:
+        workerImplementation = new WorkerFixedPool(workerScript, workerOptions)
+        break
+      case WorkerProcessType.dynamicPool:
+        workerImplementation = new WorkerDynamicPool(workerScript, workerOptions)
+        break
       default:
-        return null;
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        throw new Error(`Worker implementation type '${workerProcessType}' not found`)
     }
+    return workerImplementation
   }
 }