X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPResponseService.ts;h=97a130341efe1f669ef2a242325f5d76cdc2205e;hb=98fc1389a2464ce8738047f8990731ae31938ee5;hp=9654b2d7b93601e008001d0cca049bec31dca58c;hpb=012ae1a9ba663125ec972fa560bb9ee3691aa57a;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts index 9654b2d7..97a13034 100644 --- a/src/charging-station/ocpp/OCPPResponseService.ts +++ b/src/charging-station/ocpp/OCPPResponseService.ts @@ -1,9 +1,9 @@ -import type { JSONSchemaType } from 'ajv'; -import Ajv from 'ajv-draft-04'; +import Ajv, { type JSONSchemaType } from 'ajv'; import ajvFormats from 'ajv-formats'; import OCPPError from '../../exception/OCPPError'; import type { JsonType } from '../../types/JsonType'; +import type { OCPPVersion } from '../../types/ocpp/OCPPVersion'; import type { RequestCommand } from '../../types/ocpp/Requests'; import logger from '../../utils/Logger'; import type ChargingStation from '../ChargingStation'; @@ -13,10 +13,15 @@ const moduleName = 'OCPPResponseService'; export default abstract class OCPPResponseService { private static instance: OCPPResponseService | null = null; + private readonly version: OCPPVersion; private readonly ajv: Ajv; - protected constructor() { - this.ajv = new Ajv(); + protected constructor(version: OCPPVersion) { + this.version = version; + this.ajv = new Ajv({ + keywords: ['javaType'], + multipleOfPrecision: 2, + }); ajvFormats(this.ajv); this.responseHandler.bind(this); this.validateResponsePayload.bind(this); @@ -43,7 +48,7 @@ export default abstract class OCPPResponseService { return true; } logger.error( - `${chargingStation.logPrefix()} ${moduleName}.validateResponsePayload: Response PDU is invalid: %j`, + `${chargingStation.logPrefix()} ${moduleName}.validateResponsePayload: Command '${commandName}' response PDU is invalid: %j`, validate.errors ); throw new OCPPError( @@ -54,8 +59,9 @@ export default abstract class OCPPResponseService { ); } - // eslint-disable-next-line @typescript-eslint/no-empty-function - protected emptyResponseHandler() {} + protected emptyResponseHandler() { + /* This is intentional */ + } public abstract responseHandler( chargingStation: ChargingStation,