X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FBootstrap.ts;h=ed9f1bef259640df365739f65ab5a4a8913c24d2;hb=ec69050249d8e32aa6ec786ff271179200bfb88e;hp=18e934db0351ace719cf67f4ca44dd606f0a09e5;hpb=6fee1791db82bd4605b180612fe642a7e2c4caa0;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts index 18e934db..ed9f1bef 100644 --- a/src/charging-station/Bootstrap.ts +++ b/src/charging-station/Bootstrap.ts @@ -6,17 +6,21 @@ import { 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 { UIServiceUtils } from './ui-websocket-services/UIServiceUtils'; -import UIWebSocketServer from './UIWebSocketServer'; +import UIServerFactory from './ui-server/UIServerFactory'; +import { UIServiceUtils } from './ui-server/ui-services/UIServiceUtils'; 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'; @@ -24,9 +28,10 @@ import { version } from '../../package.json'; export default class Bootstrap { private static instance: Bootstrap | null = null; private workerImplementation: WorkerAbstract | null = null; - private readonly uiWebSocketServer!: UIWebSocketServer; + 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; @@ -34,14 +39,14 @@ export default class Bootstrap { private constructor() { this.started = false; this.workerScript = path.join( - path.resolve(__dirname, '../'), // wouldn't path.resolve(./ChargingStationWorker.js) achieve the same result ? + path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'), 'charging-station', - 'ChargingStationWorker.js' + 'ChargingStationWorker' + path.extname(fileURLToPath(import.meta.url)) ); - this.initWorkerImplementation(); - Configuration.getUIWebSocketServer().enabled && - (this.uiWebSocketServer = new UIWebSocketServer({ - ...Configuration.getUIWebSocketServer().options, + this.initialize(); + Configuration.getUIServer().enabled && + (this.uiServer = UIServerFactory.getUIServerImplementation(ApplicationProtocol.WS, { + ...Configuration.getUIServer().options, handleProtocols: UIServiceUtils.handleProtocols, })); Configuration.getPerformanceStorage().enabled && @@ -63,13 +68,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.uiWebSocketServer?.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; @@ -79,14 +85,18 @@ export default class Bootstrap { } catch (error) { console.error( chalk.red( - 'Charging station start with template file ' + stationTemplateUrl.file + ' error ' + 'Error at starting charging station with template file ' + + stationTemplateUrl.file + + ': ' ), error ); } } } 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( @@ -97,13 +107,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)` : '' @@ -123,7 +135,8 @@ export default class Bootstrap { public async stop(): Promise { if (isMainThread && this.started) { await this.workerImplementation.stop(); - this.uiWebSocketServer?.stop(); + this.workerImplementation = null; + this.uiServer?.stop(); await this.storage?.close(); } else { console.error(chalk.red('Trying to stop the charging stations simulator while not started')); @@ -133,34 +146,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.uiWebSocketServer.chargingStations.add(msg.data.id as string); - } else if (msg.id === ChargingStationWorkerMessageEvents.STOPPED) { - this.uiWebSocketServer.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( @@ -170,7 +190,7 @@ 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)