X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerFactory.ts;h=73bcd56dc62467c7bb942157d88554014b8240af;hb=8fb8f42ace8b9295865adebaeb7845e064c05e71;hp=b297f42b231715643ef14761ca1c45a93295a5cf;hpb=35639ced7a1a8e9cfb7b0db675fc2757ea902d04;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index b297f42b..73bcd56d 100644
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,58 +1,39 @@
-import { Worker, isMainThread } from 'worker_threads';
-import { WorkerData, WorkerOptions, WorkerProcessType } from '../types/Worker';
+import { isMainThread } from 'node:worker_threads'
 
-import { PoolOptions } from 'poolifier';
-import type WorkerAbstract from './WorkerAbstract';
-import WorkerConstants from './WorkerConstants';
-import WorkerDynamicPool from './WorkerDynamicPool';
-import WorkerSet from './WorkerSet';
-import WorkerStaticPool from './WorkerStaticPool';
+import { mergeDeepRight } from 'rambda'
 
-export default class WorkerFactory {
-  private constructor() {
+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>(
+  public static getWorkerImplementation<D extends WorkerData, R extends WorkerData>(
     workerScript: string,
     workerProcessType: WorkerProcessType,
     workerOptions?: WorkerOptions
-  ): WorkerAbstract<T> | null {
+  ): 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')
     }
-    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 PoolOptions<Worker>);
-    workerOptions?.messageHandler &&
-      // eslint-disable-next-line @typescript-eslint/no-misused-promises
-      (workerOptions.poolOptions.messageHandler = workerOptions.messageHandler);
-    let workerImplementation: WorkerAbstract<T> = null;
+    workerOptions = mergeDeepRight<WorkerOptions>(DEFAULT_WORKER_OPTIONS, workerOptions ?? {})
     switch (workerProcessType) {
-      case WorkerProcessType.WORKER_SET:
-        workerOptions.elementsPerWorker =
-          workerOptions?.elementsPerWorker ?? WorkerConstants.DEFAULT_ELEMENTS_PER_WORKER;
-        workerImplementation = new WorkerSet(workerScript, workerOptions);
-        break;
-      case WorkerProcessType.STATIC_POOL:
-        workerOptions.poolMaxSize =
-          workerOptions?.poolMaxSize ?? WorkerConstants.DEFAULT_POOL_MAX_SIZE;
-        workerImplementation = new WorkerStaticPool(workerScript, workerOptions);
-        break;
-      case WorkerProcessType.DYNAMIC_POOL:
-        workerOptions.poolMinSize =
-          workerOptions?.poolMinSize ?? WorkerConstants.DEFAULT_POOL_MIN_SIZE;
-        workerOptions.poolMaxSize =
-          workerOptions?.poolMaxSize ?? WorkerConstants.DEFAULT_POOL_MAX_SIZE;
-        workerImplementation = new WorkerDynamicPool(workerScript, workerOptions);
-        break;
+      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`);
+        throw new Error(`Worker implementation type '${workerProcessType}' not found`)
     }
-    return workerImplementation;
   }
 }