X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=6201bf07e2b52fe7e6d1931412da74e89043717c;hb=248f70eff6b955b177f0bbd9ca84356c3b99d72e;hp=19f760e74565061f0b0e1e18cb74f2b0fdcbbd6d;hpb=361c98f57255e5b91d123d5f2ba43ab533134b1a;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 19f760e7..6201bf07 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -6,9 +6,10 @@ import { parentPort } from 'node:worker_threads';
 import { ThreadWorker } from 'poolifier';
 
 import { ChargingStation } from './ChargingStation';
+import { BaseError } from '../exception';
 import type { ChargingStationWorkerData } from '../types';
 import { Configuration } from '../utils';
-import { WorkerConstants, type WorkerMessage, WorkerMessageEvents } from '../worker';
+import { type WorkerMessage, WorkerMessageEvents } from '../worker';
 
 const moduleName = 'ChargingStationWorker';
 
@@ -17,8 +18,8 @@ const moduleName = 'ChargingStationWorker';
  *
  * @param data - workerData
  */
-const startChargingStation = (data: ChargingStationWorkerData): void => {
-  new ChargingStation(data.index, data.templateFile).start();
+const startChargingStation = (data?: ChargingStationWorkerData): void => {
+  new ChargingStation(data!.index, data!.templateFile).start();
 };
 
 class ChargingStationWorker extends AsyncResource {
@@ -26,12 +27,35 @@ class ChargingStationWorker extends AsyncResource {
     super(moduleName);
     // Add message listener to create and start charging station from the main thread
     parentPort?.on('message', (message: WorkerMessage<ChargingStationWorkerData>) => {
-      if (message.id === WorkerMessageEvents.startWorkerElement) {
-        this.runInAsyncScope(
-          startChargingStation.bind(this) as (data: ChargingStationWorkerData) => void,
-          this,
-          message.data
-        );
+      switch (message.event) {
+        case WorkerMessageEvents.startWorkerElement:
+          try {
+            this.runInAsyncScope(
+              startChargingStation.bind(this) as (data?: ChargingStationWorkerData) => void,
+              this,
+              message.data,
+            );
+            parentPort?.postMessage({
+              event: WorkerMessageEvents.startedWorkerElement,
+            });
+          } catch (error) {
+            parentPort?.postMessage({
+              event: WorkerMessageEvents.startWorkerElementError,
+              data: {
+                message: (error as Error).message,
+                stack: (error as Error).stack,
+              },
+            });
+          }
+          break;
+        default:
+          throw new BaseError(
+            `Unknown worker event: '${message.event}' received with data: '${JSON.stringify(
+              message.data,
+              undefined,
+              2,
+            )}'`,
+          );
       }
     });
   }
@@ -39,9 +63,7 @@ class ChargingStationWorker extends AsyncResource {
 
 export let chargingStationWorker: ChargingStationWorker | ThreadWorker<ChargingStationWorkerData>;
 if (Configuration.workerPoolInUse()) {
-  chargingStationWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
-    maxInactiveTime: WorkerConstants.POOL_MAX_INACTIVE_TIME,
-  });
+  chargingStationWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation);
 } else {
   chargingStationWorker = new ChargingStationWorker();
 }