type JsonType,
type OCPP16AuthorizeRequest,
type OCPP16BootNotificationRequest,
+ OCPP16ChargePointStatus,
type OCPP16DataTransferRequest,
type OCPP16DiagnosticsStatusNotificationRequest,
type OCPP16FirmwareStatusNotificationRequest,
OCPPVersion,
type RequestParams,
} from '../../../types';
-import { Constants, Utils } from '../../../utils';
+import { Constants, generateUUID } from '../../../utils';
import { OCPPRequestService } from '../OCPPRequestService';
import type { OCPPResponseService } from '../OCPPResponseService';
const moduleName = 'OCPP16RequestService';
export class OCPP16RequestService extends OCPPRequestService {
- protected jsonSchemas: Map<OCPP16RequestCommand, JSONSchemaType<JsonObject>>;
+ protected jsonSchemas: Map<OCPP16RequestCommand, JSONSchemaType<JsonType>>;
public constructor(ocppResponseService: OCPPResponseService) {
// if (new.target?.name === moduleName) {
// throw new TypeError(`Cannot construct ${new.target?.name} instances directly`);
// }
super(OCPPVersion.VERSION_16, ocppResponseService);
- this.jsonSchemas = new Map<OCPP16RequestCommand, JSONSchemaType<JsonObject>>([
+ this.jsonSchemas = new Map<OCPP16RequestCommand, JSONSchemaType<JsonType>>([
[
OCPP16RequestCommand.AUTHORIZE,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16AuthorizeRequest>(
'assets/json-schemas/ocpp/1.6/Authorize.json',
moduleName,
- 'constructor'
+ 'constructor',
),
],
[
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16BootNotificationRequest>(
'assets/json-schemas/ocpp/1.6/BootNotification.json',
moduleName,
- 'constructor'
+ 'constructor',
),
],
[
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DiagnosticsStatusNotificationRequest>(
'assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotification.json',
moduleName,
- 'constructor'
+ 'constructor',
),
],
[
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16HeartbeatRequest>(
'assets/json-schemas/ocpp/1.6/Heartbeat.json',
moduleName,
- 'constructor'
+ 'constructor',
),
],
[
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16MeterValuesRequest>(
'assets/json-schemas/ocpp/1.6/MeterValues.json',
moduleName,
- 'constructor'
+ 'constructor',
),
],
[
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StatusNotificationRequest>(
'assets/json-schemas/ocpp/1.6/StatusNotification.json',
moduleName,
- 'constructor'
+ 'constructor',
),
],
[
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StartTransactionRequest>(
'assets/json-schemas/ocpp/1.6/StartTransaction.json',
moduleName,
- 'constructor'
+ 'constructor',
),
],
[
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StopTransactionRequest>(
'assets/json-schemas/ocpp/1.6/StopTransaction.json',
moduleName,
- 'constructor'
+ 'constructor',
),
],
[
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferRequest>(
'assets/json-schemas/ocpp/1.6/DataTransfer.json',
moduleName,
- 'constructor'
+ 'constructor',
),
],
[
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16FirmwareStatusNotificationRequest>(
'assets/json-schemas/ocpp/1.6/FirmwareStatusNotification.json',
moduleName,
- 'constructor'
+ 'constructor',
),
],
]);
this.buildRequestPayload = this.buildRequestPayload.bind(this) as <Request extends JsonType>(
chargingStation: ChargingStation,
commandName: OCPP16RequestCommand,
- commandParams?: JsonType
+ commandParams?: JsonType,
) => Request;
}
chargingStation: ChargingStation,
commandName: OCPP16RequestCommand,
commandParams?: JsonType,
- params?: RequestParams
+ params?: RequestParams,
): Promise<ResponseType> {
// FIXME?: add sanity checks on charging station availability, connector availability, connector status, etc.
if (OCPP16ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) {
return (await this.sendMessage(
chargingStation,
- Utils.generateUUID(),
+ generateUUID(),
this.buildRequestPayload<RequestType>(chargingStation, commandName, commandParams),
commandName,
- params
+ params,
)) as ResponseType;
}
// OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError().
ErrorType.NOT_SUPPORTED,
`Unsupported OCPP command '${commandName}'`,
commandName,
- commandParams
+ commandParams,
);
}
private buildRequestPayload<Request extends JsonType>(
chargingStation: ChargingStation,
commandName: OCPP16RequestCommand,
- commandParams?: JsonType
+ commandParams?: JsonType,
): Request {
- let connectorId: number;
+ let connectorId: number | undefined;
let energyActiveImportRegister: number;
commandParams = commandParams as JsonObject;
switch (commandName) {
idTag: Constants.DEFAULT_IDTAG,
meterStart: chargingStation.getEnergyActiveImportRegisterByConnectorId(
commandParams?.connectorId as number,
- true
+ true,
),
timestamp: new Date(),
+ ...(OCPP16ServiceUtils.hasReservation(
+ chargingStation,
+ commandParams?.connectorId as number,
+ commandParams?.idTag as string,
+ ) && {
+ reservationId: chargingStation.getReservationBy(
+ 'connectorId',
+ chargingStation.getConnectorStatus(0)?.status === OCPP16ChargePointStatus.Reserved
+ ? 0
+ : (commandParams?.connectorId as number),
+ )!.reservationId,
+ }),
...commandParams,
} as unknown as Request;
case OCPP16RequestCommand.STOP_TRANSACTION:
- chargingStation.getTransactionDataMeterValues() &&
+ chargingStation.stationInfo?.transactionDataMeterValues &&
(connectorId = chargingStation.getConnectorIdByTransactionId(
- commandParams?.transactionId as number
- ));
+ commandParams?.transactionId as number,
+ )!);
energyActiveImportRegister = chargingStation.getEnergyActiveImportRegisterByTransactionId(
commandParams?.transactionId as number,
- true
+ true,
);
return {
idTag: chargingStation.getTransactionIdTag(commandParams?.transactionId as number),
meterStop: energyActiveImportRegister,
timestamp: new Date(),
- ...(chargingStation.getTransactionDataMeterValues() && {
+ ...(chargingStation.stationInfo?.transactionDataMeterValues && {
transactionData: OCPP16ServiceUtils.buildTransactionDataMeterValues(
- chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue,
+ chargingStation.getConnectorStatus(connectorId!)!.transactionBeginMeterValue!,
OCPP16ServiceUtils.buildTransactionEndMeterValue(
chargingStation,
- connectorId,
- energyActiveImportRegister
- )
+ connectorId!,
+ energyActiveImportRegister,
+ ),
),
}),
...commandParams,
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
`Unsupported OCPP command '${commandName}'`,
commandName,
- commandParams
+ commandParams,
);
}
}