X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPIncomingRequestService.ts;h=876e71d8483dd83f313a48f26af9e0ec00cbd102;hb=22e0d48e12052aaa7ed3f76fc59cac779ae67a5c;hp=3f4cb29492ac41bce26ec0b46ffb02ac9f6cdc45;hpb=51581a20372bcec3032755365137bd80b4b6c7fa;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts index 3f4cb294..876e71d8 100644 --- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts +++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts @@ -1,15 +1,18 @@ import { AsyncResource } from 'async_hooks'; -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 { HandleErrorParams } from '../../types/Error'; -import type { JsonType } from '../../types/JsonType'; +import type { JsonObject, JsonType } from '../../types/JsonType'; +import type { OCPPVersion } from '../../types/ocpp/OCPPVersion'; import type { IncomingRequestCommand } from '../../types/ocpp/Requests'; +import type { ClearCacheResponse } from '../../types/ocpp/Responses'; import logger from '../../utils/Logger'; import type ChargingStation from '../ChargingStation'; +import { ChargingStationUtils } from '../ChargingStationUtils'; +import OCPPConstants from './OCPPConstants'; import { OCPPServiceUtils } from './OCPPServiceUtils'; const moduleName = 'OCPPIncomingRequestService'; @@ -17,12 +20,18 @@ const moduleName = 'OCPPIncomingRequestService'; export default abstract class OCPPIncomingRequestService { private static instance: OCPPIncomingRequestService | null = null; protected asyncResource: AsyncResource; + private readonly version: OCPPVersion; private readonly ajv: Ajv; + protected abstract jsonSchemas: Map>; - protected constructor() { - this.asyncResource = new AsyncResource(moduleName); - this.ajv = new Ajv(); + protected constructor(version: OCPPVersion) { + this.version = version; + this.ajv = new Ajv({ + keywords: ['javaType'], + multipleOfPrecision: 2, + }); ajvFormats(this.ajv); + this.asyncResource = new AsyncResource(moduleName); this.incomingRequestHandler.bind(this); this.validateIncomingRequestPayload.bind(this); } @@ -69,7 +78,7 @@ export default abstract class OCPPIncomingRequestService { return true; } logger.error( - `${chargingStation.logPrefix()} ${moduleName}.validateIncomingRequestPayload: Incoming request PDU is invalid: %j`, + `${chargingStation.logPrefix()} ${moduleName}.validateIncomingRequestPayload: Command '${commandName}' incoming request PDU is invalid: %j`, validate.errors ); throw new OCPPError( @@ -80,6 +89,13 @@ export default abstract class OCPPIncomingRequestService { ); } + protected handleRequestClearCache(chargingStation: ChargingStation): ClearCacheResponse { + chargingStation.authorizedTagsCache.deleteAuthorizedTags( + ChargingStationUtils.getAuthorizationFile(chargingStation.stationInfo) + ); + return OCPPConstants.OCPP_RESPONSE_ACCEPTED; + } + public abstract incomingRequestHandler( chargingStation: ChargingStation, messageId: string,