X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStation.ts;h=a451c5ee4668b31cbad728fa4881cf2356a812a8;hb=658e2d16622bc69a4a0c5df02fae29fd0cc7efac;hp=539ab309e62276e5db999fcdd19988f505afded9;hpb=93b4a429b3cd9c37b5698b601361039c51e295d2;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index 539ab309..a451c5ee 100644
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -23,7 +23,7 @@ import {
   SupportedFeatureProfiles,
   VendorDefaultParametersKey,
 } from '../types/ocpp/Configuration';
-import { MeterValueMeasurand, MeterValuePhase } from '../types/ocpp/MeterValues';
+import { MeterValue, MeterValueMeasurand, MeterValuePhase } from '../types/ocpp/MeterValues';
 import { WSError, WebSocketCloseEventStatusCode } from '../types/WebSocket';
 import WebSocket, { ClientOptions, Data, OPEN, RawData } from 'ws';
 
@@ -44,6 +44,7 @@ import { MessageType } from '../types/ocpp/MessageType';
 import OCPP16IncomingRequestService from './ocpp/1.6/OCPP16IncomingRequestService';
 import OCPP16RequestService from './ocpp/1.6/OCPP16RequestService';
 import OCPP16ResponseService from './ocpp/1.6/OCPP16ResponseService';
+import { OCPP16ServiceUtils } from './ocpp/1.6/OCPP16ServiceUtils';
 import OCPPError from '../exception/OCPPError';
 import OCPPIncomingRequestService from './ocpp/OCPPIncomingRequestService';
 import OCPPRequestService from './ocpp/OCPPRequestService';
@@ -254,29 +255,33 @@ export default class ChargingStation {
     return this.stationInfo.phaseLineToLineVoltageMeterValues ?? false;
   }
 
