X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerSet.ts;h=f25fd03c4872849fc0863fb9806864e44dc45da1;hb=0045cef5dae3be8131969d08f70c10748922524e;hp=9b9ad3324540ce37dcbb828f42420535f668acf6;hpb=2a370053f45f2d58e90ab7b292294c521a262ca1;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index 9b9ad332..f25fd03c 100644
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -1,6 +1,6 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import { WorkerMessageEvents, WorkerSetElement } from '../types/Worker';
+import { WorkerMessageEvents, WorkerOptions, WorkerSetElement } from '../types/Worker';
 
 import Utils from '../utils/Utils';
 import { Worker } from 'worker_threads';
@@ -8,7 +8,8 @@ import WorkerAbstract from './WorkerAbstract';
 import { WorkerUtils } from './WorkerUtils';
 
 export default class WorkerSet<T> extends WorkerAbstract {
-  public maxElementsPerWorker: number;
+  public readonly maxElementsPerWorker: number;
+  private readonly messageHandler: (message: unknown) => void | Promise<void>;
   private workerSet: Set<WorkerSetElement>;
 
   /**
@@ -17,12 +18,13 @@ export default class WorkerSet<T> extends WorkerAbstract {
    * @param workerScript
    * @param maxElementsPerWorker
    * @param workerStartDelay
-   * @param messageListenerCallback
+   * @param opts
    */
-  constructor(workerScript: string, maxElementsPerWorker = 1, workerStartDelay?: number, messageListenerCallback: (message: any) => void = () => { /* This is intentional */ }) {
-    super(workerScript, workerStartDelay, messageListenerCallback);
-    this.workerSet = new Set<WorkerSetElement>();
+  constructor(workerScript: string, maxElementsPerWorker = 1, workerStartDelay?: number, opts?: WorkerOptions) {
+    super(workerScript, workerStartDelay);
     this.maxElementsPerWorker = maxElementsPerWorker;
+    this.messageHandler = opts?.messageHandler ?? (() => { /* This is intentional */ });
+    this.workerSet = new Set<WorkerSetElement>();
   }
 
   get size(): number {
@@ -77,7 +79,11 @@ export default class WorkerSet<T> extends WorkerAbstract {
    */
   private startWorker(): void {
     const worker = new Worker(this.workerScript);
-    worker.on('message', this.messageListener);
+    worker.on('message', (msg) => {
+      (async () => {
+        await this.messageHandler(msg);
+      })().catch(() => { /* This is intentional */ });
+    });
     worker.on('error', () => { /* This is intentional */ });
     worker.on('exit', (code) => {
       WorkerUtils.defaultExitHandler(code);
@@ -88,7 +94,6 @@ export default class WorkerSet<T> extends WorkerAbstract {
 
   private getLastWorkerSetElement(): WorkerSetElement {
     let workerSetElement: WorkerSetElement;
-    // eslint-disable-next-line no-empty
     for (workerSetElement of this.workerSet) { /* This is intentional */ }
     return workerSetElement;
   }