X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPResponseService.ts;h=80d5a68687b0ef1011feb4637cd3862acba608a3;hb=7164966d863b4539243b473c5e2e9d22fb9b5fd1;hp=414eb8a8ac6ade9c7c7fafa4d0032b9a2d9ea0f9;hpb=b0342994636646699094b2d16a767d6d902d2bde;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts index 414eb8a8..80d5a686 100644 --- a/src/charging-station/ocpp/OCPPResponseService.ts +++ b/src/charging-station/ocpp/OCPPResponseService.ts @@ -1,13 +1,13 @@ import Ajv, { type JSONSchemaType } from 'ajv'; import ajvFormats from 'ajv-formats'; +import { OCPPServiceUtils } from './OCPPServiceUtils'; import OCPPError from '../../exception/OCPPError'; -import type { JsonType } from '../../types/JsonType'; +import type { JsonObject, JsonType } from '../../types/JsonType'; import type { OCPPVersion } from '../../types/ocpp/OCPPVersion'; -import type { RequestCommand } from '../../types/ocpp/Requests'; +import type { IncomingRequestCommand, RequestCommand } from '../../types/ocpp/Requests'; import logger from '../../utils/Logger'; import type ChargingStation from '../ChargingStation'; -import { OCPPServiceUtils } from './OCPPServiceUtils'; const moduleName = 'OCPPResponseService'; @@ -15,10 +15,17 @@ export default abstract class OCPPResponseService { private static instance: OCPPResponseService | null = null; private readonly version: OCPPVersion; private readonly ajv: Ajv; + public abstract jsonIncomingRequestResponseSchemas: Map< + IncomingRequestCommand, + JSONSchemaType + >; protected constructor(version: OCPPVersion) { this.version = version; - this.ajv = new Ajv(); + this.ajv = new Ajv({ + keywords: ['javaType'], + multipleOfPrecision: 2, + }); ajvFormats(this.ajv); this.responseHandler.bind(this); this.validateResponsePayload.bind(this); @@ -45,7 +52,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(