X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPResponseService.ts;h=97a130341efe1f669ef2a242325f5d76cdc2205e;hb=98fc1389a2464ce8738047f8990731ae31938ee5;hp=afef76b6df7360aac48e644dab255e6ae1b73d92;hpb=b52c969dc8bfbd4bc2a2b6f1fc74e3868c4a091d;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts
index afef76b6..97a13034 100644
--- a/src/charging-station/ocpp/OCPPResponseService.ts
+++ b/src/charging-station/ocpp/OCPPResponseService.ts
@@ -1,27 +1,34 @@
-import { JSONSchemaType } from 'ajv';
-import Ajv from 'ajv-draft-04';
+import Ajv, { type JSONSchemaType } from 'ajv';
 import ajvFormats from 'ajv-formats';
 
 import OCPPError from '../../exception/OCPPError';
-import { JsonType } from '../../types/JsonType';
-import { ErrorType } from '../../types/ocpp/ErrorType';
-import { RequestCommand } from '../../types/ocpp/Requests';
+import type { JsonType } from '../../types/JsonType';
+import type { OCPPVersion } from '../../types/ocpp/OCPPVersion';
+import type { RequestCommand } from '../../types/ocpp/Requests';
 import logger from '../../utils/Logger';
 import type ChargingStation from '../ChargingStation';
+import { OCPPServiceUtils } from './OCPPServiceUtils';
 
 const moduleName = 'OCPPResponseService';
 
 export default abstract class OCPPResponseService {
   private static instance: OCPPResponseService | null = null;
-  private ajv: Ajv;
+  private readonly version: OCPPVersion;
+  private readonly ajv: Ajv;
 
-  protected constructor() {
-    this.ajv = new Ajv();
+  protected constructor(version: OCPPVersion) {
+    this.version = version;
+    this.ajv = new Ajv({
+      keywords: ['javaType'],
+      multipleOfPrecision: 2,
+    });
     ajvFormats(this.ajv);
+    this.responseHandler.bind(this);
+    this.validateResponsePayload.bind(this);
   }
 
   public static getInstance<T extends OCPPResponseService>(this: new () => T): T {
-    if (!OCPPResponseService.instance) {
+    if (OCPPResponseService.instance === null) {
       OCPPResponseService.instance = new this();
     }
     return OCPPResponseService.instance as T;
@@ -33,7 +40,7 @@ export default abstract class OCPPResponseService {
     schema: JSONSchemaType<T>,
     payload: T
   ): boolean {
-    if (!chargingStation.getPayloadSchemaValidation()) {
+    if (chargingStation.getPayloadSchemaValidation() === false) {
       return true;
     }
     const validate = this.ajv.compile(schema);
@@ -41,19 +48,20 @@ export default abstract class OCPPResponseService {
       return true;
     }
     logger.error(
-      `${chargingStation.logPrefix()} ${moduleName}.validateResponsePayload: Response PDU is invalid: %j`,
+      `${chargingStation.logPrefix()} ${moduleName}.validateResponsePayload: Command '${commandName}' response PDU is invalid: %j`,
       validate.errors
     );
     throw new OCPPError(
-      ErrorType.FORMATION_VIOLATION,
+      OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
       'Response PDU is invalid',
       commandName,
       JSON.stringify(validate.errors, null, 2)
     );
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  protected emptyResponseHandler() {}
+  protected emptyResponseHandler() {
+    /* This is intentional */
+  }
 
   public abstract responseHandler(
     chargingStation: ChargingStation,