X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerSet.ts;h=eaa19ac8f384ed5ce591362696e13bfdf765ab5a;hb=aaf2bf9c2ec7712394d7ab9da12449262d894e60;hp=8a1aeb30bc5521f1701f6f1d190cda2aaf24aa37;hpb=edd134392e237a3242dc2093341df70244c51472;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index 8a1aeb30..eaa19ac8 100644
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -1,19 +1,19 @@
 // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import { Worker } from 'worker_threads';
+import { Worker } from 'node:worker_threads';
 
+import { WorkerAbstract } from './WorkerAbstract';
+import { WorkerConstants } from './WorkerConstants';
 import {
   type MessageHandler,
   type WorkerData,
   WorkerMessageEvents,
   type WorkerOptions,
   type WorkerSetElement,
-} from '../types/Worker';
-import Utils from '../utils/Utils';
-import WorkerAbstract from './WorkerAbstract';
+} from './WorkerTypes';
 import { WorkerUtils } from './WorkerUtils';
 
-export default class WorkerSet extends WorkerAbstract<WorkerData> {
+export class WorkerSet extends WorkerAbstract<WorkerData> {
   private readonly workerSet: Set<WorkerSetElement>;
 
   /**
@@ -31,7 +31,7 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
     return this.workerSet.size;
   }
 
-  get maxElementsPerWorker(): number | null {
+  get maxElementsPerWorker(): number | undefined {
     return this.workerOptions.elementsPerWorker;
   }
 
@@ -52,13 +52,13 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
       await this.startWorker();
     }
     this.getLastWorker().postMessage({
-      id: WorkerMessageEvents.START_WORKER_ELEMENT,
+      id: WorkerMessageEvents.startWorkerElement,
       data: elementData,
     });
     this.getLastWorkerSetElement().numberOfWorkerElements++;
     // Start element sequentially to optimize memory at startup
     if (this.workerOptions.elementStartDelay > 0) {
-      await Utils.sleep(this.workerOptions.elementStartDelay);
+      await WorkerUtils.sleep(this.workerOptions.elementStartDelay);
     }
   }
 
@@ -90,12 +90,9 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
     const worker = new Worker(this.workerScript);
     worker.on(
       'message',
-      (
-        this.workerOptions?.messageHandler ??
-        (() => {
-          /* This is intentional */
-        })
-      ).bind(this) as MessageHandler<Worker>
+      (this.workerOptions?.messageHandler ?? WorkerConstants.EMPTY_FUNCTION).bind(
+        this
+      ) as MessageHandler<Worker>
     );
     worker.on('error', WorkerUtils.defaultErrorHandler.bind(this) as (err: Error) => void);
     worker.on('exit', (code) => {
@@ -105,7 +102,7 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
     this.workerSet.add({ worker, numberOfWorkerElements: 0 });
     // Start worker sequentially to optimize memory at startup
     this.workerOptions.workerStartDelay > 0 &&
-      (await Utils.sleep(this.workerOptions.workerStartDelay));
+      (await WorkerUtils.sleep(this.workerOptions.workerStartDelay));
   }
 
   private getLastWorkerSetElement(): WorkerSetElement {