X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPIncomingRequestService.ts;h=bca4809e8d38a2af5fc00ae66d619f73d182d742;hb=ba62a535da8d31400787113da1f77282967abb65;hp=6015d4d9b8037956e1434ae23b934fd4f98bad6e;hpb=b0342994636646699094b2d16a767d6d902d2bde;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts index 6015d4d9..bca4809e 100644 --- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts +++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts @@ -1,30 +1,37 @@ -import { AsyncResource } from 'async_hooks'; +import { AsyncResource } from 'node:async_hooks'; 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 { OCPPVersion } from '../../types/ocpp/OCPPVersion'; -import type { IncomingRequestCommand } from '../../types/ocpp/Requests'; -import logger from '../../utils/Logger'; -import type ChargingStation from '../ChargingStation'; -import { OCPPServiceUtils } from './OCPPServiceUtils'; +import { OCPPConstants, OCPPServiceUtils } from './internal'; +import { type ChargingStation, ChargingStationUtils } from '../../charging-station'; +import { OCPPError } from '../../exception'; +import type { + ClearCacheResponse, + HandleErrorParams, + IncomingRequestCommand, + JsonObject, + JsonType, + OCPPVersion, +} from '../../types'; +import { logger } from '../../utils'; const moduleName = 'OCPPIncomingRequestService'; -export default abstract class OCPPIncomingRequestService { +export abstract class OCPPIncomingRequestService extends AsyncResource { private static instance: OCPPIncomingRequestService | null = null; - protected asyncResource: AsyncResource; private readonly version: OCPPVersion; private readonly ajv: Ajv; + protected abstract jsonSchemas: Map>; protected constructor(version: OCPPVersion) { + super(moduleName); this.version = version; - this.ajv = new Ajv(); + this.ajv = new Ajv({ + keywords: ['javaType'], + multipleOfPrecision: 2, + }); ajvFormats(this.ajv); - this.asyncResource = new AsyncResource(moduleName); this.incomingRequestHandler.bind(this); this.validateIncomingRequestPayload.bind(this); } @@ -71,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( @@ -82,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,