X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=19f760e74565061f0b0e1e18cb74f2b0fdcbbd6d;hb=361c98f57255e5b91d123d5f2ba43ab533134b1a;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..19f760e7 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -10,8 +10,10 @@ 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
  */
@@ -21,29 +23,23 @@ const startChargingStation = (data: ChargingStationWorkerData): void => {
 
 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);
+        this.runInAsyncScope(
+          startChargingStation.bind(this) as (data: ChargingStationWorkerData) => void,
+          this,
+          message.data
+        );
       }
     });
   }
-
-  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 {