X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=d056d8ec866ee1c948740e24ca03ed2ae4f525d4;hb=0a1dd746244cebb3633d88c6650839d9f32227fe;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..d056d8ec 100644 --- a/src/charging-station/AutomaticTransactionGenerator.ts +++ b/src/charging-station/AutomaticTransactionGenerator.ts @@ -22,6 +22,7 @@ import { cloneObject, formatDurationMilliSeconds, getRandomInteger, + isValidTime, logPrefix, logger, secureRandom, @@ -52,13 +53,16 @@ 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 { @@ -124,7 +128,7 @@ export class AutomaticTransactionGenerator { private startConnectors (): void { if ( - this.connectorsStatus?.size > 0 && + this.connectorsStatus.size > 0 && this.connectorsStatus.size !== this.chargingStation.getNumberOfConnectors() ) { this.connectorsStatus.clear() @@ -178,7 +182,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 +191,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,18 +201,19 @@ 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( @@ -223,9 +227,9 @@ export class AutomaticTransactionGenerator { } } 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 @@ -255,11 +259,9 @@ 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 + isValidTime(this.connectorsStatus.get(connectorId)?.startDate) && + isValidTime(this.connectorsStatus.get(connectorId)?.lastRunDate) ? // 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 @@ -272,10 +274,14 @@ export class AutomaticTransactionGenerator { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion this.connectorsStatus.get(connectorId)!.startDate!.getTime() + hoursToMilliseconds( - this.chargingStation.getAutomaticTransactionGeneratorConfiguration().stopAfterHours + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()!.stopAfterHours ) - previousRunDuration ) + 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 +289,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 +323,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()) { @@ -377,10 +373,10 @@ export class AutomaticTransactionGenerator { private getConnectorStatus (connectorId: number): Status { const connectorStatus = - this.chargingStation.getAutomaticTransactionGeneratorStatuses()?.[connectorId] != null + this.chargingStation.getAutomaticTransactionGeneratorStatuses()?.[connectorId - 1] != null ? cloneObject( // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.chargingStation.getAutomaticTransactionGeneratorStatuses()![connectorId] + this.chargingStation.getAutomaticTransactionGeneratorStatuses()![connectorId - 1] ) : undefined this.resetConnectorStatus(connectorStatus) @@ -406,14 +402,10 @@ export class AutomaticTransactionGenerator { 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) + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.enable !== true) ) { connectorStatus.start = false } @@ -428,7 +420,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 +429,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 +447,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 } @@ -498,13 +490,13 @@ export class AutomaticTransactionGenerator { ) 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 +518,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 +529,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 } } }