Add configuration tunable for pool worker choice strategy

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

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index 41fa1d89715444ca5cd69b07f6684789f63b2ecc..2cda0ca2420f3ad4ae49fcfa64dcc55d7b7a261d 100644 (file)
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,6 +1,6 @@
 import { WorkerOptions, WorkerProcessType } from '../types/Worker';
 
-import Utils from '../utils/Utils';
+import Constants from '../utils/Constants';
 import WorkerAbstract from './WorkerAbstract';
 import WorkerDynamicPool from './WorkerDynamicPool';
 import WorkerSet from './WorkerSet';
@@ -12,28 +12,19 @@ export default class WorkerFactory {
     if (!isMainThread) {
       throw new Error('Trying to get a worker implementation outside the main thread');
     }
-    if (Utils.isUndefined(options)) {
-      options = {} as WorkerOptions;
-    }
+    options = options ?? {} as WorkerOptions;
+    options.startDelay = options.startDelay ?? Constants.WORKER_START_DELAY;
     switch (workerProcessType) {
       case WorkerProcessType.WORKER_SET:
-        if (Utils.isUndefined(options.elementsPerWorker)) {
-          options.elementsPerWorker = 1;
-        }
-        return new WorkerSet<T>(workerScript, options.elementsPerWorker);
+        options.elementsPerWorker = options.elementsPerWorker ?? 1;
+        return new WorkerSet<T>(workerScript, options.elementsPerWorker, options.startDelay);
       case WorkerProcessType.STATIC_POOL:
-        if (Utils.isUndefined(options.poolMaxSize)) {
-          options.poolMaxSize = 16;
-        }
-        return new WorkerStaticPool<T>(workerScript, options.poolMaxSize);
+        options.poolMaxSize = options.poolMaxSize ?? 16;
+        return new WorkerStaticPool<T>(workerScript, options.poolMaxSize, options.startDelay, options.poolOptions);
       case WorkerProcessType.DYNAMIC_POOL:
-        if (Utils.isUndefined(options.poolMinSize)) {
-          options.poolMinSize = 4;
-        }
-        if (Utils.isUndefined(options.poolMaxSize)) {
-          options.poolMaxSize = 16;
-        }
-        return new WorkerDynamicPool<T>(workerScript, options.poolMinSize, options.poolMaxSize);
+        options.poolMinSize = options.poolMinSize ?? 4;
+        options.poolMaxSize = options.poolMaxSize ?? 16;
+        return new WorkerDynamicPool<T>(workerScript, options.poolMinSize, options.poolMaxSize, options.startDelay, options.poolOptions);
       default:
         return null;
     }