X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=e12fba9497629207fdd1e368c4ecd50cbfb2687c;hb=7274efb72e3cef8204594d138c5cf092b3a4fc6e;hp=9da371cdc2deab82b92adba90fbc427fc5c8a457;hpb=66a7748ddeda8c94d7562a1ce58d440319654a4c;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts index 9da371cd..e12fba94 100644 --- a/src/charging-station/AutomaticTransactionGenerator.ts +++ b/src/charging-station/AutomaticTransactionGenerator.ts @@ -20,9 +20,10 @@ import { import { Constants, cloneObject, + convertToDate, formatDurationMilliSeconds, getRandomInteger, - isNullOrUndefined, + isValidTime, logPrefix, logger, secureRandom, @@ -53,13 +54,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 { @@ -125,7 +129,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() @@ -179,7 +183,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)) { @@ -189,9 +192,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)}`) @@ -199,39 +202,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 @@ -257,26 +259,26 @@ 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 - // 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 ( + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.stopAbsoluteDuration === + false || // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.connectorsStatus.get(connectorId)!.startDate!.getTime() + - hoursToMilliseconds( - this.chargingStation.getAutomaticTransactionGeneratorConfiguration().stopAfterHours - ) - - previousRunDuration - ) + !isValidTime(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 } @@ -284,6 +286,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()) { @@ -313,21 +320,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()) { @@ -378,13 +370,29 @@ 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) + if (connectorStatus != null) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + connectorStatus.startDate = convertToDate(connectorStatus.startDate)! + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + connectorStatus.lastRunDate = convertToDate(connectorStatus.lastRunDate)! + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + connectorStatus.stopDate = convertToDate(connectorStatus.stopDate)! + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + connectorStatus.stoppedDate = convertToDate(connectorStatus.stoppedDate)! + if ( + !this.started && + (connectorStatus.start || + this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.enable !== true) + ) { + connectorStatus.start = false + } + } return ( connectorStatus ?? { start: false, @@ -403,23 +411,6 @@ export class AutomaticTransactionGenerator { ) } - private resetConnectorStatus (connectorStatus: Status | undefined): void { - if (connectorStatus === undefined) { - 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 { @@ -429,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 ) @@ -438,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< @@ -456,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 } @@ -492,26 +483,25 @@ 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 logger.debug( `${this.logPrefix(connectorId)} stopping a not started transaction${ - !isNullOrUndefined(transactionId) ? ` with id ${transactionId}` : '' + transactionId != null ? ` with id ${transactionId}` : '' }` ) } @@ -527,8 +517,8 @@ export class AutomaticTransactionGenerator { private readonly logPrefix = (connectorId?: number): string => { return logPrefix( - ` ${this.chargingStation.stationInfo.chargingStationId} | ATG${ - !isNullOrUndefined(connectorId) ? ` on connector #${connectorId}` : '' + ` ${this.chargingStation.stationInfo?.chargingStationId} | ATG${ + connectorId != null ? ` on connector #${connectorId}` : '' }:` ) } @@ -538,14 +528,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 } } }