X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=b20bf3e8ba2851e8bd5be467b03cb044ef73a132;hb=2bb7a73e94db7533c1ba47db677d709e6f07dfdb;hp=fb551a4565d82319cd07249b01cf7f6b65086ce2;hpb=4e4199c8e4c7f11216be46b0490e8214e04f702d;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index fb551a45..b20bf3e8 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,52 +1,60 @@
-// 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({
-      index: (workerData as ChargingStationWorkerData).index,
-      templateFile: (workerData as ChargingStationWorkerData).templateFile,
-    });
-  }
-}
+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
+ * Creates and starts 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.event === WorkerMessageEvents.startWorkerElement) {
+        try {
+          this.runInAsyncScope(
+            startChargingStation.bind(this) as (data?: ChargingStationWorkerData) => void,
+            this,
+            message.data,
+          );
+          parentPort?.postMessage({
+            event: WorkerMessageEvents.startedWorkerElement,
+          });
+        } catch (error) {
+          parentPort?.postMessage({
+            event: WorkerMessageEvents.startWorkerElementError,
+            data: {
+              message: (error as Error).message,
+              stack: (error as Error).stack,
+            },
+          });
+        }
+      }
+    });
+  }
+}
+
+export let chargingStationWorker: ChargingStationWorker | ThreadWorker<ChargingStationWorkerData>;
+if (Configuration.workerPoolInUse()) {
+  chargingStationWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
+    maxInactiveTime: WorkerConstants.POOL_MAX_INACTIVE_TIME,
+  });
+} else {
+  chargingStationWorker = new ChargingStationWorker();
 }