X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FBootstrap.ts;h=1dcad015822788a32d534cbd7574822b1f077170;hb=244c1396e337032577839fa13e9191d5e943864f;hp=ab935c7bab4615e92af810bd77d2acd94e00bcc9;hpb=42e341c40076aa8c5fc37e10512ec41c9ab60825;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts index ab935c7b..1dcad015 100644 --- a/src/charging-station/Bootstrap.ts +++ b/src/charging-station/Bootstrap.ts @@ -4,6 +4,7 @@ import { EventEmitter } from 'node:events' import { dirname, extname, join, parse } from 'node:path' import process, { exit } from 'node:process' import { fileURLToPath } from 'node:url' +import { isMainThread } from 'node:worker_threads' import type { Worker } from 'worker_threads' import chalk from 'chalk' @@ -18,12 +19,12 @@ import { type Storage, StorageFactory } from '../performance/index.js' import { type ChargingStationData, type ChargingStationWorkerData, + type ChargingStationWorkerEventError, type ChargingStationWorkerMessage, type ChargingStationWorkerMessageData, ChargingStationWorkerMessageEvents, ConfigurationSection, ProcedureName, - type StationTemplateUrl, type Statistics, type StorageConfiguration, type UIServerConfiguration, @@ -39,7 +40,8 @@ import { isAsyncFunction, isNotEmptyArray, logPrefix, - logger + logger, + max } from '../utils/index.js' import { type WorkerAbstract, WorkerFactory } from '../worker/index.js' @@ -53,12 +55,19 @@ enum exitCodes { gracefulShutdownError = 4 } +interface TemplateChargingStations { + configured: number + added: number + started: number + lastIndex: number +} + export class Bootstrap extends EventEmitter { private static instance: Bootstrap | null = null private workerImplementation?: WorkerAbstract private readonly uiServer?: AbstractUIServer private storage?: Storage - private readonly chargingStationsByTemplate: Map + private readonly chargingStationsByTemplate: Map private readonly version: string = version private initializedCounters: boolean private started: boolean @@ -76,20 +85,16 @@ export class Bootstrap extends EventEmitter { this.started = false this.starting = false this.stopping = false - this.chargingStationsByTemplate = new Map< - string, - { - configured: number - started: number - } - >() + this.chargingStationsByTemplate = new Map() this.uiServer = UIServerFactory.getUIServerImplementation( Configuration.getConfigurationSection(ConfigurationSection.uiServer) ) this.initializedCounters = false this.initializeCounters() Configuration.configurationChangeCallback = async () => { - await Bootstrap.getInstance().restart(false) + if (isMainThread) { + await Bootstrap.getInstance().restart() + } } } @@ -111,6 +116,17 @@ export class Bootstrap extends EventEmitter { ) } + public getLastIndex (templateName: string): number { + return this.chargingStationsByTemplate.get(templateName)?.lastIndex ?? 0 + } + + private get numberOfAddedChargingStations (): number { + return [...this.chargingStationsByTemplate.values()].reduce( + (accumulator, value) => accumulator + value.added, + 0 + ) + } + private get numberOfStartedChargingStations (): number { return [...this.chargingStationsByTemplate.values()].reduce( (accumulator, value) => accumulator + value.started, @@ -122,6 +138,7 @@ export class Bootstrap extends EventEmitter { if (!this.started) { if (!this.starting) { this.starting = true + this.on(ChargingStationWorkerMessageEvents.added, this.workerEventAdded) this.on(ChargingStationWorkerMessageEvents.started, this.workerEventStarted) this.on(ChargingStationWorkerMessageEvents.stopped, this.workerEventStopped) this.on(ChargingStationWorkerMessageEvents.updated, this.workerEventUpdated) @@ -159,7 +176,7 @@ export class Bootstrap extends EventEmitter { this.chargingStationsByTemplate.get(parse(stationTemplateUrl.file).name) ?.configured ?? stationTemplateUrl.numberOfStations for (let index = 1; index <= nbStations; index++) { - await this.startChargingStation(index, stationTemplateUrl) + await this.addChargingStation(index, stationTemplateUrl.file) } } catch (error) { console.error( @@ -174,7 +191,7 @@ export class Bootstrap extends EventEmitter { chalk.green( `Charging stations simulator ${ this.version - } started with ${this.numberOfConfiguredChargingStations} charging station(s) from ${this.numberOfChargingStationTemplates} configured charging station template(s) and ${ + } started with ${this.numberOfConfiguredChargingStations} configured charging station(s) from ${this.numberOfChargingStationTemplates} charging station template(s) and ${ Configuration.workerDynamicPoolInUse() ? `${workerConfiguration.poolMinSize}/` : '' }${this.workerImplementation?.size}${ Configuration.workerPoolInUse() ? `/${workerConfiguration.poolMaxSize}` : '' @@ -202,23 +219,21 @@ export class Bootstrap extends EventEmitter { } } - public async stop (stopChargingStations = true): Promise { + public async stop (): Promise { if (this.started) { if (!this.stopping) { this.stopping = true - if (stopChargingStations) { - await this.uiServer?.sendInternalRequest( - this.uiServer.buildProtocolRequest( - generateUUID(), - ProcedureName.STOP_CHARGING_STATION, - Constants.EMPTY_FROZEN_OBJECT - ) + await this.uiServer?.sendInternalRequest( + this.uiServer.buildProtocolRequest( + generateUUID(), + ProcedureName.STOP_CHARGING_STATION, + Constants.EMPTY_FROZEN_OBJECT ) - try { - await this.waitChargingStationsStopped() - } catch (error) { - console.error(chalk.red('Error while waiting for charging stations to stop: '), error) - } + ) + try { + await this.waitChargingStationsStopped() + } catch (error) { + console.error(chalk.red('Error while waiting for charging stations to stop: '), error) } await this.workerImplementation?.stop() delete this.workerImplementation @@ -235,10 +250,10 @@ export class Bootstrap extends EventEmitter { } } - public async restart (stopChargingStations?: boolean): Promise { - await this.stop(stopChargingStations) + private async restart (): Promise { + await this.stop() Configuration.getConfigurationSection(ConfigurationSection.uiServer) - .enabled === false && this.uiServer?.stop() + .enabled !== true && this.uiServer?.stop() this.initializedCounters = false await this.start() } @@ -268,6 +283,9 @@ export class Bootstrap extends EventEmitter { } private initializeWorkerImplementation (workerConfiguration: WorkerConfiguration): void { + if (!isMainThread) { + return + } let elementsPerWorker: number | undefined switch (workerConfiguration.elementsPerWorker) { case 'auto': @@ -315,6 +333,9 @@ export class Bootstrap extends EventEmitter { // ) try { switch (msg.event) { + case ChargingStationWorkerMessageEvents.added: + this.emit(ChargingStationWorkerMessageEvents.added, msg.data as ChargingStationData) + break case ChargingStationWorkerMessageEvents.started: this.emit(ChargingStationWorkerMessageEvents.started, msg.data as ChargingStationData) break @@ -330,14 +351,14 @@ export class Bootstrap extends EventEmitter { msg.data as Statistics ) break - case ChargingStationWorkerMessageEvents.startWorkerElementError: + case ChargingStationWorkerMessageEvents.workerElementError: logger.error( - `${this.logPrefix()} ${moduleName}.messageHandler: Error occurred while starting worker element:`, + `${this.logPrefix()} ${moduleName}.messageHandler: Error occurred while handling '${(msg.data as ChargingStationWorkerEventError).event}' event on worker:`, msg.data ) - this.emit(ChargingStationWorkerMessageEvents.startWorkerElementError, msg.data) + this.emit(ChargingStationWorkerMessageEvents.workerElementError, msg.data) break - case ChargingStationWorkerMessageEvents.startedWorkerElement: + case ChargingStationWorkerMessageEvents.addedWorkerElement: break default: throw new BaseError( @@ -356,6 +377,19 @@ export class Bootstrap extends EventEmitter { } } + private readonly workerEventAdded = (data: ChargingStationData): void => { + this.uiServer?.chargingStations.set(data.stationInfo.hashId, data) + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + ++this.chargingStationsByTemplate.get(data.stationInfo.templateName)!.added + logger.info( + `${this.logPrefix()} ${moduleName}.workerEventAdded: Charging station ${ + data.stationInfo.chargingStationId + } (hashId: ${data.stationInfo.hashId}) added (${ + this.numberOfAddedChargingStations + } added from ${this.numberOfConfiguredChargingStations} configured charging station(s))` + ) + } + private readonly workerEventStarted = (data: ChargingStationData): void => { this.uiServer?.chargingStations.set(data.stationInfo.hashId, data) // eslint-disable-next-line @typescript-eslint/no-non-null-assertion @@ -365,7 +399,7 @@ export class Bootstrap extends EventEmitter { data.stationInfo.chargingStationId } (hashId: ${data.stationInfo.hashId}) started (${ this.numberOfStartedChargingStations - } started from ${this.numberOfConfiguredChargingStations})` + } started from ${this.numberOfAddedChargingStations} added charging station(s))` ) } @@ -378,7 +412,7 @@ export class Bootstrap extends EventEmitter { data.stationInfo.chargingStationId } (hashId: ${data.stationInfo.hashId}) stopped (${ this.numberOfStartedChargingStations - } started from ${this.numberOfConfiguredChargingStations})` + } started from ${this.numberOfAddedChargingStations} added charging station(s))` ) } @@ -410,7 +444,9 @@ export class Bootstrap extends EventEmitter { const templateName = parse(stationTemplateUrl.file).name this.chargingStationsByTemplate.set(templateName, { configured: stationTemplateUrl.numberOfStations, - started: 0 + added: 0, + started: 0, + lastIndex: 0 }) this.uiServer?.chargingStationTemplates.add(templateName) } @@ -428,10 +464,14 @@ export class Bootstrap extends EventEmitter { ) exit(exitCodes.missingChargingStationsConfiguration) } - if (this.numberOfConfiguredChargingStations === 0) { + if ( + this.numberOfConfiguredChargingStations === 0 && + Configuration.getConfigurationSection(ConfigurationSection.uiServer) + .enabled !== true + ) { console.error( chalk.red( - "'stationTemplateUrls' has no charging station enabled, please check your configuration" + "'stationTemplateUrls' has no charging station enabled and UI server is disabled, please check your configuration" ) ) exit(exitCodes.noChargingStationTemplates) @@ -440,19 +480,21 @@ export class Bootstrap extends EventEmitter { } } - private async startChargingStation ( - index: number, - stationTemplateUrl: StationTemplateUrl - ): Promise { + public async addChargingStation (index: number, stationTemplateFile: string): Promise { await this.workerImplementation?.addElement({ index, templateFile: join( dirname(fileURLToPath(import.meta.url)), 'assets', 'station-templates', - stationTemplateUrl.file + stationTemplateFile ) }) + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.chargingStationsByTemplate.get(parse(stationTemplateFile).name)!.lastIndex = max( + index, + this.chargingStationsByTemplate.get(parse(stationTemplateFile).name)?.lastIndex ?? -Infinity + ) } private gracefulShutdown (): void { @@ -460,7 +502,6 @@ export class Bootstrap extends EventEmitter { .then(() => { console.info(chalk.green('Graceful shutdown')) this.uiServer?.stop() - // stop() asks for charging stations to stop by default this.waitChargingStationsStopped() .then(() => { exit(exitCodes.succeeded)