X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=626e6e072c3d63f6869be875cbe7be13e3e2f25f;hb=a745e4127ed71e21b50d0397cd8ef79bf59a7573;hp=84ce450eb2cfa65784aa70da7165aab0e8b43df1;hpb=e7aeea18e189dd087c8f951cf77a253e2818ae90;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index 84ce450e..626e6e07 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,32 +1,31 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
+import { parentPort, workerData } from 'worker_threads';
+
+import { ThreadWorker } from 'poolifier';
+
 import {
   ChargingStationWorkerData,
   ChargingStationWorkerMessage,
   ChargingStationWorkerMessageEvents,
 } from '../types/ChargingStationWorker';
-import { parentPort, workerData } from 'worker_threads';
-
-import ChargingStation from './ChargingStation';
-import Constants from '../utils/Constants';
-import { ThreadWorker } from 'poolifier';
 import Utils from '../utils/Utils';
+import WorkerConstants from '../worker/WorkerConstants';
+import ChargingStation from './ChargingStation';
+import { ChargingStationUtils } from './ChargingStationUtils';
 
 // Conditionally export ThreadWorker instance for pool usage
 export let threadWorker: ThreadWorker;
-if (Utils.workerPoolInUse()) {
+if (ChargingStationUtils.workerPoolInUse()) {
   threadWorker = new ThreadWorker<ChargingStationWorkerData>(startChargingStation, {
-    maxInactiveTime: Constants.WORKER_POOL_MAX_INACTIVE_TIME,
+    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.index as number,
-      templateFile: workerData.templateFile as string,
-    });
+    startChargingStation(workerData as ChargingStationWorkerData);
   }
 }
 
@@ -34,7 +33,7 @@ if (Utils.workerPoolInUse()) {
  * Listen messages send by the main thread
  */
 function addMessageListener(): void {
-  parentPort?.on('message', (message: ChargingStationWorkerMessage) => {
+  parentPort?.on('message', (message: ChargingStationWorkerMessage<ChargingStationWorkerData>) => {
     if (message.id === ChargingStationWorkerMessageEvents.START_WORKER_ELEMENT) {
       startChargingStation(message.data);
     }