X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=d928a623d27c3567b28c1b392cd49520caefa436;hb=b1bbdae5d6550f7a6a03b443d60d41debe166a07;hp=e6b3dbf457fc0cde4bec0abb052d6453b2eb1fa8;hpb=17bc43d765c22c8d8c132484f8dc9c3edd370d91;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts index e6b3dbf4..d928a623 100644 --- a/src/charging-station/AutomaticTransactionGenerator.ts +++ b/src/charging-station/AutomaticTransactionGenerator.ts @@ -1,17 +1,17 @@ // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved. -import { AsyncResource } from 'async_hooks'; +import { AsyncResource } from 'node:async_hooks'; -import type { ChargingStation } from './ChargingStation'; -import { ChargingStationUtils } from './ChargingStationUtils'; +import { type ChargingStation, ChargingStationUtils, IdTagsCache } from './internal'; import { BaseError } from '../exception'; -import { PerformanceStatistics } from '../performance'; +// import { PerformanceStatistics } from '../performance'; +import { PerformanceStatistics } from '../performance/PerformanceStatistics'; import { AuthorizationStatus, type AuthorizeRequest, type AuthorizeResponse, type AutomaticTransactionGeneratorConfiguration, - IdTagDistribution, + ConnectorStatusEnum, RequestCommand, type StartTransactionRequest, type StartTransactionResponse, @@ -19,9 +19,7 @@ import { StopTransactionReason, type StopTransactionResponse, } from '../types'; -import { Constants } from '../utils/Constants'; -import { logger } from '../utils/Logger'; -import { Utils } from '../utils/Utils'; +import { Constants, Utils, logger } from '../utils'; const moduleName = 'AutomaticTransactionGenerator'; @@ -35,7 +33,6 @@ export class AutomaticTransactionGenerator extends AsyncResource { public readonly configuration: AutomaticTransactionGeneratorConfiguration; public started: boolean; private readonly chargingStation: ChargingStation; - private idTagIndex: number; private constructor( automaticTransactionGeneratorConfiguration: AutomaticTransactionGeneratorConfiguration, @@ -45,7 +42,6 @@ export class AutomaticTransactionGenerator extends AsyncResource { this.started = false; this.configuration = automaticTransactionGeneratorConfiguration; this.chargingStation = chargingStation; - this.idTagIndex = 0; this.connectorsStatus = new Map(); this.initializeConnectorsStatus(); } @@ -67,7 +63,9 @@ export class AutomaticTransactionGenerator extends AsyncResource { } public start(): void { - if (this.checkChargingStation() === false) { + if ( + ChargingStationUtils.checkChargingStation(this.chargingStation, this.logPrefix()) === false + ) { return; } if (this.started === true) { @@ -88,7 +86,12 @@ export class AutomaticTransactionGenerator extends AsyncResource { } public startConnector(connectorId: number): void { - if (this.checkChargingStation(connectorId) === false) { + if ( + ChargingStationUtils.checkChargingStation( + this.chargingStation, + this.logPrefix(connectorId) + ) === false + ) { return; } if (this.connectorsStatus.has(connectorId) === false) { @@ -103,9 +106,7 @@ export class AutomaticTransactionGenerator extends AsyncResource { ) => Promise, this, connectorId - ).catch(() => { - /* This is intentional */ - }); + ).catch(Constants.EMPTY_FUNCTION); } else if (this.connectorsStatus.get(connectorId)?.start === true) { logger.warn(`${this.logPrefix(connectorId)} is already started on connector`); } @@ -131,17 +132,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); + } } } } @@ -188,6 +209,18 @@ export class AutomaticTransactionGenerator extends AsyncResource { this.stopConnector(connectorId); break; } + if ( + this.chargingStation.getConnectorStatus(connectorId)?.status === + ConnectorStatusEnum.Unavailable + ) { + logger.info( + `${this.logPrefix( + connectorId + )} entered in transaction loop while the connector ${connectorId} status is unavailable` + ); + this.stopConnector(connectorId); + break; + } if (!this.chargingStation?.ocppRequestService) { logger.info( `${this.logPrefix( @@ -218,16 +251,16 @@ export class AutomaticTransactionGenerator extends AsyncResource { Utils.getRandomInteger(this.configuration.maxDuration, this.configuration.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()}` ); @@ -282,22 +315,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, + }); + } } } } @@ -308,8 +364,12 @@ export class AutomaticTransactionGenerator extends AsyncResource { const measureId = 'StartTransaction with ATG'; const beginId = PerformanceStatistics.beginMeasure(measureId); let startResponse: StartTransactionResponse; - if (this.chargingStation.hasAuthorizedTags()) { - const idTag = this.getIdTag(connectorId); + if (this.chargingStation.hasIdTags()) { + const idTag = IdTagsCache.getInstance().getIdTag( + this.configuration?.idTagDistribution, + this.chargingStation, + connectorId + ); const startTransactionLogMsg = `${this.logPrefix( connectorId )} start transaction with an idTag '${idTag}'`; @@ -385,7 +445,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()}` : '' }` ); } @@ -397,45 +457,10 @@ export class AutomaticTransactionGenerator extends AsyncResource { return this.configuration?.requireAuthorize ?? true; } - private getRandomIdTag(authorizationFile: string): string { - const tags = this.chargingStation.authorizedTagsCache.getAuthorizedTags(authorizationFile); - this.idTagIndex = Math.floor(Utils.secureRandom() * tags.length); - return tags[this.idTagIndex]; - } - - private getRoundRobinIdTag(authorizationFile: string): string { - const tags = this.chargingStation.authorizedTagsCache.getAuthorizedTags(authorizationFile); - const idTag = tags[this.idTagIndex]; - this.idTagIndex = this.idTagIndex === tags.length - 1 ? 0 : this.idTagIndex + 1; - return idTag; - } - - private getConnectorAffinityIdTag(authorizationFile: string, connectorId: number): string { - const tags = this.chargingStation.authorizedTagsCache.getAuthorizedTags(authorizationFile); - this.idTagIndex = (this.chargingStation.index - 1 + (connectorId - 1)) % tags.length; - return tags[this.idTagIndex]; - } - - private getIdTag(connectorId: number): string { - const authorizationFile = ChargingStationUtils.getAuthorizationFile( - this.chargingStation.stationInfo - ); - switch (this.configuration?.idTagDistribution) { - case IdTagDistribution.RANDOM: - return this.getRandomIdTag(authorizationFile); - case IdTagDistribution.ROUND_ROBIN: - return this.getRoundRobinIdTag(authorizationFile); - case IdTagDistribution.CONNECTOR_AFFINITY: - return this.getConnectorAffinityIdTag(authorizationFile, connectorId); - default: - return this.getRoundRobinIdTag(authorizationFile); - } - } - private logPrefix = (connectorId?: number): string => { return Utils.logPrefix( ` ${this.chargingStation.stationInfo.chargingStationId} | ATG${ - connectorId !== undefined ? ` on connector #${connectorId.toString()}` : '' + !Utils.isNullOrUndefined(connectorId) ? ` on connector #${connectorId.toString()}` : '' }:` ); }; @@ -452,12 +477,4 @@ export class AutomaticTransactionGenerator extends AsyncResource { this.connectorsStatus.get(connectorId).rejectedStartTransactionRequests++; } } - - private checkChargingStation(connectorId?: number): boolean { - if (this.chargingStation.started === false && this.chargingStation.starting === false) { - logger.warn(`${this.logPrefix(connectorId)} charging station is stopped, cannot proceed`); - return false; - } - return true; - } }