Apply dependencies update

[e-mobility-charging-stations-simulator.git] / src / charging-station / ChargingStationWorker.ts

diff --git a/src/charging-station/ChargingStationWorker.ts b/src/charging-station/ChargingStationWorker.ts
index fb551a4565d82319cd07249b01cf7f6b65086ce2..66f557d6913f7382791a7e864028ac2e14718588 100644 (file)
--- 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,11 +21,8 @@ if (Utils.workerPoolInUse()) {
 } 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,
-    });
+  if (Utils.isUndefined(workerData) === false) {
+    startChargingStation(workerData as ChargingStationWorkerData);
   }
 }
 
@@ -34,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);
     }
   });
@@ -44,7 +40,7 @@ function addMessageListener(): void {
 /**
  * Create and start a charging station instance
  *
- * @param data workerData
+ * @param data - workerData
  */
 function startChargingStation(data: ChargingStationWorkerData): void {
   const station = new ChargingStation(data.index, data.templateFile);