import type { JSONSchemaType } from 'ajv';
-import { OCPP20ServiceUtils } from './OCPP20ServiceUtils';
+import type { ChargingStation } from '../../../charging-station';
import { OCPPError } from '../../../exception';
import {
ErrorType,
OCPPVersion,
type RequestParams,
} from '../../../types';
-import { Utils } from '../../../utils/Utils';
-import type { ChargingStation } from '../../ChargingStation';
-import { OCPPConstants } from '../OCPPConstants';
-import { OCPPRequestService } from '../OCPPRequestService';
-import type { OCPPResponseService } from '../OCPPResponseService';
+import { Utils } from '../../../utils';
+import {
+ OCPP20Constants,
+ OCPP20ServiceUtils,
+ OCPPRequestService,
+ type OCPPResponseService,
+} from '../internal';
const moduleName = 'OCPP20RequestService';
protected jsonSchemas: Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>;
public constructor(ocppResponseService: OCPPResponseService) {
- if (new.target?.name === moduleName) {
- throw new TypeError(`Cannot construct ${new.target?.name} instances directly`);
- }
+ // 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>>([
[
),
],
]);
- this.buildRequestPayload.bind(this);
+ this.buildRequestPayload = this.buildRequestPayload.bind(this) as <Request extends JsonType>(
+ chargingStation: ChargingStation,
+ commandName: OCPP20RequestCommand,
+ commandParams?: JsonType
+ ) => Request;
}
public async requestHandler<RequestType extends JsonType, ResponseType extends JsonType>(
commandParams?: JsonType,
params?: RequestParams
): Promise<ResponseType> {
+ // FIXME?: add sanity checks on charging station availability, connector availability, connector status, etc.
if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) {
return (await this.sendMessage(
chargingStation,
this.buildRequestPayload<RequestType>(chargingStation, commandName, commandParams),
commandName,
params
- )) as unknown 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(
case OCPP20RequestCommand.BOOT_NOTIFICATION:
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(),