X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FBootstrap.ts;h=cdfb26a6c615cd08e6e9de1140b29d0558f5f91a;hb=4c3c0d59f56be4d58e906e938c00390b41e0ca7f;hp=c35464d1e2d4e3293c0f26dcf0ca134126cf6b40;hpb=76a5d780d1eb17a18fd5f9d95df2cf0c8bc3d9c9;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts index c35464d1..cdfb26a6 100644 --- a/src/charging-station/Bootstrap.ts +++ b/src/charging-station/Bootstrap.ts @@ -2,13 +2,14 @@ import path from 'node:path'; import { fileURLToPath } from 'node:url'; -import { type Worker, isMainThread } from 'worker_threads'; +import { type Worker, isMainThread } from 'node:worker_threads'; import chalk from 'chalk'; import { ChargingStationUtils } from './ChargingStationUtils'; -import { type AbstractUIServer, UIServerFactory } from './internal'; -import { version } from '../../package.json'; +import type { AbstractUIServer } from './ui-server/AbstractUIServer'; +import { UIServerFactory } from './ui-server/UIServerFactory'; +import packageJson from '../../package.json' assert { type: 'json' }; import { BaseError } from '../exception'; import { type Storage, StorageFactory } from '../performance'; import { @@ -20,9 +21,7 @@ import { type StationTemplateUrl, type Statistics, } from '../types'; -import { Configuration } from '../utils/Configuration'; -import { logger } from '../utils/Logger'; -import { Utils } from '../utils/Utils'; +import { Configuration, Utils, logger } from '../utils'; import { type MessageHandler, type WorkerAbstract, WorkerFactory } from '../worker'; const moduleName = 'Bootstrap'; @@ -40,7 +39,7 @@ export class Bootstrap { private readonly uiServer!: AbstractUIServer | null; private readonly storage!: Storage; private numberOfStartedChargingStations!: number; - private readonly version: string = version; + private readonly version: string = packageJson.version; private initializedCounters: boolean; private started: boolean; private readonly workerScript: string; @@ -173,16 +172,16 @@ export class Bootstrap { // ); try { switch (msg.id) { - case ChargingStationWorkerMessageEvents.STARTED: + case ChargingStationWorkerMessageEvents.started: this.workerEventStarted(msg.data as ChargingStationData); break; - case ChargingStationWorkerMessageEvents.STOPPED: + case ChargingStationWorkerMessageEvents.stopped: this.workerEventStopped(msg.data as ChargingStationData); break; - case ChargingStationWorkerMessageEvents.UPDATED: + case ChargingStationWorkerMessageEvents.updated: this.workerEventUpdated(msg.data as ChargingStationData); break; - case ChargingStationWorkerMessageEvents.PERFORMANCE_STATISTICS: + case ChargingStationWorkerMessageEvents.performanceStatistics: this.workerEventPerformanceStatistics(msg.data as Statistics); break; default: @@ -239,9 +238,9 @@ export class Bootstrap { const stationTemplateUrls = Configuration.getStationTemplateUrls(); if (Utils.isNotEmptyArray(stationTemplateUrls)) { this.numberOfChargingStationTemplates = stationTemplateUrls.length; - stationTemplateUrls.forEach((stationTemplateUrl) => { + for (const stationTemplateUrl of stationTemplateUrls) { this.numberOfChargingStations += stationTemplateUrl.numberOfStations ?? 0; - }); + } } else { console.warn( chalk.yellow("'stationTemplateUrls' not defined or empty in configuration, exiting")