X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=2380c967beada92d179262a2c71abc30640758f6;hb=2665ed1ef62a9fc9b6eec417f3ec7c33305789cf;hp=94198ac6f502d7433f7c5b0498c476ec328b52ff;hpb=401fa922baa555f5997732052918ae2ab5ff184c;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts index 94198ac6..2380c967 100644 --- a/src/charging-station/AutomaticTransactionGenerator.ts +++ b/src/charging-station/AutomaticTransactionGenerator.ts @@ -1,4 +1,4 @@ -// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved. +// Partial Copyright Jerome Benoit. 2021-2024. All Rights Reserved. import { hoursToMilliseconds, secondsToMilliseconds } from 'date-fns' @@ -19,9 +19,11 @@ import { } from '../types/index.js' import { Constants, - cloneObject, + clone, + convertToDate, formatDurationMilliSeconds, getRandomInteger, + isValidDate, logPrefix, logger, secureRandom, @@ -52,16 +54,19 @@ export class AutomaticTransactionGenerator { public static getInstance ( chargingStation: ChargingStation ): AutomaticTransactionGenerator | undefined { - if (!AutomaticTransactionGenerator.instances.has(chargingStation.stationInfo.hashId)) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + if (!AutomaticTransactionGenerator.instances.has(chargingStation.stationInfo!.hashId)) { AutomaticTransactionGenerator.instances.set( - chargingStation.stationInfo.hashId, + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + chargingStation.stationInfo!.hashId, new AutomaticTransactionGenerator(chargingStation) ) } - return AutomaticTransactionGenerator.instances.get(chargingStation.stationInfo.hashId) + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + return AutomaticTransactionGenerator.instances.get(chargingStation.stationInfo!.hashId) } - public start (): void { + public start (stopAbsoluteDuration?: boolean): void { if (!checkChargingStation(this.chargingStation, this.logPrefix())) { return } @@ -74,7 +79,7 @@ export class AutomaticTransactionGenerator { return } this.starting = true - this.startConnectors() + this.startConnectors(stopAbsoluteDuration) this.started = true this.starting = false } @@ -94,7 +99,7 @@ export class AutomaticTransactionGenerator { this.stopping = false } - public startConnector (connectorId: number): void { + public startConnector (connectorId: number, stopAbsoluteDuration?: boolean): void { if (!checkChargingStation(this.chargingStation, this.logPrefix(connectorId))) { return } @@ -103,7 +108,7 @@ export class AutomaticTransactionGenerator { throw new BaseError(`Connector ${connectorId} does not exist`) } if (this.connectorsStatus.get(connectorId)?.start === false) { - this.internalStartConnector(connectorId).catch(Constants.EMPTY_FUNCTION) + this.internalStartConnector(connectorId, stopAbsoluteDuration).catch(Constants.EMPTY_FUNCTION) } else if (this.connectorsStatus.get(connectorId)?.start === true) { logger.warn(`${this.logPrefix(connectorId)} is already started on connector`) } @@ -122,9 +127,9 @@ export class AutomaticTransactionGenerator { } } - private startConnectors (): void { + private startConnectors (stopAbsoluteDuration?: boolean): void { if ( - this.connectorsStatus?.size > 0 && + this.connectorsStatus.size > 0 && this.connectorsStatus.size !== this.chargingStation.getNumberOfConnectors() ) { this.connectorsStatus.clear() @@ -134,14 +139,14 @@ export class AutomaticTransactionGenerator { for (const [evseId, evseStatus] of this.chargingStation.evses) { if (evseId > 0) { for (const connectorId of evseStatus.connectors.keys()) { - this.startConnector(connectorId) + this.startConnector(connectorId, stopAbsoluteDuration) } } } } else { for (const connectorId of this.chargingStation.connectors.keys()) { if (connectorId > 0) { - this.startConnector(connectorId) + this.startConnector(connectorId, stopAbsoluteDuration) } } } @@ -165,8 +170,11 @@ export class AutomaticTransactionGenerator { } } - private async internalStartConnector (connectorId: number): Promise { - this.setStartConnectorStatus(connectorId) + private async internalStartConnector ( + connectorId: number, + stopAbsoluteDuration?: boolean + ): Promise { + this.setStartConnectorStatus(connectorId, stopAbsoluteDuration) logger.info( `${this.logPrefix( connectorId @@ -178,7 +186,6 @@ export class AutomaticTransactionGenerator { )}` ) while (this.connectorsStatus.get(connectorId)?.start === true) { - await this.waitChargingStationServiceInitialization(connectorId) await this.waitChargingStationAvailable(connectorId) await this.waitConnectorAvailable(connectorId) if (!this.canStartConnector(connectorId)) { @@ -188,9 +195,9 @@ export class AutomaticTransactionGenerator { const wait = secondsToMilliseconds( getRandomInteger( this.chargingStation.getAutomaticTransactionGeneratorConfiguration() - .maxDelayBetweenTwoTransactions, + ?.maxDelayBetweenTwoTransactions, this.chargingStation.getAutomaticTransactionGeneratorConfiguration() - .minDelayBetweenTwoTransactions + ?.minDelayBetweenTwoTransactions ) ) logger.info(`${this.logPrefix(connectorId)} waiting for ${formatDurationMilliSeconds(wait)}`) @@ -198,39 +205,38 @@ export class AutomaticTransactionGenerator { const start = secureRandom() if ( start < - this.chargingStation.getAutomaticTransactionGeneratorConfiguration().probabilityOfStart + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()!.probabilityOfStart ) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions = 0 // Start transaction const startResponse = await this.startTransaction(connectorId) - if (startResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) { + if (startResponse?.idTagInfo.status === AuthorizationStatus.ACCEPTED) { // Wait until end of transaction const waitTrxEnd = secondsToMilliseconds( getRandomInteger( - this.chargingStation.getAutomaticTransactionGeneratorConfiguration().maxDuration, - this.chargingStation.getAutomaticTransactionGeneratorConfiguration().minDuration + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.maxDuration, + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.minDuration ) ) logger.info( - `${this.logPrefix( - connectorId - )} transaction started with id ${this.chargingStation.getConnectorStatus(connectorId) - ?.transactionId} and will stop in ${formatDurationMilliSeconds(waitTrxEnd)}` + `${this.logPrefix(connectorId)} transaction started with id ${ + this.chargingStation.getConnectorStatus(connectorId)?.transactionId + } and will stop in ${formatDurationMilliSeconds(waitTrxEnd)}` ) await sleep(waitTrxEnd) await this.stopTransaction(connectorId) } } else { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions! + ++this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.skippedTransactions! + ++this.connectorsStatus.get(connectorId)!.skippedTransactions logger.info( - `${this.logPrefix(connectorId)} skipped consecutively ${this.connectorsStatus.get( - connectorId - )?.skippedConsecutiveTransactions}/${this.connectorsStatus.get(connectorId) - ?.skippedTransactions} transaction(s)` + `${this.logPrefix(connectorId)} skipped consecutively ${ + this.connectorsStatus.get(connectorId)?.skippedConsecutiveTransactions + }/${this.connectorsStatus.get(connectorId)?.skippedTransactions} transaction(s)` ) } // eslint-disable-next-line @typescript-eslint/no-non-null-assertion @@ -254,28 +260,31 @@ export class AutomaticTransactionGenerator { ) } - private setStartConnectorStatus (connectorId: number): void { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions = 0 - const previousRunDuration = - this.connectorsStatus.get(connectorId)?.startDate != null && - this.connectorsStatus.get(connectorId)?.lastRunDate != null - ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.connectorsStatus.get(connectorId)!.lastRunDate!.getTime() - - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.connectorsStatus.get(connectorId)!.startDate!.getTime() - : 0 + private setStartConnectorStatus ( + connectorId: number, + stopAbsoluteDuration = this.chargingStation.getAutomaticTransactionGeneratorConfiguration() + ?.stopAbsoluteDuration + ): void { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion this.connectorsStatus.get(connectorId)!.startDate = new Date() - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.connectorsStatus.get(connectorId)!.stopDate = new Date( + if ( + stopAbsoluteDuration === false || // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.connectorsStatus.get(connectorId)!.startDate!.getTime() + - hoursToMilliseconds( - this.chargingStation.getAutomaticTransactionGeneratorConfiguration().stopAfterHours - ) - - previousRunDuration - ) + !isValidDate(this.connectorsStatus.get(connectorId)!.stopDate) + ) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.connectorsStatus.get(connectorId)!.stopDate = new Date( + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.connectorsStatus.get(connectorId)!.startDate!.getTime() + + hoursToMilliseconds( + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()!.stopAfterHours + ) + ) + } + delete this.connectorsStatus.get(connectorId)?.stoppedDate + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions = 0 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion this.connectorsStatus.get(connectorId)!.start = true } @@ -283,6 +292,11 @@ export class AutomaticTransactionGenerator { private canStartConnector (connectorId: number): boolean { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion if (new Date() > this.connectorsStatus.get(connectorId)!.stopDate!) { + logger.info( + `${this.logPrefix( + connectorId + )} entered in transaction loop while the ATG stop date has been reached` + ) return false } if (!this.chargingStation.inAcceptedState()) { @@ -312,21 +326,6 @@ export class AutomaticTransactionGenerator { return true } - private async waitChargingStationServiceInitialization (connectorId: number): Promise { - let logged = false - while (this.chargingStation?.ocppRequestService == null) { - if (!logged) { - logger.info( - `${this.logPrefix( - connectorId - )} transaction loop waiting for charging station service to be initialized` - ) - logged = true - } - await sleep(Constants.CHARGING_STATION_ATG_INITIALIZATION_TIME) - } - } - private async waitChargingStationAvailable (connectorId: number): Promise { let logged = false while (!this.chargingStation.isChargingStationAvailable()) { @@ -376,14 +375,31 @@ export class AutomaticTransactionGenerator { } private getConnectorStatus (connectorId: number): Status { - const connectorStatus = - this.chargingStation.getAutomaticTransactionGeneratorStatuses()?.[connectorId] != null - ? cloneObject( - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.chargingStation.getAutomaticTransactionGeneratorStatuses()![connectorId] - ) - : undefined - this.resetConnectorStatus(connectorStatus) + const statusIndex = connectorId - 1 + let connectorStatus: Status | undefined + if (this.chargingStation.getAutomaticTransactionGeneratorStatuses()?.[statusIndex] != null) { + connectorStatus = clone( + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.chargingStation.getAutomaticTransactionGeneratorStatuses()![statusIndex] + ) + } else if (this.chargingStation.getAutomaticTransactionGeneratorStatuses() != null) { + logger.warn( + `${this.logPrefix(connectorId)} no status found for connector #${connectorId} in charging station configuration file. New status will be created` + ) + } + if (connectorStatus != null) { + connectorStatus.startDate = convertToDate(connectorStatus.startDate) + connectorStatus.lastRunDate = convertToDate(connectorStatus.lastRunDate) + connectorStatus.stopDate = convertToDate(connectorStatus.stopDate) + connectorStatus.stoppedDate = convertToDate(connectorStatus.stoppedDate) + if ( + !this.started && + (connectorStatus.start || + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.enable !== true) + ) { + connectorStatus.start = false + } + } return ( connectorStatus ?? { start: false, @@ -402,23 +418,6 @@ export class AutomaticTransactionGenerator { ) } - private resetConnectorStatus (connectorStatus: Status | undefined): void { - if (connectorStatus == null) { - return - } - delete connectorStatus?.startDate - delete connectorStatus?.lastRunDate - delete connectorStatus?.stopDate - delete connectorStatus?.stoppedDate - if ( - !this.started && - (connectorStatus.start || - !this.chargingStation.getAutomaticTransactionGeneratorConfiguration().enable) - ) { - connectorStatus.start = false - } - } - private async startTransaction ( connectorId: number ): Promise { @@ -428,7 +427,7 @@ export class AutomaticTransactionGenerator { if (this.chargingStation.hasIdTags()) { const idTag = IdTagsCache.getInstance().getIdTag( // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.chargingStation.getAutomaticTransactionGeneratorConfiguration().idTagDistribution!, + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()!.idTagDistribution!, this.chargingStation, connectorId ) @@ -437,10 +436,10 @@ export class AutomaticTransactionGenerator { )} start transaction with an idTag '${idTag}'` if (this.getRequireAuthorize()) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.authorizeRequests! + ++this.connectorsStatus.get(connectorId)!.authorizeRequests if (await isIdTagAuthorized(this.chargingStation, connectorId, idTag)) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.acceptedAuthorizeRequests! + ++this.connectorsStatus.get(connectorId)!.acceptedAuthorizeRequests logger.info(startTransactionLogMsg) // Start transaction startResponse = await this.chargingStation.ocppRequestService.requestHandler< @@ -455,7 +454,7 @@ export class AutomaticTransactionGenerator { return startResponse } // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.rejectedAuthorizeRequests! + ++this.connectorsStatus.get(connectorId)!.rejectedAuthorizeRequests PerformanceStatistics.endMeasure(measureId, beginId) return startResponse } @@ -491,20 +490,19 @@ export class AutomaticTransactionGenerator { let stopResponse: StopTransactionResponse | undefined if (this.chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) { logger.info( - `${this.logPrefix( - connectorId - )} stop transaction with id ${this.chargingStation.getConnectorStatus(connectorId) - ?.transactionId}` + `${this.logPrefix(connectorId)} stop transaction with id ${ + this.chargingStation.getConnectorStatus(connectorId)?.transactionId + }` ) stopResponse = await this.chargingStation.stopTransactionOnConnector(connectorId, reason) // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.stopTransactionRequests! - if (stopResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) { + ++this.connectorsStatus.get(connectorId)!.stopTransactionRequests + if (stopResponse.idTagInfo?.status === AuthorizationStatus.ACCEPTED) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.acceptedStopTransactionRequests! + ++this.connectorsStatus.get(connectorId)!.acceptedStopTransactionRequests } else { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.rejectedStopTransactionRequests! + ++this.connectorsStatus.get(connectorId)!.rejectedStopTransactionRequests } } else { const transactionId = this.chargingStation.getConnectorStatus(connectorId)?.transactionId @@ -526,7 +524,7 @@ export class AutomaticTransactionGenerator { private readonly logPrefix = (connectorId?: number): string => { return logPrefix( - ` ${this.chargingStation.stationInfo.chargingStationId} | ATG${ + ` ${this.chargingStation.stationInfo?.chargingStationId} | ATG${ connectorId != null ? ` on connector #${connectorId}` : '' }:` ) @@ -537,14 +535,14 @@ export class AutomaticTransactionGenerator { startResponse: StartTransactionResponse ): void { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.startTransactionRequests! - if (startResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) { + ++this.connectorsStatus.get(connectorId)!.startTransactionRequests + if (startResponse.idTagInfo.status === AuthorizationStatus.ACCEPTED) { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.acceptedStartTransactionRequests! + ++this.connectorsStatus.get(connectorId)!.acceptedStartTransactionRequests } else { logger.warn(`${this.logPrefix(connectorId)} start transaction rejected`) // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - ++this.connectorsStatus.get(connectorId)!.rejectedStartTransactionRequests! + ++this.connectorsStatus.get(connectorId)!.rejectedStartTransactionRequests } } }