import { OCPPServiceUtils } from './OCPPServiceUtils';
import type { ChargingStation } from '../../charging-station';
import { OCPPError } from '../../exception';
-import type {
- IncomingRequestCommand,
- JsonObject,
- JsonType,
- OCPPVersion,
- RequestCommand,
-} from '../../types';
+import type { IncomingRequestCommand, JsonType, OCPPVersion, RequestCommand } from '../../types';
import { logger } from '../../utils';
const moduleName = 'OCPPResponseService';
public jsonIncomingRequestResponseValidateFunctions: Map<
IncomingRequestCommand,
- ValidateFunction<JsonObject>
+ ValidateFunction<JsonType>
>;
private readonly version: OCPPVersion;
private readonly ajv: Ajv;
- private jsonRequestValidateFunctions: Map<RequestCommand, ValidateFunction<JsonObject>>;
+ private jsonRequestValidateFunctions: Map<RequestCommand, ValidateFunction<JsonType>>;
public abstract jsonIncomingRequestResponseSchemas: Map<
IncomingRequestCommand,
- JSONSchemaType<JsonObject>
+ JSONSchemaType<JsonType>
>;
protected constructor(version: OCPPVersion) {
multipleOfPrecision: 2,
});
ajvFormats(this.ajv);
- this.jsonRequestValidateFunctions = new Map<RequestCommand, ValidateFunction<JsonObject>>();
+ this.jsonRequestValidateFunctions = new Map<RequestCommand, ValidateFunction<JsonType>>();
this.jsonIncomingRequestResponseValidateFunctions = new Map<
IncomingRequestCommand,
- ValidateFunction<JsonObject>
+ ValidateFunction<JsonType>
>();
this.responseHandler = this.responseHandler.bind(this) as <
ReqType extends JsonType,
schema: JSONSchemaType<T>,
payload: T,
): boolean {
- if (chargingStation.getOcppStrictCompliance() === false) {
+ if (chargingStation.stationInfo?.ocppStrictCompliance === false) {
return true;
}
- if (this.jsonRequestValidateFunctions.has(commandName) === false) {
- this.jsonRequestValidateFunctions.set(
- commandName,
- this.ajv.compile<JsonObject>(schema).bind(this),
- );
- }
- const validate = this.jsonRequestValidateFunctions.get(commandName)!;
+ const validate = this.getJsonRequestValidateFunction<T>(commandName, schema);
if (validate(payload)) {
return true;
}
validate.errors,
);
throw new OCPPError(
- OCPPServiceUtils.ajvErrorsToErrorType(validate.errors!),
+ OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
'Response PDU is invalid',
commandName,
JSON.stringify(validate.errors, undefined, 2),
/* This is intentional */
}
+ private getJsonRequestValidateFunction<T extends JsonType>(
+ commandName: RequestCommand,
+ schema: JSONSchemaType<T>,
+ ) {
+ if (this.jsonRequestValidateFunctions.has(commandName) === false) {
+ this.jsonRequestValidateFunctions.set(commandName, this.ajv.compile<T>(schema).bind(this));
+ }
+ return this.jsonRequestValidateFunctions.get(commandName)!;
+ }
+
public abstract responseHandler<ReqType extends JsonType, ResType extends JsonType>(
chargingStation: ChargingStation,
commandName: RequestCommand,