X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Fcharging-station%2Focpp%2FOCPPResponseService.ts;h=97a130341efe1f669ef2a242325f5d76cdc2205e;hb=98fc1389a2464ce8738047f8990731ae31938ee5;hp=e5767be194dc23ab2c4fef567b63577bb9127e34;hpb=d270cc878c61c42098557a0e03cc1620f74112de;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts index e5767be1..97a13034 100644 --- a/src/charging-station/ocpp/OCPPResponseService.ts +++ b/src/charging-station/ocpp/OCPPResponseService.ts @@ -1,10 +1,9 @@ import Ajv, { type JSONSchemaType } from 'ajv'; -import AjvDraft04 from 'ajv-draft-04'; import ajvFormats from 'ajv-formats'; import OCPPError from '../../exception/OCPPError'; import type { JsonType } from '../../types/JsonType'; -import { OCPPVersion } from '../../types/ocpp/OCPPVersion'; +import type { OCPPVersion } from '../../types/ocpp/OCPPVersion'; import type { RequestCommand } from '../../types/ocpp/Requests'; import logger from '../../utils/Logger'; import type ChargingStation from '../ChargingStation'; @@ -19,15 +18,10 @@ export default abstract class OCPPResponseService { protected constructor(version: OCPPVersion) { this.version = version; - switch (this.version) { - case OCPPVersion.VERSION_16: - this.ajv = new AjvDraft04(); - break; - case OCPPVersion.VERSION_20: - case OCPPVersion.VERSION_201: - this.ajv = new Ajv(); - break; - } + this.ajv = new Ajv({ + keywords: ['javaType'], + multipleOfPrecision: 2, + }); ajvFormats(this.ajv); this.responseHandler.bind(this); this.validateResponsePayload.bind(this); @@ -54,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(