X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Fcharging-station%2Focpp%2FOCPPResponseService.ts;h=738aa5ae4ffea2c8ea2f7ce7013826241eabb1c1;hb=66a7748ddeda8c94d7562a1ce58d440319654a4c;hp=9daa991c952c30ff184748099dfbe158544ed8c1;hpb=1f7173559059235505c4cca840d2c92a5b2daa6e;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts
index 9daa991c..738aa5ae 100644
--- a/src/charging-station/ocpp/OCPPResponseService.ts
+++ b/src/charging-station/ocpp/OCPPResponseService.ts
@@ -1,93 +1,120 @@
-import Ajv, { type JSONSchemaType } from 'ajv';
-import ajvFormats from 'ajv-formats';
+import _Ajv, { type JSONSchemaType, type ValidateFunction } from 'ajv'
+import _ajvFormats from 'ajv-formats'
 
-import { OCPPServiceUtils } from './OCPPServiceUtils';
-import type { ChargingStation } from '../../charging-station';
-import { OCPPError } from '../../exception';
+import { OCPPServiceUtils } from './OCPPServiceUtils.js'
+import type { ChargingStation } from '../../charging-station/index.js'
+import { OCPPError } from '../../exception/index.js'
 import type {
   IncomingRequestCommand,
-  JsonObject,
   JsonType,
   OCPPVersion,
-  RequestCommand,
-} from '../../types';
-import { logger } from '../../utils';
+  RequestCommand
+} from '../../types/index.js'
+import { logger } from '../../utils/index.js'
+type Ajv = _Ajv.default
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+const Ajv = _Ajv.default
+const ajvFormats = _ajvFormats.default
 
-const moduleName = 'OCPPResponseService';
+const moduleName = 'OCPPResponseService'
 
 export abstract class OCPPResponseService {
-  private static instance: OCPPResponseService | null = null;
-  private readonly version: OCPPVersion;
-  private readonly ajv: Ajv;
+  private static instance: OCPPResponseService | null = null
+
+  public jsonIncomingRequestResponseValidateFunctions: Map<
+  IncomingRequestCommand,
+  ValidateFunction<JsonType>
+  >
+
+  private readonly version: OCPPVersion
+  private readonly ajv: Ajv
+  private readonly jsonRequestValidateFunctions: Map<RequestCommand, ValidateFunction<JsonType>>
+
   public abstract jsonIncomingRequestResponseSchemas: Map<
-    IncomingRequestCommand,
-    JSONSchemaType<JsonObject>
-  >;
+  IncomingRequestCommand,
+  JSONSchemaType<JsonType>
+  >
 
-  protected constructor(version: OCPPVersion) {
-    this.version = version;
+  protected constructor (version: OCPPVersion) {
+    this.version = version
     this.ajv = new Ajv({
       keywords: ['javaType'],
-      multipleOfPrecision: 2,
-    });
-    ajvFormats(this.ajv);
+      multipleOfPrecision: 2
+    })
+    ajvFormats(this.ajv)
+    this.jsonRequestValidateFunctions = new Map<RequestCommand, ValidateFunction<JsonType>>()
+    this.jsonIncomingRequestResponseValidateFunctions = new Map<
+    IncomingRequestCommand,
+    ValidateFunction<JsonType>
+    >()
     this.responseHandler = this.responseHandler.bind(this) as <
       ReqType extends JsonType,
-      ResType extends JsonType,
+      ResType extends JsonType
     >(
       chargingStation: ChargingStation,
       commandName: RequestCommand,
       payload: ResType,
-      requestPayload: ReqType,
-    ) => Promise<void>;
+      requestPayload: ReqType
+    ) => Promise<void>
     this.validateResponsePayload = this.validateResponsePayload.bind(this) as <T extends JsonType>(
       chargingStation: ChargingStation,
       commandName: RequestCommand,
       schema: JSONSchemaType<T>,
-      payload: T,
-    ) => boolean;
+      payload: T
+    ) => boolean
   }
 
   public static getInstance<T extends OCPPResponseService>(this: new () => T): T {
     if (OCPPResponseService.instance === null) {
-      OCPPResponseService.instance = new this();
+      OCPPResponseService.instance = new this()
     }
-    return OCPPResponseService.instance as T;
+    return OCPPResponseService.instance as T
   }
 
   protected validateResponsePayload<T extends JsonType>(
     chargingStation: ChargingStation,
     commandName: RequestCommand,
     schema: JSONSchemaType<T>,
-    payload: T,
+    payload: T
   ): boolean {
-    if (chargingStation.getOcppStrictCompliance() === false) {
-      return true;
+    if (chargingStation.stationInfo?.ocppStrictCompliance === false) {
+      return true
     }
-    const validate = this.ajv.compile(schema);
+    const validate = this.getJsonRequestValidateFunction<T>(commandName, schema)
     if (validate(payload)) {
-      return true;
+      return true
     }
     logger.error(
       `${chargingStation.logPrefix()} ${moduleName}.validateResponsePayload: Command '${commandName}' response PDU is invalid: %j`,
-      validate.errors,
-    );
+      validate.errors
+    )
     throw new OCPPError(
-      OCPPServiceUtils.ajvErrorsToErrorType(validate.errors!),
+      OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
       'Response PDU is invalid',
       commandName,
-      JSON.stringify(validate.errors, undefined, 2),
-    );
+      JSON.stringify(validate.errors, undefined, 2)
+    )
   }
 
-  protected emptyResponseHandler() {
+  protected emptyResponseHandler (): void {
     /* This is intentional */
   }
 
+  private getJsonRequestValidateFunction<T extends JsonType>(
+    commandName: RequestCommand,
+    schema: JSONSchemaType<T>
+  ): ValidateFunction<JsonType> {
+    if (!this.jsonRequestValidateFunctions.has(commandName)) {
+      this.jsonRequestValidateFunctions.set(commandName, this.ajv.compile<T>(schema).bind(this))
+    }
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    return this.jsonRequestValidateFunctions.get(commandName)!
+  }
+
   public abstract responseHandler<ReqType extends JsonType, ResType extends JsonType>(
     chargingStation: ChargingStation,
     commandName: RequestCommand,
     payload: ResType,
-    requestPayload: ReqType,
-  ): Promise<void>;
+    requestPayload: ReqType
+  ): Promise<void>
 }