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

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 73c2cb7f..3fd74e36 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,59 +1,51 @@
-// 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, workerData } from 'node:worker_threads';
 
 import { ThreadWorker } from 'poolifier';
 
-import {
-  ChargingStationWorkerData,
-  ChargingStationWorkerMessage,
-  ChargingStationWorkerMessageEvents,
-} from '../types/ChargingStationWorker';
-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';
+
+/**
+ * Create and start a charging station instance
+ *
+ * @param data - workerData
+ */
+const startChargingStation = (data: ChargingStationWorkerData): void => {
+  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 {
-  // Add message listener to start charging station from main thread
-  addMessageListener();
-  if (Utils.isUndefined(workerData) === false) {
-    startChargingStation(workerData as ChargingStationWorkerData);
-  }
-}
+  class ChargingStationWorker extends AsyncResource {
+    constructor() {
+      super('ChargingStationWorker');
+    }
 
-/**
- * Listen messages send by the main thread
- */
-function addMessageListener(): void {
-  parentPort?.on('message', (message: ChargingStationWorkerMessage<ChargingStationWorkerData>) => {
-    if (message.id === ChargingStationWorkerMessageEvents.START_WORKER_ELEMENT) {
+    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);
+  }
 }
-
-/**
- * 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();
-}
-
-process.on('uncaughtException', (err) => {
-  throw err;
-});
-
-process.on('unhandledRejection', (reason) => {
-  throw reason;
-});