X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerSet.ts;h=fba3516aabb3899a8dd005e2707dfb0a450c83f5;hb=e0b0ee2176a4dc5a8914a3fb094ec16b4966a740;hp=956d97de0f07b54f0ce627f4620642205963de2a;hpb=8114d10e3893e96bb725ce2fca9744429ee4b75b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts
index 956d97de..fba3516a 100644
--- a/src/worker/WorkerSet.ts
+++ b/src/worker/WorkerSet.ts
@@ -2,29 +2,29 @@
 
 import { Worker } from 'worker_threads';
 
-import { WorkerData, WorkerMessageEvents, WorkerOptions, WorkerSetElement } from '../types/Worker';
+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';
 
 export default class WorkerSet extends WorkerAbstract<WorkerData> {
   private readonly workerSet: Set<WorkerSetElement>;
-  private readonly messageHandler: (message: unknown) => void | Promise<void>;
 
   /**
    * Create a new `WorkerSet`.
    *
-   * @param workerScript
-   * @param workerOptions
+   * @param workerScript -
+   * @param workerOptions -
    */
   constructor(workerScript: string, workerOptions?: WorkerOptions) {
     super(workerScript, workerOptions);
     this.workerSet = new Set<WorkerSetElement>();
-    this.messageHandler =
-      workerOptions?.messageHandler ??
-      (() => {
-        /* This is intentional */
-      });
   }
 
   get size(): number {
@@ -37,7 +37,7 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
 
   /**
    *
-   * @param elementData
+   * @param elementData -
    * @returns
    * @public
    */
@@ -84,21 +84,20 @@ export default class WorkerSet extends WorkerAbstract<WorkerData> {
   }
 
   /**
-   *
-   * @private
+   * Start a new `Worker`.
    */
   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.workerOptions?.messageHandler ??
+        (() => {
+          /* This is intentional */
+        })
+      ).bind(this) as MessageHandler<Worker>
+    );
+    worker.on('error', WorkerUtils.defaultErrorHandler.bind(this) as (err: Error) => void);
     worker.on('exit', (code) => {
       WorkerUtils.defaultExitHandler(code);
       this.workerSet.delete(this.getWorkerSetElementByWorker(worker));