Hook the OCPP 2.0 stack into the main code

[e-mobility-charging-stations-simulator.git] / src / charging-station / ocpp / OCPPResponseService.ts

diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts
index 624659aeec5e18cb78a6c5dd31d498ce2648489d..3f69655ec82dfaa573bb04b269e244c45c3a4102 100644 (file)
--- a/src/charging-station/ocpp/OCPPResponseService.ts
+++ b/src/charging-station/ocpp/OCPPResponseService.ts
@@ -1,10 +1,10 @@
-import { JSONSchemaType } from 'ajv';
+import type { JSONSchemaType } from 'ajv';
 import Ajv from 'ajv-draft-04';
 import ajvFormats from 'ajv-formats';
 
 import OCPPError from '../../exception/OCPPError';
-import { JsonType } from '../../types/JsonType';
-import { RequestCommand } from '../../types/ocpp/Requests';
+import type { JsonType } from '../../types/JsonType';
+import type { RequestCommand } from '../../types/ocpp/Requests';
 import logger from '../../utils/Logger';
 import type ChargingStation from '../ChargingStation';
 import { OCPPServiceUtils } from './OCPPServiceUtils';
@@ -13,11 +13,13 @@ const moduleName = 'OCPPResponseService';
 
 export default abstract class OCPPResponseService {
   private static instance: OCPPResponseService | null = null;
-  private ajv: Ajv;
+  private readonly ajv: Ajv;
 
   protected constructor() {
     this.ajv = new Ajv();
     ajvFormats(this.ajv);
+    this.responseHandler.bind(this);
+    this.validateResponsePayload.bind(this);
   }
 
   public static getInstance<T extends OCPPResponseService>(this: new () => T): T {
@@ -33,7 +35,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);
@@ -52,8 +54,9 @@ export default abstract class OCPPResponseService {
     );
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  protected emptyResponseHandler() {}
+  protected emptyResponseHandler() {
+    /* This is intentional */
+  }
 
   public abstract responseHandler(
     chargingStation: ChargingStation,