X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=c5076adce7ca9a24f7c25ea50a45a1c916a355cf;hb=b9da1bc288a2a6ffccfbca6cd19aa195bc6ccfbf;hp=d928a623d27c3567b28c1b392cd49520caefa436;hpb=4334db724447c1a0f989cd467dc44e136a7478eb;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts index d928a623..c5076adc 100644 --- a/src/charging-station/AutomaticTransactionGenerator.ts +++ b/src/charging-station/AutomaticTransactionGenerator.ts @@ -2,15 +2,15 @@ import { AsyncResource } from 'node:async_hooks'; -import { type ChargingStation, ChargingStationUtils, IdTagsCache } from './internal'; +import type { ChargingStation } from './ChargingStation'; +import { ChargingStationUtils } from './ChargingStationUtils'; +import { IdTagsCache } from './IdTagsCache'; import { BaseError } from '../exception'; -// import { PerformanceStatistics } from '../performance'; -import { PerformanceStatistics } from '../performance/PerformanceStatistics'; +import { PerformanceStatistics } from '../performance'; import { AuthorizationStatus, type AuthorizeRequest, type AuthorizeResponse, - type AutomaticTransactionGeneratorConfiguration, ConnectorStatusEnum, RequestCommand, type StartTransactionRequest, @@ -30,33 +30,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); @@ -182,7 +173,7 @@ export class AutomaticTransactionGenerator extends AsyncResource { this.stopConnector(connectorId); break; } - if (this.chargingStation.isInAcceptedState() === false) { + if (this.chargingStation.inAcceptedState() === false) { logger.error( `${this.logPrefix( connectorId @@ -233,23 +224,30 @@ 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 started with id ${this.chargingStation .getConnectorStatus(connectorId) @@ -267,8 +265,8 @@ export class AutomaticTransactionGenerator extends AsyncResource { await this.stopTransaction(connectorId); } } else { - this.connectorsStatus.get(connectorId).skippedConsecutiveTransactions++; - this.connectorsStatus.get(connectorId).skippedTransactions++; + ++this.connectorsStatus.get(connectorId).skippedConsecutiveTransactions; + ++this.connectorsStatus.get(connectorId).skippedTransactions; logger.info( `${this.logPrefix(connectorId)} skipped consecutively ${this.connectorsStatus .get(connectorId) @@ -305,8 +303,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 ?? - Constants.CHARGING_STATION_ATG_DEFAULT_STOP_AFTER_HOURS) * + this.chargingStation.getAutomaticTransactionGeneratorConfiguration().stopAfterHours * 3600 * 1000 - previousRunDuration @@ -366,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 ); @@ -383,9 +380,9 @@ export class AutomaticTransactionGenerator extends AsyncResource { >(this.chargingStation, RequestCommand.AUTHORIZE, { idTag, }); - this.connectorsStatus.get(connectorId).authorizeRequests++; + ++this.connectorsStatus.get(connectorId).authorizeRequests; if (authorizeResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) { - this.connectorsStatus.get(connectorId).acceptedAuthorizeRequests++; + ++this.connectorsStatus.get(connectorId).acceptedAuthorizeRequests; logger.info(startTransactionLogMsg); // Start transaction startResponse = await this.chargingStation.ocppRequestService.requestHandler< @@ -399,7 +396,7 @@ export class AutomaticTransactionGenerator extends AsyncResource { PerformanceStatistics.endMeasure(measureId, beginId); return startResponse; } - this.connectorsStatus.get(connectorId).rejectedAuthorizeRequests++; + ++this.connectorsStatus.get(connectorId).rejectedAuthorizeRequests; PerformanceStatistics.endMeasure(measureId, beginId); return startResponse; } @@ -435,11 +432,11 @@ export class AutomaticTransactionGenerator extends AsyncResource { let stopResponse: StopTransactionResponse; if (this.chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) { stopResponse = await this.chargingStation.stopTransactionOnConnector(connectorId, reason); - this.connectorsStatus.get(connectorId).stopTransactionRequests++; + ++this.connectorsStatus.get(connectorId).stopTransactionRequests; if (stopResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) { - this.connectorsStatus.get(connectorId).acceptedStopTransactionRequests++; + ++this.connectorsStatus.get(connectorId).acceptedStopTransactionRequests; } else { - this.connectorsStatus.get(connectorId).rejectedStopTransactionRequests++; + ++this.connectorsStatus.get(connectorId).rejectedStopTransactionRequests; } } else { const transactionId = this.chargingStation.getConnectorStatus(connectorId)?.transactionId; @@ -454,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 => { @@ -469,12 +468,12 @@ export class AutomaticTransactionGenerator extends AsyncResource { connectorId: number, startResponse: StartTransactionResponse ): void { - this.connectorsStatus.get(connectorId).startTransactionRequests++; + ++this.connectorsStatus.get(connectorId).startTransactionRequests; if (startResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) { - this.connectorsStatus.get(connectorId).acceptedStartTransactionRequests++; + ++this.connectorsStatus.get(connectorId).acceptedStartTransactionRequests; } else { logger.warn(`${this.logPrefix(connectorId)} start transaction rejected`); - this.connectorsStatus.get(connectorId).rejectedStartTransactionRequests++; + ++this.connectorsStatus.get(connectorId).rejectedStartTransactionRequests; } } }