X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FBootstrap.ts;h=143bb5c4298ee229fe3c0d8d66ad69eebda37bf6;hb=c3ee95af4edd541595e3873c8aa4c93d38e59474;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..143bb5c4 100644 --- a/src/charging-station/Bootstrap.ts +++ b/src/charging-station/Bootstrap.ts @@ -3,6 +3,7 @@ import { ChargingStationWorkerData, ChargingStationWorkerMessage, ChargingStationWorkerMessageEvents } from '../types/ChargingStationWorker'; import Configuration from '../utils/Configuration'; +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 +18,7 @@ import { version } from '../../package.json'; export default class Bootstrap { private static instance: Bootstrap | null = null; - private workerImplementation: WorkerAbstract | null = null; + private workerImplementation: WorkerAbstract | null = null; private readonly uiWebSocketServer!: UIWebSocketServer; private readonly storage!: Storage; private numberOfChargingStations: number; @@ -34,7 +35,7 @@ export default class Bootstrap { })); Configuration.getPerformanceStorage().enabled && (this.storage = StorageFactory.getStorage( Configuration.getPerformanceStorage().type, - Configuration.getPerformanceStorage().URI, + Configuration.getPerformanceStorage().uri, this.logPrefix() )); Configuration.setConfigurationChangeCallback(async () => Bootstrap.getInstance().restart()); @@ -54,25 +55,26 @@ 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)) + templateFile: path.join(path.resolve(__dirname, '../'), 'assets', 'station-templates', path.basename(stationTemplateUrl.file)) }; await this.workerImplementation.addElement(workerData); this.numberOfChargingStations++; } } 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')); @@ -117,11 +119,11 @@ export default class Bootstrap { }, 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); } } });