X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPIncomingRequestService.ts;h=509eebd57b16bd8beacb924aafba3b5e2c5e8423;hb=7cb5b17fac198fe3ecd009ac4c692c0d88dd051e;hp=5760e1d1cf43f7c83058e91d38d07e5901fff704;hpb=cbb3711f55d6cc41a82fe4ff7104d8083077f526;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts index 5760e1d1..509eebd5 100644 --- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts +++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts @@ -1,11 +1,11 @@ -import { JSONSchemaType } from 'ajv'; +import type { JSONSchemaType } from 'ajv'; import Ajv from 'ajv-draft-04'; import ajvFormats from 'ajv-formats'; import OCPPError from '../../exception/OCPPError'; -import { HandleErrorParams } from '../../types/Error'; -import { JsonType } from '../../types/JsonType'; -import { IncomingRequestCommand } from '../../types/ocpp/Requests'; +import type { HandleErrorParams } from '../../types/Error'; +import type { JsonType } from '../../types/JsonType'; +import type { IncomingRequestCommand } from '../../types/ocpp/Requests'; import logger from '../../utils/Logger'; import type ChargingStation from '../ChargingStation'; import { OCPPServiceUtils } from './OCPPServiceUtils'; @@ -19,10 +19,12 @@ export default abstract class OCPPIncomingRequestService { protected constructor() { this.ajv = new Ajv(); ajvFormats(this.ajv); + this.incomingRequestHandler.bind(this); + this.validateIncomingRequestPayload.bind(this); } public static getInstance(this: new () => T): T { - if (!OCPPIncomingRequestService.instance) { + if (OCPPIncomingRequestService.instance === null) { OCPPIncomingRequestService.instance = new this(); } return OCPPIncomingRequestService.instance as T; @@ -35,8 +37,7 @@ export default abstract class OCPPIncomingRequestService { params: HandleErrorParams = { throwError: true } ): T { logger.error( - `${chargingStation.logPrefix()} ${moduleName}.handleIncomingRequestError: Incoming request command %s error: %j`, - commandName, + `${chargingStation.logPrefix()} ${moduleName}.handleIncomingRequestError: Incoming request command '${commandName}' error:`, error ); if (!params?.throwError && params?.errorResponse) { @@ -56,7 +57,7 @@ export default abstract class OCPPIncomingRequestService { schema: JSONSchemaType, payload: T ): boolean { - if (!chargingStation.getPayloadSchemaValidation()) { + if (chargingStation.getPayloadSchemaValidation() === false) { return true; } const validate = this.ajv.compile(schema); @@ -68,7 +69,7 @@ export default abstract class OCPPIncomingRequestService { validate.errors ); throw new OCPPError( - OCPPServiceUtils.AjvErrorsToErrorType(validate.errors), + OCPPServiceUtils.ajvErrorsToErrorType(validate.errors), 'Incoming request PDU is invalid', commandName, JSON.stringify(validate.errors, null, 2)