X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPRequestService.ts;h=4ea134b6ef062d5860e2b36e29d8d7d29b794781;hb=b2b606263e2676354259164d532ff9aa91ccdf87;hp=a3b78ca63ec8e40d44a07c7a12f9689ed38eee63;hpb=d58b442097da31f8b974d51aef63c64470d9ab48;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPRequestService.ts b/src/charging-station/ocpp/OCPPRequestService.ts index a3b78ca6..4ea134b6 100644 --- a/src/charging-station/ocpp/OCPPRequestService.ts +++ b/src/charging-station/ocpp/OCPPRequestService.ts @@ -23,7 +23,13 @@ import { type ResponseCallback, type ResponseType, } from '../../types'; -import { Constants, Utils, handleSendMessageError, logger } from '../../utils'; +import { + Constants, + cloneObject, + handleSendMessageError, + logger, + promiseWithTimeout, +} from '../../utils'; const moduleName = 'OCPPRequestService'; @@ -191,7 +197,7 @@ export abstract class OCPPRequestService { commandName: RequestCommand | IncomingRequestCommand, payload: T ): boolean { - if (chargingStation.getPayloadSchemaValidation() === false) { + if (chargingStation.getOcppStrictCompliance() === false) { return true; } if (this.jsonSchemas.has(commandName as RequestCommand) === false) { @@ -201,7 +207,7 @@ export abstract class OCPPRequestService { return true; } const validate = this.ajv.compile(this.jsonSchemas.get(commandName as RequestCommand)); - payload = Utils.cloneObject(payload); + payload = cloneObject(payload); OCPPServiceUtils.convertDateToISOString(payload); if (validate(payload)) { return true; @@ -224,7 +230,7 @@ export abstract class OCPPRequestService { commandName: RequestCommand | IncomingRequestCommand, payload: T ): boolean { - if (chargingStation.getPayloadSchemaValidation() === false) { + if (chargingStation.getOcppStrictCompliance() === false) { return true; } if ( @@ -242,7 +248,7 @@ export abstract class OCPPRequestService { commandName as IncomingRequestCommand ) ); - payload = Utils.cloneObject(payload); + payload = cloneObject(payload); OCPPServiceUtils.convertDateToISOString(payload); if (validate(payload)) { return true; @@ -284,7 +290,7 @@ export abstract class OCPPRequestService { // eslint-disable-next-line @typescript-eslint/no-this-alias const self = this; // Send a message through wsConnection - return Utils.promiseWithTimeout( + return promiseWithTimeout( new Promise((resolve, reject) => { /** * Function that will receive the request's response