Initial code cleanups for the future OCPP requests code optimization

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index 37457ceea91c3549dd69b593602a8d67ece7d7a4..0e5918db515068f4dee02a9a1e98f952b6de11f1 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@ -9,7 +9,6 @@ import {
   MessageTrigger,
   OCPP16AvailabilityType,
   OCPP16IncomingRequestCommand,
-  OCPP16RequestCommand,
   OCPP16TriggerMessageRequest,
   RemoteStartTransactionRequest,
   RemoteStopTransactionRequest,
@@ -272,7 +271,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
     if (!Utils.isString(commandPayload.key)) {
       logger.error(
         `${this.chargingStation.logPrefix()} ${
-          OCPP16RequestCommand.CHANGE_CONFIGURATION
+          OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION
         } request key field is not a string:`,
         commandPayload
       );
@@ -280,7 +279,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
     if (!Utils.isString(commandPayload.value)) {
       logger.error(
         `${this.chargingStation.logPrefix()} ${
-          OCPP16RequestCommand.CHANGE_CONFIGURATION
+          OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION
         } request value field is not a string:`,
         commandPayload
       );

diff --git a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
index 5cd71f426278f051bca58b17a1c5ad316def3d69..18d6dac0e3d777b208a2b412e09d1330a4eacbff 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts
@@ -1,6 +1,5 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import { ACElectricUtils, DCElectricUtils } from '../../../utils/ElectricUtils';
 import {
   AuthorizeRequest,
   OCPP16AuthorizeResponse,
@@ -10,7 +9,6 @@ import {
   StartTransactionRequest,
   StopTransactionRequest,
 } from '../../../types/ocpp/1.6/Transaction';
-import { CurrentType, Voltage } from '../../../types/ChargingStationTemplate';
 import {
   DiagnosticsStatusNotificationRequest,
   HeartbeatRequest,
@@ -18,21 +16,12 @@ import {
   OCPP16RequestCommand,
   StatusNotificationRequest,
 } from '../../../types/ocpp/1.6/Requests';
-import MeasurandPerPhaseSampledValueTemplates, {
-  SampledValueTemplate,
-} from '../../../types/MeasurandPerPhaseSampledValueTemplates';
-import {
-  MeterValueUnit,
-  MeterValuesRequest,
-  OCPP16MeterValue,
-  OCPP16MeterValueMeasurand,
-  OCPP16MeterValuePhase,
-} from '../../../types/ocpp/1.6/MeterValues';
+import { MeterValuesRequest, OCPP16MeterValue } from '../../../types/ocpp/1.6/MeterValues';
 
 import type ChargingStation from '../../ChargingStation';
 import Constants from '../../../utils/Constants';
 import { ErrorType } from '../../../types/ocpp/ErrorType';
-import MeasurandValues from '../../../types/MeasurandValues';
+import { JsonType } from '../../../types/JsonType';
 import { OCPP16BootNotificationResponse } from '../../../types/ocpp/1.6/Responses';
 import { OCPP16ChargePointErrorCode } from '../../../types/ocpp/1.6/ChargePointErrorCode';
 import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus';
@@ -43,7 +32,6 @@ import OCPPRequestService from '../OCPPRequestService';
 import type OCPPResponseService from '../OCPPResponseService';
 import { SendParams } from '../../../types/ocpp/Requests';
 import Utils from '../../../utils/Utils';
-import logger from '../../../utils/Logger';
 
 const moduleName = 'OCPP16RequestService';
 
@@ -186,562 +174,14 @@ export default class OCPP16RequestService extends OCPPRequestService {
   public async sendMeterValues(
     connectorId: number,
     transactionId: number,
-    interval: number,
-    debug = false
+    interval: number
   ): Promise<void> {
-    const meterValue: OCPP16MeterValue = {
-      timestamp: new Date().toISOString(),
-      sampledValue: [],
-    };
-    const connector = this.chargingStation.getConnectorStatus(connectorId);
-    // SoC measurand
-    const socSampledValueTemplate = this.chargingStation.getSampledValueTemplate(
-      connectorId,
-      OCPP16MeterValueMeasurand.STATE_OF_CHARGE
-    );
-    if (socSampledValueTemplate) {
-      const socSampledValueTemplateValue = socSampledValueTemplate.value
-        ? Utils.getRandomFloatFluctuatedRounded(
-            parseInt(socSampledValueTemplate.value),
-            socSampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT
-          )
-        : Utils.getRandomInteger(100);
-      meterValue.sampledValue.push(
-        OCPP16ServiceUtils.buildSampledValue(socSampledValueTemplate, socSampledValueTemplateValue)
-      );
-      const sampledValuesIndex = meterValue.sampledValue.length - 1;
-      if (Utils.convertToInt(meterValue.sampledValue[sampledValuesIndex].value) > 100 || debug) {
-        logger.error(
-          `${this.chargingStation.logPrefix()} MeterValues measurand ${
-            meterValue.sampledValue[sampledValuesIndex].measurand ??
-            OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
-          }: connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${
-            meterValue.sampledValue[sampledValuesIndex].value
-          }/100`
-        );
-      }
-    }
-    // Voltage measurand
-    const voltageSampledValueTemplate = this.chargingStation.getSampledValueTemplate(
-      connectorId,
-      OCPP16MeterValueMeasurand.VOLTAGE
-    );
-    if (voltageSampledValueTemplate) {
-      const voltageSampledValueTemplateValue = voltageSampledValueTemplate.value
-        ? parseInt(voltageSampledValueTemplate.value)
-        : this.chargingStation.getVoltageOut();
-      const fluctuationPercent =
-        voltageSampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT;
-      const voltageMeasurandValue = Utils.getRandomFloatFluctuatedRounded(
-        voltageSampledValueTemplateValue,
-        fluctuationPercent
-      );
-      if (
-        this.chargingStation.getNumberOfPhases() !== 3 ||
-        (this.chargingStation.getNumberOfPhases() === 3 &&
-          this.chargingStation.getMainVoltageMeterValues())
-      ) {
-        meterValue.sampledValue.push(
-          OCPP16ServiceUtils.buildSampledValue(voltageSampledValueTemplate, voltageMeasurandValue)
-        );
-      }
-      for (
-        let phase = 1;
-        this.chargingStation.getNumberOfPhases() === 3 &&
-        phase <= this.chargingStation.getNumberOfPhases();
-        phase++
-      ) {
-        const phaseLineToNeutralValue = `L${phase}-N`;
-        const voltagePhaseLineToNeutralSampledValueTemplate =
-          this.chargingStation.getSampledValueTemplate(
-            connectorId,
-            OCPP16MeterValueMeasurand.VOLTAGE,
-            phaseLineToNeutralValue as OCPP16MeterValuePhase
-          );
-        let voltagePhaseLineToNeutralMeasurandValue: number;
-        if (voltagePhaseLineToNeutralSampledValueTemplate) {
-          const voltagePhaseLineToNeutralSampledValueTemplateValue =
-            voltagePhaseLineToNeutralSampledValueTemplate.value
-              ? parseInt(voltagePhaseLineToNeutralSampledValueTemplate.value)
-              : this.chargingStation.getVoltageOut();
-          const fluctuationPhaseToNeutralPercent =
-            voltagePhaseLineToNeutralSampledValueTemplate.fluctuationPercent ??
-            Constants.DEFAULT_FLUCTUATION_PERCENT;
-          voltagePhaseLineToNeutralMeasurandValue = Utils.getRandomFloatFluctuatedRounded(
-            voltagePhaseLineToNeutralSampledValueTemplateValue,
-            fluctuationPhaseToNeutralPercent
-          );
-        }
-        meterValue.sampledValue.push(
-          OCPP16ServiceUtils.buildSampledValue(
-            voltagePhaseLineToNeutralSampledValueTemplate ?? voltageSampledValueTemplate,
-            voltagePhaseLineToNeutralMeasurandValue ?? voltageMeasurandValue,
-            null,
-            phaseLineToNeutralValue as OCPP16MeterValuePhase
-          )
-        );
-        if (this.chargingStation.getPhaseLineToLineVoltageMeterValues()) {
-          const phaseLineToLineValue = `L${phase}-L${
-            (phase + 1) % this.chargingStation.getNumberOfPhases() !== 0
-              ? (phase + 1) % this.chargingStation.getNumberOfPhases()
-              : this.chargingStation.getNumberOfPhases()
-          }`;
-          const voltagePhaseLineToLineSampledValueTemplate =
-            this.chargingStation.getSampledValueTemplate(
-              connectorId,
-              OCPP16MeterValueMeasurand.VOLTAGE,
-              phaseLineToLineValue as OCPP16MeterValuePhase
-            );
-          let voltagePhaseLineToLineMeasurandValue: number;
-          if (voltagePhaseLineToLineSampledValueTemplate) {
-            const voltagePhaseLineToLineSampledValueTemplateValue =
-              voltagePhaseLineToLineSampledValueTemplate.value
-                ? parseInt(voltagePhaseLineToLineSampledValueTemplate.value)
-                : Voltage.VOLTAGE_400;
-            const fluctuationPhaseLineToLinePercent =
-              voltagePhaseLineToLineSampledValueTemplate.fluctuationPercent ??
-              Constants.DEFAULT_FLUCTUATION_PERCENT;
-            voltagePhaseLineToLineMeasurandValue = Utils.getRandomFloatFluctuatedRounded(
-              voltagePhaseLineToLineSampledValueTemplateValue,
-              fluctuationPhaseLineToLinePercent
-            );
-          }
-          const defaultVoltagePhaseLineToLineMeasurandValue = Utils.getRandomFloatFluctuatedRounded(
-            Voltage.VOLTAGE_400,
-            fluctuationPercent
-          );
-          meterValue.sampledValue.push(
-            OCPP16ServiceUtils.buildSampledValue(
-              voltagePhaseLineToLineSampledValueTemplate ?? voltageSampledValueTemplate,
-              voltagePhaseLineToLineMeasurandValue ?? defaultVoltagePhaseLineToLineMeasurandValue,
-              null,
-              phaseLineToLineValue as OCPP16MeterValuePhase
-            )
-          );
-        }
-      }
-    }
-    // Power.Active.Import measurand
-    const powerSampledValueTemplate = this.chargingStation.getSampledValueTemplate(
-      connectorId,
-      OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT
-    );
-    let powerPerPhaseSampledValueTemplates: MeasurandPerPhaseSampledValueTemplates = {};
-    if (this.chargingStation.getNumberOfPhases() === 3) {
-      powerPerPhaseSampledValueTemplates = {
-        L1: this.chargingStation.getSampledValueTemplate(
-          connectorId,
-          OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT,
-          OCPP16MeterValuePhase.L1_N
-        ),
-        L2: this.chargingStation.getSampledValueTemplate(
-          connectorId,
-          OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT,
-          OCPP16MeterValuePhase.L2_N
-        ),
-        L3: this.chargingStation.getSampledValueTemplate(
-          connectorId,
-          OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT,
-          OCPP16MeterValuePhase.L3_N
-        ),
-      };
-    }
-    if (powerSampledValueTemplate) {
-      OCPP16ServiceUtils.checkMeasurandPowerDivider(
-        this.chargingStation,
-        powerSampledValueTemplate.measurand
-      );
-      const errMsg = `${this.chargingStation.logPrefix()} MeterValues measurand ${
-        powerSampledValueTemplate.measurand ??
-        OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
-      }: Unknown ${this.chargingStation.getCurrentOutType()} currentOutType in template file ${
-        this.chargingStation.stationTemplateFile
-      }, cannot calculate ${
-        powerSampledValueTemplate.measurand ??
-        OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
-      } measurand value`;
-      const powerMeasurandValues = {} as MeasurandValues;
-      const unitDivider = powerSampledValueTemplate?.unit === MeterValueUnit.KILO_WATT ? 1000 : 1;
-      const maxPower = Math.round(
-        this.chargingStation.stationInfo.maxPower / this.chargingStation.stationInfo.powerDivider
-      );
-      const maxPowerPerPhase = Math.round(
-        this.chargingStation.stationInfo.maxPower /
-          this.chargingStation.stationInfo.powerDivider /
-          this.chargingStation.getNumberOfPhases()
-      );
-      switch (this.chargingStation.getCurrentOutType()) {
-        case CurrentType.AC:
-          if (this.chargingStation.getNumberOfPhases() === 3) {
-            const defaultFluctuatedPowerPerPhase =
-              powerSampledValueTemplate.value &&
-              Utils.getRandomFloatFluctuatedRounded(
-                parseInt(powerSampledValueTemplate.value) /
-                  this.chargingStation.getNumberOfPhases(),
-                powerSampledValueTemplate.fluctuationPercent ??
-                  Constants.DEFAULT_FLUCTUATION_PERCENT
-              );
-            const phase1FluctuatedValue =
-              powerPerPhaseSampledValueTemplates?.L1?.value &&
-              Utils.getRandomFloatFluctuatedRounded(
-                parseInt(powerPerPhaseSampledValueTemplates.L1.value),
-                powerPerPhaseSampledValueTemplates.L1.fluctuationPercent ??
-                  Constants.DEFAULT_FLUCTUATION_PERCENT
-              );
-            const phase2FluctuatedValue =
-              powerPerPhaseSampledValueTemplates?.L2?.value &&
-              Utils.getRandomFloatFluctuatedRounded(
-                parseInt(powerPerPhaseSampledValueTemplates.L2.value),
-                powerPerPhaseSampledValueTemplates.L2.fluctuationPercent ??
-                  Constants.DEFAULT_FLUCTUATION_PERCENT
-              );
-            const phase3FluctuatedValue =
-              powerPerPhaseSampledValueTemplates?.L3?.value &&
-              Utils.getRandomFloatFluctuatedRounded(
-                parseInt(powerPerPhaseSampledValueTemplates.L3.value),
-                powerPerPhaseSampledValueTemplates.L3.fluctuationPercent ??
-                  Constants.DEFAULT_FLUCTUATION_PERCENT
-              );
-            powerMeasurandValues.L1 =
-              phase1FluctuatedValue ??
-              defaultFluctuatedPowerPerPhase ??
-              Utils.getRandomFloatRounded(maxPowerPerPhase / unitDivider);
-            powerMeasurandValues.L2 =
-              phase2FluctuatedValue ??
-              defaultFluctuatedPowerPerPhase ??
-              Utils.getRandomFloatRounded(maxPowerPerPhase / unitDivider);
-            powerMeasurandValues.L3 =
-              phase3FluctuatedValue ??
-              defaultFluctuatedPowerPerPhase ??
-              Utils.getRandomFloatRounded(maxPowerPerPhase / unitDivider);
-          } else {
-            powerMeasurandValues.L1 = powerSampledValueTemplate.value
-              ? Utils.getRandomFloatFluctuatedRounded(
-                  parseInt(powerSampledValueTemplate.value),
-                  powerSampledValueTemplate.fluctuationPercent ??
-                    Constants.DEFAULT_FLUCTUATION_PERCENT
-                )
-              : Utils.getRandomFloatRounded(maxPower / unitDivider);
-            powerMeasurandValues.L2 = 0;
-            powerMeasurandValues.L3 = 0;
-          }
-          powerMeasurandValues.allPhases = Utils.roundTo(
-            powerMeasurandValues.L1 + powerMeasurandValues.L2 + powerMeasurandValues.L3,
-            2
-          );
-          break;
-        case CurrentType.DC:
-          powerMeasurandValues.allPhases = powerSampledValueTemplate.value
-            ? Utils.getRandomFloatFluctuatedRounded(
-                parseInt(powerSampledValueTemplate.value),
-                powerSampledValueTemplate.fluctuationPercent ??
-                  Constants.DEFAULT_FLUCTUATION_PERCENT
-              )
-            : Utils.getRandomFloatRounded(maxPower / unitDivider);
-          break;
-        default:
-          logger.error(errMsg);
-          throw new OCPPError(ErrorType.INTERNAL_ERROR, errMsg, OCPP16RequestCommand.METER_VALUES);
-      }
-      meterValue.sampledValue.push(
-        OCPP16ServiceUtils.buildSampledValue(
-          powerSampledValueTemplate,
-          powerMeasurandValues.allPhases
-        )
-      );
-      const sampledValuesIndex = meterValue.sampledValue.length - 1;
-      const maxPowerRounded = Utils.roundTo(maxPower / unitDivider, 2);
-      if (
-        Utils.convertToFloat(meterValue.sampledValue[sampledValuesIndex].value) > maxPowerRounded ||
-        debug
-      ) {
-        logger.error(
-          `${this.chargingStation.logPrefix()} MeterValues measurand ${
-            meterValue.sampledValue[sampledValuesIndex].measurand ??
-            OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
-          }: connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${
-            meterValue.sampledValue[sampledValuesIndex].value
-          }/${maxPowerRounded}`
-        );
-      }
-      for (
-        let phase = 1;
-        this.chargingStation.getNumberOfPhases() === 3 &&
-        phase <= this.chargingStation.getNumberOfPhases();
-        phase++
-      ) {
-        const phaseValue = `L${phase}-N`;
-        meterValue.sampledValue.push(
-          OCPP16ServiceUtils.buildSampledValue(
-            (powerPerPhaseSampledValueTemplates[`L${phase}`] as SampledValueTemplate) ??
-              powerSampledValueTemplate,
-            powerMeasurandValues[`L${phase}`] as number,
-            null,
-            phaseValue as OCPP16MeterValuePhase
-          )
-        );
-        const sampledValuesPerPhaseIndex = meterValue.sampledValue.length - 1;
-        const maxPowerPerPhaseRounded = Utils.roundTo(maxPowerPerPhase / unitDivider, 2);
-        if (
-          Utils.convertToFloat(meterValue.sampledValue[sampledValuesPerPhaseIndex].value) >
-            maxPowerPerPhaseRounded ||
-          debug
-        ) {
-          logger.error(
-            `${this.chargingStation.logPrefix()} MeterValues measurand ${
-              meterValue.sampledValue[sampledValuesPerPhaseIndex].measurand ??
-              OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
-            }: phase ${
-              meterValue.sampledValue[sampledValuesPerPhaseIndex].phase
-            }, connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${
-              meterValue.sampledValue[sampledValuesPerPhaseIndex].value
-            }/${maxPowerPerPhaseRounded}`
-          );
-        }
-      }
-    }
-    // Current.Import measurand
-    const currentSampledValueTemplate = this.chargingStation.getSampledValueTemplate(
+    const meterValue = OCPP16ServiceUtils.buildMeterValue(
+      this.chargingStation,
       connectorId,
-      OCPP16MeterValueMeasurand.CURRENT_IMPORT
+      transactionId,
+      interval
     );
-    let currentPerPhaseSampledValueTemplates: MeasurandPerPhaseSampledValueTemplates = {};
-    if (this.chargingStation.getNumberOfPhases() === 3) {
-      currentPerPhaseSampledValueTemplates = {
-        L1: this.chargingStation.getSampledValueTemplate(
-          connectorId,
-          OCPP16MeterValueMeasurand.CURRENT_IMPORT,
-          OCPP16MeterValuePhase.L1
-        ),
-        L2: this.chargingStation.getSampledValueTemplate(
-          connectorId,
-          OCPP16MeterValueMeasurand.CURRENT_IMPORT,
-          OCPP16MeterValuePhase.L2
-        ),
-        L3: this.chargingStation.getSampledValueTemplate(
-          connectorId,
-          OCPP16MeterValueMeasurand.CURRENT_IMPORT,
-          OCPP16MeterValuePhase.L3
-        ),
-      };
-    }
-    if (currentSampledValueTemplate) {
-      OCPP16ServiceUtils.checkMeasurandPowerDivider(
-        this.chargingStation,
-        currentSampledValueTemplate.measurand
-      );
-      const errMsg = `${this.chargingStation.logPrefix()} MeterValues measurand ${
-        currentSampledValueTemplate.measurand ??
-        OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
-      }: Unknown ${this.chargingStation.getCurrentOutType()} currentOutType in template file ${
-        this.chargingStation.stationTemplateFile
-      }, cannot calculate ${
-        currentSampledValueTemplate.measurand ??
-        OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
-      } measurand value`;
-      const currentMeasurandValues: MeasurandValues = {} as MeasurandValues;
-      let maxAmperage: number;
-      switch (this.chargingStation.getCurrentOutType()) {
-        case CurrentType.AC:
-          maxAmperage = ACElectricUtils.amperagePerPhaseFromPower(
-            this.chargingStation.getNumberOfPhases(),
-            this.chargingStation.stationInfo.maxPower /
-              this.chargingStation.stationInfo.powerDivider,
-            this.chargingStation.getVoltageOut()
-          );
-          if (this.chargingStation.getNumberOfPhases() === 3) {
-            const defaultFluctuatedAmperagePerPhase =
-              currentSampledValueTemplate.value &&
-              Utils.getRandomFloatFluctuatedRounded(
-                parseInt(currentSampledValueTemplate.value),
-                currentSampledValueTemplate.fluctuationPercent ??
-                  Constants.DEFAULT_FLUCTUATION_PERCENT
-              );
-            const phase1FluctuatedValue =
-              currentPerPhaseSampledValueTemplates?.L1?.value &&
-              Utils.getRandomFloatFluctuatedRounded(
-                parseInt(currentPerPhaseSampledValueTemplates.L1.value),
-                currentPerPhaseSampledValueTemplates.L1.fluctuationPercent ??
-                  Constants.DEFAULT_FLUCTUATION_PERCENT
-              );
-            const phase2FluctuatedValue =
-              currentPerPhaseSampledValueTemplates?.L2?.value &&
-              Utils.getRandomFloatFluctuatedRounded(
-                parseInt(currentPerPhaseSampledValueTemplates.L2.value),
-                currentPerPhaseSampledValueTemplates.L2.fluctuationPercent ??
-                  Constants.DEFAULT_FLUCTUATION_PERCENT
-              );
-            const phase3FluctuatedValue =
-              currentPerPhaseSampledValueTemplates?.L3?.value &&
-              Utils.getRandomFloatFluctuatedRounded(
-                parseInt(currentPerPhaseSampledValueTemplates.L3.value),
-                currentPerPhaseSampledValueTemplates.L3.fluctuationPercent ??
-                  Constants.DEFAULT_FLUCTUATION_PERCENT
-              );
-            currentMeasurandValues.L1 =
-              phase1FluctuatedValue ??
-              defaultFluctuatedAmperagePerPhase ??
-              Utils.getRandomFloatRounded(maxAmperage);
-            currentMeasurandValues.L2 =
-              phase2FluctuatedValue ??
-              defaultFluctuatedAmperagePerPhase ??
-              Utils.getRandomFloatRounded(maxAmperage);
-            currentMeasurandValues.L3 =
-              phase3FluctuatedValue ??
-              defaultFluctuatedAmperagePerPhase ??
-              Utils.getRandomFloatRounded(maxAmperage);
-          } else {
-            currentMeasurandValues.L1 = currentSampledValueTemplate.value
-              ? Utils.getRandomFloatFluctuatedRounded(
-                  parseInt(currentSampledValueTemplate.value),
-                  currentSampledValueTemplate.fluctuationPercent ??
-                    Constants.DEFAULT_FLUCTUATION_PERCENT
-                )
-              : Utils.getRandomFloatRounded(maxAmperage);
-            currentMeasurandValues.L2 = 0;
-            currentMeasurandValues.L3 = 0;
-          }
-          currentMeasurandValues.allPhases = Utils.roundTo(
-            (currentMeasurandValues.L1 + currentMeasurandValues.L2 + currentMeasurandValues.L3) /
-              this.chargingStation.getNumberOfPhases(),
-            2
-          );
-          break;
-        case CurrentType.DC:
-          maxAmperage = DCElectricUtils.amperage(
-            this.chargingStation.stationInfo.maxPower /
-              this.chargingStation.stationInfo.powerDivider,
-            this.chargingStation.getVoltageOut()
-          );
-          currentMeasurandValues.allPhases = currentSampledValueTemplate.value
-            ? Utils.getRandomFloatFluctuatedRounded(
-                parseInt(currentSampledValueTemplate.value),
-                currentSampledValueTemplate.fluctuationPercent ??
-                  Constants.DEFAULT_FLUCTUATION_PERCENT
-              )
-            : Utils.getRandomFloatRounded(maxAmperage);
-          break;
-        default:
-          logger.error(errMsg);
-          throw new OCPPError(ErrorType.INTERNAL_ERROR, errMsg, OCPP16RequestCommand.METER_VALUES);
-      }
-      meterValue.sampledValue.push(
-        OCPP16ServiceUtils.buildSampledValue(
-          currentSampledValueTemplate,
-          currentMeasurandValues.allPhases
-        )
-      );
-      const sampledValuesIndex = meterValue.sampledValue.length - 1;
-      if (
-        Utils.convertToFloat(meterValue.sampledValue[sampledValuesIndex].value) > maxAmperage ||
-        debug
-      ) {
-        logger.error(
-          `${this.chargingStation.logPrefix()} MeterValues measurand ${
-            meterValue.sampledValue[sampledValuesIndex].measurand ??
-            OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
-          }: connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${
-            meterValue.sampledValue[sampledValuesIndex].value
-          }/${maxAmperage}`
-        );
-      }
-      for (
-        let phase = 1;
-        this.chargingStation.getNumberOfPhases() === 3 &&
-        phase <= this.chargingStation.getNumberOfPhases();
-        phase++
-      ) {
-        const phaseValue = `L${phase}`;
-        meterValue.sampledValue.push(
-          OCPP16ServiceUtils.buildSampledValue(
-            (currentPerPhaseSampledValueTemplates[phaseValue] as SampledValueTemplate) ??
-              currentSampledValueTemplate,
-            currentMeasurandValues[phaseValue] as number,
-            null,
-            phaseValue as OCPP16MeterValuePhase
-          )
-        );
-        const sampledValuesPerPhaseIndex = meterValue.sampledValue.length - 1;
-        if (
-          Utils.convertToFloat(meterValue.sampledValue[sampledValuesPerPhaseIndex].value) >
-            maxAmperage ||
-          debug
-        ) {
-          logger.error(
-            `${this.chargingStation.logPrefix()} MeterValues measurand ${
-              meterValue.sampledValue[sampledValuesPerPhaseIndex].measurand ??
-              OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
-            }: phase ${
-              meterValue.sampledValue[sampledValuesPerPhaseIndex].phase
-            }, connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${
-              meterValue.sampledValue[sampledValuesPerPhaseIndex].value
-            }/${maxAmperage}`
-          );
-        }
-      }
-    }
-    // Energy.Active.Import.Register measurand (default)
-    const energySampledValueTemplate = this.chargingStation.getSampledValueTemplate(connectorId);
-    if (energySampledValueTemplate) {
-      OCPP16ServiceUtils.checkMeasurandPowerDivider(
-        this.chargingStation,
-        energySampledValueTemplate.measurand
-      );
-      const unitDivider =
-        energySampledValueTemplate?.unit === MeterValueUnit.KILO_WATT_HOUR ? 1000 : 1;
-      const maxEnergyRounded = Utils.roundTo(
-        ((this.chargingStation.stationInfo.maxPower /
-          this.chargingStation.stationInfo.powerDivider) *
-          interval) /
-          (3600 * 1000),
-        2
-      );
-      const energyValueRounded = energySampledValueTemplate.value
-        ? // Cumulate the fluctuated value around the static one
-          Utils.getRandomFloatFluctuatedRounded(
-            parseInt(energySampledValueTemplate.value),
-            energySampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT
-          )
-        : Utils.getRandomFloatRounded(maxEnergyRounded);
-      // Persist previous value on connector
-      if (
-        connector &&
-        !Utils.isNullOrUndefined(connector.energyActiveImportRegisterValue) &&
-        connector.energyActiveImportRegisterValue >= 0 &&
-        !Utils.isNullOrUndefined(connector.transactionEnergyActiveImportRegisterValue) &&
-        connector.transactionEnergyActiveImportRegisterValue >= 0
-      ) {
-        connector.energyActiveImportRegisterValue += energyValueRounded;
-        connector.transactionEnergyActiveImportRegisterValue += energyValueRounded;
-      } else {
-        connector.energyActiveImportRegisterValue = 0;
-        connector.transactionEnergyActiveImportRegisterValue = 0;
-      }
-      meterValue.sampledValue.push(
-        OCPP16ServiceUtils.buildSampledValue(
-          energySampledValueTemplate,
-          Utils.roundTo(
-            this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId) /
-              unitDivider,
-            2
-          )
-        )
-      );
-      const sampledValuesIndex = meterValue.sampledValue.length - 1;
-      if (energyValueRounded > maxEnergyRounded || debug) {
-        logger.error(
-          `${this.chargingStation.logPrefix()} MeterValues measurand ${
-            meterValue.sampledValue[sampledValuesIndex].measurand ??
-            OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
-          }: connectorId ${connectorId}, transaction ${
-            connector.transactionId
-          }, value: ${energyValueRounded}/${maxEnergyRounded}, duration: ${Utils.roundTo(
-            interval / (3600 * 1000),
-            4
-          )}h`
-        );
-      }
-    }
     const payload: MeterValuesRequest = {
       connectorId,
       transactionId,
@@ -788,4 +228,98 @@ export default class OCPP16RequestService extends OCPPRequestService {
       OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION
     );
   }
+
+  private buildCommandPayload(
+    commandName: OCPP16RequestCommand,
+    commandParams: JsonType
+  ): JsonType {
+    switch (commandName) {
+      case OCPP16RequestCommand.AUTHORIZE:
+        return {
+          ...(!Utils.isUndefined(commandParams?.idTag)
+            ? { idTag: commandParams.idTag }
+            : { idTag: Constants.DEFAULT_IDTAG }),
+        } as AuthorizeRequest;
+      case OCPP16RequestCommand.BOOT_NOTIFICATION:
+        return {
+          chargePointModel: commandParams?.chargePointModel,
+          chargePointVendor: commandParams?.chargePointVendor,
+          ...(!Utils.isUndefined(commandParams?.chargeBoxSerialNumber) && {
+            chargeBoxSerialNumber: commandParams.chargeBoxSerialNumber,
+          }),
+          ...(!Utils.isUndefined(commandParams?.chargePointSerialNumber) && {
+            chargePointSerialNumber: commandParams.chargePointSerialNumber,
+          }),
+          ...(!Utils.isUndefined(commandParams?.firmwareVersion) && {
+            firmwareVersion: commandParams.firmwareVersion,
+          }),
+          ...(!Utils.isUndefined(commandParams?.iccid) && { iccid: commandParams.iccid }),
+          ...(!Utils.isUndefined(commandParams?.imsi) && { imsi: commandParams.imsi }),
+          ...(!Utils.isUndefined(commandParams?.meterSerialNumber) && {
+            meterSerialNumber: commandParams.meterSerialNumber,
+          }),
+          ...(!Utils.isUndefined(commandParams?.meterType) && {
+            meterType: commandParams.meterType,
+          }),
+        } as OCPP16BootNotificationRequest;
+      case OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION:
+        return {
+          status: commandParams?.diagnosticsStatus,
+        } as DiagnosticsStatusNotificationRequest;
+      case OCPP16RequestCommand.HEARTBEAT:
+        return {} as HeartbeatRequest;
+      case OCPP16RequestCommand.METER_VALUES:
+        return {
+          connectorId: commandParams?.connectorId,
+          transactionId: commandParams?.transactionId,
+          meterValue: Array.isArray(commandParams?.meterValues)
+            ? commandParams?.meterValues
+            : [commandParams?.meterValue],
+        } as MeterValuesRequest;
+      case OCPP16RequestCommand.STATUS_NOTIFICATION:
+        return {
+          connectorId: commandParams?.connectorId,
+          errorCode: commandParams?.errorCode,
+          status: commandParams?.status,
+        } as StatusNotificationRequest;
+      case OCPP16RequestCommand.START_TRANSACTION:
+        return {
+          connectorId: commandParams?.connectorId,
+          ...(!Utils.isUndefined(commandParams?.idTag)
+            ? { idTag: commandParams?.idTag }
+            : { idTag: Constants.DEFAULT_IDTAG }),
+          meterStart: this.chargingStation.getEnergyActiveImportRegisterByConnectorId(
+            commandParams?.connectorId as number
+          ),
+          timestamp: new Date().toISOString(),
+        } as StartTransactionRequest;
+      case OCPP16RequestCommand.STOP_TRANSACTION:
+        return {
+          transactionId: commandParams?.transactionId,
+          ...(!Utils.isUndefined(commandParams?.idTag) && { idTag: commandParams.idTag }),
+          meterStop: commandParams?.meterStop,
+          timestamp: new Date().toISOString(),
+          ...(commandParams?.reason && { reason: commandParams.reason }),
+          ...(this.chargingStation.getTransactionDataMeterValues() && {
+            transactionData: OCPP16ServiceUtils.buildTransactionDataMeterValues(
+              this.chargingStation.getConnectorStatus(commandParams?.connectorId as number)
+                .transactionBeginMeterValue,
+              OCPP16ServiceUtils.buildTransactionEndMeterValue(
+                this.chargingStation,
+                commandParams?.connectorId as number,
+                commandParams?.meterStop as number
+              )
+            ),
+          }),
+        } as StopTransactionRequest;
+      default:
+        throw new OCPPError(
+          ErrorType.NOT_SUPPORTED,
+          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+          `Unsupported OCPP command: ${commandName}`,
+          commandName,
+          { commandName }
+        );
+    }
+  }
 }

diff --git a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
index d112270a6aa6e99124931ed66682b08c458ddde8..901276c363c192399d958eac1ea182e48e204a1d 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
@@ -1,5 +1,10 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
+import { ACElectricUtils, DCElectricUtils } from '../../../utils/ElectricUtils';
+import { CurrentType, Voltage } from '../../../types/ChargingStationTemplate';
+import MeasurandPerPhaseSampledValueTemplates, {
+  SampledValueTemplate,
+} from '../../../types/MeasurandPerPhaseSampledValueTemplates';
 import {
   MeterValueContext,
   MeterValueLocation,
@@ -11,10 +16,12 @@ import {
 } from '../../../types/ocpp/1.6/MeterValues';
 
 import type ChargingStation from '../../ChargingStation';
+import Constants from '../../../utils/Constants';
 import { ErrorType } from '../../../types/ocpp/ErrorType';
+import MeasurandValues from '../../../types/MeasurandValues';
+import { OCPP16RequestCommand } from '../../../types/ocpp/1.6/Requests';
 import OCPPError from '../../../exception/OCPPError';
 import { RequestCommand } from '../../../types/ocpp/Requests';
-import { SampledValueTemplate } from '../../../types/MeasurandPerPhaseSampledValueTemplates';
 import Utils from '../../../utils/Utils';
 import logger from '../../../utils/Logger';
 
@@ -95,10 +102,565 @@ export class OCPP16ServiceUtils {
     }
   }
 
+  public static buildMeterValue(
+    chargingStation: ChargingStation,
+    connectorId: number,
+    transactionId: number,
+    interval: number,
+    debug = false
+  ): OCPP16MeterValue {
+    const meterValue: OCPP16MeterValue = {
+      timestamp: new Date().toISOString(),
+      sampledValue: [],
+    };
+    const connector = chargingStation.getConnectorStatus(connectorId);
+    // SoC measurand
+    const socSampledValueTemplate = chargingStation.getSampledValueTemplate(
+      connectorId,
+      OCPP16MeterValueMeasurand.STATE_OF_CHARGE
+    );
+    if (socSampledValueTemplate) {
+      const socSampledValueTemplateValue = socSampledValueTemplate.value
+        ? Utils.getRandomFloatFluctuatedRounded(
+            parseInt(socSampledValueTemplate.value),
+            socSampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT
+          )
+        : Utils.getRandomInteger(100);
+      meterValue.sampledValue.push(
+        OCPP16ServiceUtils.buildSampledValue(socSampledValueTemplate, socSampledValueTemplateValue)
+      );
+      const sampledValuesIndex = meterValue.sampledValue.length - 1;
+      if (Utils.convertToInt(meterValue.sampledValue[sampledValuesIndex].value) > 100 || debug) {
+        logger.error(
+          `${chargingStation.logPrefix()} MeterValues measurand ${
+            meterValue.sampledValue[sampledValuesIndex].measurand ??
+            OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
+          }: connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${
+            meterValue.sampledValue[sampledValuesIndex].value
+          }/100`
+        );
+      }
+    }
+    // Voltage measurand
+    const voltageSampledValueTemplate = chargingStation.getSampledValueTemplate(
+      connectorId,
+      OCPP16MeterValueMeasurand.VOLTAGE
+    );
+    if (voltageSampledValueTemplate) {
+      const voltageSampledValueTemplateValue = voltageSampledValueTemplate.value
+        ? parseInt(voltageSampledValueTemplate.value)
+        : chargingStation.getVoltageOut();
+      const fluctuationPercent =
+        voltageSampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT;
+      const voltageMeasurandValue = Utils.getRandomFloatFluctuatedRounded(
+        voltageSampledValueTemplateValue,
+        fluctuationPercent
+      );
+      if (
+        chargingStation.getNumberOfPhases() !== 3 ||
+        (chargingStation.getNumberOfPhases() === 3 && chargingStation.getMainVoltageMeterValues())
+      ) {
+        meterValue.sampledValue.push(
+          OCPP16ServiceUtils.buildSampledValue(voltageSampledValueTemplate, voltageMeasurandValue)
+        );
+      }
+      for (
+        let phase = 1;
+        chargingStation.getNumberOfPhases() === 3 && phase <= chargingStation.getNumberOfPhases();
+        phase++
+      ) {
+        const phaseLineToNeutralValue = `L${phase}-N`;
+        const voltagePhaseLineToNeutralSampledValueTemplate =
+          chargingStation.getSampledValueTemplate(
+            connectorId,
+            OCPP16MeterValueMeasurand.VOLTAGE,
+            phaseLineToNeutralValue as OCPP16MeterValuePhase
+          );
+        let voltagePhaseLineToNeutralMeasurandValue: number;
+        if (voltagePhaseLineToNeutralSampledValueTemplate) {
+          const voltagePhaseLineToNeutralSampledValueTemplateValue =
+            voltagePhaseLineToNeutralSampledValueTemplate.value
+              ? parseInt(voltagePhaseLineToNeutralSampledValueTemplate.value)
+              : chargingStation.getVoltageOut();
+          const fluctuationPhaseToNeutralPercent =
+            voltagePhaseLineToNeutralSampledValueTemplate.fluctuationPercent ??
+            Constants.DEFAULT_FLUCTUATION_PERCENT;
+          voltagePhaseLineToNeutralMeasurandValue = Utils.getRandomFloatFluctuatedRounded(
+            voltagePhaseLineToNeutralSampledValueTemplateValue,
+            fluctuationPhaseToNeutralPercent
+          );
+        }
+        meterValue.sampledValue.push(
+          OCPP16ServiceUtils.buildSampledValue(
+            voltagePhaseLineToNeutralSampledValueTemplate ?? voltageSampledValueTemplate,
+            voltagePhaseLineToNeutralMeasurandValue ?? voltageMeasurandValue,
+            null,
+            phaseLineToNeutralValue as OCPP16MeterValuePhase
+          )
+        );
+        if (chargingStation.getPhaseLineToLineVoltageMeterValues()) {
+          const phaseLineToLineValue = `L${phase}-L${
+            (phase + 1) % chargingStation.getNumberOfPhases() !== 0
+              ? (phase + 1) % chargingStation.getNumberOfPhases()
+              : chargingStation.getNumberOfPhases()
+          }`;
+          const voltagePhaseLineToLineSampledValueTemplate =
+            chargingStation.getSampledValueTemplate(
+              connectorId,
+              OCPP16MeterValueMeasurand.VOLTAGE,
+              phaseLineToLineValue as OCPP16MeterValuePhase
+            );
+          let voltagePhaseLineToLineMeasurandValue: number;
+          if (voltagePhaseLineToLineSampledValueTemplate) {
+            const voltagePhaseLineToLineSampledValueTemplateValue =
+              voltagePhaseLineToLineSampledValueTemplate.value
+                ? parseInt(voltagePhaseLineToLineSampledValueTemplate.value)
+                : Voltage.VOLTAGE_400;
+            const fluctuationPhaseLineToLinePercent =
+              voltagePhaseLineToLineSampledValueTemplate.fluctuationPercent ??
+              Constants.DEFAULT_FLUCTUATION_PERCENT;
+            voltagePhaseLineToLineMeasurandValue = Utils.getRandomFloatFluctuatedRounded(
+              voltagePhaseLineToLineSampledValueTemplateValue,
+              fluctuationPhaseLineToLinePercent
+            );
+          }
+          const defaultVoltagePhaseLineToLineMeasurandValue = Utils.getRandomFloatFluctuatedRounded(
+            Voltage.VOLTAGE_400,
+            fluctuationPercent
+          );
+          meterValue.sampledValue.push(
+            OCPP16ServiceUtils.buildSampledValue(
+              voltagePhaseLineToLineSampledValueTemplate ?? voltageSampledValueTemplate,
+              voltagePhaseLineToLineMeasurandValue ?? defaultVoltagePhaseLineToLineMeasurandValue,
+              null,
+              phaseLineToLineValue as OCPP16MeterValuePhase
+            )
+          );
+        }
+      }
+    }
+    // Power.Active.Import measurand
+    const powerSampledValueTemplate = chargingStation.getSampledValueTemplate(
+      connectorId,
+      OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT
+    );
+    let powerPerPhaseSampledValueTemplates: MeasurandPerPhaseSampledValueTemplates = {};
+    if (chargingStation.getNumberOfPhases() === 3) {
+      powerPerPhaseSampledValueTemplates = {
+        L1: chargingStation.getSampledValueTemplate(
+          connectorId,
+          OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT,
+          OCPP16MeterValuePhase.L1_N
+        ),
+        L2: chargingStation.getSampledValueTemplate(
+          connectorId,
+          OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT,
+          OCPP16MeterValuePhase.L2_N
+        ),
+        L3: chargingStation.getSampledValueTemplate(
+          connectorId,
+          OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT,
+          OCPP16MeterValuePhase.L3_N
+        ),
+      };
+    }
+    if (powerSampledValueTemplate) {
+      OCPP16ServiceUtils.checkMeasurandPowerDivider(
+        chargingStation,
+        powerSampledValueTemplate.measurand
+      );
+      const errMsg = `${chargingStation.logPrefix()} MeterValues measurand ${
+        powerSampledValueTemplate.measurand ??
+        OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
+      }: Unknown ${chargingStation.getCurrentOutType()} currentOutType in template file ${
+        chargingStation.stationTemplateFile
+      }, cannot calculate ${
+        powerSampledValueTemplate.measurand ??
+        OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
+      } measurand value`;
+      const powerMeasurandValues = {} as MeasurandValues;
+      const unitDivider = powerSampledValueTemplate?.unit === MeterValueUnit.KILO_WATT ? 1000 : 1;
+      const maxPower = Math.round(
+        chargingStation.stationInfo.maxPower / chargingStation.stationInfo.powerDivider
+      );
+      const maxPowerPerPhase = Math.round(
+        chargingStation.stationInfo.maxPower /
+          chargingStation.stationInfo.powerDivider /
+          chargingStation.getNumberOfPhases()
+      );
+      switch (chargingStation.getCurrentOutType()) {
+        case CurrentType.AC:
+          if (chargingStation.getNumberOfPhases() === 3) {
+            const defaultFluctuatedPowerPerPhase =
+              powerSampledValueTemplate.value &&
+              Utils.getRandomFloatFluctuatedRounded(
+                parseInt(powerSampledValueTemplate.value) / chargingStation.getNumberOfPhases(),
+                powerSampledValueTemplate.fluctuationPercent ??
+                  Constants.DEFAULT_FLUCTUATION_PERCENT
+              );
+            const phase1FluctuatedValue =
+              powerPerPhaseSampledValueTemplates?.L1?.value &&
+              Utils.getRandomFloatFluctuatedRounded(
+                parseInt(powerPerPhaseSampledValueTemplates.L1.value),
+                powerPerPhaseSampledValueTemplates.L1.fluctuationPercent ??
+                  Constants.DEFAULT_FLUCTUATION_PERCENT
+              );
+            const phase2FluctuatedValue =
+              powerPerPhaseSampledValueTemplates?.L2?.value &&
+              Utils.getRandomFloatFluctuatedRounded(
+                parseInt(powerPerPhaseSampledValueTemplates.L2.value),
+                powerPerPhaseSampledValueTemplates.L2.fluctuationPercent ??
+                  Constants.DEFAULT_FLUCTUATION_PERCENT
+              );
+            const phase3FluctuatedValue =
+              powerPerPhaseSampledValueTemplates?.L3?.value &&
+              Utils.getRandomFloatFluctuatedRounded(
+                parseInt(powerPerPhaseSampledValueTemplates.L3.value),
+                powerPerPhaseSampledValueTemplates.L3.fluctuationPercent ??
+                  Constants.DEFAULT_FLUCTUATION_PERCENT
+              );
+            powerMeasurandValues.L1 =
+              phase1FluctuatedValue ??
+              defaultFluctuatedPowerPerPhase ??
+              Utils.getRandomFloatRounded(maxPowerPerPhase / unitDivider);
+            powerMeasurandValues.L2 =
+              phase2FluctuatedValue ??
+              defaultFluctuatedPowerPerPhase ??
+              Utils.getRandomFloatRounded(maxPowerPerPhase / unitDivider);
+            powerMeasurandValues.L3 =
+              phase3FluctuatedValue ??
+              defaultFluctuatedPowerPerPhase ??
+              Utils.getRandomFloatRounded(maxPowerPerPhase / unitDivider);
+          } else {
+            powerMeasurandValues.L1 = powerSampledValueTemplate.value
+              ? Utils.getRandomFloatFluctuatedRounded(
+                  parseInt(powerSampledValueTemplate.value),
+                  powerSampledValueTemplate.fluctuationPercent ??
+                    Constants.DEFAULT_FLUCTUATION_PERCENT
+                )
+              : Utils.getRandomFloatRounded(maxPower / unitDivider);
+            powerMeasurandValues.L2 = 0;
+            powerMeasurandValues.L3 = 0;
+          }
+          powerMeasurandValues.allPhases = Utils.roundTo(
+            powerMeasurandValues.L1 + powerMeasurandValues.L2 + powerMeasurandValues.L3,
+            2
+          );
+          break;
+        case CurrentType.DC:
+          powerMeasurandValues.allPhases = powerSampledValueTemplate.value
+            ? Utils.getRandomFloatFluctuatedRounded(
+                parseInt(powerSampledValueTemplate.value),
+                powerSampledValueTemplate.fluctuationPercent ??
+                  Constants.DEFAULT_FLUCTUATION_PERCENT
+              )
+            : Utils.getRandomFloatRounded(maxPower / unitDivider);
+          break;
+        default:
+          logger.error(errMsg);
+          throw new OCPPError(ErrorType.INTERNAL_ERROR, errMsg, OCPP16RequestCommand.METER_VALUES);
+      }
+      meterValue.sampledValue.push(
+        OCPP16ServiceUtils.buildSampledValue(
+          powerSampledValueTemplate,
+          powerMeasurandValues.allPhases
+        )
+      );
+      const sampledValuesIndex = meterValue.sampledValue.length - 1;
+      const maxPowerRounded = Utils.roundTo(maxPower / unitDivider, 2);
+      if (
+        Utils.convertToFloat(meterValue.sampledValue[sampledValuesIndex].value) > maxPowerRounded ||
+        debug
+      ) {
+        logger.error(
+          `${chargingStation.logPrefix()} MeterValues measurand ${
+            meterValue.sampledValue[sampledValuesIndex].measurand ??
+            OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
+          }: connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${
+            meterValue.sampledValue[sampledValuesIndex].value
+          }/${maxPowerRounded}`
+        );
+      }
+      for (
+        let phase = 1;
+        chargingStation.getNumberOfPhases() === 3 && phase <= chargingStation.getNumberOfPhases();
+        phase++
+      ) {
+        const phaseValue = `L${phase}-N`;
+        meterValue.sampledValue.push(
+          OCPP16ServiceUtils.buildSampledValue(
+            (powerPerPhaseSampledValueTemplates[`L${phase}`] as SampledValueTemplate) ??
+              powerSampledValueTemplate,
+            powerMeasurandValues[`L${phase}`] as number,
+            null,
+            phaseValue as OCPP16MeterValuePhase
+          )
+        );
+        const sampledValuesPerPhaseIndex = meterValue.sampledValue.length - 1;
+        const maxPowerPerPhaseRounded = Utils.roundTo(maxPowerPerPhase / unitDivider, 2);
+        if (
+          Utils.convertToFloat(meterValue.sampledValue[sampledValuesPerPhaseIndex].value) >
+            maxPowerPerPhaseRounded ||
+          debug
+        ) {
+          logger.error(
+            `${chargingStation.logPrefix()} MeterValues measurand ${
+              meterValue.sampledValue[sampledValuesPerPhaseIndex].measurand ??
+              OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
+            }: phase ${
+              meterValue.sampledValue[sampledValuesPerPhaseIndex].phase
+            }, connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${
+              meterValue.sampledValue[sampledValuesPerPhaseIndex].value
+            }/${maxPowerPerPhaseRounded}`
+          );
+        }
+      }
+    }
+    // Current.Import measurand
+    const currentSampledValueTemplate = chargingStation.getSampledValueTemplate(
+      connectorId,
+      OCPP16MeterValueMeasurand.CURRENT_IMPORT
+    );
+    let currentPerPhaseSampledValueTemplates: MeasurandPerPhaseSampledValueTemplates = {};
+    if (chargingStation.getNumberOfPhases() === 3) {
+      currentPerPhaseSampledValueTemplates = {
+        L1: chargingStation.getSampledValueTemplate(
+          connectorId,
+          OCPP16MeterValueMeasurand.CURRENT_IMPORT,
+          OCPP16MeterValuePhase.L1
+        ),
+        L2: chargingStation.getSampledValueTemplate(
+          connectorId,
+          OCPP16MeterValueMeasurand.CURRENT_IMPORT,
+          OCPP16MeterValuePhase.L2
+        ),
+        L3: chargingStation.getSampledValueTemplate(
+          connectorId,
+          OCPP16MeterValueMeasurand.CURRENT_IMPORT,
+          OCPP16MeterValuePhase.L3
+        ),
+      };
+    }
+    if (currentSampledValueTemplate) {
+      OCPP16ServiceUtils.checkMeasurandPowerDivider(
+        chargingStation,
+        currentSampledValueTemplate.measurand
+      );
+      const errMsg = `${chargingStation.logPrefix()} MeterValues measurand ${
+        currentSampledValueTemplate.measurand ??
+        OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
+      }: Unknown ${chargingStation.getCurrentOutType()} currentOutType in template file ${
+        chargingStation.stationTemplateFile
+      }, cannot calculate ${
+        currentSampledValueTemplate.measurand ??
+        OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
+      } measurand value`;
+      const currentMeasurandValues: MeasurandValues = {} as MeasurandValues;
+      let maxAmperage: number;
+      switch (chargingStation.getCurrentOutType()) {
+        case CurrentType.AC:
+          maxAmperage = ACElectricUtils.amperagePerPhaseFromPower(
+            chargingStation.getNumberOfPhases(),
+            chargingStation.stationInfo.maxPower / chargingStation.stationInfo.powerDivider,
+            chargingStation.getVoltageOut()
+          );
+          if (chargingStation.getNumberOfPhases() === 3) {
+            const defaultFluctuatedAmperagePerPhase =
+              currentSampledValueTemplate.value &&
+              Utils.getRandomFloatFluctuatedRounded(
+                parseInt(currentSampledValueTemplate.value),
+                currentSampledValueTemplate.fluctuationPercent ??
+                  Constants.DEFAULT_FLUCTUATION_PERCENT
+              );
+            const phase1FluctuatedValue =
+              currentPerPhaseSampledValueTemplates?.L1?.value &&
+              Utils.getRandomFloatFluctuatedRounded(
+                parseInt(currentPerPhaseSampledValueTemplates.L1.value),
+                currentPerPhaseSampledValueTemplates.L1.fluctuationPercent ??
+                  Constants.DEFAULT_FLUCTUATION_PERCENT
+              );
+            const phase2FluctuatedValue =
+              currentPerPhaseSampledValueTemplates?.L2?.value &&
+              Utils.getRandomFloatFluctuatedRounded(
+                parseInt(currentPerPhaseSampledValueTemplates.L2.value),
+                currentPerPhaseSampledValueTemplates.L2.fluctuationPercent ??
+                  Constants.DEFAULT_FLUCTUATION_PERCENT
+              );
+            const phase3FluctuatedValue =
+              currentPerPhaseSampledValueTemplates?.L3?.value &&
+              Utils.getRandomFloatFluctuatedRounded(
+                parseInt(currentPerPhaseSampledValueTemplates.L3.value),
+                currentPerPhaseSampledValueTemplates.L3.fluctuationPercent ??
+                  Constants.DEFAULT_FLUCTUATION_PERCENT
+              );
+            currentMeasurandValues.L1 =
+              phase1FluctuatedValue ??
+              defaultFluctuatedAmperagePerPhase ??
+              Utils.getRandomFloatRounded(maxAmperage);
+            currentMeasurandValues.L2 =
+              phase2FluctuatedValue ??
+              defaultFluctuatedAmperagePerPhase ??
+              Utils.getRandomFloatRounded(maxAmperage);
+            currentMeasurandValues.L3 =
+              phase3FluctuatedValue ??
+              defaultFluctuatedAmperagePerPhase ??
+              Utils.getRandomFloatRounded(maxAmperage);
+          } else {
+            currentMeasurandValues.L1 = currentSampledValueTemplate.value
+              ? Utils.getRandomFloatFluctuatedRounded(
+                  parseInt(currentSampledValueTemplate.value),
+                  currentSampledValueTemplate.fluctuationPercent ??
+                    Constants.DEFAULT_FLUCTUATION_PERCENT
+                )
+              : Utils.getRandomFloatRounded(maxAmperage);
+            currentMeasurandValues.L2 = 0;
+            currentMeasurandValues.L3 = 0;
+          }
+          currentMeasurandValues.allPhases = Utils.roundTo(
+            (currentMeasurandValues.L1 + currentMeasurandValues.L2 + currentMeasurandValues.L3) /
+              chargingStation.getNumberOfPhases(),
+            2
+          );
+          break;
+        case CurrentType.DC:
+          maxAmperage = DCElectricUtils.amperage(
+            chargingStation.stationInfo.maxPower / chargingStation.stationInfo.powerDivider,
+            chargingStation.getVoltageOut()
+          );
+          currentMeasurandValues.allPhases = currentSampledValueTemplate.value
+            ? Utils.getRandomFloatFluctuatedRounded(
+                parseInt(currentSampledValueTemplate.value),
+                currentSampledValueTemplate.fluctuationPercent ??
+                  Constants.DEFAULT_FLUCTUATION_PERCENT
+              )
+            : Utils.getRandomFloatRounded(maxAmperage);
+          break;
+        default:
+          logger.error(errMsg);
+          throw new OCPPError(ErrorType.INTERNAL_ERROR, errMsg, OCPP16RequestCommand.METER_VALUES);
+      }
+      meterValue.sampledValue.push(
+        OCPP16ServiceUtils.buildSampledValue(
+          currentSampledValueTemplate,
+          currentMeasurandValues.allPhases
+        )
+      );
+      const sampledValuesIndex = meterValue.sampledValue.length - 1;
+      if (
+        Utils.convertToFloat(meterValue.sampledValue[sampledValuesIndex].value) > maxAmperage ||
+        debug
+      ) {
+        logger.error(
+          `${chargingStation.logPrefix()} MeterValues measurand ${
+            meterValue.sampledValue[sampledValuesIndex].measurand ??
+            OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
+          }: connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${
+            meterValue.sampledValue[sampledValuesIndex].value
+          }/${maxAmperage}`
+        );
+      }
+      for (
+        let phase = 1;
+        chargingStation.getNumberOfPhases() === 3 && phase <= chargingStation.getNumberOfPhases();
+        phase++
+      ) {
+        const phaseValue = `L${phase}`;
+        meterValue.sampledValue.push(
+          OCPP16ServiceUtils.buildSampledValue(
+            (currentPerPhaseSampledValueTemplates[phaseValue] as SampledValueTemplate) ??
+              currentSampledValueTemplate,
+            currentMeasurandValues[phaseValue] as number,
+            null,
+            phaseValue as OCPP16MeterValuePhase
+          )
+        );
+        const sampledValuesPerPhaseIndex = meterValue.sampledValue.length - 1;
+        if (
+          Utils.convertToFloat(meterValue.sampledValue[sampledValuesPerPhaseIndex].value) >
+            maxAmperage ||
+          debug
+        ) {
+          logger.error(
+            `${chargingStation.logPrefix()} MeterValues measurand ${
+              meterValue.sampledValue[sampledValuesPerPhaseIndex].measurand ??
+              OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
+            }: phase ${
+              meterValue.sampledValue[sampledValuesPerPhaseIndex].phase
+            }, connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${
+              meterValue.sampledValue[sampledValuesPerPhaseIndex].value
+            }/${maxAmperage}`
+          );
+        }
+      }
+    }
+    // Energy.Active.Import.Register measurand (default)
+    const energySampledValueTemplate = chargingStation.getSampledValueTemplate(connectorId);
+    if (energySampledValueTemplate) {
+      OCPP16ServiceUtils.checkMeasurandPowerDivider(
+        chargingStation,
+        energySampledValueTemplate.measurand
+      );
+      const unitDivider =
+        energySampledValueTemplate?.unit === MeterValueUnit.KILO_WATT_HOUR ? 1000 : 1;
+      const maxEnergyRounded = Utils.roundTo(
+        ((chargingStation.stationInfo.maxPower / chargingStation.stationInfo.powerDivider) *
+          interval) /
+          (3600 * 1000),
+        2
+      );
+      const energyValueRounded = energySampledValueTemplate.value
+        ? // Cumulate the fluctuated value around the static one
+          Utils.getRandomFloatFluctuatedRounded(
+            parseInt(energySampledValueTemplate.value),
+            energySampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT
+          )
+        : Utils.getRandomFloatRounded(maxEnergyRounded);
+      // Persist previous value on connector
+      if (
+        connector &&
+        !Utils.isNullOrUndefined(connector.energyActiveImportRegisterValue) &&
+        connector.energyActiveImportRegisterValue >= 0 &&
+        !Utils.isNullOrUndefined(connector.transactionEnergyActiveImportRegisterValue) &&
+        connector.transactionEnergyActiveImportRegisterValue >= 0
+      ) {
+        connector.energyActiveImportRegisterValue += energyValueRounded;
+        connector.transactionEnergyActiveImportRegisterValue += energyValueRounded;
+      } else {
+        connector.energyActiveImportRegisterValue = 0;
+        connector.transactionEnergyActiveImportRegisterValue = 0;
+      }
+      meterValue.sampledValue.push(
+        OCPP16ServiceUtils.buildSampledValue(
+          energySampledValueTemplate,
+          Utils.roundTo(
+            chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId) /
+              unitDivider,
+            2
+          )
+        )
+      );
+      const sampledValuesIndex = meterValue.sampledValue.length - 1;
+      if (energyValueRounded > maxEnergyRounded || debug) {
+        logger.error(
+          `${chargingStation.logPrefix()} MeterValues measurand ${
+            meterValue.sampledValue[sampledValuesIndex].measurand ??
+            OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
+          }: connectorId ${connectorId}, transaction ${
+            connector.transactionId
+          }, value: ${energyValueRounded}/${maxEnergyRounded}, duration: ${Utils.roundTo(
+            interval / (3600 * 1000),
+            4
+          )}h`
+        );
+      }
+    }
+    return meterValue;
+  }
+
   public static buildTransactionBeginMeterValue(
     chargingStation: ChargingStation,
     connectorId: number,
-    meterBegin: number
+    meterStart: number
   ): OCPP16MeterValue {
     const meterValue: OCPP16MeterValue = {
       timestamp: new Date().toISOString(),
@@ -110,7 +672,7 @@ export class OCPP16ServiceUtils {
     meterValue.sampledValue.push(
       OCPP16ServiceUtils.buildSampledValue(
         sampledValueTemplate,
-        Utils.roundTo(meterBegin / unitDivider, 4),
+        Utils.roundTo(meterStart / unitDivider, 4),
         MeterValueContext.TRANSACTION_BEGIN
       )
     );
@@ -120,7 +682,7 @@ export class OCPP16ServiceUtils {
   public static buildTransactionEndMeterValue(
     chargingStation: ChargingStation,
     connectorId: number,
-    meterEnd: number
+    meterStop: number
   ): OCPP16MeterValue {
     const meterValue: OCPP16MeterValue = {
       timestamp: new Date().toISOString(),
@@ -132,7 +694,7 @@ export class OCPP16ServiceUtils {
     meterValue.sampledValue.push(
       OCPP16ServiceUtils.buildSampledValue(
         sampledValueTemplate,
-        Utils.roundTo(meterEnd / unitDivider, 4),
+        Utils.roundTo(meterStop / unitDivider, 4),
         MeterValueContext.TRANSACTION_END
       )
     );

diff --git a/src/types/ocpp/1.6/Requests.ts b/src/types/ocpp/1.6/Requests.ts
index 4b5ff45ca22bb396b1563c5eca7b2fb1ff324798..1b3dc4e7b919eb61d9c3cf22fc004343ad77553b 100644 (file)
--- a/src/types/ocpp/1.6/Requests.ts
+++ b/src/types/ocpp/1.6/Requests.ts
@@ -11,7 +11,6 @@ export enum OCPP16RequestCommand {
   BOOT_NOTIFICATION = 'BootNotification',
   HEARTBEAT = 'Heartbeat',
   STATUS_NOTIFICATION = 'StatusNotification',
-  CHANGE_CONFIGURATION = 'ChangeConfiguration',
   AUTHORIZE = 'Authorize',
   START_TRANSACTION = 'StartTransaction',
   STOP_TRANSACTION = 'StopTransaction',