X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerFactory.ts;h=76da7a20fc453d561218814be001e53a43a7c546;hb=9f2e313013116428f5bce2be59e2f5c07502c026;hp=dba59173510a3e63e33c7dafa191d444eb406385;hpb=adeb9b56509fe4d63239eff1cd8a9d84250817a6;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index dba59173..76da7a20 100644
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,41 +1,44 @@
-import { WorkerOptions, WorkerProcessType } from '../types/Worker';
+import { Worker, isMainThread } from 'worker_threads';
+import { WorkerData, WorkerOptions, WorkerProcessType } from '../types/Worker';
 
-import Utils from '../utils/Utils';
+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 Wrk from './Wrk';
-import { isMainThread } from 'worker_threads';
 
 export default class WorkerFactory {
-  public static getWorkerImplementation<T>(workerScript: string, workerProcessType: WorkerProcessType, options?: WorkerOptions): Wrk {
+  private constructor() {
+    // This is intentional
+  }
+
+  public static getWorkerImplementation<T extends WorkerData>(workerScript: string, workerProcessType: WorkerProcessType, options?: WorkerOptions): WorkerAbstract<T> | null {
     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;
+    options.poolOptions = options?.poolOptions ?? {} as PoolOptions<Worker>;
+    options?.messageHandler && (options.poolOptions.messageHandler = options.messageHandler);
+    let workerImplementation: WorkerAbstract<T> = null;
     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 ?? Constants.DEFAULT_CHARGING_STATIONS_PER_WORKER;
+        workerImplementation = new WorkerSet(workerScript, options.elementsPerWorker, options.startDelay, options);
+        break;
       case WorkerProcessType.STATIC_POOL:
-        if (Utils.isUndefined(options.poolMaxSize)) {
-          options.poolMaxSize = 16;
-        }
-        return new WorkerStaticPool<T>(workerScript, options.poolMaxSize);
+        options.poolMaxSize = options.poolMaxSize ?? Constants.DEFAULT_WORKER_POOL_MAX_SIZE;
+        workerImplementation = new WorkerStaticPool(workerScript, options.poolMaxSize, options.startDelay, options.poolOptions);
+        break;
       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 ?? Constants.DEFAULT_WORKER_POOL_MIN_SIZE;
+        options.poolMaxSize = options.poolMaxSize ?? Constants.DEFAULT_WORKER_POOL_MAX_SIZE;
+        workerImplementation = new WorkerDynamicPool(workerScript, options.poolMinSize, options.poolMaxSize, options.startDelay, options.poolOptions);
+        break;
       default:
-        return null;
+        throw new Error(`Worker implementation type '${workerProcessType}' not found`);
     }
+    return workerImplementation;
   }
 }