X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FBootstrap.ts;h=2bc650cc32ec9116f638b33da3eb1d4e4a361d21;hb=53e5fd67dea2dd83ec9c34d963dd6e502ec46f5c;hp=af96523f1f13c3853e487a375b536a8c02a7f3b8;hpb=b19021e229ef0d868cea4b03118b357b80fee173;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts
index af96523f..2bc650cc 100644
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -1,29 +1,36 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { isMainThread } from 'worker_threads';
+
+import chalk from 'chalk';
+
+import { version } from '../../package.json';
+import BaseError from '../exception/BaseError';
+import { Storage } from '../performance/storage/Storage';
+import { StorageFactory } from '../performance/storage/StorageFactory';
 import {
+  ChargingStationData,
   ChargingStationWorkerData,
   ChargingStationWorkerMessage,
+  ChargingStationWorkerMessageData,
   ChargingStationWorkerMessageEvents,
 } from '../types/ChargingStationWorker';
-
-import { AbstractUIServer } from './ui-server/AbstractUIServer';
-import { ApplicationProtocol } from '../types/UIProtocol';
-import { ChargingStationUtils } from './ChargingStationUtils';
-import Configuration from '../utils/Configuration';
 import { StationTemplateUrl } from '../types/ConfigurationData';
 import Statistics from '../types/Statistics';
-import { Storage } from '../performance/storage/Storage';
-import { StorageFactory } from '../performance/storage/StorageFactory';
-import UIServerFactory from './ui-server/UIServerFactory';
-import { UIServiceUtils } from './ui-server/ui-services/UIServiceUtils';
+import { ApplicationProtocol } from '../types/UIProtocol';
+import Configuration from '../utils/Configuration';
+import logger from '../utils/Logger';
 import Utils from '../utils/Utils';
 import WorkerAbstract from '../worker/WorkerAbstract';
 import WorkerFactory from '../worker/WorkerFactory';
