feat: add connector status handling at boot with evses configuration

[e-mobility-charging-stations-simulator.git] / src / charging-station / ChargingStation.ts

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index 0d7f286532425e708632a8ea80f632c54d3a53e5..c51064f6667c74de7624a062e09546ed1191b7d8 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -263,11 +263,11 @@ export class ChargingStation {
       }
       return numberOfConnectors;
     }
-    return this.connectors.get(0) ? this.connectors.size - 1 : this.connectors.size;
+    return this.connectors.has(0) ? this.connectors.size - 1 : this.connectors.size;
   }
 
   public getNumberOfEvses(): number {
-    return this.evses.size;
+    return this.evses.has(0) ? this.evses.size - 1 : this.evses.size;
   }
 
   public getConnectorStatus(connectorId: number): ConnectorStatus | undefined {
@@ -1324,22 +1324,6 @@ export class ChargingStation {
       if (this.connectors?.size === 0 || connectorsConfigChanged) {
         connectorsConfigChanged && this.connectors.clear();
         this.connectorsConfigurationHash = connectorsConfigHash;
-        const connectorZeroStatus = stationInfo?.Connectors[0];
-        // Add connector id 0
-        if (connectorZeroStatus && this.getUseConnectorId0(stationInfo) === true) {
-          ChargingStationUtils.checkStationInfoConnectorStatus(
-            0,
-            connectorZeroStatus,
-            this.logPrefix(),
-            this.templateFile
-          );
-          this.connectors.set(0, Utils.cloneObject<ConnectorStatus>(connectorZeroStatus));
-          this.getConnectorStatus(0).availability = AvailabilityType.Operative;
-          if (Utils.isUndefined(this.getConnectorStatus(0)?.chargingProfiles)) {
-            this.getConnectorStatus(0).chargingProfiles = [];
-          }
-        }
-        // Add remaining connectors
         const templateMaxConnectors = ChargingStationUtils.getMaxNumberOfConnectors(
           stationInfo.Connectors
         );
@@ -1348,9 +1332,11 @@ export class ChargingStation {
           this.templateFile,
           this.logPrefix()
         );
+        const templateMaxAvailableConnectors = stationInfo?.Connectors[0]
+          ? templateMaxConnectors - 1
+          : templateMaxConnectors;
         if (
-          configuredMaxConnectors >
-            (stationInfo?.Connectors[0] ? templateMaxConnectors - 1 : templateMaxConnectors) &&
+          configuredMaxConnectors > templateMaxAvailableConnectors &&
           !stationInfo?.randomConnectors
         ) {
           logger.warn(
@@ -1360,14 +1346,19 @@ export class ChargingStation {
           );
           stationInfo.randomConnectors = true;
         }
-        const templateMaxAvailableConnectors = stationInfo?.Connectors[0]
-          ? templateMaxConnectors - 1
-          : templateMaxConnectors;
-        if (templateMaxAvailableConnectors > 0) {
-          for (let connectorId = 1; connectorId <= configuredMaxConnectors; connectorId++) {
-            const templateConnectorId = stationInfo?.randomConnectors
-              ? Utils.getRandomInteger(templateMaxAvailableConnectors, 1)
-              : connectorId;
+        if (templateMaxConnectors > 0) {
+          for (let connectorId = 0; connectorId <= configuredMaxConnectors; connectorId++) {
+            if (
+              connectorId === 0 &&
+              (!stationInfo?.Connectors[connectorId] ||
+                this.getUseConnectorId0(stationInfo) === false)
+            ) {
+              continue;
+            }
+            const templateConnectorId =
+              connectorId > 0 && stationInfo?.randomConnectors
+                ? Utils.getRandomInteger(templateMaxAvailableConnectors, 1)
+                : connectorId;
             const connectorStatus = stationInfo?.Connectors[templateConnectorId];
             ChargingStationUtils.checkStationInfoConnectorStatus(
               templateConnectorId,
@@ -2006,30 +1997,32 @@ export class ChargingStation {
     // Start heartbeat
     this.startHeartbeat();
     // Initialize connectors status
-    for (const connectorId of this.connectors.keys()) {
-      let connectorStatus: ConnectorStatusEnum | undefined;
-      if (connectorId === 0) {
-        continue;
-      } else if (
-        !this.getConnectorStatus(connectorId)?.status &&
-        (this.isChargingStationAvailable() === false ||
-          this.isConnectorAvailable(connectorId) === false)
-      ) {
-        connectorStatus = ConnectorStatusEnum.Unavailable;
-      } else if (
-        !this.getConnectorStatus(connectorId)?.status &&
-        this.getConnectorStatus(connectorId)?.bootStatus
-      ) {
-        // Set boot status in template at startup
-        connectorStatus = this.getConnectorStatus(connectorId)?.bootStatus;
-      } else if (this.getConnectorStatus(connectorId)?.status) {
-        // Set previous status at startup
-        connectorStatus = this.getConnectorStatus(connectorId)?.status;
-      } else {
-        // Set default status
-        connectorStatus = ConnectorStatusEnum.Available;
+    if (this.hasEvses) {
+      for (const [evseId, evseStatus] of this.evses) {
+        if (evseId === 0) {
+          continue;
+        }
+        for (const [connectorId, connectorStatus] of evseStatus.connectors) {
+          const connectorBootStatus = ChargingStationUtils.getBootConnectorStatus(
+            this,
+            connectorId,
+            connectorStatus
+          );
+          await OCPPServiceUtils.sendAndSetConnectorStatus(this, connectorId, connectorBootStatus);
+        }
+      }
+    } else {
+      for (const connectorId of this.connectors.keys()) {
+        if (connectorId === 0) {
+          continue;
+        }
+        const connectorBootStatus = ChargingStationUtils.getBootConnectorStatus(
+          this,
+          connectorId,
+          this.getConnectorStatus(connectorId)
+        );
+        await OCPPServiceUtils.sendAndSetConnectorStatus(this, connectorId, connectorBootStatus);
       }
-      await OCPPServiceUtils.sendAndSetConnectorStatus(this, connectorId, connectorStatus);
     }
     if (this.stationInfo?.firmwareStatus === FirmwareStatus.Installing) {
       await this.ocppRequestService.requestHandler<