refactor: more coding style fixes

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

diff --git a/src/worker/WorkerFactory.ts b/src/worker/WorkerFactory.ts
index a6679cca73149c07fb6130feb6eb4f8bc62dfd80..833c939f1767e832b021f152a5d2725caf221f72 100644 (file)
--- a/src/worker/WorkerFactory.ts
+++ b/src/worker/WorkerFactory.ts
@@ -1,16 +1,15 @@
-import { Worker, isMainThread } from 'worker_threads';
+import { isMainThread } from 'node:worker_threads'
 
-import type { PoolOptions } from 'poolifier';
+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'
 
-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';
-
-export default class WorkerFactory {
-  private constructor() {
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+export class WorkerFactory {
+  private constructor () {
     // This is intentional
   }
 
@@ -18,42 +17,26 @@ export default class WorkerFactory {
     workerScript: string,
     workerProcessType: WorkerProcessType,
     workerOptions?: WorkerOptions
-  ): WorkerAbstract<T> | null {
+  ): WorkerAbstract<T> | undefined {
     if (!isMainThread) {
-      throw new Error('Cannot 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 = { ...DEFAULT_WORKER_OPTIONS, ...workerOptions }
+    let workerImplementation: WorkerAbstract<T>
     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:
+        workerImplementation = new WorkerSet(workerScript, workerOptions)
+        break
+      case WorkerProcessType.fixedPool:
+        workerImplementation = new WorkerFixedPool(workerScript, workerOptions)
+        break
+      case WorkerProcessType.dynamicPool:
+        workerImplementation = new WorkerDynamicPool(workerScript, workerOptions)
+        break
       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;
+    return workerImplementation
   }
 }