X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPIncomingRequestService.ts;h=06ccd312c0e970022c844f200fe3d0b631ef8c93;hb=64818750b8394051b2a77ccf27ea4c2ff2b7af6e;hp=2990b489d7e7b1982e7751e2b9ba39ad63de4a7b;hpb=9952c548347c27a4006eb765659d7bc05c400260;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts index 2990b489..06ccd312 100644 --- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts +++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts @@ -1,11 +1,13 @@ -import { JSONSchemaType } from 'ajv'; +import { AsyncResource } from 'async_hooks'; + +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'; @@ -14,9 +16,11 @@ const moduleName = 'OCPPIncomingRequestService'; export default abstract class OCPPIncomingRequestService { private static instance: OCPPIncomingRequestService | null = null; + protected asyncResource: AsyncResource; private ajv: Ajv; protected constructor() { + this.asyncResource = new AsyncResource(moduleName); this.ajv = new Ajv(); ajvFormats(this.ajv); this.incomingRequestHandler.bind(this); @@ -37,8 +41,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) { @@ -58,7 +61,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);