X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStationWorker.ts;h=58f1327ab862fa7b1042ab6495834bd1543fcbc3;hb=4bfd22def612cf8ad6e4a31c5d5df3ffcca45e70;hp=de0a47fe5d5745fd29b477ac072c046024922686;hpb=3fa0f0edb5e3bb9fff2b343fb4ad7fc6c7c8df34;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index de0a47fe..58f1327a 100644
--- a/src/charging-station/ChargingStationWorker.ts
+++ b/src/charging-station/ChargingStationWorker.ts
@@ -1,20 +1,19 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import {
-  ChargingStationWorkerData,
-  ChargingStationWorkerMessage,
-  ChargingStationWorkerMessageEvents,
-} from '../types/ChargingStationWorker';
 import { parentPort, workerData } from 'worker_threads';
 
-import ChargingStation from './ChargingStation';
 import { ThreadWorker } from 'poolifier';
+
+import type { ChargingStationWorkerData } from '../types/ChargingStationWorker';
+import { WorkerMessage, WorkerMessageEvents } from '../types/Worker';
 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: WorkerConstants.POOL_MAX_INACTIVE_TIME,
     async: false,
@@ -22,13 +21,8 @@ if (Utils.workerPoolInUse()) {
 } else {
   // Add message listener to start charging station from main thread
   addMessageListener();
-  if (!Utils.isUndefined(workerData)) {
-    startChargingStation({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      index: workerData.index as number,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      templateFile: workerData.templateFile as string,
-    });
+  if (Utils.isUndefined(workerData) === false) {
+    startChargingStation(workerData as ChargingStationWorkerData);
   }
 }
 
@@ -36,8 +30,8 @@ if (Utils.workerPoolInUse()) {
  * Listen messages send by the main thread
  */
 function addMessageListener(): void {
-  parentPort?.on('message', (message: ChargingStationWorkerMessage) => {
-    if (message.id === ChargingStationWorkerMessageEvents.START_WORKER_ELEMENT) {
+  parentPort?.on('message', (message: WorkerMessage<ChargingStationWorkerData>) => {
+    if (message.id === WorkerMessageEvents.START_WORKER_ELEMENT) {
       startChargingStation(message.data);
     }
   });