-// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2024. All Rights Reserved.
-import type { JSONSchemaType } from 'ajv';
+import type { ValidateFunction } from 'ajv'
-import type { ChargingStation } from '../../../charging-station';
-import { OCPPError } from '../../../exception';
+import type { ChargingStation } from '../../../charging-station/index.js'
+import { OCPPError } from '../../../exception/index.js'
import {
ErrorType,
type JsonObject,
OCPP20RequestCommand,
type OCPP20StatusNotificationRequest,
OCPPVersion,
- type RequestParams,
-} from '../../../types';
-import { Utils } from '../../../utils';
-import {
- OCPP20ServiceUtils,
- OCPPConstants,
- OCPPRequestService,
- type OCPPResponseService,
-} from '../internal';
+ type RequestParams
+} from '../../../types/index.js'
+import { generateUUID } from '../../../utils/index.js'
+import { OCPPRequestService } from '../OCPPRequestService.js'
+import type { OCPPResponseService } from '../OCPPResponseService.js'
+import { OCPP20Constants } from './OCPP20Constants.js'
+import { OCPP20ServiceUtils } from './OCPP20ServiceUtils.js'
-const moduleName = 'OCPP20RequestService';
+const moduleName = 'OCPP20RequestService'
export class OCPP20RequestService extends OCPPRequestService {
- protected jsonSchemas: Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>;
+ protected payloadValidateFunctions: Map<OCPP20RequestCommand, ValidateFunction<JsonType>>
- public constructor(ocppResponseService: OCPPResponseService) {
- if (new.target?.name === moduleName) {
- throw new TypeError(`Cannot construct ${new.target?.name} instances directly`);
- }
- super(OCPPVersion.VERSION_20, ocppResponseService);
- this.jsonSchemas = new Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>([
+ public constructor (ocppResponseService: OCPPResponseService) {
+ // if (new.target.name === moduleName) {
+ // throw new TypeError(`Cannot construct ${new.target.name} instances directly`)
+ // }
+ super(OCPPVersion.VERSION_201, ocppResponseService)
+ this.payloadValidateFunctions = new Map<OCPP20RequestCommand, ValidateFunction<JsonType>>([
[
OCPP20RequestCommand.BOOT_NOTIFICATION,
- OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20BootNotificationRequest>(
- '../../../assets/json-schemas/ocpp/2.0/BootNotificationRequest.json',
- moduleName,
- 'constructor'
- ),
+ this.ajv
+ .compile(
+ OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20BootNotificationRequest>(
+ 'assets/json-schemas/ocpp/2.0/BootNotificationRequest.json',
+ moduleName,
+ 'constructor'
+ )
+ )
+ .bind(this)
],
[
OCPP20RequestCommand.HEARTBEAT,
- OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20HeartbeatRequest>(
- '../../../assets/json-schemas/ocpp/2.0/HeartbeatRequest.json',
- moduleName,
- 'constructor'
- ),
+ this.ajv
+ .compile(
+ OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20HeartbeatRequest>(
+ 'assets/json-schemas/ocpp/2.0/HeartbeatRequest.json',
+ moduleName,
+ 'constructor'
+ )
+ )
+ .bind(this)
],
[
OCPP20RequestCommand.STATUS_NOTIFICATION,
- OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20StatusNotificationRequest>(
- '../../../assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json',
- moduleName,
- 'constructor'
- ),
- ],
- ]);
- this.buildRequestPayload.bind(this);
+ this.ajv
+ .compile(
+ OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20StatusNotificationRequest>(
+ 'assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json',
+ moduleName,
+ 'constructor'
+ )
+ )
+ .bind(this)
+ ]
+ ])
+ this.buildRequestPayload = this.buildRequestPayload.bind(this)
}
public async requestHandler<RequestType extends JsonType, ResponseType extends JsonType>(
chargingStation: ChargingStation,
commandName: OCPP20RequestCommand,
- commandParams?: JsonType,
+ commandParams?: RequestType,
params?: RequestParams
): Promise<ResponseType> {
- if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) {
+ // FIXME?: add sanity checks on charging station availability, connector availability, connector status, etc.
+ if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName)) {
+ // TODO: post request actions hook
return (await this.sendMessage(
chargingStation,
- Utils.generateUUID(),
+ generateUUID(),
this.buildRequestPayload<RequestType>(chargingStation, commandName, commandParams),
commandName,
params
- )) as ResponseType;
+ )) as ResponseType
}
// OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError().
throw new OCPPError(
`Unsupported OCPP command '${commandName}'`,
commandName,
commandParams
- );
+ )
}
private buildRequestPayload<Request extends JsonType>(
commandName: OCPP20RequestCommand,
commandParams?: JsonType
): Request {
- commandParams = commandParams as JsonObject;
+ commandParams = commandParams as JsonObject
switch (commandName) {
case OCPP20RequestCommand.BOOT_NOTIFICATION:
- return commandParams as unknown as Request;
+ return commandParams as unknown as Request
case OCPP20RequestCommand.HEARTBEAT:
- return OCPPConstants.OCPP_RESPONSE_EMPTY as unknown as Request;
+ return OCPP20Constants.OCPP_RESPONSE_EMPTY as unknown as Request
case OCPP20RequestCommand.STATUS_NOTIFICATION:
return {
timestamp: new Date(),
- ...commandParams,
- } as unknown as Request;
+ ...commandParams
+ } as unknown as Request
default:
// OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError().
throw new OCPPError(
`Unsupported OCPP command '${commandName}'`,
commandName,
commandParams
- );
+ )
}
}
}