WorkerSet: remove ugly hack to deal with async worker message handler

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

diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index 782284f3d00447286ad13ca62fb00093be9df243..f41752fc7a2b088fda4b8c68b4b74bec347b1bf9 100644 (file)
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -1,15 +1,15 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import { WorkerData, WorkerMessageEvents, WorkerOptions, WorkerSetElement } from '../types/Worker';
+import { Worker } from 'worker_threads';
 
+import { WorkerData, WorkerMessageEvents, WorkerOptions, WorkerSetElement } from '../types/Worker';
 import Utils from '../utils/Utils';
-import { Worker } from 'worker_threads';
 import WorkerAbstract from './WorkerAbstract';
 import { WorkerUtils } from './WorkerUtils';
 
 export default class WorkerSet extends WorkerAbstract<WorkerData> {
   private readonly workerSet: Set<WorkerSetElement>;
-  private readonly messageHandler: (message: unknown) => void | Promise<void>;
+  private readonly messageHandler: (message: unknown) => void;
 
   /**
    * Create a new `WorkerSet`.
@@ -46,6 +46,7 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
       throw new Error("Cannot add a WorkerSet element: workers' set does not exist");
     }
     if (
+      this.workerSet.size === 0 ||
       this.getLastWorkerSetElement().numberOfWorkerElements >= this.workerOptions.elementsPerWorker
     ) {
       await this.startWorker();
@@ -54,7 +55,7 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
       id: WorkerMessageEvents.START_WORKER_ELEMENT,
       data: elementData,
     });
-    this.getLastWorkerSetElement().numberOfWorkerElements++; // should there not be a hanshake to be safer ?
+    this.getLastWorkerSetElement().numberOfWorkerElements++;
     // Start element sequentially to optimize memory at startup
     if (this.workerOptions.elementStartDelay > 0) {
       await Utils.sleep(this.workerOptions.elementStartDelay);
@@ -88,16 +89,8 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
    */
   private async startWorker(): Promise<void> {
     const worker = new Worker(this.workerScript);
-    worker.on('message', (msg) => {
-      (async () => {
-        await this.messageHandler(msg);
-      })().catch(() => {
-        /* This is intentional */
-      });
-    });
-    worker.on('error', () => {
-      /* This is intentional */
-    });
+    worker.on('message', this.messageHandler);
+    worker.on('error', WorkerUtils.defaultErrorHandler);
     worker.on('exit', (code) => {
       WorkerUtils.defaultExitHandler(code);
       this.workerSet.delete(this.getWorkerSetElementByWorker(worker));