X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=8b9ae7cee30e1110badce18017d87f9fa8a1ca69;hb=e8044a69a745aab08dfeea0bd9ec9dd7fe84cdd7;hp=d058866abae0da08c3d43937af6e3931e0872c6d;hpb=9bb1159e3a17ace0e8502e7c4e727219a2b033f2;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts index d058866a..8b9ae7ce 100644 --- a/src/charging-station/AutomaticTransactionGenerator.ts +++ b/src/charging-station/AutomaticTransactionGenerator.ts @@ -10,7 +10,6 @@ import { AuthorizationStatus, type AuthorizeRequest, type AuthorizeResponse, - type AutomaticTransactionGeneratorConfiguration, ConnectorStatusEnum, RequestCommand, type StartTransactionRequest, @@ -30,33 +29,24 @@ export class AutomaticTransactionGenerator extends AsyncResource { >(); public readonly connectorsStatus: Map; - public readonly configuration: AutomaticTransactionGeneratorConfiguration; public started: boolean; private readonly chargingStation: ChargingStation; - private constructor( - automaticTransactionGeneratorConfiguration: AutomaticTransactionGeneratorConfiguration, - chargingStation: ChargingStation - ) { + private constructor(chargingStation: ChargingStation) { super(moduleName); this.started = false; - this.configuration = automaticTransactionGeneratorConfiguration; this.chargingStation = chargingStation; this.connectorsStatus = new Map(); this.initializeConnectorsStatus(); } public static getInstance( - automaticTransactionGeneratorConfiguration: AutomaticTransactionGeneratorConfiguration, chargingStation: ChargingStation ): AutomaticTransactionGenerator | undefined { if (AutomaticTransactionGenerator.instances.has(chargingStation.stationInfo.hashId) === false) { AutomaticTransactionGenerator.instances.set( chargingStation.stationInfo.hashId, - new AutomaticTransactionGenerator( - automaticTransactionGeneratorConfiguration, - chargingStation - ) + new AutomaticTransactionGenerator(chargingStation) ); } return AutomaticTransactionGenerator.instances.get(chargingStation.stationInfo.hashId); @@ -132,17 +122,37 @@ export class AutomaticTransactionGenerator extends AsyncResource { this.connectorsStatus.clear(); this.initializeConnectorsStatus(); } - for (const connectorId of this.chargingStation.connectors.keys()) { - if (connectorId > 0) { - this.startConnector(connectorId); + if (this.chargingStation.hasEvses) { + for (const [evseId, evseStatus] of this.chargingStation.evses) { + if (evseId > 0) { + for (const connectorId of evseStatus.connectors.keys()) { + this.startConnector(connectorId); + } + } + } + } else { + for (const connectorId of this.chargingStation.connectors.keys()) { + if (connectorId > 0) { + this.startConnector(connectorId); + } } } } private stopConnectors(): void { - for (const connectorId of this.chargingStation.connectors.keys()) { - if (connectorId > 0) { - this.stopConnector(connectorId); + if (this.chargingStation.hasEvses) { + for (const [evseId, evseStatus] of this.chargingStation.evses) { + if (evseId > 0) { + for (const connectorId of evseStatus.connectors.keys()) { + this.stopConnector(connectorId); + } + } + } + } else { + for (const connectorId of this.chargingStation.connectors.keys()) { + if (connectorId > 0) { + this.stopConnector(connectorId); + } } } } @@ -213,34 +223,41 @@ export class AutomaticTransactionGenerator extends AsyncResource { } const wait = Utils.getRandomInteger( - this.configuration.maxDelayBetweenTwoTransactions, - this.configuration.minDelayBetweenTwoTransactions + this.chargingStation.getAutomaticTransactionGeneratorConfiguration() + .maxDelayBetweenTwoTransactions, + this.chargingStation.getAutomaticTransactionGeneratorConfiguration() + .minDelayBetweenTwoTransactions ) * 1000; logger.info( `${this.logPrefix(connectorId)} waiting for ${Utils.formatDurationMilliSeconds(wait)}` ); await Utils.sleep(wait); const start = Utils.secureRandom(); - if (start < this.configuration.probabilityOfStart) { + if ( + start < + this.chargingStation.getAutomaticTransactionGeneratorConfiguration().probabilityOfStart + ) { this.connectorsStatus.get(connectorId).skippedConsecutiveTransactions = 0; // Start transaction const startResponse = await this.startTransaction(connectorId); if (startResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) { // Wait until end of transaction const waitTrxEnd = - Utils.getRandomInteger(this.configuration.maxDuration, this.configuration.minDuration) * - 1000; + Utils.getRandomInteger( + this.chargingStation.getAutomaticTransactionGeneratorConfiguration().maxDuration, + this.chargingStation.getAutomaticTransactionGeneratorConfiguration().minDuration + ) * 1000; logger.info( - `${this.logPrefix(connectorId)} transaction ${this.chargingStation + `${this.logPrefix(connectorId)} transaction started with id ${this.chargingStation .getConnectorStatus(connectorId) - ?.transactionId?.toString()} started and will stop in ${Utils.formatDurationMilliSeconds( + ?.transactionId?.toString()} and will stop in ${Utils.formatDurationMilliSeconds( waitTrxEnd )}` ); await Utils.sleep(waitTrxEnd); // Stop transaction logger.info( - `${this.logPrefix(connectorId)} stop transaction ${this.chargingStation + `${this.logPrefix(connectorId)} stop transaction with id ${this.chargingStation .getConnectorStatus(connectorId) ?.transactionId?.toString()}` ); @@ -285,7 +302,7 @@ export class AutomaticTransactionGenerator extends AsyncResource { this.connectorsStatus.get(connectorId).startDate = new Date(); this.connectorsStatus.get(connectorId).stopDate = new Date( this.connectorsStatus.get(connectorId).startDate.getTime() + - (this.configuration.stopAfterHours ?? + (this.chargingStation.getAutomaticTransactionGeneratorConfiguration().stopAfterHours ?? Constants.CHARGING_STATION_ATG_DEFAULT_STOP_AFTER_HOURS) * 3600 * 1000 - @@ -295,22 +312,45 @@ export class AutomaticTransactionGenerator extends AsyncResource { } private initializeConnectorsStatus(): void { - for (const connectorId of this.chargingStation.connectors.keys()) { - if (connectorId > 0) { - this.connectorsStatus.set(connectorId, { - start: false, - authorizeRequests: 0, - acceptedAuthorizeRequests: 0, - rejectedAuthorizeRequests: 0, - startTransactionRequests: 0, - acceptedStartTransactionRequests: 0, - rejectedStartTransactionRequests: 0, - stopTransactionRequests: 0, - acceptedStopTransactionRequests: 0, - rejectedStopTransactionRequests: 0, - skippedConsecutiveTransactions: 0, - skippedTransactions: 0, - }); + if (this.chargingStation.hasEvses) { + for (const [evseId, evseStatus] of this.chargingStation.evses) { + if (evseId > 0) { + for (const connectorId of evseStatus.connectors.keys()) { + this.connectorsStatus.set(connectorId, { + start: false, + authorizeRequests: 0, + acceptedAuthorizeRequests: 0, + rejectedAuthorizeRequests: 0, + startTransactionRequests: 0, + acceptedStartTransactionRequests: 0, + rejectedStartTransactionRequests: 0, + stopTransactionRequests: 0, + acceptedStopTransactionRequests: 0, + rejectedStopTransactionRequests: 0, + skippedConsecutiveTransactions: 0, + skippedTransactions: 0, + }); + } + } + } + } else { + for (const connectorId of this.chargingStation.connectors.keys()) { + if (connectorId > 0) { + this.connectorsStatus.set(connectorId, { + start: false, + authorizeRequests: 0, + acceptedAuthorizeRequests: 0, + rejectedAuthorizeRequests: 0, + startTransactionRequests: 0, + acceptedStartTransactionRequests: 0, + rejectedStartTransactionRequests: 0, + stopTransactionRequests: 0, + acceptedStopTransactionRequests: 0, + rejectedStopTransactionRequests: 0, + skippedConsecutiveTransactions: 0, + skippedTransactions: 0, + }); + } } } } @@ -323,7 +363,7 @@ export class AutomaticTransactionGenerator extends AsyncResource { let startResponse: StartTransactionResponse; if (this.chargingStation.hasIdTags()) { const idTag = IdTagsCache.getInstance().getIdTag( - this.configuration?.idTagDistribution, + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.idTagDistribution, this.chargingStation, connectorId ); @@ -402,7 +442,7 @@ export class AutomaticTransactionGenerator extends AsyncResource { const transactionId = this.chargingStation.getConnectorStatus(connectorId)?.transactionId; logger.warn( `${this.logPrefix(connectorId)} stopping a not started transaction${ - !Utils.isNullOrUndefined(transactionId) ? ` ${transactionId?.toString()}` : '' + !Utils.isNullOrUndefined(transactionId) ? ` with id ${transactionId?.toString()}` : '' }` ); } @@ -411,7 +451,9 @@ export class AutomaticTransactionGenerator extends AsyncResource { } private getRequireAuthorize(): boolean { - return this.configuration?.requireAuthorize ?? true; + return ( + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.requireAuthorize ?? true + ); } private logPrefix = (connectorId?: number): string => {