X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPIncomingRequestService.ts;h=06165c2f0514ec79399fa1483b39458bb8ade616;hb=4293e5179eabbc8f42a1c06064d15c0ec7d1ca3f;hp=49128ccbd1b74a9440d76ac998bd849f539ac723;hpb=30d5941416b387d6315e3e13f6b3c49967a9e80c;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts index 49128ccb..06165c2f 100644 --- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts +++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts @@ -3,8 +3,6 @@ import { EventEmitter } from 'node:events' import _Ajv, { type ValidateFunction } from 'ajv' import _ajvFormats from 'ajv-formats' -import { OCPPConstants } from './OCPPConstants.js' -import { OCPPServiceUtils } from './OCPPServiceUtils.js' import { type ChargingStation, getIdTagsFile } from '../../charging-station/index.js' import { OCPPError } from '../../exception/index.js' import type { @@ -15,6 +13,8 @@ import type { OCPPVersion } from '../../types/index.js' import { logger, setDefaultErrorParams } from '../../utils/index.js' +import { OCPPConstants } from './OCPPConstants.js' +import { ajvErrorsToErrorType } from './OCPPServiceUtils.js' type Ajv = _Ajv.default // eslint-disable-next-line @typescript-eslint/no-redeclare const Ajv = _Ajv.default @@ -56,7 +56,7 @@ export abstract class OCPPIncomingRequestService extends EventEmitter { error: Error, params: HandleErrorParams = { throwError: true, consoleOut: false } ): T | undefined { - setDefaultErrorParams(params) + params = setDefaultErrorParams(params) logger.error( `${chargingStation.logPrefix()} ${moduleName}.handleIncomingRequestError: Incoming request command '${commandName}' error:`, error @@ -89,7 +89,7 @@ export abstract class OCPPIncomingRequestService extends EventEmitter { validate?.errors ) throw new OCPPError( - OCPPServiceUtils.ajvErrorsToErrorType(validate?.errors), + ajvErrorsToErrorType(validate?.errors), 'Incoming request PDU is invalid', commandName, JSON.stringify(validate?.errors, undefined, 2)