X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=dfab482ab2d63af90f06a7011e2e2bbf7ab5c205;hb=0a0da58d95d81782d92cd9a03c80ea6d3945aef6;hp=b9d3f1d0f24f8b0898551bb0bf8c68be378afb49;hpb=e7aeea18e189dd087c8f951cf77a253e2818ae90;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts
index b9d3f1d0..dfab482a 100644
--- a/src/charging-station/AutomaticTransactionGenerator.ts
+++ b/src/charging-station/AutomaticTransactionGenerator.ts
@@ -1,62 +1,138 @@
-// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
+import { AsyncResource } from 'node:async_hooks';
+
+import { hoursToMilliseconds, secondsToMilliseconds } from 'date-fns';
+
+import type { ChargingStation } from './ChargingStation';
+import { checkChargingStation } from './Helpers';
+import { IdTagsCache } from './IdTagsCache';
+import { OCPPServiceUtils } from './ocpp';
+import { BaseError } from '../exception';
+import { PerformanceStatistics } from '../performance';
 import {
   AuthorizationStatus,
-  AuthorizeResponse,
-  StartTransactionResponse,
+  ConnectorStatusEnum,
+  RequestCommand,
+  type StartTransactionRequest,
+  type StartTransactionResponse,
+  type Status,
   StopTransactionReason,
-  StopTransactionResponse,
-} from '../types/ocpp/Transaction';
+  type StopTransactionResponse,
+} from '../types';
+import {
+  Constants,
+  cloneObject,
+  formatDurationMilliSeconds,
+  getRandomInteger,
+  isNullOrUndefined,
+  logPrefix,
+  logger,
+  secureRandom,
+  sleep,
+} from '../utils';
 
-import type ChargingStation from './ChargingStation';
-import Constants from '../utils/Constants';
-import PerformanceStatistics from '../performance/PerformanceStatistics';
-import { Status } from '../types/AutomaticTransactionGenerator';
-import Utils from '../utils/Utils';
-import logger from '../utils/Logger';
+const moduleName = 'AutomaticTransactionGenerator';
 
