fix: fix worker options argument passing to worker pool/set

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

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index 2cda0ca2420f3ad4ae49fcfa64dcc55d7b7a261d..35fe82eb4c73a017d01316e265ddc7348fc72025 100644 (file)
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,32 +1,56 @@
-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 type { ThreadPoolOptions } from 'poolifier';
 
-export default class WorkerFactory {
-  public static getWorkerImplementation<T>(workerScript: string, workerProcessType: WorkerProcessType, options?: WorkerOptions): WorkerAbstract {
+import type { WorkerAbstract } from './WorkerAbstract';
+import { WorkerConstants } from './WorkerConstants';
+import { WorkerDynamicPool } from './WorkerDynamicPool';
+import { WorkerSet } from './WorkerSet';
+import { WorkerStaticPool } from './WorkerStaticPool';
+import { type WorkerData, type WorkerOptions, WorkerProcessType } from './WorkerTypes';
+
+export class WorkerFactory {
+  private constructor() {
+    // This is intentional
+  }
+
+  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');
+      throw new Error('Cannot get a worker implementation outside the main thread');
     }
-    options = options ?? {} as WorkerOptions;
-    options.startDelay = options.startDelay ?? Constants.WORKER_START_DELAY;
+    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 ThreadPoolOptions);
+    let workerImplementation: WorkerAbstract<T> | null = null;
     switch (workerProcessType) {
-      case WorkerProcessType.WORKER_SET:
-        options.elementsPerWorker = options.elementsPerWorker ?? 1;
-        return new WorkerSet<T>(workerScript, options.elementsPerWorker, options.startDelay);
-      case WorkerProcessType.STATIC_POOL:
-        options.poolMaxSize = options.poolMaxSize ?? 16;
-        return new WorkerStaticPool<T>(workerScript, options.poolMaxSize, options.startDelay, options.poolOptions);
-      case WorkerProcessType.DYNAMIC_POOL:
-        options.poolMinSize = options.poolMinSize ?? 4;
-        options.poolMaxSize = options.poolMaxSize ?? 16;
-        return new WorkerDynamicPool<T>(workerScript, options.poolMinSize, options.poolMaxSize, options.startDelay, options.poolOptions);
+      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:
-        return null;
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        throw new Error(`Worker implementation type '${workerProcessType}' not found`);
     }
+    return workerImplementation;
   }
 }