X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=85ea77fb8b58d1d18d6424ee2f8c927080b03180;hb=b19021e229ef0d868cea4b03118b357b80fee173;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..85ea77fb 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,22 +1,30 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import { ChargingStationWorkerData, WorkerMessage, WorkerMessageEvents } from '../types/Worker';
+import {
+  ChargingStationWorkerData,
+  ChargingStationWorkerMessage,
+  ChargingStationWorkerMessageEvents,
+} from '../types/ChargingStationWorker';
 import { parentPort, workerData } from 'worker_threads';
 
 import ChargingStation from './ChargingStation';
-import Constants from '../utils/Constants';
+import { ChargingStationUtils } from './ChargingStationUtils';
 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: Constants.WORKER_POOL_MAX_INACTIVE_TIME, async: false });
+if (ChargingStationUtils.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.index as number, templateFile: workerData.templateFile as string });
+    startChargingStation(workerData as ChargingStationWorkerData);
   }
 }
 
@@ -24,8 +32,8 @@ if (Utils.workerPoolInUse()) {
  * Listen messages send by the main thread
  */
 function addMessageListener(): void {
-  parentPort?.on('message', (message: WorkerMessage) => {
-    if (message.id === WorkerMessageEvents.START_WORKER_ELEMENT) {
+  parentPort?.on('message', (message: ChargingStationWorkerMessage) => {
+    if (message.id === ChargingStationWorkerMessageEvents.START_WORKER_ELEMENT) {
       startChargingStation(message.data);
     }
   });