X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcharging-station%2FAutomaticTransactionGenerator.ts;h=32d9897380b261ce1338bfe84c1e82e96cd156e7;hb=4160ae28993e439fd92b9c067b8bdfdd7963515c;hp=eb45b056b80d6625e18be881b0d515789b95048c;hpb=2e3d65ae7245bce98c6a29be76985503dc6de29b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts
index eb45b056..32d98973 100644
--- a/src/charging-station/AutomaticTransactionGenerator.ts
+++ b/src/charging-station/AutomaticTransactionGenerator.ts
@@ -10,6 +10,8 @@ import {
 
 import type ChargingStation from './ChargingStation';
 import Constants from '../utils/Constants';
+import { MeterValuesResponse } from '../types/ocpp/Responses';
+import { OCPP16ServiceUtils } from './ocpp/1.6/OCPP16ServiceUtils';
 import PerformanceStatistics from '../performance/PerformanceStatistics';
 import { RequestCommand } from '../types/ocpp/Requests';
 import { Status } from '../types/AutomaticTransactionGenerator';
@@ -34,13 +36,13 @@ export default class AutomaticTransactionGenerator {
   }
 
   public static getInstance(chargingStation: ChargingStation): AutomaticTransactionGenerator {
-    if (!AutomaticTransactionGenerator.instances.has(chargingStation.id)) {
+    if (!AutomaticTransactionGenerator.instances.has(chargingStation.hashId)) {
       AutomaticTransactionGenerator.instances.set(
-        chargingStation.id,
+        chargingStation.hashId,
         new AutomaticTransactionGenerator(chargingStation)
       );
     }
-    return AutomaticTransactionGenerator.instances.get(chargingStation.id);
+    return AutomaticTransactionGenerator.instances.get(chargingStation.hashId);
   }
 
   public start(): void {
@@ -273,21 +275,25 @@ export default class AutomaticTransactionGenerator {
         this.chargingStation.getConnectorStatus(connectorId).authorizeIdTag = idTag;
         // Authorize idTag
         const authorizeResponse: AuthorizeResponse =
-          (await this.chargingStation.ocppRequestService.sendMessageHandler(
+          await this.chargingStation.ocppRequestService.sendMessageHandler<AuthorizeResponse>(
             RequestCommand.AUTHORIZE,
             {
               idTag,
             }
-          )) as AuthorizeResponse;
+          );
         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);
           // Start transaction
-          startResponse = await this.chargingStation.ocppRequestService.sendStartTransaction(
-            connectorId,
-            idTag
-          );
+          startResponse =
+            await this.chargingStation.ocppRequestService.sendMessageHandler<StartTransactionResponse>(
+              RequestCommand.START_TRANSACTION,
+              {
+                connectorId,
+                idTag,
+              }
+            );
           PerformanceStatistics.endMeasure(measureId, beginId);
           return startResponse;
         }
@@ -297,15 +303,23 @@ export default class AutomaticTransactionGenerator {
       }
       logger.info(this.logPrefix(connectorId) + ' start transaction for idTag ' + idTag);
       // Start transaction
-      startResponse = await this.chargingStation.ocppRequestService.sendStartTransaction(
-        connectorId,
-        idTag
-      );
+      startResponse =
+        await this.chargingStation.ocppRequestService.sendMessageHandler<StartTransactionResponse>(
+          RequestCommand.START_TRANSACTION,
+          {
+            connectorId,
+            idTag,
+          }
+        );
       PerformanceStatistics.endMeasure(measureId, beginId);
       return startResponse;
     }
     logger.info(this.logPrefix(connectorId) + ' start transaction without an idTag');
-    startResponse = await this.chargingStation.ocppRequestService.sendStartTransaction(connectorId);
+    startResponse =
+      await this.chargingStation.ocppRequestService.sendMessageHandler<StartTransactionResponse>(
+        RequestCommand.START_TRANSACTION,
+        { connectorId }
+      );
     PerformanceStatistics.endMeasure(measureId, beginId);
     return startResponse;
   }
@@ -320,12 +334,37 @@ export default class AutomaticTransactionGenerator {
     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
-      );
+      if (
+        this.chargingStation.getBeginEndMeterValues() &&
+        this.chargingStation.getOcppStrictCompliance() &&
+        !this.chargingStation.getOutOfOrderEndMeterValues()
+      ) {
+        // FIXME: Implement OCPP version agnostic helpers
+        const transactionEndMeterValue = OCPP16ServiceUtils.buildTransactionEndMeterValue(
+          this.chargingStation,
+          connectorId,
+          this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId)
+        );
+        await this.chargingStation.ocppRequestService.sendMessageHandler<MeterValuesResponse>(
+          RequestCommand.METER_VALUES,
+          {
+            connectorId,
+            transactionId,
+            meterValue: transactionEndMeterValue,
+          }
+        );
+      }
+      stopResponse =
+        await this.chargingStation.ocppRequestService.sendMessageHandler<StopTransactionResponse>(
+          RequestCommand.STOP_TRANSACTION,
+          {
+            transactionId,
+            meterStop:
+              this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId),
+            idTag: this.chargingStation.getTransactionIdTag(transactionId),
+            reason,
+          }
+        );
       this.connectorsStatus.get(connectorId).stopTransactionRequests++;
     } else {
       logger.warn(