X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPServiceUtils.ts;h=f5bbe1602290dbba4699600570c46a76a10c44f4;hb=88499f52f95a8030eb2186b918fac160b95e58a5;hp=f18db3e01b17b0c55b375d6203dd84908fba34dc;hpb=5edd8ba0f8978cfb3ca9d80f299d9748c6c5970e;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/OCPPServiceUtils.ts b/src/charging-station/ocpp/OCPPServiceUtils.ts
index f18db3e0..f5bbe160 100644
--- a/src/charging-station/ocpp/OCPPServiceUtils.ts
+++ b/src/charging-station/ocpp/OCPPServiceUtils.ts
@@ -3,19 +3,23 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 import type { DefinedError, ErrorObject, JSONSchemaType } from 'ajv';
+import { isDate } from 'date-fns';
 
 import { OCPP16Constants } from './1.6/OCPP16Constants';
 import { OCPP20Constants } from './2.0/OCPP20Constants';
 import { OCPPConstants } from './OCPPConstants';
-import { type ChargingStation, ChargingStationConfigurationUtils } from '../../charging-station';
+import { type ChargingStation, getConfigurationKey, getIdTagsFile } from '../../charging-station';
 import { BaseError } from '../../exception';
 import {
+  AuthorizationStatus,
+  type AuthorizeRequest,
+  type AuthorizeResponse,
   ChargePointErrorCode,
+  type ConnectorStatus,
   type ConnectorStatusEnum,
   ErrorType,
   FileType,
   IncomingRequestCommand,
-  type JsonObject,
   type JsonType,
   MessageTrigger,
   MessageType,
@@ -145,10 +149,14 @@ export class OCPPServiceUtils {
 
   public static convertDateToISOString<T extends JsonType>(obj: T): void {
     for (const key in obj) {
-      if (obj[key] instanceof Date) {
-        (obj as JsonObject)[key] = (obj[key] as Date).toISOString();
-      } else if (obj[key] !== null && typeof obj[key] === 'object') {
-        OCPPServiceUtils.convertDateToISOString<T>(obj[key] as T);
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+      if (isDate(obj![key])) {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+        (obj![key] as string) = (obj![key] as Date).toISOString();
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+      } else if (obj![key] !== null && typeof obj![key] === 'object') {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+        OCPPServiceUtils.convertDateToISOString<T>(obj![key] as T);
       }
     }
   }
@@ -192,7 +200,7 @@ export class OCPPServiceUtils {
     connectorId: number,
     status: ConnectorStatusEnum,
     evseId?: number,
-    options: { send: boolean } = { send: true },
+    options?: { send: boolean },
   ) {
     options = { send: true, ...options };
     if (options.send) {
@@ -211,7 +219,31 @@ export class OCPPServiceUtils {
         ),
       );
     }
-    chargingStation.getConnectorStatus(connectorId).status = status;
+    chargingStation.getConnectorStatus(connectorId)!.status = status;
+  }
+
+  public static async isIdTagAuthorized(
+    chargingStation: ChargingStation,
+    connectorId: number,
+    idTag: string,
+  ): Promise<boolean> {
+    if (!chargingStation.getLocalAuthListEnabled() && !chargingStation.getRemoteAuthorization()) {
+      logger.warn(
+        `${chargingStation.logPrefix()} The charging station expects to authorize RFID tags but nor local authorization nor remote authorization are enabled. Misbehavior may occur`,
+      );
+    }
+    if (
+      chargingStation.getLocalAuthListEnabled() === true &&
+      OCPPServiceUtils.isIdTagLocalAuthorized(chargingStation, idTag)
+    ) {
+      const connectorStatus: ConnectorStatus = chargingStation.getConnectorStatus(connectorId)!;
+      connectorStatus.localAuthorizeIdTag = idTag;
+      connectorStatus.idTagLocalAuthorized = true;
+      return true;
+    } else if (chargingStation.getRemoteAuthorization()) {
+      return await OCPPServiceUtils.isIdTagRemoteAuthorized(chargingStation, connectorId, idTag);
+    }
+    return false;
   }
 
   protected static checkConnectorStatusTransition(
@@ -219,7 +251,7 @@ export class OCPPServiceUtils {
     connectorId: number,
     status: ConnectorStatusEnum,
   ): boolean {
-    const fromStatus = chargingStation.getConnectorStatus(connectorId).status;
+    const fromStatus = chargingStation.getConnectorStatus(connectorId)!.status;
     let transitionAllowed = false;
     switch (chargingStation.stationInfo.ocppVersion) {
       case OCPPVersion.VERSION_16:
@@ -262,7 +294,7 @@ export class OCPPServiceUtils {
         `${chargingStation.logPrefix()} OCPP ${
           chargingStation.stationInfo.ocppVersion
         } connector id ${connectorId} status transition from '${
-          chargingStation.getConnectorStatus(connectorId).status
+          chargingStation.getConnectorStatus(connectorId)!.status
         }' to '${status}' is not allowed`,
       );
     }
@@ -286,6 +318,7 @@ export class OCPPServiceUtils {
         OCPPServiceUtils.logPrefix(ocppVersion, moduleName, methodName),
         { throwError: false },
       );
+      return {} as JSONSchemaType<T>;
     }
   }
 
@@ -304,7 +337,7 @@ export class OCPPServiceUtils {
     }
     if (
       measurand !== MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER &&
-      ChargingStationConfigurationUtils.getConfigurationKey(
+      getConfigurationKey(
         chargingStation,
         StandardParametersKey.MeterValuesSampledData,
       )?.value?.includes(measurand) === false
@@ -317,7 +350,7 @@ export class OCPPServiceUtils {
       return;
     }
     const sampledValueTemplates: SampledValueTemplate[] =
-      chargingStation.getConnectorStatus(connectorId)?.MeterValues;
+      chargingStation.getConnectorStatus(connectorId)!.MeterValues;
     for (
       let index = 0;
       isNotEmptyArray(sampledValueTemplates) === true && index < sampledValueTemplates.length;
@@ -336,7 +369,7 @@ export class OCPPServiceUtils {
         phase &&
         sampledValueTemplates[index]?.phase === phase &&
         sampledValueTemplates[index]?.measurand === measurand &&
-        ChargingStationConfigurationUtils.getConfigurationKey(
+        getConfigurationKey(
           chargingStation,
           StandardParametersKey.MeterValuesSampledData,
         )?.value?.includes(measurand) === true
@@ -346,7 +379,7 @@ export class OCPPServiceUtils {
         !phase &&
         !sampledValueTemplates[index].phase &&
         sampledValueTemplates[index]?.measurand === measurand &&
-        ChargingStationConfigurationUtils.getConfigurationKey(
+        getConfigurationKey(
           chargingStation,
           StandardParametersKey.MeterValuesSampledData,
         )?.value?.includes(measurand) === true
@@ -388,8 +421,37 @@ export class OCPPServiceUtils {
     const parsedInt = parseInt(value);
     const numberValue = isNaN(parsedInt) ? Infinity : parsedInt;
     return options?.limitationEnabled
-      ? Math.min(numberValue * options.unitMultiplier, limit)
-      : numberValue * options.unitMultiplier;
+      ? Math.min(numberValue * options.unitMultiplier!, limit)
+      : numberValue * options.unitMultiplier!;
+  }
+
+  private static isIdTagLocalAuthorized(chargingStation: ChargingStation, idTag: string): boolean {
+    return (
+      chargingStation.hasIdTags() === true &&
+      isNotEmptyString(
+        chargingStation.idTagsCache
+          .getIdTags(getIdTagsFile(chargingStation.stationInfo)!)
+          ?.find((tag) => tag === idTag),
+      )
+    );
+  }
+
+  private static async isIdTagRemoteAuthorized(
+    chargingStation: ChargingStation,
+    connectorId: number,
+    idTag: string,
+  ): Promise<boolean> {
+    chargingStation.getConnectorStatus(connectorId)!.authorizeIdTag = idTag;
+    return (
+      (
+        await chargingStation.ocppRequestService.requestHandler<
+          AuthorizeRequest,
+          AuthorizeResponse
+        >(chargingStation, RequestCommand.AUTHORIZE, {
+          idTag,
+        })
+      )?.idTagInfo?.status === AuthorizationStatus.ACCEPTED
+    );
   }
 
   private static logPrefix = (