X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=948ef133acb6adf2a3b13fe7d82520e3bcef6348;hb=821c6c8229d6dfdc93ce917dfaad74e681e5a35c;hp=0562a8973bb8bd36a60f6353e6503339e6111a63;hpb=101196c654ddcd686e4992f58864f591ceea6c00;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts
index 0562a897..948ef133 100644
--- a/src/charging-station/AutomaticTransactionGenerator.ts
+++ b/src/charging-station/AutomaticTransactionGenerator.ts
@@ -1,26 +1,20 @@
+// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+
 import { AuthorizationStatus, AuthorizeResponse, StartTransactionResponse, StopTransactionReason, StopTransactionResponse } from '../types/ocpp/Transaction';
-import { PerformanceObserver, performance } from 'perf_hooks';
 
 import ChargingStation from './ChargingStation';
 import Constants from '../utils/Constants';
+import PerformanceStatistics from '../utils/PerformanceStatistics';
 import Utils from '../utils/Utils';
 import logger from '../utils/Logger';
 
 export default class AutomaticTransactionGenerator {
   public timeToStop: boolean;
   private chargingStation: ChargingStation;
-  private performanceObserver!: PerformanceObserver;
 
   constructor(chargingStation: ChargingStation) {
     this.chargingStation = chargingStation;
     this.timeToStop = true;
-    if (this.chargingStation.getEnableStatistics()) {
-      this.performanceObserver = new PerformanceObserver((list) => {
-        const entry = list.getEntries()[0];
-        this.chargingStation.performanceStatistics.logPerformance(entry, Constants.ENTITY_AUTOMATIC_TRANSACTION_GENERATOR);
-        this.performanceObserver.disconnect();
-      });
-    }
   }
 
   public async start(): Promise<void> {
@@ -46,7 +40,7 @@ export default class AutomaticTransactionGenerator {
       const transactionId = this.chargingStation.getConnector(Utils.convertToInt(connector)).transactionId;
       if (this.chargingStation.getConnector(Utils.convertToInt(connector)).transactionStarted) {
         logger.info(this.logPrefix(Utils.convertToInt(connector)) + ' ATG OVER. Stop transaction ' + transactionId.toString());
-        await this.chargingStation.ocppRequestService.sendStopTransaction(transactionId, this.chargingStation.getTransactionMeterStop(transactionId),
+        await this.chargingStation.ocppRequestService.sendStopTransaction(transactionId, this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId),
           this.chargingStation.getTransactionIdTag(transactionId), reason);
       }
     }
@@ -85,16 +79,8 @@ export default class AutomaticTransactionGenerator {
       const start = Math.random();
       let skip = 0;
       if (start < this.chargingStation.stationInfo.AutomaticTransactionGenerator.probabilityOfStart) {
-        skip = 0;
         // Start transaction
-        let startResponse: StartTransactionResponse | AuthorizeResponse;
-        if (this.chargingStation.getEnableStatistics()) {
-          const startTransaction = performance.timerify(this.startTransaction);
-          this.performanceObserver.observe({ entryTypes: ['function'] });
-          startResponse = await startTransaction(connectorId, this);
-        } else {
-          startResponse = await this.startTransaction(connectorId, this);
-        }
+        const startResponse = await this.startTransaction(connectorId);
         if (startResponse?.idTagInfo?.status !== AuthorizationStatus.ACCEPTED) {
           logger.warn(this.logPrefix(connectorId) + ' transaction rejected');
           await Utils.sleep(Constants.CHARGING_STATION_ATG_WAIT_TIME);
@@ -107,13 +93,7 @@ export default class AutomaticTransactionGenerator {
           // Stop transaction
           if (this.chargingStation.getConnector(connectorId)?.transactionStarted) {
             logger.info(this.logPrefix(connectorId) + ' stop transaction ' + this.chargingStation.getConnector(connectorId).transactionId.toString());
-            if (this.chargingStation.getEnableStatistics()) {
-              const stopTransaction = performance.timerify(this.stopTransaction);
-              this.performanceObserver.observe({ entryTypes: ['function'] });
-              await stopTransaction(connectorId, this);
-            } else {
-              await this.stopTransaction(connectorId, this);
-            }
+            await this.stopTransaction(connectorId);
           }
         }
       } else {
@@ -125,32 +105,46 @@ export default class AutomaticTransactionGenerator {
   }
 
   // eslint-disable-next-line consistent-this
-  private async startTransaction(connectorId: number, self: AutomaticTransactionGenerator): Promise<StartTransactionResponse | AuthorizeResponse> {
-    if (self.chargingStation.hasAuthorizedTags()) {
-      const tagId = self.chargingStation.getRandomTagId();
-      if (self.chargingStation.stationInfo.AutomaticTransactionGenerator.requireAuthorize) {
+  private async startTransaction(connectorId: number): Promise<StartTransactionResponse | AuthorizeResponse> {
+    const measureId = 'StartTransaction with ATG';
+    const beginId = PerformanceStatistics.beginMeasure(measureId);
+    let startResponse: StartTransactionResponse;
+    if (this.chargingStation.hasAuthorizedTags()) {
+      const tagId = this.chargingStation.getRandomTagId();
+      if (this.chargingStation.getAutomaticTransactionGeneratorRequireAuthorize()) {
         // Authorize tagId
-        const authorizeResponse = await self.chargingStation.ocppRequestService.sendAuthorize(tagId);
+        const authorizeResponse = await this.chargingStation.ocppRequestService.sendAuthorize(connectorId, tagId);
         if (authorizeResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) {
-          logger.info(self.logPrefix(connectorId) + ' start transaction for tagID ' + tagId);
+          logger.info(this.logPrefix(connectorId) + ' start transaction for tagID ' + tagId);
           // Start transaction
-          return await self.chargingStation.ocppRequestService.sendStartTransaction(connectorId, tagId);
+          startResponse = await this.chargingStation.ocppRequestService.sendStartTransaction(connectorId, tagId);
+          PerformanceStatistics.endMeasure(measureId, beginId);
+          return startResponse;
         }
+        PerformanceStatistics.endMeasure(measureId, beginId);
         return authorizeResponse;
       }
-      logger.info(self.logPrefix(connectorId) + ' start transaction for tagID ' + tagId);
+      logger.info(this.logPrefix(connectorId) + ' start transaction for tagID ' + tagId);
       // Start transaction
-      return await self.chargingStation.ocppRequestService.sendStartTransaction(connectorId, tagId);
+      startResponse = await this.chargingStation.ocppRequestService.sendStartTransaction(connectorId, tagId);
+      PerformanceStatistics.endMeasure(measureId, beginId);
+      return startResponse;
     }
-    logger.info(self.logPrefix(connectorId) + ' start transaction without a tagID');
-    return await self.chargingStation.ocppRequestService.sendStartTransaction(connectorId);
+    logger.info(this.logPrefix(connectorId) + ' start transaction without a tagID');
+    startResponse = await this.chargingStation.ocppRequestService.sendStartTransaction(connectorId);
+    PerformanceStatistics.endMeasure(measureId, beginId);
+    return startResponse;
   }
 
   // eslint-disable-next-line consistent-this
-  private async stopTransaction(connectorId: number, self: AutomaticTransactionGenerator): Promise<StopTransactionResponse> {
-    const transactionId = self.chargingStation.getConnector(connectorId).transactionId;
-    return await self.chargingStation.ocppRequestService.sendStopTransaction(transactionId, self.chargingStation.getTransactionMeterStop(transactionId),
-      self.chargingStation.getTransactionIdTag(transactionId));
+  private async stopTransaction(connectorId: number): Promise<StopTransactionResponse> {
+    const measureId = 'StopTransaction with ATG';
+    const beginId = PerformanceStatistics.beginMeasure(measureId);
+    const transactionId = this.chargingStation.getConnector(connectorId).transactionId;
+    const stopResponse = this.chargingStation.ocppRequestService.sendStopTransaction(transactionId,
+      this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId), this.chargingStation.getTransactionIdTag(transactionId));
+    PerformanceStatistics.endMeasure(measureId, beginId);
+    return stopResponse;
   }
 
   private logPrefix(connectorId?: number): string {