-export default class AutomaticTransactionGenerator {
+export class AutomaticTransactionGenerator extends AsyncResource {
   private static readonly instances: Map<string, AutomaticTransactionGenerator> = new Map<
     string,
     AutomaticTransactionGenerator
   >();
+
+  public readonly connectorsStatus: Map<number, Status>;
   public started: boolean;
+  private starting: boolean;
+  private stopping: boolean;
   private readonly chargingStation: ChargingStation;
-  private readonly connectorsStatus: Map<number, Status>;
 
   private constructor(chargingStation: ChargingStation) {
+    super(moduleName);
+    this.started = false;
+    this.starting = false;
+    this.stopping = false;
     this.chargingStation = chargingStation;
     this.connectorsStatus = new Map<number, Status>();
-    this.stopConnectors();
-    this.started = false;
+    this.initializeConnectorsStatus();
   }
 
-  public static getInstance(chargingStation: ChargingStation): AutomaticTransactionGenerator {
-    if (!AutomaticTransactionGenerator.instances.has(chargingStation.id)) {
+  public static getInstance(
+    chargingStation: ChargingStation,
+  ): AutomaticTransactionGenerator | undefined {
+    if (AutomaticTransactionGenerator.instances.has(chargingStation.stationInfo.hashId) === false) {
       AutomaticTransactionGenerator.instances.set(
-        chargingStation.id,
-        new AutomaticTransactionGenerator(chargingStation)
+        chargingStation.stationInfo.hashId,
+        new AutomaticTransactionGenerator(chargingStation),
       );
     }
-    return AutomaticTransactionGenerator.instances.get(chargingStation.id);
+    return AutomaticTransactionGenerator.instances.get(chargingStation.stationInfo.hashId);
   }
 
   public start(): void {
-    if (this.started) {
-      logger.error(`${this.logPrefix()} trying to start while already started`);
+    if (checkChargingStation(this.chargingStation, this.logPrefix()) === false) {
       return;
     }
+    if (this.started === true) {
+      logger.warn(`${this.logPrefix()} is already started`);
+      return;
+    }
+    if (this.starting === true) {
+      logger.warn(`${this.logPrefix()} is already starting`);
+      return;
+    }
+    this.starting = true;
     this.startConnectors();
     this.started = true;
+    this.starting = false;
   }
 
   public stop(): void {
-    if (!this.started) {
-      logger.error(`${this.logPrefix()} trying to stop while not started`);
+    if (this.started === false) {
+      logger.warn(`${this.logPrefix()} is already stopped`);
       return;
     }
+    if (this.stopping === true) {
+      logger.warn(`${this.logPrefix()} is already stopping`);
+      return;
+    }
+    this.stopping = true;
     this.stopConnectors();
     this.started = false;
+    this.stopping = false;
+  }
+
+  public startConnector(connectorId: number): void {
+    if (checkChargingStation(this.chargingStation, this.logPrefix(connectorId)) === false) {
+      return;
+    }
+    if (this.connectorsStatus.has(connectorId) === false) {
+      logger.error(`${this.logPrefix(connectorId)} starting on non existing connector`);
+      throw new BaseError(`Connector ${connectorId} does not exist`);
+    }
+    if (this.connectorsStatus.get(connectorId)?.start === false) {
+      this.runInAsyncScope(
+        this.internalStartConnector.bind(this) as (
+          this: AutomaticTransactionGenerator,
+          ...args: unknown[]
+        ) => Promise<void>,
+        this,
+        connectorId,
+      ).catch(Constants.EMPTY_FUNCTION);
+    } else if (this.connectorsStatus.get(connectorId)?.start === true) {
+      logger.warn(`${this.logPrefix(connectorId)} is already started on connector`);
+    }
+  }
+
+  public stopConnector(connectorId: number): void {
+    if (this.connectorsStatus.has(connectorId) === false) {
+      logger.error(`${this.logPrefix(connectorId)} stopping on non existing connector`);
+      throw new BaseError(`Connector ${connectorId} does not exist`);
+    }
+    if (this.connectorsStatus.get(connectorId)?.start === true) {
+      this.connectorsStatus.get(connectorId)!.start = false;
+    } else if (this.connectorsStatus.get(connectorId)?.start === false) {
+      logger.warn(`${this.logPrefix(connectorId)} is already stopped on connector`);
+    }
   }
 
   private startConnectors(): void {
@@ -65,283 +141,357 @@ export default class AutomaticTransactionGenerator {
       this.connectorsStatus.size !== this.chargingStation.getNumberOfConnectors()
     ) {
       this.connectorsStatus.clear();
+      this.initializeConnectorsStatus();
     }
-    for (const connectorId of this.chargingStation.connectors.keys()) {
-      if (connectorId > 0) {
-        this.startConnector(connectorId);
+    if (this.chargingStation.hasEvses) {
+      for (const [evseId, evseStatus] of this.chargingStation.evses) {
+        if (evseId > 0) {
+          for (const connectorId of evseStatus.connectors.keys()) {
+            this.startConnector(connectorId);
+          }
+        }
+      }
+    } else {
+      for (const connectorId of this.chargingStation.connectors.keys()) {
+        if (connectorId > 0) {
+          this.startConnector(connectorId);
+        }
       }
     }
   }
 
   private stopConnectors(): void {
-    for (const connectorId of this.chargingStation.connectors.keys()) {
-      if (connectorId > 0) {
-        this.stopConnector(connectorId);
+    if (this.chargingStation.hasEvses) {
+      for (const [evseId, evseStatus] of this.chargingStation.evses) {
+        if (evseId > 0) {
+          for (const connectorId of evseStatus.connectors.keys()) {
+            this.stopConnector(connectorId);
+          }
+        }
+      }
+    } else {
+      for (const connectorId of this.chargingStation.connectors.keys()) {
+        if (connectorId > 0) {
+          this.stopConnector(connectorId);
+        }
       }
     }
   }
 
   private async internalStartConnector(connectorId: number): Promise<void> {
-    this.initStartConnectorStatus(connectorId);
+    this.setStartConnectorStatus(connectorId);
     logger.info(
-      this.logPrefix(connectorId) +
-        ' started on connector and will run for ' +
-        Utils.formatDurationMilliSeconds(
-          this.connectorsStatus.get(connectorId).stopDate.getTime() -
-            this.connectorsStatus.get(connectorId).startDate.getTime()
-        )
+      `${this.logPrefix(
+        connectorId,
+      )} started on connector and will run for ${formatDurationMilliSeconds(
+        this.connectorsStatus.get(connectorId)!.stopDate!.getTime() -
+          this.connectorsStatus.get(connectorId)!.startDate!.getTime(),
+      )}`,
     );
-    while (this.connectorsStatus.get(connectorId).start) {
-      if (new Date() > this.connectorsStatus.get(connectorId).stopDate) {
-        this.stopConnector(connectorId);
-        break;
-      }
-      if (!this.chargingStation.isInAcceptedState()) {
-        logger.error(
-          this.logPrefix(connectorId) +
-            ' entered in transaction loop while the charging station is not in accepted state'
-        );
-        this.stopConnector(connectorId);
-        break;
-      }
-      if (!this.chargingStation.isChargingStationAvailable()) {
-        logger.info(
-          this.logPrefix(connectorId) +
-            ' entered in transaction loop while the charging station is unavailable'
-        );
-        this.stopConnector(connectorId);
-        break;
-      }
-      if (!this.chargingStation.isConnectorAvailable(connectorId)) {
-        logger.info(
-          `${this.logPrefix(
-            connectorId
-          )} entered in transaction loop while the connector ${connectorId} is unavailable`
-        );
+    while (this.connectorsStatus.get(connectorId)?.start === true) {
+      if (!this.canStartConnector(connectorId)) {
         this.stopConnector(connectorId);
         break;
       }
       if (!this.chargingStation?.ocppRequestService) {
         logger.info(
           `${this.logPrefix(
-            connectorId
-          )} transaction loop waiting for charging station service to be initialized`
+            connectorId,
+          )} transaction loop waiting for charging station service to be initialized`,
         );
         do {
-          await Utils.sleep(Constants.CHARGING_STATION_ATG_INITIALIZATION_TIME);
+          await sleep(Constants.CHARGING_STATION_ATG_INITIALIZATION_TIME);
         } while (!this.chargingStation?.ocppRequestService);
       }
-      const wait =
-        Utils.getRandomInteger(
-          this.chargingStation.stationInfo.AutomaticTransactionGenerator
+      const wait = secondsToMilliseconds(
+        getRandomInteger(
+          this.chargingStation.getAutomaticTransactionGeneratorConfiguration()
             .maxDelayBetweenTwoTransactions,
-          this.chargingStation.stationInfo.AutomaticTransactionGenerator
-            .minDelayBetweenTwoTransactions
-        ) * 1000;
-      logger.info(
-        this.logPrefix(connectorId) + ' waiting for ' + Utils.formatDurationMilliSeconds(wait)
+          this.chargingStation.getAutomaticTransactionGeneratorConfiguration()
+            .minDelayBetweenTwoTransactions,
+        ),
       );
-      await Utils.sleep(wait);
-      const start = Utils.secureRandom();
+      logger.info(`${this.logPrefix(connectorId)} waiting for ${formatDurationMilliSeconds(wait)}`);
+      await sleep(wait);
+      const start = secureRandom();
       if (
-        start < this.chargingStation.stationInfo.AutomaticTransactionGenerator.probabilityOfStart
+        start <
+        this.chargingStation.getAutomaticTransactionGeneratorConfiguration().probabilityOfStart
       ) {
-        this.connectorsStatus.get(connectorId).skippedConsecutiveTransactions = 0;
+        this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions = 0;
         // Start transaction
         const startResponse = await this.startTransaction(connectorId);
-        this.connectorsStatus.get(connectorId).startTransactionRequests++;
-        if (startResponse?.idTagInfo?.status !== AuthorizationStatus.ACCEPTED) {
-          logger.warn(this.logPrefix(connectorId) + ' start transaction rejected');
-          this.connectorsStatus.get(connectorId).rejectedStartTransactionRequests++;
-        } else {
+        if (startResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) {
           // Wait until end of transaction
-          const waitTrxEnd =
-            Utils.getRandomInteger(
-              this.chargingStation.stationInfo.AutomaticTransactionGenerator.maxDuration,
-              this.chargingStation.stationInfo.AutomaticTransactionGenerator.minDuration
-            ) * 1000;
+          const waitTrxEnd = secondsToMilliseconds(
+            getRandomInteger(
+              this.chargingStation.getAutomaticTransactionGeneratorConfiguration().maxDuration,
+              this.chargingStation.getAutomaticTransactionGeneratorConfiguration().minDuration,
+            ),
+          );
           logger.info(
-            this.logPrefix(connectorId) +
-              ' transaction ' +
-              this.chargingStation.getConnectorStatus(connectorId).transactionId.toString() +
-              ' started and will stop in ' +
-              Utils.formatDurationMilliSeconds(waitTrxEnd)
+            `${this.logPrefix(connectorId)} transaction started with id ${this.chargingStation
+              .getConnectorStatus(connectorId)
+              ?.transactionId?.toString()} and will stop in ${formatDurationMilliSeconds(
+              waitTrxEnd,
+            )}`,
           );
-          this.connectorsStatus.get(connectorId).acceptedStartTransactionRequests++;
-          await Utils.sleep(waitTrxEnd);
+          await sleep(waitTrxEnd);
           // Stop transaction
           logger.info(
-            this.logPrefix(connectorId) +
-              ' stop transaction ' +
-              this.chargingStation.getConnectorStatus(connectorId).transactionId.toString()
+            `${this.logPrefix(connectorId)} stop transaction with id ${this.chargingStation
+              .getConnectorStatus(connectorId)
+              ?.transactionId?.toString()}`,
           );
           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).skippedConsecutiveTransactions.toString() +
-            '/' +
-            this.connectorsStatus.get(connectorId).skippedTransactions.toString() +
-            ' transaction(s)'
+          `${this.logPrefix(connectorId)} skipped consecutively ${this.connectorsStatus
+            .get(connectorId)
+            ?.skippedConsecutiveTransactions?.toString()}/${this.connectorsStatus
+            .get(connectorId)
+            ?.skippedTransactions?.toString()} transaction(s)`,
         );
       }
-      this.connectorsStatus.get(connectorId).lastRunDate = new Date();
+      this.connectorsStatus.get(connectorId)!.lastRunDate = new Date();
     }
-    await this.stopTransaction(connectorId);
-    this.connectorsStatus.get(connectorId).stoppedDate = new Date();
+    this.connectorsStatus.get(connectorId)!.stoppedDate = new Date();
     logger.info(
-      this.logPrefix(connectorId) +
-        ' stopped on connector and lasted for ' +
-        Utils.formatDurationMilliSeconds(
-          this.connectorsStatus.get(connectorId).stoppedDate.getTime() -
-            this.connectorsStatus.get(connectorId).startDate.getTime()
-        )
+      `${this.logPrefix(
+        connectorId,
+      )} stopped on connector and lasted for ${formatDurationMilliSeconds(
+        this.connectorsStatus.get(connectorId)!.stoppedDate!.getTime() -
+          this.connectorsStatus.get(connectorId)!.startDate!.getTime(),
+      )}`,
     );
     logger.debug(
-      `${this.logPrefix(connectorId)} connector status %j`,
-      this.connectorsStatus.get(connectorId)
+      `${this.logPrefix(connectorId)} connector status: %j`,
+      this.connectorsStatus.get(connectorId),
     );
   }
 
-  private startConnector(connectorId: number): void {
-    // Avoid hogging the event loop with a busy loop
-    setImmediate(() => {
-      this.internalStartConnector(connectorId).catch(() => {
-        /* This is intentional */
-      });
-    });
+  private setStartConnectorStatus(connectorId: number): void {
+    this.connectorsStatus.get(connectorId)!.skippedConsecutiveTransactions = 0;
+    const previousRunDuration =
+      this.connectorsStatus.get(connectorId)?.startDate &&
+      this.connectorsStatus.get(connectorId)?.lastRunDate
+        ? this.connectorsStatus.get(connectorId)!.lastRunDate!.getTime() -
+          this.connectorsStatus.get(connectorId)!.startDate!.getTime()
+        : 0;
+    this.connectorsStatus.get(connectorId)!.startDate = new Date();
+    this.connectorsStatus.get(connectorId)!.stopDate = new Date(
+      this.connectorsStatus.get(connectorId)!.startDate!.getTime() +
+        hoursToMilliseconds(
+          this.chargingStation.getAutomaticTransactionGeneratorConfiguration().stopAfterHours,
+        ) -
+        previousRunDuration,
+    );
+    this.connectorsStatus.get(connectorId)!.start = true;
   }
 
-  private stopConnector(connectorId: number): void {
-    this.connectorsStatus.set(connectorId, {
-      ...this.connectorsStatus.get(connectorId),
-      start: false,
-    });
+  private canStartConnector(connectorId: number): boolean {
+    if (new Date() > this.connectorsStatus.get(connectorId)!.stopDate!) {
+      return false;
+    }
+    if (this.chargingStation.inAcceptedState() === false) {
+      logger.error(
+        `${this.logPrefix(
+          connectorId,
+        )} entered in transaction loop while the charging station is not in accepted state`,
+      );
+      return false;
+    }
+    if (this.chargingStation.isChargingStationAvailable() === false) {
+      logger.info(
+        `${this.logPrefix(
+          connectorId,
+        )} entered in transaction loop while the charging station is unavailable`,
+      );
+      return false;
+    }
+    if (this.chargingStation.isConnectorAvailable(connectorId) === false) {
+      logger.info(
+        `${this.logPrefix(
+          connectorId,
+        )} entered in transaction loop while the connector ${connectorId} is unavailable`,
+      );
+      return false;
+    }
+    if (
+      this.chargingStation.getConnectorStatus(connectorId)?.status ===
+      ConnectorStatusEnum.Unavailable
+    ) {
+      logger.info(
+        `${this.logPrefix(
+          connectorId,
+        )} entered in transaction loop while the connector ${connectorId} status is unavailable`,
+      );
+      return false;
+    }
+    return true;
   }
 
-  private initStartConnectorStatus(connectorId: number): void {
-    this.connectorsStatus.get(connectorId).authorizeRequests =
-      this?.connectorsStatus.get(connectorId)?.authorizeRequests ?? 0;
-    this.connectorsStatus.get(connectorId).acceptedAuthorizeRequests =
-      this?.connectorsStatus.get(connectorId)?.acceptedAuthorizeRequests ?? 0;
-    this.connectorsStatus.get(connectorId).rejectedAuthorizeRequests =
-      this?.connectorsStatus.get(connectorId)?.rejectedAuthorizeRequests ?? 0;
-    this.connectorsStatus.get(connectorId).startTransactionRequests =
-      this?.connectorsStatus.get(connectorId)?.startTransactionRequests ?? 0;
-    this.connectorsStatus.get(connectorId).acceptedStartTransactionRequests =
-      this?.connectorsStatus.get(connectorId)?.acceptedStartTransactionRequests ?? 0;
-    this.connectorsStatus.get(connectorId).rejectedStartTransactionRequests =
-      this?.connectorsStatus.get(connectorId)?.rejectedStartTransactionRequests ?? 0;
-    this.connectorsStatus.get(connectorId).stopTransactionRequests =
-      this?.connectorsStatus.get(connectorId)?.stopTransactionRequests ?? 0;
-    this.connectorsStatus.get(connectorId).skippedConsecutiveTransactions = 0;
-    this.connectorsStatus.get(connectorId).skippedTransactions =
-      this?.connectorsStatus.get(connectorId)?.skippedTransactions ?? 0;
-    const previousRunDuration =
-      this?.connectorsStatus.get(connectorId)?.startDate &&
-      this?.connectorsStatus.get(connectorId)?.lastRunDate
-        ? this.connectorsStatus.get(connectorId).lastRunDate.getTime() -
-          this.connectorsStatus.get(connectorId).startDate.getTime()
-        : 0;
-    this.connectorsStatus.get(connectorId).startDate = new Date();
-    this.connectorsStatus.get(connectorId).stopDate = new Date(
-      this.connectorsStatus.get(connectorId).startDate.getTime() +
-        (this.chargingStation.stationInfo?.AutomaticTransactionGenerator?.stopAfterHours ??
-          Constants.CHARGING_STATION_ATG_DEFAULT_STOP_AFTER_HOURS) *
-          3600 *
-          1000 -
-        previousRunDuration
+  private initializeConnectorsStatus(): void {
+    if (this.chargingStation.hasEvses) {
+      for (const [evseId, evseStatus] of this.chargingStation.evses) {
+        if (evseId > 0) {
+          for (const connectorId of evseStatus.connectors.keys()) {
+            this.connectorsStatus.set(connectorId, this.getConnectorStatus(connectorId));
+          }
+        }
+      }
+    } else {
+      for (const connectorId of this.chargingStation.connectors.keys()) {
+        if (connectorId > 0) {
+          this.connectorsStatus.set(connectorId, this.getConnectorStatus(connectorId));
+        }
+      }
+    }
+  }
+
+  private getConnectorStatus(connectorId: number): Status {
+    const connectorStatus = this.chargingStation.getAutomaticTransactionGeneratorStatuses()?.[
+      connectorId
+    ]
+      ? cloneObject<Status[]>(this.chargingStation.getAutomaticTransactionGeneratorStatuses()!)[
+          connectorId
+        ]
+      : undefined;
+    delete connectorStatus?.startDate;
+    delete connectorStatus?.lastRunDate;
+    delete connectorStatus?.stopDate;
+    delete connectorStatus?.stoppedDate;
+    return (
+      connectorStatus ?? {
+        start: false,
+        authorizeRequests: 0,
+        acceptedAuthorizeRequests: 0,
+        rejectedAuthorizeRequests: 0,
+        startTransactionRequests: 0,
+        acceptedStartTransactionRequests: 0,
+        rejectedStartTransactionRequests: 0,
+        stopTransactionRequests: 0,
+        acceptedStopTransactionRequests: 0,
+        rejectedStopTransactionRequests: 0,
+        skippedConsecutiveTransactions: 0,
+        skippedTransactions: 0,
+      }
     );
-    this.connectorsStatus.get(connectorId).start = true;
   }
 
   private async startTransaction(
-    connectorId: number
-  ): Promise<StartTransactionResponse | AuthorizeResponse> {
+    connectorId: number,
+  ): Promise<StartTransactionResponse | undefined> {
     const measureId = 'StartTransaction with ATG';
     const beginId = PerformanceStatistics.beginMeasure(measureId);
-    let startResponse: StartTransactionResponse;
-    if (this.chargingStation.hasAuthorizedTags()) {
-      const idTag = this.chargingStation.getRandomIdTag();
-      if (this.chargingStation.getAutomaticTransactionGeneratorRequireAuthorize()) {
-        // Authorize idTag
-        const authorizeResponse = await this.chargingStation.ocppRequestService.sendAuthorize(
-          connectorId,
-          idTag
-        );
-        this.connectorsStatus.get(connectorId).authorizeRequests++;
-        if (authorizeResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) {
-          this.connectorsStatus.get(connectorId).acceptedAuthorizeRequests++;
-          logger.info(this.logPrefix(connectorId) + ' start transaction for idTag ' + idTag);
+    let startResponse: StartTransactionResponse | undefined;
+    if (this.chargingStation.hasIdTags()) {
+      const idTag = IdTagsCache.getInstance().getIdTag(
+        this.chargingStation.getAutomaticTransactionGeneratorConfiguration().idTagDistribution!,
+        this.chargingStation,
+        connectorId,
+      );
+      const startTransactionLogMsg = `${this.logPrefix(
+        connectorId,
+      )} start transaction with an idTag '${idTag}'`;
+      if (this.getRequireAuthorize()) {
+        ++this.connectorsStatus.get(connectorId)!.authorizeRequests!;
+        if (await OCPPServiceUtils.isIdTagAuthorized(this.chargingStation, connectorId, idTag)) {
+          ++this.connectorsStatus.get(connectorId)!.acceptedAuthorizeRequests!;
+          logger.info(startTransactionLogMsg);
           // Start transaction
-          startResponse = await this.chargingStation.ocppRequestService.sendStartTransaction(
+          startResponse = await this.chargingStation.ocppRequestService.requestHandler<
+            StartTransactionRequest,
+            StartTransactionResponse
+          >(this.chargingStation, RequestCommand.START_TRANSACTION, {
             connectorId,
-            idTag
-          );
+            idTag,
+          });
+          this.handleStartTransactionResponse(connectorId, startResponse);
           PerformanceStatistics.endMeasure(measureId, beginId);
           return startResponse;
         }
-        this.connectorsStatus.get(connectorId).rejectedAuthorizeRequests++;
+        ++this.connectorsStatus.get(connectorId)!.rejectedAuthorizeRequests!;
         PerformanceStatistics.endMeasure(measureId, beginId);
-        return authorizeResponse;
+        return startResponse;
       }
-      logger.info(this.logPrefix(connectorId) + ' start transaction for idTag ' + idTag);
+      logger.info(startTransactionLogMsg);
       // Start transaction
-      startResponse = await this.chargingStation.ocppRequestService.sendStartTransaction(
+      startResponse = await this.chargingStation.ocppRequestService.requestHandler<
+        StartTransactionRequest,
+        StartTransactionResponse
+      >(this.chargingStation, RequestCommand.START_TRANSACTION, {
         connectorId,
-        idTag
-      );
+        idTag,
+      });
+      this.handleStartTransactionResponse(connectorId, startResponse);
       PerformanceStatistics.endMeasure(measureId, beginId);
       return startResponse;
     }
-    logger.info(this.logPrefix(connectorId) + ' start transaction without an idTag');
-    startResponse = await this.chargingStation.ocppRequestService.sendStartTransaction(connectorId);
+    logger.info(`${this.logPrefix(connectorId)} start transaction without an idTag`);
+    startResponse = await this.chargingStation.ocppRequestService.requestHandler<
+      StartTransactionRequest,
+      StartTransactionResponse
+    >(this.chargingStation, RequestCommand.START_TRANSACTION, { connectorId });
+    this.handleStartTransactionResponse(connectorId, startResponse);
     PerformanceStatistics.endMeasure(measureId, beginId);
     return startResponse;
   }
 
   private async stopTransaction(
     connectorId: number,
-    reason: StopTransactionReason = StopTransactionReason.NONE
-  ): Promise<StopTransactionResponse> {
+    reason: StopTransactionReason = StopTransactionReason.LOCAL,
+  ): Promise<StopTransactionResponse | undefined> {
     const measureId = 'StopTransaction with ATG';
     const beginId = PerformanceStatistics.beginMeasure(measureId);
-    let transactionId = 0;
-    let stopResponse: StopTransactionResponse;
-    if (this.chargingStation.getConnectorStatus(connectorId)?.transactionStarted) {
-      transactionId = this.chargingStation.getConnectorStatus(connectorId).transactionId;
-      stopResponse = await this.chargingStation.ocppRequestService.sendStopTransaction(
-        transactionId,
-        this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId),
-        this.chargingStation.getTransactionIdTag(transactionId),
-        reason
-      );
-      this.connectorsStatus.get(connectorId).stopTransactionRequests++;
+    let stopResponse: StopTransactionResponse | undefined;
+    if (this.chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) {
+      stopResponse = await this.chargingStation.stopTransactionOnConnector(connectorId, reason);
+      ++this.connectorsStatus.get(connectorId)!.stopTransactionRequests!;
+      if (stopResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) {
+        ++this.connectorsStatus.get(connectorId)!.acceptedStopTransactionRequests!;
+      } else {
+        ++this.connectorsStatus.get(connectorId)!.rejectedStopTransactionRequests!;
+      }
     } else {
+      const transactionId = this.chargingStation.getConnectorStatus(connectorId)?.transactionId;
       logger.warn(
-        `${this.logPrefix(connectorId)} trying to stop a not started transaction${
-          transactionId ? ' ' + transactionId.toString() : ''
-        }`
+        `${this.logPrefix(connectorId)} stopping a not started transaction${
+          !isNullOrUndefined(transactionId) ? ` with id ${transactionId?.toString()}` : ''
+        }`,
       );
     }
     PerformanceStatistics.endMeasure(measureId, beginId);
     return stopResponse;
   }
 
-  private logPrefix(connectorId?: number): string {
-    if (connectorId) {
-      return Utils.logPrefix(
-        ' ' +
-          this.chargingStation.stationInfo.chargingStationId +
-          ' | ATG on connector #' +
-          connectorId.toString() +
-          ':'
-      );
+  private getRequireAuthorize(): boolean {
+    return (
+      this.chargingStation.getAutomaticTransactionGeneratorConfiguration()?.requireAuthorize ?? true
+    );
+  }
+
+  private logPrefix = (connectorId?: number): string => {
+    return logPrefix(
+      ` ${this.chargingStation.stationInfo.chargingStationId} | ATG${
+        !isNullOrUndefined(connectorId) ? ` on connector #${connectorId!.toString()}` : ''
+      }:`,
+    );
+  };
+
+  private handleStartTransactionResponse(
+    connectorId: number,
+    startResponse: StartTransactionResponse,
+  ): void {
+    ++this.connectorsStatus.get(connectorId)!.startTransactionRequests!;
+    if (startResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) {
+      ++this.connectorsStatus.get(connectorId)!.acceptedStartTransactionRequests!;
+    } else {
+      logger.warn(`${this.logPrefix(connectorId)} start transaction rejected`);
+      ++this.connectorsStatus.get(connectorId)!.rejectedStartTransactionRequests!;
     }
-    return Utils.logPrefix(' ' + this.chargingStation.stationInfo.chargingStationId + ' | ATG:');
   }
 }