fix: fix off-by-one in ATG statuses handling

[e-mobility-charging-stations-simulator.git] / src / charging-station / AutomaticTransactionGenerator.ts

diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts
index 329f748367d0a20790cca278f08a92e549882a22..d056d8ec866ee1c948740e24ca03ed2ae4f525d4 100644 (file)
--- a/src/charging-station/AutomaticTransactionGenerator.ts
+++ b/src/charging-station/AutomaticTransactionGenerator.ts
@@ -22,7 +22,7 @@ import {
   cloneObject,
   formatDurationMilliSeconds,
   getRandomInteger,
-  isNullOrUndefined,
+  isValidTime,
   logPrefix,
   logger,
   secureRandom,
@@ -53,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 {
@@ -125,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()
@@ -179,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)) {
@@ -189,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)}`)
@@ -199,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(
@@ -224,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
@@ -256,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
@@ -273,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
   }
@@ -284,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()) {
@@ -313,21 +323,6 @@ export class AutomaticTransactionGenerator {
     return true
   }
 
-  private async waitChargingStationServiceInitialization (connectorId: number): Promise<void> {
-    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<void> {
     let logged = false
     while (!this.chargingStation.isChargingStationAvailable()) {
@@ -378,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<Status>(
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          this.chargingStation.getAutomaticTransactionGeneratorStatuses()![connectorId]
+          this.chargingStation.getAutomaticTransactionGeneratorStatuses()![connectorId - 1]
         )
         : undefined
     this.resetConnectorStatus(connectorStatus)
@@ -407,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
     }
@@ -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
       }
@@ -499,19 +490,19 @@ 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
       logger.debug(
         `${this.logPrefix(connectorId)} stopping a not started transaction${
-          !isNullOrUndefined(transactionId) ? ` with id ${transactionId}` : ''
+          transactionId != null ? ` with id ${transactionId}` : ''
         }`
       )
     }
@@ -527,8 +518,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 +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
     }
   }
 }