X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Fcharging-station%2FBootstrap.ts;h=23307f4c34a74b509ba352c071fb3383566134f5;hb=01a4dcbb168f3fb8c52b81a6ff5473b4259f390f;hp=1f5c898f914102a010688155120f6db6ab662d04;hpb=fe94fce08a020e0c35e354c2282ec0587a605f4e;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts index 1f5c898f..23307f4c 100644 --- a/src/charging-station/Bootstrap.ts +++ b/src/charging-station/Bootstrap.ts @@ -1,34 +1,38 @@ // 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 { Storage } from '../performance/storage/Storage'; +import { StorageFactory } from '../performance/storage/StorageFactory'; import { ChargingStationWorkerData, ChargingStationWorkerMessage, ChargingStationWorkerMessageEvents, } from '../types/ChargingStationWorker'; - -import { AbstractUIServer } from './ui-server/AbstractUIServer'; -import { ApplicationProtocol } from '../types/UIProtocol'; -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 Utils from '../utils/Utils'; import WorkerAbstract from '../worker/WorkerAbstract'; import WorkerFactory from '../worker/WorkerFactory'; -import chalk from 'chalk'; -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'; export default class Bootstrap { private static instance: Bootstrap | null = null; private workerImplementation: WorkerAbstract | null = null; private readonly uiServer!: AbstractUIServer; private readonly storage!: Storage; - private numberOfChargingStations: number; + private numberOfChargingStationTemplates!: number; + private numberOfChargingStations!: number; private readonly version: string = version; private started: boolean; private readonly workerScript: string; @@ -36,11 +40,11 @@ export default class Bootstrap { private constructor() { this.started = false; this.workerScript = path.join( - path.resolve(__dirname, '../'), + path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'), 'charging-station', - 'ChargingStationWorker.js' + 'ChargingStationWorker' + path.extname(fileURLToPath(import.meta.url)) ); - this.initWorkerImplementation(); + this.initialize(); Configuration.getUIServer().enabled && (this.uiServer = UIServerFactory.getUIServerImplementation(ApplicationProtocol.WS, { ...Configuration.getUIServer().options, @@ -65,13 +69,14 @@ export default class Bootstrap { public async start(): Promise { if (isMainThread && !this.started) { try { - this.numberOfChargingStations = 0; + this.initialize(); await this.storage?.open(); await this.workerImplementation.start(); this.uiServer?.start(); const stationTemplateUrls = Configuration.getStationTemplateUrls(); + this.numberOfChargingStationTemplates = stationTemplateUrls.length; // Start ChargingStation object in worker thread - if (stationTemplateUrls) { + if (!Utils.isEmptyArray(stationTemplateUrls)) { for (const stationTemplateUrl of stationTemplateUrls) { try { const nbStations = stationTemplateUrl.numberOfStations ?? 0; @@ -90,7 +95,9 @@ export default class Bootstrap { } } } else { - console.warn(chalk.yellow("No 'stationTemplateUrls' defined in configuration, exiting")); + console.warn( + chalk.yellow("'stationTemplateUrls' not defined or empty in configuration, exiting") + ); } if (this.numberOfChargingStations === 0) { console.warn( @@ -101,13 +108,15 @@ export default class Bootstrap { chalk.green( `Charging stations simulator ${ this.version - } started with ${this.numberOfChargingStations.toString()} charging station(s) and ${ - Utils.workerDynamicPoolInUse() - ? `${Configuration.getWorkerPoolMinSize().toString()}/` + } started with ${this.numberOfChargingStations.toString()} charging station(s) from ${this.numberOfChargingStationTemplates.toString()} configured charging station template(s) and ${ + ChargingStationUtils.workerDynamicPoolInUse() + ? `${Configuration.getWorker().poolMinSize.toString()}/` : '' }${this.workerImplementation.size}${ - Utils.workerPoolInUse() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : '' - } worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode${ + ChargingStationUtils.workerPoolInUse() + ? `/${Configuration.getWorker().poolMaxSize.toString()}` + : '' + } worker(s) concurrently running in '${Configuration.getWorker().processType}' mode${ this.workerImplementation.maxElementsPerWorker ? ` (${this.workerImplementation.maxElementsPerWorker} charging station(s) per worker)` : '' @@ -127,6 +136,7 @@ export default class Bootstrap { public async stop(): Promise { if (isMainThread && this.started) { await this.workerImplementation.stop(); + this.workerImplementation = null; this.uiServer?.stop(); await this.storage?.close(); } else { @@ -137,34 +147,41 @@ export default class Bootstrap { public async restart(): Promise { await this.stop(); - this.initWorkerImplementation(); + this.initialize(); await this.start(); } - private initWorkerImplementation(): void { - this.workerImplementation = WorkerFactory.getWorkerImplementation( - this.workerScript, - Configuration.getWorkerProcess(), - { - workerStartDelay: Configuration.getWorkerStartDelay(), - elementStartDelay: Configuration.getElementStartDelay(), - poolMaxSize: Configuration.getWorkerPoolMaxSize(), - poolMinSize: Configuration.getWorkerPoolMinSize(), - elementsPerWorker: Configuration.getChargingStationsPerWorker(), - 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); - } - }, - } - ); + private initializeWorkerImplementation(): void { + !this.workerImplementation && + (this.workerImplementation = WorkerFactory.getWorkerImplementation( + this.workerScript, + Configuration.getWorker().processType, + { + workerStartDelay: Configuration.getWorker().startDelay, + elementStartDelay: Configuration.getWorker().elementStartDelay, + poolMaxSize: Configuration.getWorker().poolMaxSize, + poolMinSize: Configuration.getWorker().poolMinSize, + elementsPerWorker: Configuration.getWorker().elementsPerWorker, + poolOptions: { + workerChoiceStrategy: Configuration.getWorker().poolStrategy, + }, + 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); + } + }, + } + )); + } + + private initialize() { + this.numberOfChargingStations = 0; + this.numberOfChargingStationTemplates = 0; + this.initializeWorkerImplementation(); } private async startChargingStation( @@ -174,10 +191,10 @@ export default class Bootstrap { const workerData: ChargingStationWorkerData = { index, templateFile: path.join( - path.resolve(__dirname, '../'), + path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'), 'assets', 'station-templates', - path.basename(stationTemplateUrl.file) + stationTemplateUrl.file ), }; await this.workerImplementation.addElement(workerData);