X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=60d065642c7ef94585aa6902bf839354339dc6aa;hb=6bd808fd1dc554c8d55521b20a064447835ef04c;hp=81e0296d8761eca012b63085553df13615b14980;hpb=2a370053f45f2d58e90ab7b292294c521a262ca1;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 81e0296d..60d06564 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,42 +1,45 @@
-// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import { ChargingStationWorkerData, WorkerMessage, WorkerMessageEvents } from '../types/Worker';
-import { parentPort, workerData } from 'worker_threads';
+import { parentPort, workerData } from 'node:worker_threads';
 
-import ChargingStation from './ChargingStation';
-import Constants from '../utils/Constants';
 import { ThreadWorker } from 'poolifier';
-import Utils from '../utils/Utils';
 
-// Conditionally export ThreadWorker instance for pool usage
-export let threadWorker: ThreadWorker;
-if (Utils.workerPoolInUse()) {
-  threadWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, { maxInactiveTime: Constants.WORKER_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.index as number, templateFile: workerData.templateFile as string });
-  }
-}
+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 => {
+  const station = new ChargingStation(data.index, data.templateFile);
+  station.start();
+};
 
 /**
  * Listen messages send by the main thread
  */
-function addMessageListener(): void {
-  parentPort?.on('message', (message: WorkerMessage) => {
-    if (message.id === WorkerMessageEvents.START_WORKER_ELEMENT) {
+const addMessageListener = (): void => {
+  parentPort?.on('message', (message: WorkerMessage<ChargingStationWorkerData>) => {
+    if (message.id === WorkerMessageEvents.startWorkerElement) {
       startChargingStation(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();
+// 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 {
+  // Add message listener to start charging station from main thread
+  addMessageListener();
+  if (workerData !== undefined) {
+    startChargingStation(workerData as ChargingStationWorkerData);
+  }
 }