X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FStationWorker.ts;h=c3c5cb51346ce2f36f843f816c29eb27abbdb524;hb=6f9f188b8335f5cc9fcb0fe9ba2e72525b70231a;hp=65e2fb8832883662aadb145798da9783f37a1ae2;hpb=b8da29bc984201049370a2bc497b7ae4143db32a;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/StationWorker.ts b/src/charging-station/StationWorker.ts
index 65e2fb88..c3c5cb51 100644
--- a/src/charging-station/StationWorker.ts
+++ b/src/charging-station/StationWorker.ts
@@ -1,5 +1,7 @@
+// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+
 import { StationWorkerData, WorkerEvents } from '../types/Worker';
-import { isMainThread, parentPort, workerData } from 'worker_threads';
+import { parentPort, workerData } from 'worker_threads';
 
 import ChargingStation from './ChargingStation';
 import Constants from '../utils/Constants';
@@ -7,28 +9,34 @@ import { ThreadWorker } from 'poolifier';
 import Utils from '../utils/Utils';
 
 // Conditionally export ThreadWorker instance for pool usage
-export let threadWorker;
+export let threadWorker: ThreadWorker;
 if (Utils.workerPoolInUse()) {
-  threadWorker = new ThreadWorker(startChargingStation, { maxInactiveTime: Constants.WORKER_POOL_MAX_INACTIVE_TIME, async: false });
-}
-
-if (!isMainThread) {
-  // Add listener to start charging station from main thread
-  addListener();
+  threadWorker = new ThreadWorker<StationWorkerData>(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 });
   }
 }
 
-function addListener() {
-  parentPort.on('message', (message) => {
+/**
+ * Listen messages send by the main thread
+ */
+function addMessageListener(): void {
+  parentPort?.on('message', (message) => {
     if (message.id === WorkerEvents.START_WORKER_ELEMENT) {
       startChargingStation(message.workerData);
     }
   });
 }
 
-function startChargingStation(data: StationWorkerData) {
-  const station = new ChargingStation(data.index , data.templateFile);
+/**
+ * Create and start a charging station instance
+ *
+ * @param {StationWorkerData} data workerData
+ */
+function startChargingStation(data: StationWorkerData): void {
+  const station = new ChargingStation(data.index, data.templateFile);
   station.start();
 }