X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPIncomingRequestService.ts;h=c98c28b8186a480ba630d3e2c052ff2ba965f37b;hb=7671fa0be211e944f027ebd83f3a0ad64c2ef2d6;hp=ccb7e98aa56d5b1bee69835d039a4c30a1d60eed;hpb=60a743910478b70e39dcefa5e1b752ec8a93880e;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts index ccb7e98a..c98c28b8 100644 --- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts +++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts @@ -1,9 +1,10 @@ -import { AsyncResource } from 'async_hooks'; +import { AsyncResource } from 'node:async_hooks'; import Ajv, { type JSONSchemaType } from 'ajv'; import ajvFormats from 'ajv-formats'; -import { OCPPConstants, OCPPServiceUtils } from './internal'; +import { OCPPConstants } from './OCPPConstants'; +import { OCPPServiceUtils } from './OCPPServiceUtils'; import { type ChargingStation, ChargingStationUtils } from '../../charging-station'; import { OCPPError } from '../../exception'; import type { @@ -32,8 +33,20 @@ export abstract class OCPPIncomingRequestService extends AsyncResource { multipleOfPrecision: 2, }); ajvFormats(this.ajv); - this.incomingRequestHandler.bind(this); - this.validateIncomingRequestPayload.bind(this); + this.incomingRequestHandler = this.incomingRequestHandler.bind(this) as ( + chargingStation: ChargingStation, + messageId: string, + commandName: IncomingRequestCommand, + commandPayload: JsonType + ) => Promise; + this.validateIncomingRequestPayload = this.validateIncomingRequestPayload.bind(this) as < + T extends JsonType + >( + chargingStation: ChargingStation, + commandName: IncomingRequestCommand, + schema: JSONSchemaType, + payload: T + ) => boolean; } public static getInstance(this: new () => T): T { @@ -90,8 +103,8 @@ export abstract class OCPPIncomingRequestService extends AsyncResource { } protected handleRequestClearCache(chargingStation: ChargingStation): ClearCacheResponse { - chargingStation.authorizedTagsCache.deleteAuthorizedTags( - ChargingStationUtils.getAuthorizationFile(chargingStation.stationInfo) + chargingStation.idTagsCache.deleteIdTags( + ChargingStationUtils.getIdTagsFile(chargingStation.stationInfo) ); return OCPPConstants.OCPP_RESPONSE_ACCEPTED; }