build(deps-dev): apply udpates

[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 90f92169cd4c76f8a49f37fc3635a4778689cd86..b73fee584b4ab5f2045d1d81d723655e7e449e39 100644 (file)
--- a/src/charging-station/ocpp/OCPPResponseService.ts
+++ b/src/charging-station/ocpp/OCPPResponseService.ts
@@ -68,16 +68,10 @@ export abstract class OCPPResponseService {
     schema: JSONSchemaType<T>,
     payload: T,
   ): boolean {
-    if (chargingStation.getOcppStrictCompliance() === false) {
+    if (chargingStation.stationInfo?.ocppStrictCompliance === false) {
       return true;
     }
-    if (this.jsonRequestValidateFunctions.has(commandName) === false) {
-      this.jsonRequestValidateFunctions.set(
-        commandName,
-        this.ajv.compile<JsonType>(schema).bind(this),
-      );
-    }
-    const validate = this.jsonRequestValidateFunctions.get(commandName)!;
+    const validate = this.getJsonRequestValidateFunction<T>(commandName, schema);
     if (validate(payload)) {
       return true;
     }
@@ -86,7 +80,7 @@ export abstract class OCPPResponseService {
       validate.errors,
     );
     throw new OCPPError(
-      OCPPServiceUtils.ajvErrorsToErrorType(validate.errors!),
+      OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
       'Response PDU is invalid',
       commandName,
       JSON.stringify(validate.errors, undefined, 2),
@@ -97,6 +91,16 @@ export abstract class OCPPResponseService {
     /* This is intentional */
   }
 
+  private getJsonRequestValidateFunction<T extends JsonType>(
+    commandName: RequestCommand,
+    schema: JSONSchemaType<T>,
+  ) {
+    if (this.jsonRequestValidateFunctions.has(commandName) === false) {
+      this.jsonRequestValidateFunctions.set(commandName, this.ajv.compile<T>(schema).bind(this));
+    }
+    return this.jsonRequestValidateFunctions.get(commandName)!;
+  }
+
   public abstract responseHandler<ReqType extends JsonType, ResType extends JsonType>(
     chargingStation: ChargingStation,
     commandName: RequestCommand,