X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fworker%2FWorkerFactory.ts;h=f64d27810ed04a3e2a7752918f94d0ea3b7ec006;hb=42371a2ed3ad187c91417fa759fd260ae86dee7c;hp=d979990c8edc5ae94375b31045b8143508b94a99;hpb=1246bb5219abcba862da33dea264154a747d3814;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index d979990c..f64d2781 100644
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,15 +1,15 @@
-import { Worker, isMainThread } from 'worker_threads';
+import { isMainThread } from 'node:worker_threads';
 
-import type { PoolOptions } from 'poolifier';
+import type { ThreadPoolOptions } from 'poolifier';
 
-import { WorkerData, WorkerOptions, WorkerProcessType } from '../types/Worker';
-import type WorkerAbstract from './WorkerAbstract';
-import WorkerConstants from './WorkerConstants';
-import WorkerDynamicPool from './WorkerDynamicPool';
-import WorkerSet from './WorkerSet';
-import WorkerStaticPool from './WorkerStaticPool';
+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 default class WorkerFactory {
+export class WorkerFactory {
   private constructor() {
     // This is intentional
   }
@@ -17,7 +17,7 @@ export default class WorkerFactory {
   public static getWorkerImplementation<T extends WorkerData>(
     workerScript: string,
     workerProcessType: WorkerProcessType,
-    workerOptions?: WorkerOptions
+    workerOptions?: WorkerOptions,
   ): WorkerAbstract<T> | null {
     if (!isMainThread) {
       throw new Error('Cannot get a worker implementation outside the main thread');
@@ -27,22 +27,20 @@ export default class WorkerFactory {
       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 &&
-      (workerOptions.poolOptions.messageHandler = workerOptions.messageHandler);
-    let workerImplementation: WorkerAbstract<T> = null;
+    workerOptions.poolOptions = workerOptions?.poolOptions ?? ({} as ThreadPoolOptions);
+    let workerImplementation: WorkerAbstract<T> | null = null;
     switch (workerProcessType) {
-      case WorkerProcessType.WORKER_SET:
+      case WorkerProcessType.workerSet:
         workerOptions.elementsPerWorker =
           workerOptions?.elementsPerWorker ?? WorkerConstants.DEFAULT_ELEMENTS_PER_WORKER;
         workerImplementation = new WorkerSet(workerScript, workerOptions);
         break;
-      case WorkerProcessType.STATIC_POOL:
+      case WorkerProcessType.staticPool:
         workerOptions.poolMaxSize =
           workerOptions?.poolMaxSize ?? WorkerConstants.DEFAULT_POOL_MAX_SIZE;
         workerImplementation = new WorkerStaticPool(workerScript, workerOptions);
         break;
-      case WorkerProcessType.DYNAMIC_POOL:
+      case WorkerProcessType.dynamicPool:
         workerOptions.poolMinSize =
           workerOptions?.poolMinSize ?? WorkerConstants.DEFAULT_POOL_MIN_SIZE;
         workerOptions.poolMaxSize =