X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F2.0%2FOCPP20RequestService.ts;h=6a7fe370cbf9103e5c98c7942299f248d601401e;hb=6e939d9e416de33fa1c64fc7f4eb6be70954f69c;hp=3b1e269556338a958568f2d4e16217a756716ddb;hpb=edd134392e237a3242dc2093341df70244c51472;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 3b1e2695..6a7fe370 100644
--- a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
@@ -1,13 +1,22 @@
 // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
 import type { JSONSchemaType } from 'ajv';
 
 import OCPPError from '../../../exception/OCPPError';
 import type { JsonObject, JsonType } from '../../../types/JsonType';
-import type { OCPP20RequestCommand } from '../../../types/ocpp/2.0/Requests';
+import {
+  type OCPP20BootNotificationRequest,
+  type OCPP20HeartbeatRequest,
+  OCPP20RequestCommand,
+  type OCPP20StatusNotificationRequest,
+} from '../../../types/ocpp/2.0/Requests';
 import { ErrorType } from '../../../types/ocpp/ErrorType';
+import { OCPPVersion } from '../../../types/ocpp/OCPPVersion';
 import type { RequestParams } from '../../../types/ocpp/Requests';
-import logger from '../../../utils/Logger';
 import Utils from '../../../utils/Utils';
 import type ChargingStation from '../../ChargingStation';
 import OCPPRequestService from '../OCPPRequestService';
@@ -17,16 +26,52 @@ import { OCPP20ServiceUtils } from './OCPP20ServiceUtils';
 const moduleName = 'OCPP20RequestService';
 
 export default class OCPP20RequestService extends OCPPRequestService {
-  private jsonSchemas: Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>;
+  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`);
     }
-    super(ocppResponseService);
-    this.jsonSchemas = new Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>();
+    super(OCPPVersion.VERSION_20, ocppResponseService);
+    this.jsonSchemas = new Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>([
+      [
+        OCPP20RequestCommand.BOOT_NOTIFICATION,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/2.0/BootNotificationRequest.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP20BootNotificationRequest>,
+      ],
+      [
+        OCPP20RequestCommand.HEARTBEAT,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/2.0/HeartbeatRequest.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP20HeartbeatRequest>,
+      ],
+      [
+        OCPP20RequestCommand.STATUS_NOTIFICATION,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP20StatusNotificationRequest>,
+      ],
+    ]);
     this.buildRequestPayload.bind(this);
-    this.validatePayload.bind(this);
   }
 
   public async requestHandler<RequestType extends JsonType, ResponseType extends JsonType>(
@@ -41,7 +86,6 @@ export default class OCPP20RequestService extends OCPPRequestService {
         commandName,
         commandParams
       );
-      this.validatePayload(chargingStation, commandName, requestPayload);
       return (await this.sendMessage(
         chargingStation,
         Utils.generateUUID(),
@@ -66,6 +110,41 @@ export default class OCPP20RequestService extends OCPPRequestService {
   ): Request {
     commandParams = commandParams as JsonObject;
     switch (commandName) {
+      case OCPP20RequestCommand.BOOT_NOTIFICATION:
+        commandParams.chargingStation = commandParams.chargingStation as JsonObject;
+        commandParams.chargingStation.modem = commandParams.chargingStation.modem as JsonObject;
+        return {
+          reason: commandParams?.reason,
+          chargingStation: {
+            model: commandParams?.chargingStation?.model,
+            vendorName: commandParams?.chargingStation?.vendorName,
+            ...(!Utils.isUndefined(commandParams?.chargingStation?.firmwareVersion) && {
+              firmwareVersion: commandParams.chargingStation?.firmwareVersion,
+            }),
+            ...(!Utils.isUndefined(commandParams?.chargingStation?.serialNumber) && {
+              serialNumber: commandParams.chargingStation?.serialNumber,
+            }),
+            ...(!Utils.isUndefined(commandParams?.chargingStation?.modem) && {
+              modem: {
+                ...(!Utils.isUndefined(commandParams?.chargingStation?.modem?.iccid) && {
+                  iccid: commandParams.chargingStation.modem.iccid,
+                }),
+                ...(!Utils.isUndefined(commandParams?.chargingStation?.modem?.imsi) && {
+                  imsi: commandParams.chargingStation.modem.imsi,
+                }),
+              },
+            }),
+          },
+        } as unknown as Request;
+      case OCPP20RequestCommand.HEARTBEAT:
+        return {} as unknown as Request;
+      case OCPP20RequestCommand.STATUS_NOTIFICATION:
+        return {
+          timestamp: commandParams?.timestamp,
+          connectorStatus: commandParams?.connectorStatus,
+          evseId: commandParams?.evseId,
+          connectorId: commandParams?.connectorId,
+        } as unknown as Request;
       default:
         // OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError().
         throw new OCPPError(
@@ -77,23 +156,4 @@ export default class OCPP20RequestService extends OCPPRequestService {
         );
     }
   }
-
-  private validatePayload<Request extends JsonType>(
-    chargingStation: ChargingStation,
-    commandName: OCPP20RequestCommand,
-    requestPayload: Request
-  ): boolean {
-    if (this.jsonSchemas.has(commandName)) {
-      return this.validateRequestPayload(
-        chargingStation,
-        commandName,
-        this.jsonSchemas.get(commandName),
-        requestPayload
-      );
-    }
-    logger.warn(
-      `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command ${commandName} PDU validation`
-    );
-    return false;
-  }
 }