import { IncomingRequestCommand } from '../../types/ocpp/Requests';
import logger from '../../utils/Logger';
import type ChargingStation from '../ChargingStation';
-import { OCPP16ServiceUtils } from './1.6/OCPP16ServiceUtils';
+import { OCPPServiceUtils } from './OCPPServiceUtils';
const moduleName = 'OCPPIncomingRequestService';
protected constructor() {
this.ajv = new Ajv();
ajvFormats(this.ajv);
+ this.incomingRequestHandler.bind(this);
+ this.validateIncomingRequestPayload.bind(this);
}
public static getInstance<T extends OCPPIncomingRequestService>(this: new () => T): T {
- if (!OCPPIncomingRequestService.instance) {
+ if (OCPPIncomingRequestService.instance === null) {
OCPPIncomingRequestService.instance = new this();
}
return OCPPIncomingRequestService.instance as T;
params: HandleErrorParams<T> = { throwError: true }
): T {
logger.error(
- `${chargingStation.logPrefix()} ${moduleName}.handleIncomingRequestError: Incoming request command %s error: %j`,
+ `${chargingStation.logPrefix()} ${moduleName}.handleIncomingRequestError: Incoming request command %s error:`,
commandName,
error
);
validate.errors
);
throw new OCPPError(
- OCPP16ServiceUtils.AjvErrorsToErrorType(validate.errors),
+ OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
'Incoming request PDU is invalid',
commandName,
JSON.stringify(validate.errors, null, 2)