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

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 4361ab9b..3fd74e36 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,12 +1,13 @@
 // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
+import { AsyncResource } from 'node:async_hooks';
 import { parentPort, workerData } from 'node:worker_threads';
 
 import { ThreadWorker } from 'poolifier';
 
-import { ChargingStation, ChargingStationUtils } from './internal';
+import { ChargingStation } from './ChargingStation';
 import type { ChargingStationWorkerData } from '../types';
-import { Utils } from '../utils';
+import { Configuration } from '../utils';
 import { WorkerConstants, type WorkerMessage, WorkerMessageEvents } from '../worker';
 
 /**
@@ -15,32 +16,36 @@ import { WorkerConstants, type WorkerMessage, WorkerMessageEvents } from '../wor
  * @param data - workerData
  */
 const startChargingStation = (data: ChargingStationWorkerData): void => {
-  const station = new ChargingStation(data.index, data.templateFile);
-  station.start();
-};
-
-/**
- * Listen messages send by the main thread
- */
-const addMessageListener = (): void => {
-  parentPort?.on('message', (message: WorkerMessage<ChargingStationWorkerData>) => {
-    if (message.id === WorkerMessageEvents.startWorkerElement) {
-      startChargingStation(message.data);
-    }
-  });
+  new ChargingStation(data.index, data.templateFile).start();
 };
 
 // Conditionally export ThreadWorker instance for pool usage
 export let threadWorker: ThreadWorker;
-if (ChargingStationUtils.workerPoolInUse()) {
+if (Configuration.workerPoolInUse()) {
   threadWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
     maxInactiveTime: WorkerConstants.POOL_MAX_INACTIVE_TIME,
-    async: false,
   });
 } 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
-  addMessageListener();
-  if (Utils.isUndefined(workerData) === false) {
-    startChargingStation(workerData as ChargingStationWorkerData);
+  parentPort?.on('message', (message: WorkerMessage<ChargingStationWorkerData>) => {
+    if (message.id === WorkerMessageEvents.startWorkerElement) {
+      startChargingStation(message.data);
+    }
+  });
+  if (workerData !== undefined) {
+    new ChargingStationWorker().run(workerData as ChargingStationWorkerData);
   }
 }