X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPIncomingRequestService.ts;h=7203569749e04d8ee88a238e4ac2f0ea754382da;hb=dd21af153ed64c6220b6b14a5165c11443032f4f;hp=28de507774a281aeeb0d32b4d17b1348b45d50c5;hpb=5398cecf45b4bdab604d0e6aff8a96dcc67d5ae9;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
index 28de5077..72035697 100644
--- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts
+++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
@@ -1,121 +1,104 @@
-import { AsyncResource } from 'node:async_hooks';
+import _Ajv, { type ValidateFunction } from 'ajv'
+import _ajvFormats from 'ajv-formats'
 
-import Ajv, { type JSONSchemaType, type ValidateFunction } from 'ajv';
-import ajvFormats from 'ajv-formats';
-
-import { OCPPConstants } from './OCPPConstants';
-import { OCPPServiceUtils } from './OCPPServiceUtils';
-import { type ChargingStation, getIdTagsFile } from '../../charging-station';
-import { OCPPError } from '../../exception';
+import { OCPPConstants } from './OCPPConstants.js'
+import { OCPPServiceUtils } from './OCPPServiceUtils.js'
+import { type ChargingStation, getIdTagsFile } from '../../charging-station/index.js'
+import { OCPPError } from '../../exception/index.js'
 import type {
   ClearCacheResponse,
   HandleErrorParams,
   IncomingRequestCommand,
   JsonType,
-  OCPPVersion,
-} from '../../types';
-import { logger, setDefaultErrorParams } from '../../utils';
+  OCPPVersion
+} from '../../types/index.js'
+import { logger, setDefaultErrorParams } 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 = 'OCPPIncomingRequestService';
+const moduleName = 'OCPPIncomingRequestService'
 
