X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=70d960119901d4a63c037c1032c6310d6c2d1b5c;hb=e843aa4048c6bfcad2d8e54763b649eda57dbcb3;hp=58f1327ab862fa7b1042ab6495834bd1543fcbc3;hpb=c72f6634184bc83a6476152446ac9f0d7d02acf5;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 58f1327a..70d96011 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,48 +1,47 @@
-// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import { parentPort, workerData } from 'worker_threads';
+import { AsyncResource } from 'node:async_hooks';
+import { parentPort } from 'node:worker_threads';
 
 import { ThreadWorker } from 'poolifier';
 
-import type { ChargingStationWorkerData } from '../types/ChargingStationWorker';
-import { WorkerMessage, WorkerMessageEvents } from '../types/Worker';
-import Utils from '../utils/Utils';
-import WorkerConstants from '../worker/WorkerConstants';
-import ChargingStation from './ChargingStation';
-import { ChargingStationUtils } from './ChargingStationUtils';
+import { ChargingStation } from './ChargingStation';
+import type { ChargingStationWorkerData } from '../types';
+import { Configuration } from '../utils';
+import { WorkerConstants, type WorkerMessage, WorkerMessageEvents } from '../worker';
 
-// Conditionally export ThreadWorker instance for pool usage
-export let threadWorker: ThreadWorker;
-if (ChargingStationUtils.workerPoolInUse()) {
-  threadWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
-    maxInactiveTime: WorkerConstants.POOL_MAX_INACTIVE_TIME,
-    async: false,
-  });
-} else {
-  // Add message listener to start charging station from main thread
-  addMessageListener();
-  if (Utils.isUndefined(workerData) === false) {
-    startChargingStation(workerData as ChargingStationWorkerData);
-  }
-}
+const moduleName = 'ChargingStationWorker';
 
 /**
- * Listen messages send by the main thread
+ * Creates and starts a charging station instance
+ *
+ * @param data - workerData
  */
-function addMessageListener(): void {
-  parentPort?.on('message', (message: WorkerMessage<ChargingStationWorkerData>) => {
-    if (message.id === WorkerMessageEvents.START_WORKER_ELEMENT) {
-      startChargingStation(message.data);
-    }
-  });
+const startChargingStation = (data: ChargingStationWorkerData): void => {
+  new ChargingStation(data.index, data.templateFile).start();
+};
+
+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.id === WorkerMessageEvents.startWorkerElement) {
+        this.runInAsyncScope(
+          startChargingStation.bind(this) as (data: ChargingStationWorkerData) => void,
+          this,
+          message.data,
+        );
+      }
+    });
+  }
 }
 
-/**
- * Create and start a charging station instance
- *
- * @param data workerData
- */
-function startChargingStation(data: ChargingStationWorkerData): void {
-  const station = new ChargingStation(data.index, data.templateFile);
-  station.start();
+export let chargingStationWorker: ChargingStationWorker | ThreadWorker<ChargingStationWorkerData>;
+if (Configuration.workerPoolInUse()) {
+  chargingStationWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
+    maxInactiveTime: WorkerConstants.POOL_MAX_INACTIVE_TIME,
+  });
+} else {
+  chargingStationWorker = new ChargingStationWorker();
 }