X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=3a723eca25dd5dd86902c510354c9069332643d6;hb=8cc482a9324a0989516b6eb6db85a16258c4b4d1;hp=3fd74e361a663f2d04880d3ae78ac44835a2d4ac;hpb=a679a1625e2f153a4c882bc8ff7befce50d4119a;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 3fd74e36..3a723eca 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,7 +1,7 @@
 // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
 import { AsyncResource } from 'node:async_hooks';
-import { parentPort, workerData } from 'node:worker_threads';
+import { parentPort } from 'node:worker_threads';
 
 import { ThreadWorker } from 'poolifier';
 
@@ -10,42 +10,38 @@ 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();
 };
 
-// Conditionally export ThreadWorker instance for pool usage
-export let threadWorker: ThreadWorker;
+class ChargingStationWorker extends AsyncResource {
+  constructor() {
+    super(moduleName);
+    // Add message listener to create and start charging station from the main thread
+    parentPort?.on('message', (message: WorkerMessage<ChargingStationWorkerData>) => {
+      if (message.event === WorkerMessageEvents.startWorkerElement) {
+        this.runInAsyncScope(
+          startChargingStation.bind(this) as (data?: ChargingStationWorkerData) => void,
+          this,
+          message.data,
+        );
+      }
+    });
+  }
+}
+
+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 {
-  class ChargingStationWorker extends AsyncResource {
-    constructor() {
-      super('ChargingStationWorker');
-    }
-
-    public run(data: ChargingStationWorkerData): void {
-      this.runInAsyncScope(
-        startChargingStation.bind(this) as (data: ChargingStationWorkerData) => void,
-        this,
-        data
-      );
-    }
-  }
-  // Add message listener to start charging station from main thread
-  parentPort?.on('message', (message: WorkerMessage<ChargingStationWorkerData>) => {
-    if (message.id === WorkerMessageEvents.startWorkerElement) {
-      startChargingStation(message.data);
-    }
-  });
-  if (workerData !== undefined) {
-    new ChargingStationWorker().run(workerData as ChargingStationWorkerData);
-  }
+  chargingStationWorker = new ChargingStationWorker();
 }