-export abstract class OCPPIncomingRequestService extends AsyncResource {
-  private static instance: OCPPIncomingRequestService | null = null;
-  private readonly version: OCPPVersion;
-  private readonly ajv: Ajv;
-  private jsonValidateFunctions: Map<IncomingRequestCommand, ValidateFunction<JsonType>>;
-  protected abstract jsonSchemas: Map<IncomingRequestCommand, JSONSchemaType<JsonType>>;
+export abstract class OCPPIncomingRequestService {
+  private static instance: OCPPIncomingRequestService | null = null
+  private readonly version: OCPPVersion
+  protected readonly ajv: Ajv
+  protected abstract payloadValidateFunctions: Map<
+  IncomingRequestCommand,
+  ValidateFunction<JsonType>
+  >
 
-  protected constructor(version: OCPPVersion) {
-    super(moduleName);
-    this.version = version;
+  protected constructor (version: OCPPVersion) {
+    this.version = version
     this.ajv = new Ajv({
       keywords: ['javaType'],
-      multipleOfPrecision: 2,
-    });
-    ajvFormats(this.ajv);
-    this.jsonValidateFunctions = new Map<IncomingRequestCommand, ValidateFunction<JsonType>>();
-    this.incomingRequestHandler = this.incomingRequestHandler.bind(this) as <
-      ReqType extends JsonType,
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      ResType extends JsonType,
-    >(
-      chargingStation: ChargingStation,
-      messageId: string,
-      commandName: IncomingRequestCommand,
-      commandPayload: ReqType,
-    ) => Promise<void>;
-    this.validateIncomingRequestPayload = this.validateIncomingRequestPayload.bind(this) as <
-      T extends JsonType,
-    >(
-      chargingStation: ChargingStation,
-      commandName: IncomingRequestCommand,
-      schema: JSONSchemaType<T>,
-      payload: T,
-    ) => boolean;
+      multipleOfPrecision: 2
+    })
+    ajvFormats(this.ajv)
+    this.incomingRequestHandler = this.incomingRequestHandler.bind(this)
+    this.validateIncomingRequestPayload = this.validateIncomingRequestPayload.bind(this)
   }
 
   public static getInstance<T extends OCPPIncomingRequestService>(this: new () => T): T {
     if (OCPPIncomingRequestService.instance === null) {
-      OCPPIncomingRequestService.instance = new this();
+      OCPPIncomingRequestService.instance = new this()
     }
-    return OCPPIncomingRequestService.instance as T;
+    return OCPPIncomingRequestService.instance as T
   }
 
   protected handleIncomingRequestError<T extends JsonType>(
     chargingStation: ChargingStation,
     commandName: IncomingRequestCommand,
     error: Error,
-    params: HandleErrorParams<T> = { throwError: true, consoleOut: false },
+    params: HandleErrorParams<T> = { throwError: true, consoleOut: false }
   ): T | undefined {
-    setDefaultErrorParams(params);
+    setDefaultErrorParams(params)
     logger.error(
       `${chargingStation.logPrefix()} ${moduleName}.handleIncomingRequestError: Incoming request command '${commandName}' error:`,
-      error,
-    );
-    if (!params?.throwError && params?.errorResponse) {
-      return params?.errorResponse;
+      error
+    )
+    if (params.throwError === false && params.errorResponse != null) {
+      return params.errorResponse
     }
-    if (params?.throwError && !params?.errorResponse) {
-      throw error;
+    if (params.throwError === true && params.errorResponse == null) {
+      throw error
     }
-    if (params?.throwError && params?.errorResponse) {
-      return params?.errorResponse;
+    if (params.throwError === true && params.errorResponse != null) {
+      return params.errorResponse
     }
   }
 
   protected validateIncomingRequestPayload<T extends JsonType>(
     chargingStation: ChargingStation,
     commandName: IncomingRequestCommand,
-    schema: JSONSchemaType<T>,
-    payload: T,
+    payload: T
   ): boolean {
     if (chargingStation.stationInfo?.ocppStrictCompliance === false) {
-      return true;
-    }
-    if (this.jsonValidateFunctions.has(commandName) === false) {
-      this.jsonValidateFunctions.set(commandName, this.ajv.compile<T>(schema).bind(this));
+      return true
     }
-    const validate = this.jsonValidateFunctions.get(commandName)!;
-    if (validate(payload)) {
-      return true;
+    const validate = this.payloadValidateFunctions.get(commandName)
+    if (validate?.(payload) === true) {
+      return true
     }
     logger.error(
       `${chargingStation.logPrefix()} ${moduleName}.validateIncomingRequestPayload: Command '${commandName}' incoming request PDU is invalid: %j`,
-      validate.errors,
-    );
+      validate?.errors
+    )
     throw new OCPPError(
-      OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
+      OCPPServiceUtils.ajvErrorsToErrorType(validate?.errors),
       'Incoming request PDU is invalid',
       commandName,
-      JSON.stringify(validate.errors, undefined, 2),
-    );
+      JSON.stringify(validate?.errors, undefined, 2)
+    )
   }
 
-  protected handleRequestClearCache(chargingStation: ChargingStation): ClearCacheResponse {
-    if (chargingStation.idTagsCache.deleteIdTags(getIdTagsFile(chargingStation.stationInfo)!)) {
-      return OCPPConstants.OCPP_RESPONSE_ACCEPTED;
+  protected handleRequestClearCache (chargingStation: ChargingStation): ClearCacheResponse {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    if (chargingStation.idTagsCache.deleteIdTags(getIdTagsFile(chargingStation.stationInfo!)!)) {
+      return OCPPConstants.OCPP_RESPONSE_ACCEPTED
     }
-    return OCPPConstants.OCPP_RESPONSE_REJECTED;
+    return OCPPConstants.OCPP_RESPONSE_REJECTED
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -123,6 +106,6 @@ export abstract class OCPPIncomingRequestService extends AsyncResource {
     chargingStation: ChargingStation,
     messageId: string,
     commandName: IncomingRequestCommand,
-    commandPayload: ReqType,
-  ): Promise<void>;
+    commandPayload: ReqType
+  ): Promise<void>
 }