X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerSet.ts;h=e1fce2e62058a8ee6c5750a7e01a2d48891c164b;hb=789871d6585093e2ab0444bd7ca063ca86c344f8;hp=fba3516aabb3899a8dd005e2707dfb0a450c83f5;hpb=d4eb5fbfd1ee235c166f3ae01a4b227b83cfa668;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index fba3516a..e1fce2e6 100644
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -1,19 +1,19 @@
-// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+// 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';
-import { WorkerUtils } from './WorkerUtils';
+} from './WorkerTypes';
+import { defaultErrorHandler, defaultExitHandler, sleep } 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++;
+    ++this.getLastWorkerSetElement().numberOfWorkerElements;
     // Start element sequentially to optimize memory at startup
     if (this.workerOptions.elementStartDelay > 0) {
-      await Utils.sleep(this.workerOptions.elementStartDelay);
+      await sleep(this.workerOptions.elementStartDelay);
     }
   }
 
@@ -90,22 +90,18 @@ 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('error', defaultErrorHandler.bind(this) as (err: Error) => void);
     worker.on('exit', (code) => {
-      WorkerUtils.defaultExitHandler(code);
+      defaultExitHandler(code);
       this.workerSet.delete(this.getWorkerSetElementByWorker(worker));
     });
     this.workerSet.add({ worker, numberOfWorkerElements: 0 });
     // Start worker sequentially to optimize memory at startup
-    this.workerOptions.workerStartDelay > 0 &&
-      (await Utils.sleep(this.workerOptions.workerStartDelay));
+    this.workerOptions.workerStartDelay > 0 && (await sleep(this.workerOptions.workerStartDelay));
   }
 
   private getLastWorkerSetElement(): WorkerSetElement {