X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPResponseService.ts;h=91b1499676b01f3b1e7583c0c385490c70e78ef8;hb=ed3d28080b6597ba2f728d625e34ce05aea49d06;hp=e838bd9fb1d4ae2280ca08d2e9516917ffac37fc;hpb=5cc4b63bd363814ddc657bd4c9b407e5eb3150cb;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts
index e838bd9f..91b14996 100644
--- a/src/charging-station/ocpp/OCPPResponseService.ts
+++ b/src/charging-station/ocpp/OCPPResponseService.ts
@@ -1,30 +1,64 @@
+import type { JSONSchemaType } from 'ajv';
+import Ajv from 'ajv-draft-04';
+import ajvFormats from 'ajv-formats';
+
+import OCPPError from '../../exception/OCPPError';
+import type { JsonType } from '../../types/JsonType';
+import type { RequestCommand } from '../../types/ocpp/Requests';
+import logger from '../../utils/Logger';
 import type ChargingStation from '../ChargingStation';
-import { JsonType } from '../../types/JsonType';
-import { RequestCommand } from '../../types/ocpp/Requests';
+import { OCPPServiceUtils } from './OCPPServiceUtils';
+
+const moduleName = 'OCPPResponseService';
 
 export default abstract class OCPPResponseService {
-  private static readonly instances: Map<string, OCPPResponseService> = new Map<
-    string,
-    OCPPResponseService
-  >();
+  private static instance: OCPPResponseService | null = null;
+  private ajv: Ajv;
 
-  protected readonly chargingStation: ChargingStation;
+  protected constructor() {
+    this.ajv = new Ajv();
+    ajvFormats(this.ajv);
+    this.responseHandler.bind(this);
+    this.validateResponsePayload.bind(this);
+  }
 
-  protected constructor(chargingStation: ChargingStation) {
-    this.chargingStation = chargingStation;
+  public static getInstance<T extends OCPPResponseService>(this: new () => T): T {
+    if (OCPPResponseService.instance === null) {
+      OCPPResponseService.instance = new this();
+    }
+    return OCPPResponseService.instance as T;
   }
 
-  public static getInstance<T extends OCPPResponseService>(
-    this: new (chargingStation: ChargingStation) => T,
-    chargingStation: ChargingStation
-  ): T {
-    if (!OCPPResponseService.instances.has(chargingStation.hashId)) {
-      OCPPResponseService.instances.set(chargingStation.hashId, new this(chargingStation));
+  protected validateResponsePayload<T extends JsonType>(
+    chargingStation: ChargingStation,
+    commandName: RequestCommand,
+    schema: JSONSchemaType<T>,
+    payload: T
+  ): boolean {
+    if (chargingStation.getPayloadSchemaValidation() === false) {
+      return true;
+    }
+    const validate = this.ajv.compile(schema);
+    if (validate(payload)) {
+      return true;
     }
-    return OCPPResponseService.instances.get(chargingStation.hashId) as T;
+    logger.error(
+      `${chargingStation.logPrefix()} ${moduleName}.validateResponsePayload: Response PDU is invalid: %j`,
+      validate.errors
+    );
+    throw new OCPPError(
+      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() {}
+
   public abstract responseHandler(
+    chargingStation: ChargingStation,
     commandName: RequestCommand,
     payload: JsonType,
     requestPayload: JsonType