-import { JSONSchemaType } from 'ajv';
+import type { JSONSchemaType } from 'ajv';
import Ajv from 'ajv-draft-04';
import ajvFormats from 'ajv-formats';
import OCPPError from '../../exception/OCPPError';
-import { JsonType } from '../../types/JsonType';
-import { RequestCommand } from '../../types/ocpp/Requests';
+import type { JsonType } from '../../types/JsonType';
+import type { RequestCommand } from '../../types/ocpp/Requests';
import logger from '../../utils/Logger';
import type ChargingStation from '../ChargingStation';
-import { OCPP16ServiceUtils } from './1.6/OCPP16ServiceUtils';
+import { OCPPServiceUtils } from './OCPPServiceUtils';
const moduleName = 'OCPPResponseService';
export default abstract class OCPPResponseService {
private static instance: OCPPResponseService | null = null;
- private ajv: Ajv;
+ private readonly ajv: Ajv;
protected constructor() {
this.ajv = new Ajv();
ajvFormats(this.ajv);
+ this.responseHandler.bind(this);
+ this.validateResponsePayload.bind(this);
}
public static getInstance<T extends OCPPResponseService>(this: new () => T): T {
- if (!OCPPResponseService.instance) {
+ if (OCPPResponseService.instance === null) {
OCPPResponseService.instance = new this();
}
return OCPPResponseService.instance as T;
schema: JSONSchemaType<T>,
payload: T
): boolean {
- if (!chargingStation.getPayloadSchemaValidation()) {
+ if (chargingStation.getPayloadSchemaValidation() === false) {
return true;
}
const validate = this.ajv.compile(schema);
validate.errors
);
throw new OCPPError(
- OCPP16ServiceUtils.AjvErrorsToErrorType(validate.errors),
+ OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
'Response PDU is invalid',
commandName,
JSON.stringify(validate.errors, null, 2)