X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F2.0%2FOCPP20RequestService.ts;h=b54e491ac0af548360b8e9ae1dad19990803bb39;hb=68220b423c52da387fdf41967dd8c738da0ff52e;hp=6a7fe370cbf9103e5c98c7942299f248d601401e;hpb=6e939d9e416de33fa1c64fc7f4eb6be70954f69c;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 6a7fe370..b54e491a 100644
--- a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
@@ -1,77 +1,67 @@
 // 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 type { JSONSchemaType } from 'ajv';
-
-import OCPPError from '../../../exception/OCPPError';
-import type { JsonObject, JsonType } from '../../../types/JsonType';
+import { OCPP20Constants } from './OCPP20Constants.js'
+import { OCPP20ServiceUtils } from './OCPP20ServiceUtils.js'
+import type { ChargingStation } from '../../../charging-station/index.js'
+import { OCPPError } from '../../../exception/index.js'
 import {
+  ErrorType,
+  type JsonObject,
+  type JsonType,
   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 Utils from '../../../utils/Utils';
-import type ChargingStation from '../../ChargingStation';
-import OCPPRequestService from '../OCPPRequestService';
-import type OCPPResponseService from '../OCPPResponseService';
-import { OCPP20ServiceUtils } from './OCPP20ServiceUtils';
+  OCPPVersion,
+  type RequestParams
+} from '../../../types/index.js'
+import { generateUUID } from '../../../utils/index.js'
+import { OCPPRequestService } from '../OCPPRequestService.js'
+import type { OCPPResponseService } from '../OCPPResponseService.js'
 
-const moduleName = 'OCPP20RequestService';
+const moduleName = 'OCPP20RequestService'
 
-export default class OCPP20RequestService extends OCPPRequestService {
-  protected jsonSchemas: Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>;
+export class OCPP20RequestService extends OCPPRequestService {
+  protected jsonSchemas: Map<OCPP20RequestCommand, JSONSchemaType<JsonType>>
 
-  public constructor(ocppResponseService: OCPPResponseService) {
-    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>>([
+  public constructor (ocppResponseService: OCPPResponseService) {
+    // 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<JsonType>>([
       [
         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>,
+        OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20BootNotificationRequest>(
+          'assets/json-schemas/ocpp/2.0/BootNotificationRequest.json',
+          moduleName,
+          'constructor'
+        )
       ],
       [
         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>,
+        OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20HeartbeatRequest>(
+          'assets/json-schemas/ocpp/2.0/HeartbeatRequest.json',
+          moduleName,
+          'constructor'
+        )
       ],
       [
         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);
+        OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20StatusNotificationRequest>(
+          'assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json',
+          moduleName,
+          'constructor'
+        )
+      ]
+    ])
+    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>(
@@ -80,19 +70,15 @@ export default class OCPP20RequestService extends OCPPRequestService {
     commandParams?: JsonType,
     params?: RequestParams
   ): Promise<ResponseType> {
-    if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) {
-      const requestPayload = this.buildRequestPayload<RequestType>(
-        chargingStation,
-        commandName,
-        commandParams
-      );
+    // FIXME?: add sanity checks on charging station availability, connector availability, connector status, etc.
+    if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName)) {
       return (await this.sendMessage(
         chargingStation,
-        Utils.generateUUID(),
-        requestPayload,
+        generateUUID(),
+        this.buildRequestPayload<RequestType>(chargingStation, commandName, commandParams),
         commandName,
         params
-      )) as unknown as ResponseType;
+      )) as ResponseType
     }
     // OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError().
     throw new OCPPError(
@@ -100,7 +86,7 @@ export default class OCPP20RequestService extends OCPPRequestService {
       `Unsupported OCPP command '${commandName}'`,
       commandName,
       commandParams
-    );
+    )
   }
 
   private buildRequestPayload<Request extends JsonType>(
@@ -108,43 +94,17 @@ export default class OCPP20RequestService extends OCPPRequestService {
     commandName: OCPP20RequestCommand,
     commandParams?: JsonType
   ): Request {
-    commandParams = commandParams as JsonObject;
+    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;
+        return commandParams as unknown as Request
       case OCPP20RequestCommand.HEARTBEAT:
-        return {} as unknown as Request;
+        return OCPP20Constants.OCPP_RESPONSE_EMPTY 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;
+          timestamp: new Date(),
+          ...commandParams
+        } 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(
@@ -153,7 +113,7 @@ export default class OCPP20RequestService extends OCPPRequestService {
           `Unsupported OCPP command '${commandName}'`,
           commandName,
           commandParams
-        );
+        )
     }
   }
 }