X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPResponseService.ts;h=45a3e1f2d5822f5236e0266492935effd38f165d;hb=298be10c5c800e43b0b9dcd6c50f6d49e2cb786b;hp=1bc4a8a8f6ae3a713da40be7ca0079aa96ae5865;hpb=0282b7c0ea2651c7367cd21bc96e8ef3637076c7;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts
index 1bc4a8a8..45a3e1f2 100644
--- a/src/charging-station/ocpp/OCPPResponseService.ts
+++ b/src/charging-station/ocpp/OCPPResponseService.ts
@@ -1,90 +1,87 @@
-import Ajv, { type JSONSchemaType } from 'ajv';
-import ajvFormats from 'ajv-formats';
+import _Ajv, { 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 { Constants, 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;
-  public abstract jsonIncomingRequestResponseSchemas: Map<
-    IncomingRequestCommand,
-    JSONSchemaType<JsonObject>
-  >;
+  private static instance: OCPPResponseService | null = null
+  private readonly version: OCPPVersion
+  protected readonly ajv: Ajv
+  protected readonly ajvIncomingRequest: Ajv
+  protected abstract jsonSchemasValidateFunction: Map<RequestCommand, ValidateFunction<JsonType>>
+  public abstract jsonSchemasIncomingRequestResponseValidateFunction: Map<
+  IncomingRequestCommand,
+  ValidateFunction<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);
-    this.responseHandler = this.responseHandler.bind(this) as (
-      chargingStation: ChargingStation,
-      commandName: RequestCommand,
-      payload: JsonType,
-      requestPayload: JsonType
-    ) => Promise<void>;
-    this.validateResponsePayload = this.validateResponsePayload.bind(this) as <T extends JsonType>(
-      chargingStation: ChargingStation,
-      commandName: RequestCommand,
-      schema: JSONSchemaType<T>,
-      payload: T
-    ) => boolean;
+      multipleOfPrecision: 2
+    })
+    ajvFormats(this.ajv)
+    this.ajvIncomingRequest = new Ajv({
+      keywords: ['javaType'],
+      multipleOfPrecision: 2
+    })
+    ajvFormats(this.ajvIncomingRequest)
+    this.responseHandler = this.responseHandler.bind(this)
+    this.validateResponsePayload = this.validateResponsePayload.bind(this)
   }
 
   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
   ): boolean {
-    if (chargingStation.getOcppStrictCompliance() === false) {
-      return true;
+    if (chargingStation.stationInfo?.ocppStrictCompliance === false) {
+      return true
     }
-    const validate = this.ajv.compile(schema);
-    if (validate(payload)) {
-      return true;
+    const validate = this.jsonSchemasValidateFunction.get(commandName)
+    if (validate?.(payload) === 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, null, 2)
-    );
+      JSON.stringify(validate?.errors, undefined, 2)
+    )
   }
 
-  protected emptyResponseHandler() {
-    /* This is intentional */
-  }
+  protected emptyResponseHandler = Constants.EMPTY_FUNCTION
 
-  public abstract responseHandler(
+  public abstract responseHandler<ReqType extends JsonType, ResType extends JsonType>(
     chargingStation: ChargingStation,
     commandName: RequestCommand,
-    payload: JsonType,
-    requestPayload: JsonType
-  ): Promise<void>;
+    payload: ResType,
+    requestPayload: ReqType
+  ): Promise<void>
 }