X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FBootstrap.ts;h=d39c705c89e19334dd95d8654e5126fc40228406;hb=35639ced7a1a8e9cfb7b0db675fc2757ea902d04;hp=ebb5619b44929c655bf5c275dcf73b7d6aebd2bb;hpb=383cb2aee597e711f037c9f67151191bb233a91c;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts
index ebb5619b..d39c705c 100644
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -1,8 +1,14 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import { ChargingStationWorkerData, ChargingStationWorkerMessage, ChargingStationWorkerMessageEvents } from '../types/ChargingStationWorker';
+import {
+  ChargingStationWorkerData,
+  ChargingStationWorkerMessage,
+  ChargingStationWorkerMessageEvents,
+} from '../types/ChargingStationWorker';
 
 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 { UIServiceUtils } from './ui-websocket-services/UIServiceUtils';
@@ -17,7 +23,7 @@ import { version } from '../../package.json';
 
 export default class Bootstrap {
   private static instance: Bootstrap | null = null;
-  private workerImplementation: WorkerAbstract | null = null;
+  private workerImplementation: WorkerAbstract<ChargingStationWorkerData> | null = null;
   private readonly uiWebSocketServer!: UIWebSocketServer;
   private readonly storage!: Storage;
   private numberOfChargingStations: number;
@@ -27,16 +33,23 @@ export default class Bootstrap {
 
   private constructor() {
     this.started = false;
-    this.workerScript = path.join(path.resolve(__dirname, '../'), 'charging-station', 'ChargingStationWorker.js');
+    this.workerScript = path.join(
+      path.resolve(__dirname, '../'),
+      'charging-station',
+      'ChargingStationWorker.js'
+    );
     this.initWorkerImplementation();
-    Configuration.getUIWebSocketServer().enabled && (this.uiWebSocketServer = new UIWebSocketServer({
-      ...Configuration.getUIWebSocketServer().options, handleProtocols: UIServiceUtils.handleProtocols
-    }));
-    Configuration.getPerformanceStorage().enabled && (this.storage = StorageFactory.getStorage(
-      Configuration.getPerformanceStorage().type,
-      Configuration.getPerformanceStorage().URI,
-      this.logPrefix()
-    ));
+    Configuration.getUIWebSocketServer().enabled &&
+      (this.uiWebSocketServer = new UIWebSocketServer({
+        ...Configuration.getUIWebSocketServer().options,
+        handleProtocols: UIServiceUtils.handleProtocols,
+      }));
+    Configuration.getPerformanceStorage().enabled &&
+      (this.storage = StorageFactory.getStorage(
+        Configuration.getPerformanceStorage().type,
+        Configuration.getPerformanceStorage().uri,
+        this.logPrefix()
+      ));
     Configuration.setConfigurationChangeCallback(async () => Bootstrap.getInstance().restart());
   }
 
@@ -54,30 +67,49 @@ export default class Bootstrap {
         await this.storage?.open();
         await this.workerImplementation.start();
         this.uiWebSocketServer?.start();
+        const stationTemplateUrls = Configuration.getStationTemplateUrls();
         // Start ChargingStation object in worker thread
-        if (Configuration.getStationTemplateURLs()) {
-          for (const stationURL of Configuration.getStationTemplateURLs()) {
+        if (stationTemplateUrls) {
+          for (const stationTemplateUrl of stationTemplateUrls) {
             try {
-              const nbStations = stationURL.numberOfStations ?? 0;
+              const nbStations = stationTemplateUrl.numberOfStations ?? 0;
               for (let index = 1; index <= nbStations; index++) {
-                const workerData: ChargingStationWorkerData = {
-                  index,
-                  templateFile: path.join(path.resolve(__dirname, '../'), 'assets', 'station-templates', path.basename(stationURL.file))
-                };
-                await this.workerImplementation.addElement(workerData);
-                this.numberOfChargingStations++;
+                await this.startChargingStation(index, stationTemplateUrl);
               }
             } catch (error) {
-              console.error(chalk.red('Charging station start with template file ' + stationURL.file + ' error '), error);
+              console.error(
+                chalk.red(
+                  'Charging station start with template file ' + stationTemplateUrl.file + ' error '
+                ),
+                error
+              );
             }
           }
         } else {
-          console.warn(chalk.yellow('No stationTemplateURLs defined in configuration, exiting'));
+          console.warn(chalk.yellow('No stationTemplateUrls defined in configuration, exiting'));
         }
         if (this.numberOfChargingStations === 0) {
-          console.warn(chalk.yellow('No charging station template enabled in configuration, exiting'));
+          console.warn(
+            chalk.yellow('No charging station template enabled in configuration, exiting')
+          );
         } else {
-          console.log(chalk.green(`Charging stations simulator ${this.version} started with ${this.numberOfChargingStations.toString()} charging station(s) and ${Utils.workerDynamicPoolInUse() ? `${Configuration.getWorkerPoolMinSize().toString()}/` : ''}${this.workerImplementation.size}${Utils.workerPoolInUse() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : ''} worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode${this.workerImplementation.maxElementsPerWorker ? ` (${this.workerImplementation.maxElementsPerWorker} charging station(s) per worker)` : ''}`));
+          console.log(
+            chalk.green(
+              `Charging stations simulator ${
+                this.version
+              } started with ${this.numberOfChargingStations.toString()} charging station(s) and ${
+                Utils.workerDynamicPoolInUse()
+                  ? `${Configuration.getWorkerPoolMinSize().toString()}/`
+                  : ''
+              }${this.workerImplementation.size}${
+                Utils.workerPoolInUse() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : ''
+              } worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode${
+                this.workerImplementation.maxElementsPerWorker
+                  ? ` (${this.workerImplementation.maxElementsPerWorker} charging station(s) per worker)`
+                  : ''
+              }`
+            )
+          );
         }
         this.started = true;
       } catch (error) {
@@ -106,25 +138,46 @@ export default class Bootstrap {
   }
 
   private initWorkerImplementation(): void {
-    this.workerImplementation = WorkerFactory.getWorkerImplementation<ChargingStationWorkerData>(this.workerScript, Configuration.getWorkerProcess(),
+    this.workerImplementation = WorkerFactory.getWorkerImplementation<ChargingStationWorkerData>(
+      this.workerScript,
+      Configuration.getWorkerProcess(),
       {
-        startDelay: Configuration.getWorkerStartDelay(),
+        workerStartDelay: Configuration.getWorkerStartDelay(),
+        elementStartDelay: Configuration.getElementStartDelay(),
         poolMaxSize: Configuration.getWorkerPoolMaxSize(),
         poolMinSize: Configuration.getWorkerPoolMinSize(),
         elementsPerWorker: Configuration.getChargingStationsPerWorker(),
         poolOptions: {
-          workerChoiceStrategy: Configuration.getWorkerPoolStrategy()
+          workerChoiceStrategy: Configuration.getWorkerPoolStrategy(),
         },
         messageHandler: async (msg: ChargingStationWorkerMessage) => {
           if (msg.id === ChargingStationWorkerMessageEvents.STARTED) {
-            this.uiWebSocketServer.chargingStations.add(msg.data.id);
+            this.uiWebSocketServer.chargingStations.add(msg.data.id as string);
           } else if (msg.id === ChargingStationWorkerMessageEvents.STOPPED) {
-            this.uiWebSocketServer.chargingStations.delete(msg.data.id);
+            this.uiWebSocketServer.chargingStations.delete(msg.data.id as string);
           } else if (msg.id === ChargingStationWorkerMessageEvents.PERFORMANCE_STATISTICS) {
-            await this.storage.storePerformanceStatistics(msg.data);
+            await this.storage.storePerformanceStatistics(msg.data as unknown as Statistics);
           }
-        }
-      });
+        },
+      }
+    );
+  }
+
+  private async startChargingStation(
+    index: number,
+    stationTemplateUrl: StationTemplateUrl
+  ): Promise<void> {
+    const workerData: ChargingStationWorkerData = {
+      index,
+      templateFile: path.join(
+        path.resolve(__dirname, '../'),
+        'assets',
+        'station-templates',
+        path.basename(stationTemplateUrl.file)
+      ),
+    };
+    await this.workerImplementation.addElement(workerData);
+    this.numberOfChargingStations++;
   }
 
   private logPrefix(): string {