X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=d9e462d064967b75255dc333f3926f28b14b4cf4;hb=2def357c05fcea4eeeaa4e0c5c8660a5cf290d2e;hp=741449e3b63e9b8126e4440c9c143116b61156b7;hpb=d58b442097da31f8b974d51aef63c64470d9ab48;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 741449e3..d9e462d0 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,49 +1,64 @@
 // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import { AsyncResource } from 'node:async_hooks';
 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';
-
-const moduleName = 'ChargingStationWorker';
+import { type WorkerMessage, WorkerMessageEvents } from '../worker';
 
 /**
- * Create and start a charging station instance
+ * Creates and starts a charging station instance
  *
- * @param data - workerData
+ * @param data - data sent to worker
  */
-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 {
+class ChargingStationWorker<Data extends ChargingStationWorkerData> {
   constructor() {
-    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
-        );
+    parentPort?.on('message', (message: WorkerMessage<Data>) => {
+      switch (message.event) {
+        case WorkerMessageEvents.startWorkerElement:
+          try {
+            startChargingStation(message.data);
+            parentPort?.postMessage({
+              event: WorkerMessageEvents.startedWorkerElement,
+            });
+          } catch (error) {
+            parentPort?.postMessage({
+              event: WorkerMessageEvents.startWorkerElementError,
+              data: {
+                name: (error as Error).name,
+                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,
+            )}'`,
+          );
       }
     });
   }
 }
 
-export let chargingStationWorker: ChargingStationWorker;
-// Conditionally export ThreadWorker instance for pool usage
-export let threadWorker: ThreadWorker;
+export let chargingStationWorker:
+  | ChargingStationWorker<ChargingStationWorkerData>
+  | ThreadWorker<ChargingStationWorkerData>;
 if (Configuration.workerPoolInUse()) {
-  threadWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
-    maxInactiveTime: WorkerConstants.POOL_MAX_INACTIVE_TIME,
-  });
+  chargingStationWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation);
 } else {
-  chargingStationWorker = new ChargingStationWorker();
+  chargingStationWorker = new ChargingStationWorker<ChargingStationWorkerData>();
 }