X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=db7ae2cb4462ff79f50359dc989b50536a73edd6;hb=109c677a5888e53d954a4f276b975b6c088ba0dd;hp=3703de9c10a31abde58063ac4d5882afbe5353fb;hpb=6b57eb9a3fccc8e29028b00a3a1f33544852760f;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 3703de9c..db7ae2cb 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -10,40 +10,59 @@ import type { ChargingStationWorkerData } from '../types';
 import { Configuration } from '../utils';
 import { WorkerConstants, type WorkerMessage, WorkerMessageEvents } from '../worker';
 
+const moduleName = 'ChargingStationWorker';
+
 /**
- * Create and start a charging station instance
+ * Creates and starts a charging station instance
  *
  * @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 {
   constructor() {
-    super('ChargingStationWorker');
+    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.run(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 Error(
+            `Unknown worker event: '${message.event}' received with data: '${JSON.stringify(
+              message.data,
+              null,
+              2,
+            )}'`,
+          );
       }
     });
   }
-
-  private run(data: ChargingStationWorkerData): void {
-    this.runInAsyncScope(
-      startChargingStation.bind(this) as (data: ChargingStationWorkerData) => void,
-      this,
-      data
-    );
-  }
 }
 
-export let chargingStationWorker: ChargingStationWorker;
-// Conditionally export ThreadWorker instance for pool usage
-export let threadWorker: ThreadWorker;
+export let chargingStationWorker: ChargingStationWorker | ThreadWorker<ChargingStationWorkerData>;
 if (Configuration.workerPoolInUse()) {
-  threadWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
+  chargingStationWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
     maxInactiveTime: WorkerConstants.POOL_MAX_INACTIVE_TIME,
   });
 } else {