-  public getEnergyActiveImportRegisterByTransactionId(transactionId: number): number | undefined {
-    if (this.getMeteringPerTransaction()) {
-      for (const connectorId of this.connectors.keys()) {
-        if (
-          connectorId > 0 &&
-          this.getConnectorStatus(connectorId).transactionId === transactionId
-        ) {
-          return this.getConnectorStatus(connectorId).transactionEnergyActiveImportRegisterValue;
-        }
-      }
-    }
+  public getConnectorIdByTransactionId(transactionId: number): number | undefined {
     for (const connectorId of this.connectors.keys()) {
-      if (connectorId > 0 && this.getConnectorStatus(connectorId).transactionId === transactionId) {
-        return this.getConnectorStatus(connectorId).energyActiveImportRegisterValue;
+      if (
+        connectorId > 0 &&
+        this.getConnectorStatus(connectorId)?.transactionId === transactionId
+      ) {
+        return connectorId;
       }
     }
   }
 
+  public getEnergyActiveImportRegisterByTransactionId(transactionId: number): number | undefined {
+    const transactionConnectorStatus = this.getConnectorStatus(
+      this.getConnectorIdByTransactionId(transactionId)
+    );
+    if (this.getMeteringPerTransaction()) {
+      return transactionConnectorStatus?.transactionEnergyActiveImportRegisterValue;
+    }
+    return transactionConnectorStatus?.energyActiveImportRegisterValue;
+  }
+
   public getEnergyActiveImportRegisterByConnectorId(connectorId: number): number | undefined {
+    const connectorStatus = this.getConnectorStatus(connectorId);
     if (this.getMeteringPerTransaction()) {
-      return this.getConnectorStatus(connectorId).transactionEnergyActiveImportRegisterValue;
+      return connectorStatus?.transactionEnergyActiveImportRegisterValue;
     }
-    return this.getConnectorStatus(connectorId).energyActiveImportRegisterValue;
+    return connectorStatus?.energyActiveImportRegisterValue;
   }
 
   public getAuthorizeRemoteTxRequests(): boolean {
@@ -454,11 +459,18 @@ export default class ChargingStation {
       this.getConnectorStatus(connectorId).transactionSetInterval = setInterval(
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
         async (): Promise<void> => {
-          await this.ocppRequestService.sendMeterValues(
+          // FIXME: Implement OCPP version agnostic helpers
+          const meterValue: MeterValue = OCPP16ServiceUtils.buildMeterValue(
+            this,
             connectorId,
             this.getConnectorStatus(connectorId).transactionId,
             interval
           );
+          await this.ocppRequestService.sendMessageHandler(RequestCommand.METER_VALUES, {
+            connectorId,
+            transactionId: this.getConnectorStatus(connectorId).transactionId,
+            meterValue: [meterValue],
+          });
         },
         interval
       );
@@ -645,14 +657,13 @@ export default class ChargingStation {
     // In case of multiple instances: add instance index to charging station id
     const instanceIndex = process.env.CF_INSTANCE_INDEX ?? 0;
     const idSuffix = stationTemplate.nameSuffix ?? '';
+    const idStr = '000000000' + this.index.toString();
     return stationTemplate.fixedName
       ? stationTemplate.baseName
       : stationTemplate.baseName +
           '-' +
           instanceIndex.toString() +
-          ('000000000' + this.index.toString()).substr(
-            ('000000000' + this.index.toString()).length - 4
-          ) +
+          idStr.substring(idStr.length - 4) +
           idSuffix;
   }
 
@@ -946,6 +957,11 @@ export default class ChargingStation {
             chargePointVendor: this.bootNotificationRequest.chargePointVendor,
             chargeBoxSerialNumber: this.bootNotificationRequest.chargeBoxSerialNumber,
             firmwareVersion: this.bootNotificationRequest.firmwareVersion,
+            chargePointSerialNumber: this.bootNotificationRequest.chargePointSerialNumber,
+            iccid: this.bootNotificationRequest.iccid,
+            imsi: this.bootNotificationRequest.imsi,
+            meterSerialNumber: this.bootNotificationRequest.meterSerialNumber,
+            meterType: this.bootNotificationRequest.meterType,
           },
           { skipBufferingOnError: true }
         )) as BootNotificationResponse;
@@ -1250,6 +1266,11 @@ export default class ChargingStation {
           chargePointVendor: this.bootNotificationRequest.chargePointVendor,
           chargeBoxSerialNumber: this.bootNotificationRequest.chargeBoxSerialNumber,
           firmwareVersion: this.bootNotificationRequest.firmwareVersion,
+          chargePointSerialNumber: this.bootNotificationRequest.chargePointSerialNumber,
+          iccid: this.bootNotificationRequest.iccid,
+          imsi: this.bootNotificationRequest.imsi,
+          meterSerialNumber: this.bootNotificationRequest.meterSerialNumber,
+          meterType: this.bootNotificationRequest.meterType,
         },
         { skipBufferingOnError: true }
       );
@@ -1337,12 +1358,29 @@ export default class ChargingStation {
       for (const connectorId of this.connectors.keys()) {
         if (connectorId > 0 && this.getConnectorStatus(connectorId)?.transactionStarted) {
           const transactionId = this.getConnectorStatus(connectorId).transactionId;
-          await this.ocppRequestService.sendStopTransaction(
+          if (
+            this.getBeginEndMeterValues() &&
+            this.getOcppStrictCompliance() &&
+            !this.getOutOfOrderEndMeterValues()
+          ) {
+            // FIXME: Implement OCPP version agnostic helpers
+            const transactionEndMeterValue = OCPP16ServiceUtils.buildTransactionEndMeterValue(
+              this,
+              connectorId,
+              this.getEnergyActiveImportRegisterByTransactionId(transactionId)
+            );
+            await this.ocppRequestService.sendMessageHandler(RequestCommand.METER_VALUES, {
+              connectorId,
+              transactionId,
+              meterValue: transactionEndMeterValue,
+            });
+          }
+          await this.ocppRequestService.sendMessageHandler(RequestCommand.STOP_TRANSACTION, {
             transactionId,
-            this.getEnergyActiveImportRegisterByTransactionId(transactionId),
-            this.getTransactionIdTag(transactionId),
-            reason
-          );
+            meterStop: this.getEnergyActiveImportRegisterByTransactionId(transactionId),
+            idTag: this.getTransactionIdTag(transactionId),
+            reason,
+          });
         }
       }
     }