-import chalk from 'chalk';
-import { fileURLToPath } from 'url';
-import { isMainThread } from 'worker_threads';
-import path from 'path';
-import { version } from '../../package.json';
+import { ChargingStationUtils } from './ChargingStationUtils';
+import { AbstractUIServer } from './ui-server/AbstractUIServer';
+import { UIServiceUtils } from './ui-server/ui-services/UIServiceUtils';
+import UIServerFactory from './ui-server/UIServerFactory';
+
+const moduleName = 'Bootstrap';
 
 export default class Bootstrap {
   private static instance: Bootstrap | null = null;
@@ -32,6 +39,7 @@ export default class Bootstrap {
   private readonly storage!: Storage;
   private numberOfChargingStationTemplates!: number;
   private numberOfChargingStations!: number;
+  private numberOfStartedChargingStations!: number;
   private readonly version: string = version;
   private started: boolean;
   private readonly workerScript: string;
@@ -59,7 +67,7 @@ export default class Bootstrap {
   }
 
   public static getInstance(): Bootstrap {
-    if (!Bootstrap.instance) {
+    if (Bootstrap.instance === null) {
       Bootstrap.instance = new Bootstrap();
     }
     return Bootstrap.instance;
@@ -102,20 +110,21 @@ export default class Bootstrap {
           console.warn(
             chalk.yellow('No charging station template enabled in configuration, exiting')
           );
+          process.exit();
         } else {
-          console.log(
+          console.info(
             chalk.green(
               `Charging stations simulator ${
                 this.version
               } started with ${this.numberOfChargingStations.toString()} charging station(s) from ${this.numberOfChargingStationTemplates.toString()} configured charging station template(s) and ${
                 ChargingStationUtils.workerDynamicPoolInUse()
-                  ? `${Configuration.getWorkerPoolMinSize().toString()}/`
+                  ? `${Configuration.getWorker().poolMinSize.toString()}/`
                   : ''
               }${this.workerImplementation.size}${
                 ChargingStationUtils.workerPoolInUse()
-                  ? `/${Configuration.getWorkerPoolMaxSize().toString()}`
+                  ? `/${Configuration.getWorker().poolMaxSize.toString()}`
                   : ''
-              } worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode${
+              } worker(s) concurrently running in '${Configuration.getWorker().processType}' mode${
                 this.workerImplementation.maxElementsPerWorker
                   ? ` (${this.workerImplementation.maxElementsPerWorker} charging station(s) per worker)`
                   : ''
@@ -154,32 +163,84 @@ export default class Bootstrap {
     !this.workerImplementation &&
       (this.workerImplementation = WorkerFactory.getWorkerImplementation<ChargingStationWorkerData>(
         this.workerScript,
-        Configuration.getWorkerProcess(),
+        Configuration.getWorker().processType,
         {
-          workerStartDelay: Configuration.getWorkerStartDelay(),
-          elementStartDelay: Configuration.getElementStartDelay(),
-          poolMaxSize: Configuration.getWorkerPoolMaxSize(),
-          poolMinSize: Configuration.getWorkerPoolMinSize(),
-          elementsPerWorker: Configuration.getChargingStationsPerWorker(),
+          workerStartDelay: Configuration.getWorker().startDelay,
+          elementStartDelay: Configuration.getWorker().elementStartDelay,
+          poolMaxSize: Configuration.getWorker().poolMaxSize,
+          poolMinSize: Configuration.getWorker().poolMinSize,
+          elementsPerWorker: Configuration.getWorker().elementsPerWorker,
           poolOptions: {
-            workerChoiceStrategy: Configuration.getWorkerPoolStrategy(),
-          },
-          messageHandler: async (msg: ChargingStationWorkerMessage) => {
-            if (msg.id === ChargingStationWorkerMessageEvents.STARTED) {
-              this.uiServer.chargingStations.add(msg.data.id as string);
-            } else if (msg.id === ChargingStationWorkerMessageEvents.STOPPED) {
-              this.uiServer.chargingStations.delete(msg.data.id as string);
-            } else if (msg.id === ChargingStationWorkerMessageEvents.PERFORMANCE_STATISTICS) {
-              await this.storage.storePerformanceStatistics(msg.data as unknown as Statistics);
-            }
+            workerChoiceStrategy: Configuration.getWorker().poolStrategy,
           },
+          messageHandler: this.messageHandler.bind(this) as (
+            msg: ChargingStationWorkerMessage<ChargingStationWorkerMessageData>
+          ) => void,
         }
       ));
   }
 
+  private messageHandler(
+    msg: ChargingStationWorkerMessage<ChargingStationWorkerMessageData>
+  ): void {
+    // logger.debug(
+    //   `${this.logPrefix()} ${moduleName}.messageHandler: Worker channel message received: ${JSON.stringify(
+    //     msg,
+    //     null,
+    //     2
+    //   )}`
+    // );
+    try {
+      switch (msg.id) {
+        case ChargingStationWorkerMessageEvents.STARTED:
+          this.workerEventStarted(msg.data as ChargingStationData);
+          break;
+        case ChargingStationWorkerMessageEvents.STOPPED:
+          this.workerEventStopped(msg.data as ChargingStationData);
+          break;
+        case ChargingStationWorkerMessageEvents.UPDATED:
+          this.workerEventUpdated(msg.data as ChargingStationData);
+          break;
+        case ChargingStationWorkerMessageEvents.PERFORMANCE_STATISTICS:
+          this.workerEventPerformanceStatistics(msg.data as Statistics);
+          break;
+        default:
+          throw new BaseError(
+            `Unknown event type: '${msg.id}' for data: ${JSON.stringify(msg.data, null, 2)}`
+          );
+      }
+    } catch (error) {
+      logger.error(
+        `${this.logPrefix()} ${moduleName}.messageHandler: Error occurred while handling '${
+          msg.id
+        }' event:`,
+        error
+      );
+    }
+  }
+
+  private workerEventStarted(data: ChargingStationData) {
+    this.uiServer?.chargingStations.set(data.hashId, data);
+    ++this.numberOfStartedChargingStations;
+  }
+
+  private workerEventStopped(data: ChargingStationData) {
+    this.uiServer?.chargingStations.set(data.hashId, data);
+    --this.numberOfStartedChargingStations;
+  }
+
+  private workerEventUpdated(data: ChargingStationData) {
+    this.uiServer?.chargingStations.set(data.hashId, data);
+  }
+
+  private workerEventPerformanceStatistics = (data: Statistics) => {
+    this.storage.storePerformanceStatistics(data) as void;
+  };
+
   private initialize() {
-    this.numberOfChargingStations = 0;
     this.numberOfChargingStationTemplates = 0;
+    this.numberOfChargingStations = 0;
+    this.numberOfStartedChargingStations = 0;
     this.initializeWorkerImplementation();
   }
 
@@ -193,11 +254,11 @@ export default class Bootstrap {
         path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'),
         'assets',
         'station-templates',
-        path.basename(stationTemplateUrl.file)
+        stationTemplateUrl.file
       ),
     };
     await this.workerImplementation.addElement(workerData);
-    this.numberOfChargingStations++;
+    ++this.numberOfChargingStations;
   }
 
   private logPrefix(): string {