X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F2.0%2FOCPP20RequestService.ts;h=6e857089d96a567c99e0599de561dd56eaccb990;hb=51022aa0d811eec79514fbeb56cb9556e7168cd7;hp=92d70aedcb2c63a569a5d35adf409de1a34424a8;hpb=617cad0c86c3fea53b56a738bb0d6ddc3da05237;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
index 92d70aed..6e857089 100644
--- a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
@@ -2,6 +2,8 @@
 
 import type { JSONSchemaType } from 'ajv';
 
+import { OCPP20Constants } from './OCPP20Constants';
+import { OCPP20ServiceUtils } from './OCPP20ServiceUtils';
 import type { ChargingStation } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
@@ -16,12 +18,8 @@ import {
   type RequestParams,
 } from '../../../types';
 import { Utils } from '../../../utils';
-import {
-  OCPP20ServiceUtils,
-  OCPPConstants,
-  OCPPRequestService,
-  type OCPPResponseService,
-} from '../internal';
+import { OCPPRequestService } from '../OCPPRequestService';
+import type { OCPPResponseService } from '../OCPPResponseService';
 
 const moduleName = 'OCPP20RequestService';
 
@@ -29,15 +27,15 @@ export class OCPP20RequestService extends OCPPRequestService {
   protected jsonSchemas: Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>;
 
   public constructor(ocppResponseService: OCPPResponseService) {
-    if (new.target?.name === moduleName) {
-      throw new TypeError(`Cannot construct ${new.target?.name} instances directly`);
-    }
+    // if (new.target?.name === moduleName) {
+    //   throw new TypeError(`Cannot construct ${new.target?.name} instances directly`);
+    // }
     super(OCPPVersion.VERSION_20, ocppResponseService);
     this.jsonSchemas = new Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>([
       [
         OCPP20RequestCommand.BOOT_NOTIFICATION,
         OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20BootNotificationRequest>(
-          '../../../assets/json-schemas/ocpp/2.0/BootNotificationRequest.json',
+          'assets/json-schemas/ocpp/2.0/BootNotificationRequest.json',
           moduleName,
           'constructor'
         ),
@@ -45,7 +43,7 @@ export class OCPP20RequestService extends OCPPRequestService {
       [
         OCPP20RequestCommand.HEARTBEAT,
         OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20HeartbeatRequest>(
-          '../../../assets/json-schemas/ocpp/2.0/HeartbeatRequest.json',
+          'assets/json-schemas/ocpp/2.0/HeartbeatRequest.json',
           moduleName,
           'constructor'
         ),
@@ -53,13 +51,17 @@ export class OCPP20RequestService extends OCPPRequestService {
       [
         OCPP20RequestCommand.STATUS_NOTIFICATION,
         OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20StatusNotificationRequest>(
-          '../../../assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json',
+          'assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json',
           moduleName,
           'constructor'
         ),
       ],
     ]);
-    this.buildRequestPayload.bind(this);
+    this.buildRequestPayload = this.buildRequestPayload.bind(this) as <Request extends JsonType>(
+      chargingStation: ChargingStation,
+      commandName: OCPP20RequestCommand,
+      commandParams?: JsonType
+    ) => Request;
   }
 
   public async requestHandler<RequestType extends JsonType, ResponseType extends JsonType>(
@@ -68,6 +70,7 @@ export class OCPP20RequestService extends OCPPRequestService {
     commandParams?: JsonType,
     params?: RequestParams
   ): Promise<ResponseType> {
+    // FIXME?: add sanity checks on charging station availability, connector availability, connector status, etc.
     if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) {
       return (await this.sendMessage(
         chargingStation,
@@ -96,7 +99,7 @@ export class OCPP20RequestService extends OCPPRequestService {
       case OCPP20RequestCommand.BOOT_NOTIFICATION:
         return commandParams as unknown as Request;
       case OCPP20RequestCommand.HEARTBEAT:
-        return OCPPConstants.OCPP_RESPONSE_EMPTY as unknown as Request;
+        return OCPP20Constants.OCPP_RESPONSE_EMPTY as unknown as Request;
       case OCPP20RequestCommand.STATUS_NOTIFICATION:
         return {
           timestamp: new Date(),