X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16ServiceUtils.ts;h=7f065d30bed7dd29c684edaa358c82c0866cbe9e;hb=d8093be156ab575dbd44546ef4646a6338a27358;hp=aac11154a715305522355933900638dc5ad57afc;hpb=9bf0ef23c51160abc6866ad8d07eea85e308edb8;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts index aac11154..7f065d30 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts @@ -2,9 +2,11 @@ import type { JSONSchemaType } from 'ajv'; -import { type ChargingStation, ChargingStationUtils } from '../../../charging-station'; +import { type ChargingStation, getIdTagsFile, hasFeatureProfile } from '../../../charging-station'; import { OCPPError } from '../../../exception'; import { + type ClearChargingProfileRequest, + type ConnectorStatus, CurrentType, ErrorType, type JsonType, @@ -51,13 +53,13 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { public static checkFeatureProfile( chargingStation: ChargingStation, featureProfile: OCPP16SupportedFeatureProfiles, - command: OCPP16RequestCommand | OCPP16IncomingRequestCommand + command: OCPP16RequestCommand | OCPP16IncomingRequestCommand, ): boolean { - if (!chargingStation.hasFeatureProfile(featureProfile)) { + if (!hasFeatureProfile(chargingStation, featureProfile)) { logger.warn( `${chargingStation.logPrefix()} Trying to '${command}' without '${featureProfile}' feature enabled in ${ OCPP16StandardParametersKey.SupportedFeatureProfiles - } in configuration` + } in configuration`, ); return false; } @@ -69,7 +71,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { connectorId: number, transactionId: number, interval: number, - debug = false + debug = false, ): OCPP16MeterValue { const meterValue: OCPP16MeterValue = { timestamp: new Date(), @@ -80,7 +82,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { const socSampledValueTemplate = OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, connectorId, - OCPP16MeterValueMeasurand.STATE_OF_CHARGE + OCPP16MeterValueMeasurand.STATE_OF_CHARGE, ); if (socSampledValueTemplate) { const socMaximumValue = 100; @@ -88,11 +90,11 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { const socSampledValueTemplateValue = socSampledValueTemplate.value ? getRandomFloatFluctuatedRounded( parseInt(socSampledValueTemplate.value), - socSampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT + socSampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT, ) : getRandomInteger(socMaximumValue, socMinimumValue); meterValue.sampledValue.push( - OCPP16ServiceUtils.buildSampledValue(socSampledValueTemplate, socSampledValueTemplateValue) + OCPP16ServiceUtils.buildSampledValue(socSampledValueTemplate, socSampledValueTemplateValue), ); const sampledValuesIndex = meterValue.sampledValue.length - 1; if ( @@ -104,11 +106,9 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { `${chargingStation.logPrefix()} MeterValues measurand ${ meterValue.sampledValue[sampledValuesIndex].measurand ?? OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER - }: connector id ${connectorId}, transaction id ${ - connector?.transactionId - }, value: ${socMinimumValue}/${ + }: connector id ${connectorId}, transaction id ${connector?.transactionId}, value: ${socMinimumValue}/${ meterValue.sampledValue[sampledValuesIndex].value - }/${socMaximumValue}}` + }/${socMaximumValue}}`, ); } } @@ -116,7 +116,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { const voltageSampledValueTemplate = OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, connectorId, - OCPP16MeterValueMeasurand.VOLTAGE + OCPP16MeterValueMeasurand.VOLTAGE, ); if (voltageSampledValueTemplate) { const voltageSampledValueTemplateValue = voltageSampledValueTemplate.value @@ -126,14 +126,14 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { voltageSampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT; const voltageMeasurandValue = getRandomFloatFluctuatedRounded( voltageSampledValueTemplateValue, - fluctuationPercent + fluctuationPercent, ); if ( chargingStation.getNumberOfPhases() !== 3 || (chargingStation.getNumberOfPhases() === 3 && chargingStation.getMainVoltageMeterValues()) ) { meterValue.sampledValue.push( - OCPP16ServiceUtils.buildSampledValue(voltageSampledValueTemplate, voltageMeasurandValue) + OCPP16ServiceUtils.buildSampledValue(voltageSampledValueTemplate, voltageMeasurandValue), ); } for ( @@ -147,9 +147,9 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { chargingStation, connectorId, OCPP16MeterValueMeasurand.VOLTAGE, - phaseLineToNeutralValue as OCPP16MeterValuePhase + phaseLineToNeutralValue as OCPP16MeterValuePhase, ); - let voltagePhaseLineToNeutralMeasurandValue: number; + let voltagePhaseLineToNeutralMeasurandValue: number | undefined; if (voltagePhaseLineToNeutralSampledValueTemplate) { const voltagePhaseLineToNeutralSampledValueTemplateValue = voltagePhaseLineToNeutralSampledValueTemplate.value @@ -160,7 +160,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { Constants.DEFAULT_FLUCTUATION_PERCENT; voltagePhaseLineToNeutralMeasurandValue = getRandomFloatFluctuatedRounded( voltagePhaseLineToNeutralSampledValueTemplateValue, - fluctuationPhaseToNeutralPercent + fluctuationPhaseToNeutralPercent, ); } meterValue.sampledValue.push( @@ -168,8 +168,8 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { voltagePhaseLineToNeutralSampledValueTemplate ?? voltageSampledValueTemplate, voltagePhaseLineToNeutralMeasurandValue ?? voltageMeasurandValue, undefined, - phaseLineToNeutralValue as OCPP16MeterValuePhase - ) + phaseLineToNeutralValue as OCPP16MeterValuePhase, + ), ); if (chargingStation.getPhaseLineToLineVoltageMeterValues()) { const phaseLineToLineValue = `L${phase}-L${ @@ -182,9 +182,9 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { chargingStation, connectorId, OCPP16MeterValueMeasurand.VOLTAGE, - phaseLineToLineValue as OCPP16MeterValuePhase + phaseLineToLineValue as OCPP16MeterValuePhase, ); - let voltagePhaseLineToLineMeasurandValue: number; + let voltagePhaseLineToLineMeasurandValue: number | undefined; if (voltagePhaseLineToLineSampledValueTemplate) { const voltagePhaseLineToLineSampledValueTemplateValue = voltagePhaseLineToLineSampledValueTemplate.value @@ -195,20 +195,20 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { Constants.DEFAULT_FLUCTUATION_PERCENT; voltagePhaseLineToLineMeasurandValue = getRandomFloatFluctuatedRounded( voltagePhaseLineToLineSampledValueTemplateValue, - fluctuationPhaseLineToLinePercent + fluctuationPhaseLineToLinePercent, ); } const defaultVoltagePhaseLineToLineMeasurandValue = getRandomFloatFluctuatedRounded( Voltage.VOLTAGE_400, - fluctuationPercent + fluctuationPercent, ); meterValue.sampledValue.push( OCPP16ServiceUtils.buildSampledValue( voltagePhaseLineToLineSampledValueTemplate ?? voltageSampledValueTemplate, voltagePhaseLineToLineMeasurandValue ?? defaultVoltagePhaseLineToLineMeasurandValue, undefined, - phaseLineToLineValue as OCPP16MeterValuePhase - ) + phaseLineToLineValue as OCPP16MeterValuePhase, + ), ); } } @@ -217,7 +217,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { const powerSampledValueTemplate = OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, connectorId, - OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT + OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT, ); let powerPerPhaseSampledValueTemplates: MeasurandPerPhaseSampledValueTemplates = {}; if (chargingStation.getNumberOfPhases() === 3) { @@ -226,26 +226,26 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { chargingStation, connectorId, OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT, - OCPP16MeterValuePhase.L1_N + OCPP16MeterValuePhase.L1_N, ), L2: OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, connectorId, OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT, - OCPP16MeterValuePhase.L2_N + OCPP16MeterValuePhase.L2_N, ), L3: OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, connectorId, OCPP16MeterValueMeasurand.POWER_ACTIVE_IMPORT, - OCPP16MeterValuePhase.L3_N + OCPP16MeterValuePhase.L3_N, ), }; } if (powerSampledValueTemplate) { OCPP16ServiceUtils.checkMeasurandPowerDivider( chargingStation, - powerSampledValueTemplate.measurand + powerSampledValueTemplate.measurand!, ); const errMsg = `MeterValues measurand ${ powerSampledValueTemplate.measurand ?? @@ -256,17 +256,17 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { powerSampledValueTemplate.measurand ?? OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER } measurand value`; - const powerMeasurandValues = {} as MeasurandValues; + const powerMeasurandValues: MeasurandValues = {} as MeasurandValues; const unitDivider = powerSampledValueTemplate?.unit === MeterValueUnit.KILO_WATT ? 1000 : 1; const connectorMaximumAvailablePower = chargingStation.getConnectorMaximumAvailablePower(connectorId); const connectorMaximumPower = Math.round(connectorMaximumAvailablePower); const connectorMaximumPowerPerPhase = Math.round( - connectorMaximumAvailablePower / chargingStation.getNumberOfPhases() + connectorMaximumAvailablePower / chargingStation.getNumberOfPhases(), ); - const connectorMinimumPower = Math.round(powerSampledValueTemplate.minimumValue) ?? 0; + const connectorMinimumPower = Math.round(powerSampledValueTemplate.minimumValue!) ?? 0; const connectorMinimumPowerPerPhase = Math.round( - connectorMinimumPower / chargingStation.getNumberOfPhases() + connectorMinimumPower / chargingStation.getNumberOfPhases(), ); switch (chargingStation.getCurrentOutType()) { case CurrentType.AC: @@ -277,64 +277,64 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( powerSampledValueTemplate.value, connectorMaximumPower / unitDivider, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ) / chargingStation.getNumberOfPhases(), powerSampledValueTemplate.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ); const phase1FluctuatedValue = - powerPerPhaseSampledValueTemplates?.L1?.value && + powerPerPhaseSampledValueTemplates.L1?.value && getRandomFloatFluctuatedRounded( OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( powerPerPhaseSampledValueTemplates.L1.value, connectorMaximumPowerPerPhase / unitDivider, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), powerPerPhaseSampledValueTemplates.L1.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ); const phase2FluctuatedValue = - powerPerPhaseSampledValueTemplates?.L2?.value && + powerPerPhaseSampledValueTemplates.L2?.value && getRandomFloatFluctuatedRounded( OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( powerPerPhaseSampledValueTemplates.L2.value, connectorMaximumPowerPerPhase / unitDivider, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), powerPerPhaseSampledValueTemplates.L2.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ); const phase3FluctuatedValue = - powerPerPhaseSampledValueTemplates?.L3?.value && + powerPerPhaseSampledValueTemplates.L3?.value && getRandomFloatFluctuatedRounded( OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( powerPerPhaseSampledValueTemplates.L3.value, connectorMaximumPowerPerPhase / unitDivider, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), powerPerPhaseSampledValueTemplates.L3.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ); powerMeasurandValues.L1 = - phase1FluctuatedValue ?? - defaultFluctuatedPowerPerPhase ?? + (phase1FluctuatedValue as number) ?? + (defaultFluctuatedPowerPerPhase as number) ?? getRandomFloatRounded( connectorMaximumPowerPerPhase / unitDivider, - connectorMinimumPowerPerPhase / unitDivider + connectorMinimumPowerPerPhase / unitDivider, ); powerMeasurandValues.L2 = - phase2FluctuatedValue ?? - defaultFluctuatedPowerPerPhase ?? + (phase2FluctuatedValue as number) ?? + (defaultFluctuatedPowerPerPhase as number) ?? getRandomFloatRounded( connectorMaximumPowerPerPhase / unitDivider, - connectorMinimumPowerPerPhase / unitDivider + connectorMinimumPowerPerPhase / unitDivider, ); powerMeasurandValues.L3 = - phase3FluctuatedValue ?? - defaultFluctuatedPowerPerPhase ?? + (phase3FluctuatedValue as number) ?? + (defaultFluctuatedPowerPerPhase as number) ?? getRandomFloatRounded( connectorMaximumPowerPerPhase / unitDivider, - connectorMinimumPowerPerPhase / unitDivider + connectorMinimumPowerPerPhase / unitDivider, ); } else { powerMeasurandValues.L1 = powerSampledValueTemplate.value @@ -342,21 +342,21 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( powerSampledValueTemplate.value, connectorMaximumPower / unitDivider, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), powerSampledValueTemplate.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ) : getRandomFloatRounded( connectorMaximumPower / unitDivider, - connectorMinimumPower / unitDivider + connectorMinimumPower / unitDivider, ); powerMeasurandValues.L2 = 0; powerMeasurandValues.L3 = 0; } powerMeasurandValues.allPhases = roundTo( powerMeasurandValues.L1 + powerMeasurandValues.L2 + powerMeasurandValues.L3, - 2 + 2, ); break; case CurrentType.DC: @@ -365,14 +365,14 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( powerSampledValueTemplate.value, connectorMaximumPower / unitDivider, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), powerSampledValueTemplate.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ) : getRandomFloatRounded( connectorMaximumPower / unitDivider, - connectorMinimumPower / unitDivider + connectorMinimumPower / unitDivider, ); break; default: @@ -382,8 +382,8 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { meterValue.sampledValue.push( OCPP16ServiceUtils.buildSampledValue( powerSampledValueTemplate, - powerMeasurandValues.allPhases - ) + powerMeasurandValues.allPhases, + ), ); const sampledValuesIndex = meterValue.sampledValue.length - 1; const connectorMaximumPowerRounded = roundTo(connectorMaximumPower / unitDivider, 2); @@ -399,11 +399,9 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { `${chargingStation.logPrefix()} MeterValues measurand ${ meterValue.sampledValue[sampledValuesIndex].measurand ?? OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER - }: connector id ${connectorId}, transaction id ${ - connector?.transactionId - }, value: ${connectorMinimumPowerRounded}/${ + }: connector id ${connectorId}, transaction id ${connector?.transactionId}, value: ${connectorMinimumPowerRounded}/${ meterValue.sampledValue[sampledValuesIndex].value - }/${connectorMaximumPowerRounded}` + }/${connectorMaximumPowerRounded}`, ); } for ( @@ -414,21 +412,22 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { const phaseValue = `L${phase}-N`; meterValue.sampledValue.push( OCPP16ServiceUtils.buildSampledValue( - (powerPerPhaseSampledValueTemplates[`L${phase}`] as SampledValueTemplate) ?? - powerSampledValueTemplate, - powerMeasurandValues[`L${phase}`] as number, + powerPerPhaseSampledValueTemplates[ + `L${phase}` as keyof MeasurandPerPhaseSampledValueTemplates + ]! ?? powerSampledValueTemplate, + powerMeasurandValues[`L${phase}` as keyof MeasurandPerPhaseSampledValueTemplates], undefined, - phaseValue as OCPP16MeterValuePhase - ) + phaseValue as OCPP16MeterValuePhase, + ), ); const sampledValuesPerPhaseIndex = meterValue.sampledValue.length - 1; const connectorMaximumPowerPerPhaseRounded = roundTo( connectorMaximumPowerPerPhase / unitDivider, - 2 + 2, ); const connectorMinimumPowerPerPhaseRounded = roundTo( connectorMinimumPowerPerPhase / unitDivider, - 2 + 2, ); if ( convertToFloat(meterValue.sampledValue[sampledValuesPerPhaseIndex].value) > @@ -443,11 +442,9 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER }: phase ${ meterValue.sampledValue[sampledValuesPerPhaseIndex].phase - }, connector id ${connectorId}, transaction id ${ - connector?.transactionId - }, value: ${connectorMinimumPowerPerPhaseRounded}/${ + }, connector id ${connectorId}, transaction id ${connector?.transactionId}, value: ${connectorMinimumPowerPerPhaseRounded}/${ meterValue.sampledValue[sampledValuesPerPhaseIndex].value - }/${connectorMaximumPowerPerPhaseRounded}` + }/${connectorMaximumPowerPerPhaseRounded}`, ); } } @@ -456,7 +453,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { const currentSampledValueTemplate = OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, connectorId, - OCPP16MeterValueMeasurand.CURRENT_IMPORT + OCPP16MeterValueMeasurand.CURRENT_IMPORT, ); let currentPerPhaseSampledValueTemplates: MeasurandPerPhaseSampledValueTemplates = {}; if (chargingStation.getNumberOfPhases() === 3) { @@ -465,26 +462,26 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { chargingStation, connectorId, OCPP16MeterValueMeasurand.CURRENT_IMPORT, - OCPP16MeterValuePhase.L1 + OCPP16MeterValuePhase.L1, ), L2: OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, connectorId, OCPP16MeterValueMeasurand.CURRENT_IMPORT, - OCPP16MeterValuePhase.L2 + OCPP16MeterValuePhase.L2, ), L3: OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, connectorId, OCPP16MeterValueMeasurand.CURRENT_IMPORT, - OCPP16MeterValuePhase.L3 + OCPP16MeterValuePhase.L3, ), }; } if (currentSampledValueTemplate) { OCPP16ServiceUtils.checkMeasurandPowerDivider( chargingStation, - currentSampledValueTemplate.measurand + currentSampledValueTemplate.measurand!, ); const errMsg = `MeterValues measurand ${ currentSampledValueTemplate.measurand ?? @@ -505,7 +502,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { connectorMaximumAmperage = ACElectricUtils.amperagePerPhaseFromPower( chargingStation.getNumberOfPhases(), connectorMaximumAvailablePower, - chargingStation.getVoltageOut() + chargingStation.getVoltageOut(), ); if (chargingStation.getNumberOfPhases() === 3) { const defaultFluctuatedAmperagePerPhase = @@ -514,55 +511,55 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( currentSampledValueTemplate.value, connectorMaximumAmperage, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), currentSampledValueTemplate.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ); const phase1FluctuatedValue = - currentPerPhaseSampledValueTemplates?.L1?.value && + currentPerPhaseSampledValueTemplates.L1?.value && getRandomFloatFluctuatedRounded( OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( currentPerPhaseSampledValueTemplates.L1.value, connectorMaximumAmperage, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), currentPerPhaseSampledValueTemplates.L1.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ); const phase2FluctuatedValue = - currentPerPhaseSampledValueTemplates?.L2?.value && + currentPerPhaseSampledValueTemplates.L2?.value && getRandomFloatFluctuatedRounded( OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( currentPerPhaseSampledValueTemplates.L2.value, connectorMaximumAmperage, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), currentPerPhaseSampledValueTemplates.L2.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ); const phase3FluctuatedValue = - currentPerPhaseSampledValueTemplates?.L3?.value && + currentPerPhaseSampledValueTemplates.L3?.value && getRandomFloatFluctuatedRounded( OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( currentPerPhaseSampledValueTemplates.L3.value, connectorMaximumAmperage, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), currentPerPhaseSampledValueTemplates.L3.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ); currentMeasurandValues.L1 = - phase1FluctuatedValue ?? - defaultFluctuatedAmperagePerPhase ?? + (phase1FluctuatedValue as number) ?? + (defaultFluctuatedAmperagePerPhase as number) ?? getRandomFloatRounded(connectorMaximumAmperage, connectorMinimumAmperage); currentMeasurandValues.L2 = - phase2FluctuatedValue ?? - defaultFluctuatedAmperagePerPhase ?? + (phase2FluctuatedValue as number) ?? + (defaultFluctuatedAmperagePerPhase as number) ?? getRandomFloatRounded(connectorMaximumAmperage, connectorMinimumAmperage); currentMeasurandValues.L3 = - phase3FluctuatedValue ?? - defaultFluctuatedAmperagePerPhase ?? + (phase3FluctuatedValue as number) ?? + (defaultFluctuatedAmperagePerPhase as number) ?? getRandomFloatRounded(connectorMaximumAmperage, connectorMinimumAmperage); } else { currentMeasurandValues.L1 = currentSampledValueTemplate.value @@ -570,10 +567,10 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( currentSampledValueTemplate.value, connectorMaximumAmperage, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), currentSampledValueTemplate.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ) : getRandomFloatRounded(connectorMaximumAmperage, connectorMinimumAmperage); currentMeasurandValues.L2 = 0; @@ -582,23 +579,23 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { currentMeasurandValues.allPhases = roundTo( (currentMeasurandValues.L1 + currentMeasurandValues.L2 + currentMeasurandValues.L3) / chargingStation.getNumberOfPhases(), - 2 + 2, ); break; case CurrentType.DC: connectorMaximumAmperage = DCElectricUtils.amperage( connectorMaximumAvailablePower, - chargingStation.getVoltageOut() + chargingStation.getVoltageOut(), ); currentMeasurandValues.allPhases = currentSampledValueTemplate.value ? getRandomFloatFluctuatedRounded( OCPP16ServiceUtils.getLimitFromSampledValueTemplateCustomValue( currentSampledValueTemplate.value, connectorMaximumAmperage, - { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() } + { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues() }, ), currentSampledValueTemplate.fluctuationPercent ?? - Constants.DEFAULT_FLUCTUATION_PERCENT + Constants.DEFAULT_FLUCTUATION_PERCENT, ) : getRandomFloatRounded(connectorMaximumAmperage, connectorMinimumAmperage); break; @@ -609,8 +606,8 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { meterValue.sampledValue.push( OCPP16ServiceUtils.buildSampledValue( currentSampledValueTemplate, - currentMeasurandValues.allPhases - ) + currentMeasurandValues.allPhases, + ), ); const sampledValuesIndex = meterValue.sampledValue.length - 1; if ( @@ -624,11 +621,9 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { `${chargingStation.logPrefix()} MeterValues measurand ${ meterValue.sampledValue[sampledValuesIndex].measurand ?? OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER - }: connector id ${connectorId}, transaction id ${ - connector?.transactionId - }, value: ${connectorMinimumAmperage}/${ + }: connector id ${connectorId}, transaction id ${connector?.transactionId}, value: ${connectorMinimumAmperage}/${ meterValue.sampledValue[sampledValuesIndex].value - }/${connectorMaximumAmperage}` + }/${connectorMaximumAmperage}`, ); } for ( @@ -639,12 +634,13 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { const phaseValue = `L${phase}`; meterValue.sampledValue.push( OCPP16ServiceUtils.buildSampledValue( - (currentPerPhaseSampledValueTemplates[phaseValue] as SampledValueTemplate) ?? - currentSampledValueTemplate, - currentMeasurandValues[phaseValue] as number, + currentPerPhaseSampledValueTemplates[ + phaseValue as keyof MeasurandPerPhaseSampledValueTemplates + ]! ?? currentSampledValueTemplate, + currentMeasurandValues[phaseValue as keyof MeasurandPerPhaseSampledValueTemplates], undefined, - phaseValue as OCPP16MeterValuePhase - ) + phaseValue as OCPP16MeterValuePhase, + ), ); const sampledValuesPerPhaseIndex = meterValue.sampledValue.length - 1; if ( @@ -660,11 +656,9 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER }: phase ${ meterValue.sampledValue[sampledValuesPerPhaseIndex].phase - }, connector id ${connectorId}, transaction id ${ - connector?.transactionId - }, value: ${connectorMinimumAmperage}/${ + }, connector id ${connectorId}, transaction id ${connector?.transactionId}, value: ${connectorMinimumAmperage}/${ meterValue.sampledValue[sampledValuesPerPhaseIndex].value - }/${connectorMaximumAmperage}` + }/${connectorMaximumAmperage}`, ); } } @@ -672,12 +666,12 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { // Energy.Active.Import.Register measurand (default) const energySampledValueTemplate = OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, - connectorId + connectorId, ); if (energySampledValueTemplate) { OCPP16ServiceUtils.checkMeasurandPowerDivider( chargingStation, - energySampledValueTemplate.measurand + energySampledValueTemplate.measurand!, ); const unitDivider = energySampledValueTemplate?.unit === MeterValueUnit.KILO_WATT_HOUR ? 1000 : 1; @@ -685,7 +679,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { chargingStation.getConnectorMaximumAvailablePower(connectorId); const connectorMaximumEnergyRounded = roundTo( (connectorMaximumAvailablePower * interval) / (3600 * 1000), - 2 + 2, ); const energyValueRounded = energySampledValueTemplate.value ? // Cumulate the fluctuated value around the static one @@ -696,24 +690,25 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { { limitationEnabled: chargingStation.getCustomValueLimitationMeterValues(), unitMultiplier: unitDivider, - } + }, ), - energySampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT + energySampledValueTemplate.fluctuationPercent ?? Constants.DEFAULT_FLUCTUATION_PERCENT, ) : getRandomFloatRounded(connectorMaximumEnergyRounded); // Persist previous value on connector - if ( - connector && - isNullOrUndefined(connector.energyActiveImportRegisterValue) === false && - connector.energyActiveImportRegisterValue >= 0 && - isNullOrUndefined(connector.transactionEnergyActiveImportRegisterValue) === false && - connector.transactionEnergyActiveImportRegisterValue >= 0 - ) { - connector.energyActiveImportRegisterValue += energyValueRounded; - connector.transactionEnergyActiveImportRegisterValue += energyValueRounded; - } else { - connector.energyActiveImportRegisterValue = 0; - connector.transactionEnergyActiveImportRegisterValue = 0; + if (connector) { + if ( + isNullOrUndefined(connector.energyActiveImportRegisterValue) === false && + connector.energyActiveImportRegisterValue! >= 0 && + isNullOrUndefined(connector.transactionEnergyActiveImportRegisterValue) === false && + connector.transactionEnergyActiveImportRegisterValue! >= 0 + ) { + connector.energyActiveImportRegisterValue! += energyValueRounded; + connector.transactionEnergyActiveImportRegisterValue! += energyValueRounded; + } else { + connector.energyActiveImportRegisterValue = 0; + connector.transactionEnergyActiveImportRegisterValue = 0; + } } meterValue.sampledValue.push( OCPP16ServiceUtils.buildSampledValue( @@ -721,9 +716,9 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { roundTo( chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId) / unitDivider, - 2 - ) - ) + 2, + ), + ), ); const sampledValuesIndex = meterValue.sampledValue.length - 1; if (energyValueRounded > connectorMaximumEnergyRounded || debug) { @@ -731,12 +726,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { `${chargingStation.logPrefix()} MeterValues measurand ${ meterValue.sampledValue[sampledValuesIndex].measurand ?? OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER - }: connector id ${connectorId}, transaction id ${ - connector?.transactionId - }, value: ${energyValueRounded}/${connectorMaximumEnergyRounded}, duration: ${roundTo( - interval / (3600 * 1000), - 4 - )}h` + }: connector id ${connectorId}, transaction id ${connector?.transactionId}, value: ${energyValueRounded}/${connectorMaximumEnergyRounded}, duration: ${interval}ms`, ); } } @@ -746,7 +736,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { public static buildTransactionBeginMeterValue( chargingStation: ChargingStation, connectorId: number, - meterStart: number + meterStart: number, ): OCPP16MeterValue { const meterValue: OCPP16MeterValue = { timestamp: new Date(), @@ -755,15 +745,15 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { // Energy.Active.Import.Register measurand (default) const sampledValueTemplate = OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, - connectorId + connectorId, ); const unitDivider = sampledValueTemplate?.unit === MeterValueUnit.KILO_WATT_HOUR ? 1000 : 1; meterValue.sampledValue.push( OCPP16ServiceUtils.buildSampledValue( - sampledValueTemplate, + sampledValueTemplate!, roundTo((meterStart ?? 0) / unitDivider, 4), - MeterValueContext.TRANSACTION_BEGIN - ) + MeterValueContext.TRANSACTION_BEGIN, + ), ); return meterValue; } @@ -771,7 +761,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { public static buildTransactionEndMeterValue( chargingStation: ChargingStation, connectorId: number, - meterStop: number + meterStop: number, ): OCPP16MeterValue { const meterValue: OCPP16MeterValue = { timestamp: new Date(), @@ -780,22 +770,22 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { // Energy.Active.Import.Register measurand (default) const sampledValueTemplate = OCPP16ServiceUtils.getSampledValueTemplate( chargingStation, - connectorId + connectorId, ); const unitDivider = sampledValueTemplate?.unit === MeterValueUnit.KILO_WATT_HOUR ? 1000 : 1; meterValue.sampledValue.push( OCPP16ServiceUtils.buildSampledValue( - sampledValueTemplate, + sampledValueTemplate!, roundTo((meterStop ?? 0) / unitDivider, 4), - MeterValueContext.TRANSACTION_END - ) + MeterValueContext.TRANSACTION_END, + ), ); return meterValue; } public static buildTransactionDataMeterValues( transactionBeginMeterValue: OCPP16MeterValue, - transactionEndMeterValue: OCPP16MeterValue + transactionEndMeterValue: OCPP16MeterValue, ): OCPP16MeterValue[] { const meterValues: OCPP16MeterValue[] = []; meterValues.push(transactionBeginMeterValue); @@ -806,21 +796,21 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { public static setChargingProfile( chargingStation: ChargingStation, connectorId: number, - cp: OCPP16ChargingProfile + cp: OCPP16ChargingProfile, ): void { if (isNullOrUndefined(chargingStation.getConnectorStatus(connectorId)?.chargingProfiles)) { logger.error( - `${chargingStation.logPrefix()} Trying to set a charging profile on connector id ${connectorId} with an uninitialized charging profiles array attribute, applying deferred initialization` + `${chargingStation.logPrefix()} Trying to set a charging profile on connector id ${connectorId} with an uninitialized charging profiles array attribute, applying deferred initialization`, ); - chargingStation.getConnectorStatus(connectorId).chargingProfiles = []; + chargingStation.getConnectorStatus(connectorId)!.chargingProfiles = []; } if ( Array.isArray(chargingStation.getConnectorStatus(connectorId)?.chargingProfiles) === false ) { logger.error( - `${chargingStation.logPrefix()} Trying to set a charging profile on connector id ${connectorId} with an improper attribute type for the charging profiles array, applying proper type initialization` + `${chargingStation.logPrefix()} Trying to set a charging profile on connector id ${connectorId} with an improper attribute type for the charging profiles array, applying proper type initialization`, ); - chargingStation.getConnectorStatus(connectorId).chargingProfiles = []; + chargingStation.getConnectorStatus(connectorId)!.chargingProfiles = []; } let cpReplaced = false; if (isNotEmptyArray(chargingStation.getConnectorStatus(connectorId)?.chargingProfiles)) { @@ -832,7 +822,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { (chargingProfile.stackLevel === cp.stackLevel && chargingProfile.chargingProfilePurpose === cp.chargingProfilePurpose) ) { - chargingStation.getConnectorStatus(connectorId).chargingProfiles[index] = cp; + chargingStation.getConnectorStatus(connectorId)!.chargingProfiles![index] = cp; cpReplaced = true; } }); @@ -840,26 +830,69 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { !cpReplaced && chargingStation.getConnectorStatus(connectorId)?.chargingProfiles?.push(cp); } + public static clearChargingProfiles = ( + chargingStation: ChargingStation, + commandPayload: ClearChargingProfileRequest, + chargingProfiles: OCPP16ChargingProfile[] | undefined, + ): boolean => { + let clearedCP = false; + if (isNotEmptyArray(chargingProfiles)) { + chargingProfiles?.forEach((chargingProfile: OCPP16ChargingProfile, index: number) => { + let clearCurrentCP = false; + if (chargingProfile.chargingProfileId === commandPayload.id) { + clearCurrentCP = true; + } + if ( + !commandPayload.chargingProfilePurpose && + chargingProfile.stackLevel === commandPayload.stackLevel + ) { + clearCurrentCP = true; + } + if ( + !chargingProfile.stackLevel && + chargingProfile.chargingProfilePurpose === commandPayload.chargingProfilePurpose + ) { + clearCurrentCP = true; + } + if ( + chargingProfile.stackLevel === commandPayload.stackLevel && + chargingProfile.chargingProfilePurpose === commandPayload.chargingProfilePurpose + ) { + clearCurrentCP = true; + } + if (clearCurrentCP) { + chargingProfiles.splice(index, 1); + logger.debug( + `${chargingStation.logPrefix()} Matching charging profile(s) cleared: %j`, + chargingProfile, + ); + clearedCP = true; + } + }); + } + return clearedCP; + }; + public static parseJsonSchemaFile( relativePath: string, moduleName?: string, - methodName?: string + methodName?: string, ): JSONSchemaType { return super.parseJsonSchemaFile( relativePath, OCPPVersion.VERSION_16, moduleName, - methodName + methodName, ); } public static async isIdTagAuthorized( chargingStation: ChargingStation, connectorId: number, - idTag: string + idTag: string, ): Promise { let authorized = false; - const connectorStatus = chargingStation.getConnectorStatus(connectorId); + const connectorStatus: ConnectorStatus = chargingStation.getConnectorStatus(connectorId)!; if (OCPP16ServiceUtils.isIdTagLocalAuthorized(chargingStation, idTag)) { connectorStatus.localAuthorizeIdTag = idTag; connectorStatus.idTagLocalAuthorized = true; @@ -870,7 +903,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { } else { logger.warn( `${chargingStation.logPrefix()} The charging station configuration expects authorize at - remote start transaction but local authorization or authorize isn't enabled` + remote start transaction but local authorization or authorize isn't enabled`, ); } return authorized; @@ -880,13 +913,13 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { sampledValueTemplate: SampledValueTemplate, value: number, context?: MeterValueContext, - phase?: OCPP16MeterValuePhase + phase?: OCPP16MeterValuePhase, ): OCPP16SampledValue { const sampledValueValue = value ?? sampledValueTemplate?.value ?? null; const sampledValueContext = context ?? sampledValueTemplate?.context ?? null; const sampledValueLocation = sampledValueTemplate?.location ?? - OCPP16ServiceUtils.getMeasurandDefaultLocation(sampledValueTemplate?.measurand ?? null); + OCPP16ServiceUtils.getMeasurandDefaultLocation(sampledValueTemplate.measurand!); const sampledValuePhase = phase ?? sampledValueTemplate?.phase ?? null; return { ...(!isNullOrUndefined(sampledValueTemplate.unit) && { @@ -899,12 +932,12 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { ...(!isNullOrUndefined(sampledValueLocation) && { location: sampledValueLocation }), ...(!isNullOrUndefined(sampledValueValue) && { value: sampledValueValue.toString() }), ...(!isNullOrUndefined(sampledValuePhase) && { phase: sampledValuePhase }), - }; + } as OCPP16SampledValue; } private static checkMeasurandPowerDivider( chargingStation: ChargingStation, - measurandType: OCPP16MeterValueMeasurand + measurandType: OCPP16MeterValueMeasurand, ): void { if (isUndefined(chargingStation.powerDivider)) { const errMsg = `MeterValues measurand ${ @@ -922,7 +955,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { } private static getMeasurandDefaultLocation( - measurandType: OCPP16MeterValueMeasurand + measurandType: OCPP16MeterValueMeasurand, ): MeterValueLocation | undefined { switch (measurandType) { case OCPP16MeterValueMeasurand.STATE_OF_CHARGE: @@ -931,7 +964,7 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { } private static getMeasurandDefaultUnit( - measurandType: OCPP16MeterValueMeasurand + measurandType: OCPP16MeterValueMeasurand, ): MeterValueUnit | undefined { switch (measurandType) { case OCPP16MeterValueMeasurand.CURRENT_EXPORT: @@ -958,15 +991,15 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { chargingStation.hasIdTags() === true && isNotEmptyString( chargingStation.idTagsCache - .getIdTags(ChargingStationUtils.getIdTagsFile(chargingStation.stationInfo)) - ?.find((tag) => tag === idTag) + .getIdTags(getIdTagsFile(chargingStation.stationInfo)!) + ?.find((tag) => tag === idTag), ) ); } private static async isIdTagRemoteAuthorized( chargingStation: ChargingStation, - idTag: string + idTag: string, ): Promise { const authorizeResponse: OCPP16AuthorizeResponse = await chargingStation.ocppRequestService.requestHandler<