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