X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F2.0%2FOCPP20RequestService.ts;h=18816f0ede247d613e4ce18079f5c1ffe0ee6394;hb=b2a0452d368cfc43bbacc4991de59afa64f662a4;hp=eb98bd154ffc11068e9f2a86343cbb93aa9e1beb;hpb=4598878063d62259a6046a870dfa455b9d0027ca;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 eb98bd15..18816f0e 100644
--- a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
@@ -6,26 +6,27 @@ import { fileURLToPath } from 'url';
 
 import type { JSONSchemaType } from 'ajv';
 
+import { OCPP20ServiceUtils } from './OCPP20ServiceUtils';
 import OCPPError from '../../../exception/OCPPError';
 import type { JsonObject, JsonType } from '../../../types/JsonType';
 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';
 import type OCPPResponseService from '../OCPPResponseService';
-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) {
@@ -35,15 +36,21 @@ export default class OCPP20RequestService extends OCPPRequestService {
     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>,
+        this.parseJsonSchemaFile<OCPP20BootNotificationRequest>(
+          '../../../assets/json-schemas/ocpp/2.0/BootNotificationRequest.json'
+        ),
+      ],
+      [
+        OCPP20RequestCommand.HEARTBEAT,
+        this.parseJsonSchemaFile<OCPP20HeartbeatRequest>(
+          '../../../assets/json-schemas/ocpp/2.0/HeartbeatRequest.json'
+        ),
+      ],
+      [
+        OCPP20RequestCommand.STATUS_NOTIFICATION,
+        this.parseJsonSchemaFile<OCPP20StatusNotificationRequest>(
+          '../../../assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json'
+        ),
       ],
     ]);
     this.buildRequestPayload.bind(this);
@@ -78,19 +85,6 @@ export default class OCPP20RequestService extends OCPPRequestService {
     );
   }
 
-  protected getRequestPayloadValidationSchema(
-    chargingStation: ChargingStation,
-    commandName: OCPP20RequestCommand
-  ): JSONSchemaType<JsonObject> | false {
-    if (this.jsonSchemas.has(commandName) === true) {
-      return this.jsonSchemas.get(commandName);
-    }
-    logger.warn(
-      `${chargingStation.logPrefix()} ${moduleName}.getPayloadValidationSchema: No JSON schema found for command ${commandName} PDU validation`
-    );
-    return false;
-  }
-
   private buildRequestPayload<Request extends JsonType>(
     chargingStation: ChargingStation,
     commandName: OCPP20RequestCommand,
@@ -99,28 +93,40 @@ export default class OCPP20RequestService extends OCPPRequestService {
     commandParams = commandParams as JsonObject;
     switch (commandName) {
       case OCPP20RequestCommand.BOOT_NOTIFICATION:
-        commandParams.modem = commandParams.modem as JsonObject;
+        commandParams.chargingStation = commandParams.chargingStation as JsonObject;
+        commandParams.chargingStation.modem = commandParams.chargingStation.modem as JsonObject;
         return {
           reason: commandParams?.reason,
           chargingStation: {
-            model: commandParams?.model,
-            vendorName: commandParams?.vendorName,
-            ...(!Utils.isUndefined(commandParams?.firmwareVersion) && {
-              firmwareVersion: commandParams.firmwareVersion,
+            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?.serialNumber) && {
-              serialNumber: commandParams.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,
+                }),
+              },
             }),
-            modem: {
-              ...(!Utils.isUndefined(commandParams?.modem?.iccid) && {
-                iccid: commandParams.modem.iccid,
-              }),
-              ...(!Utils.isUndefined(commandParams?.modem?.imsi) && {
-                imsi: commandParams.modem.imsi,
-              }),
-            },
           },
         } as unknown as Request;
+      case OCPP20RequestCommand.HEARTBEAT:
+        return {} as unknown as Request;
+      case OCPP20RequestCommand.STATUS_NOTIFICATION:
+        return {
+          timestamp: commandParams?.timestamp ?? new Date(),
+          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(
@@ -132,4 +138,13 @@ export default class OCPP20RequestService extends OCPPRequestService {
         );
     }
   }
+
+  private parseJsonSchemaFile<T extends JsonType>(relativePath: string): JSONSchemaType<T> {
+    return JSON.parse(
+      fs.readFileSync(
+        path.resolve(path.dirname(fileURLToPath(import.meta.url)), relativePath),
+        'utf8'
+      )
+    ) as JSONSchemaType<T>;
+  }
 }