X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FBootstrap.ts;h=8972119701cb9faee8206a9c2fa1d9a9e1444f36;hb=7859628671cd8bd4cf9e424b37b8c014dd559ee3;hp=e29c6445fefcccb383b4387f93d670a948c57326;hpb=56eb297e60819adea5d3a1f419a872cc8d3b5284;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts index e29c6445..89721197 100644 --- a/src/charging-station/Bootstrap.ts +++ b/src/charging-station/Bootstrap.ts @@ -1,4 +1,4 @@ -// Partial Copyright Jerome Benoit. 2021. All Rights Reserved. +// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved. import path from 'path'; import { fileURLToPath } from 'url'; @@ -11,14 +11,15 @@ import BaseError from '../exception/BaseError'; import type { Storage } from '../performance/storage/Storage'; import { StorageFactory } from '../performance/storage/StorageFactory'; import { - ChargingStationData, - ChargingStationWorkerData, - ChargingStationWorkerMessage, - ChargingStationWorkerMessageData, + type ChargingStationData, + type ChargingStationWorkerData, + type ChargingStationWorkerMessage, + type ChargingStationWorkerMessageData, ChargingStationWorkerMessageEvents, } from '../types/ChargingStationWorker'; import type { StationTemplateUrl } from '../types/ConfigurationData'; import type { Statistics } from '../types/Statistics'; +import type { MessageHandler } from '../types/Worker'; import Configuration from '../utils/Configuration'; import logger from '../utils/Logger'; import Utils from '../utils/Utils'; @@ -178,10 +179,7 @@ export class Bootstrap { poolOptions: { workerChoiceStrategy: Configuration.getWorker().poolStrategy, }, - messageHandler: this.messageHandler.bind(this) as ( - this: Worker, - msg: ChargingStationWorkerMessage - ) => void, + messageHandler: this.messageHandler.bind(this) as MessageHandler, } )); } @@ -229,9 +227,9 @@ export class Bootstrap { this.uiServer?.chargingStations.set(data.stationInfo.hashId, data); ++this.numberOfStartedChargingStations; logger.info( - `${this.logPrefix()} ${moduleName}.workerEventStarted: Charging station '${ + `${this.logPrefix()} ${moduleName}.workerEventStarted: Charging station ${ data.stationInfo.chargingStationId - } (hashId: ${data.stationInfo.hashId})' started (${ + } (hashId: ${data.stationInfo.hashId}) started (${ this.numberOfStartedChargingStations } started from ${this.numberOfChargingStations})` ); @@ -241,9 +239,9 @@ export class Bootstrap { this.uiServer?.chargingStations.set(data.stationInfo.hashId, data); --this.numberOfStartedChargingStations; logger.info( - `${this.logPrefix()} ${moduleName}.workerEventStopped: Charging station '${ + `${this.logPrefix()} ${moduleName}.workerEventStopped: Charging station ${ data.stationInfo.chargingStationId - } (hashId: ${data.stationInfo.hashId})' stopped (${ + } (hashId: ${data.stationInfo.hashId}) stopped (${ this.numberOfStartedChargingStations } started from ${this.numberOfChargingStations})` );