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

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 514fba8c..741449e3 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,49 +1,49 @@
-// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import {
-  ChargingStationWorkerData,
-  ChargingStationWorkerMessage,
-  ChargingStationWorkerMessageEvents,
-} from '../types/ChargingStationWorker';
-import { parentPort, workerData } from 'worker_threads';
+import { AsyncResource } from 'node:async_hooks';
+import { parentPort } from 'node:worker_threads';
 
-import ChargingStation from './ChargingStation';
 import { ThreadWorker } from 'poolifier';
-import Utils from '../utils/Utils';
-import WorkerConstants from '../worker/WorkerConstants';
 
-// Conditionally export ThreadWorker instance for pool usage
-export let threadWorker: ThreadWorker;
-if (Utils.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)) {
-    startChargingStation(workerData as ChargingStationWorkerData);
-  }
-}
+import { ChargingStation } from './ChargingStation';
+import type { ChargingStationWorkerData } from '../types';
+import { Configuration } from '../utils';
+import { WorkerConstants, type WorkerMessage, WorkerMessageEvents } from '../worker';
 
-/**
- * Listen messages send by the main thread
- */
-function addMessageListener(): void {
-  parentPort?.on('message', (message: ChargingStationWorkerMessage) => {
-    if (message.id === ChargingStationWorkerMessageEvents.START_WORKER_ELEMENT) {
-      startChargingStation(message.data);
-    }
-  });
-}
+const moduleName = 'ChargingStationWorker';
 
 /**
  * Create and start a charging station instance
  *
- * @param data workerData
+ * @param data - workerData
  */
-function startChargingStation(data: ChargingStationWorkerData): void {
-  const station = new ChargingStation(data.index, data.templateFile);
-  station.start();
+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
+        );
+      }
+    });
+  }
+}
+
+export let chargingStationWorker: ChargingStationWorker;
+// Conditionally export ThreadWorker instance for pool usage
+export let threadWorker: ThreadWorker;
+if (Configuration.workerPoolInUse()) {
+  threadWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
+    maxInactiveTime: WorkerConstants.POOL_MAX_INACTIVE_TIME,
+  });
+} else {
+  chargingStationWorker = new ChargingStationWorker();
 }