-import Ajv, { type JSONSchemaType } from 'ajv';
+import Ajv, { type JSONSchemaType, type ValidateFunction } from 'ajv';
import ajvFormats from 'ajv-formats';
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';
export abstract class OCPPResponseService {
private static instance: OCPPResponseService | null = null;
+
+ public jsonIncomingRequestResponseValidateFunctions: Map<
+ IncomingRequestCommand,
+ ValidateFunction<JsonType>
+ >;
+
private readonly version: OCPPVersion;
private readonly ajv: Ajv;
+ 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.responseHandler = this.responseHandler.bind(this) as (
+ this.jsonRequestValidateFunctions = new Map<RequestCommand, ValidateFunction<JsonType>>();
+ this.jsonIncomingRequestResponseValidateFunctions = new Map<
+ IncomingRequestCommand,
+ ValidateFunction<JsonType>
+ >();
+ this.responseHandler = this.responseHandler.bind(this) as <
+ ReqType extends JsonType,
+ ResType extends JsonType,
+ >(
chargingStation: ChargingStation,
commandName: RequestCommand,
- payload: JsonType,
- requestPayload: JsonType,
+ payload: ResType,
+ requestPayload: ReqType,
) => Promise<void>;
this.validateResponsePayload = this.validateResponsePayload.bind(this) as <T extends JsonType>(
chargingStation: ChargingStation,
schema: JSONSchemaType<T>,
payload: T,
): boolean {
- if (chargingStation.getOcppStrictCompliance() === false) {
+ if (chargingStation.stationInfo?.ocppStrictCompliance === false) {
return true;
}
- const validate = this.ajv.compile(schema);
+ if (this.jsonRequestValidateFunctions.has(commandName) === false) {
+ this.jsonRequestValidateFunctions.set(commandName, this.ajv.compile<T>(schema).bind(this));
+ }
+ const validate = this.jsonRequestValidateFunctions.get(commandName)!;
if (validate(payload)) {
return true;
}
OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
'Response PDU is invalid',
commandName,
- JSON.stringify(validate.errors, null, 2),
+ JSON.stringify(validate.errors, undefined, 2),
);
}
/* This is intentional */
}
- public abstract responseHandler(
+ public abstract responseHandler<ReqType extends JsonType, ResType extends JsonType>(
chargingStation: ChargingStation,
commandName: RequestCommand,
- payload: JsonType,
- requestPayload: JsonType,
+ payload: ResType,
+ requestPayload: ReqType,
): Promise<void>;
}