Untangle ChargingStation class from OCPP services classes
[e-mobility-charging-stations-simulator.git] / src / charging-station / ChargingStation.ts
index 79fc4f430b9785dbd0497b027c6dc16bb3bb7be9..cd84076e29e3bf54e133af5258741d583b2f68fa 100644 (file)
@@ -5,15 +5,20 @@ import {
   AvailabilityType,
   BootNotificationRequest,
   CachedRequest,
+  HeartbeatRequest,
   IncomingRequest,
   IncomingRequestCommand,
+  MeterValuesRequest,
   RequestCommand,
+  StatusNotificationRequest,
 } from '../types/ocpp/Requests';
 import {
   BootNotificationResponse,
+  ErrorResponse,
   HeartbeatResponse,
   MeterValuesResponse,
   RegistrationStatus,
+  Response,
   StatusNotificationResponse,
 } from '../types/ocpp/Responses';
 import {
@@ -21,6 +26,7 @@ import {
   ChargingRateUnitType,
   ChargingSchedulePeriod,
 } from '../types/ocpp/ChargingProfile';
+import { ChargingProfileKindType, RecurrencyKindType } from '../types/ocpp/1.6/ChargingProfile';
 import ChargingStationConfiguration, { Section } from '../types/ChargingStationConfiguration';
 import ChargingStationOcppConfiguration, {
   ConfigurationKey,
@@ -39,11 +45,16 @@ import {
   VendorDefaultParametersKey,
 } from '../types/ocpp/Configuration';
 import { MeterValue, MeterValueMeasurand, MeterValuePhase } from '../types/ocpp/MeterValues';
-import { StopTransactionReason, StopTransactionResponse } from '../types/ocpp/Transaction';
+import {
+  StopTransactionReason,
+  StopTransactionRequest,
+  StopTransactionResponse,
+} from '../types/ocpp/Transaction';
 import { WSError, WebSocketCloseEventStatusCode } from '../types/WebSocket';
 import WebSocket, { Data, OPEN, RawData } from 'ws';
 
 import AutomaticTransactionGenerator from './AutomaticTransactionGenerator';
+import BaseError from '../exception/BaseError';
 import { ChargePointErrorCode } from '../types/ocpp/ChargePointErrorCode';
 import { ChargePointStatus } from '../types/ocpp/ChargePointStatus';
 import ChargingStationInfo from '../types/ChargingStationInfo';
@@ -72,6 +83,7 @@ import Utils from '../utils/Utils';
 import crypto from 'crypto';
 import fs from 'fs';
 import logger from '../utils/Logger';
+import moment from 'moment';
 import { parentPort } from 'worker_threads';
 import path from 'path';
 
@@ -236,23 +248,23 @@ export default class ChargingStation {
   }
 
   public getConnectorMaximumAvailablePower(connectorId: number): number {
-    let amperageLimitationPowerLimit: number;
-    if (this.getAmperageLimitation() < this.stationInfo.maximumAmperage) {
-      amperageLimitationPowerLimit =
-        this.getCurrentOutType() === CurrentType.AC
+    let connectorAmperageLimitationPowerLimit: number;
+    if (
+      !Utils.isNullOrUndefined(this.getAmperageLimitation()) &&
+      this.getAmperageLimitation() < this.stationInfo.maximumAmperage
+    ) {
+      connectorAmperageLimitationPowerLimit =
+        (this.getCurrentOutType() === CurrentType.AC
           ? ACElectricUtils.powerTotal(
               this.getNumberOfPhases(),
               this.getVoltageOut(),
               this.getAmperageLimitation() * this.getNumberOfConnectors()
             )
-          : DCElectricUtils.power(this.getVoltageOut(), this.getAmperageLimitation());
+          : DCElectricUtils.power(this.getVoltageOut(), this.getAmperageLimitation())) /
+        this.stationInfo.powerDivider;
     }
+    const connectorMaximumPower = this.getMaximumPower() / this.stationInfo.powerDivider;
     const connectorChargingProfilePowerLimit = this.getChargingProfilePowerLimit(connectorId);
-    const connectorMaximumPower =
-      ((this.stationInfo['maxPower'] as number) ?? this.stationInfo.maximumPower) /
-      this.stationInfo.powerDivider;
-    const connectorAmperageLimitationPowerLimit =
-      amperageLimitationPowerLimit / this.stationInfo.powerDivider;
     return Math.min(
       isNaN(connectorMaximumPower) ? Infinity : connectorMaximumPower,
       isNaN(connectorAmperageLimitationPowerLimit)
@@ -294,6 +306,10 @@ export default class ChargingStation {
     return this.stationInfo.phaseLineToLineVoltageMeterValues ?? false;
   }
 
+  public getCustomValueLimitationMeterValues(): boolean {
+    return this.stationInfo.customValueLimitationMeterValues ?? true;
+  }
+
   public getConnectorIdByTransactionId(transactionId: number): number | undefined {
     for (const connectorId of this.connectors.keys()) {
       if (
@@ -360,7 +376,7 @@ export default class ChargingStation {
     }
     if (
       measurand !== MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER &&
-      !this.getConfigurationKey(StandardParametersKey.MeterValuesSampledData).value.includes(
+      !this.getConfigurationKey(StandardParametersKey.MeterValuesSampledData)?.value.includes(
         measurand
       )
     ) {
@@ -391,7 +407,7 @@ export default class ChargingStation {
         phase &&
         sampledValueTemplates[index]?.phase === phase &&
         sampledValueTemplates[index]?.measurand === measurand &&
-        this.getConfigurationKey(StandardParametersKey.MeterValuesSampledData).value.includes(
+        this.getConfigurationKey(StandardParametersKey.MeterValuesSampledData)?.value.includes(
           measurand
         )
       ) {
@@ -400,7 +416,7 @@ export default class ChargingStation {
         !phase &&
         !sampledValueTemplates[index].phase &&
         sampledValueTemplates[index]?.measurand === measurand &&
-        this.getConfigurationKey(StandardParametersKey.MeterValuesSampledData).value.includes(
+        this.getConfigurationKey(StandardParametersKey.MeterValuesSampledData)?.value.includes(
           measurand
         )
       ) {
@@ -435,7 +451,8 @@ export default class ChargingStation {
     ) {
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
       this.heartbeatSetInterval = setInterval(async (): Promise<void> => {
-        await this.ocppRequestService.sendMessageHandler<HeartbeatResponse>(
+        await this.ocppRequestService.requestHandler<HeartbeatRequest, HeartbeatResponse>(
+          this,
           RequestCommand.HEARTBEAT
         );
       }, this.getHeartbeatInterval());
@@ -507,7 +524,8 @@ export default class ChargingStation {
             this.getConnectorStatus(connectorId).transactionId,
             interval
           );
-          await this.ocppRequestService.sendMessageHandler<MeterValuesResponse>(
+          await this.ocppRequestService.requestHandler<MeterValuesRequest, MeterValuesResponse>(
+            this,
             RequestCommand.METER_VALUES,
             {
               connectorId,
@@ -534,6 +552,27 @@ export default class ChargingStation {
       this.performanceStatistics.start();
     }
     this.openWSConnection();
+    // Handle WebSocket message
+    this.wsConnection.on(
+      'message',
+      this.onMessage.bind(this) as (this: WebSocket, data: RawData, isBinary: boolean) => void
+    );
+    // Handle WebSocket error
+    this.wsConnection.on(
+      'error',
+      this.onError.bind(this) as (this: WebSocket, error: Error) => void
+    );
+    // Handle WebSocket close
+    this.wsConnection.on(
+      'close',
+      this.onClose.bind(this) as (this: WebSocket, code: number, reason: Buffer) => void
+    );
+    // Handle WebSocket open
+    this.wsConnection.on('open', this.onOpen.bind(this) as (this: WebSocket) => void);
+    // Handle WebSocket ping
+    this.wsConnection.on('ping', this.onPing.bind(this) as (this: WebSocket, data: Buffer) => void);
+    // Handle WebSocket pong
+    this.wsConnection.on('pong', this.onPong.bind(this) as (this: WebSocket, data: Buffer) => void);
     // Monitor authorization file
     FileUtils.watchJsonFile<string[]>(
       this.logPrefix(),
@@ -580,27 +619,6 @@ export default class ChargingStation {
         }
       }
     );
-    // Handle WebSocket message
-    this.wsConnection.on(
-      'message',
-      this.onMessage.bind(this) as (this: WebSocket, data: RawData, isBinary: boolean) => void
-    );
-    // Handle WebSocket error
-    this.wsConnection.on(
-      'error',
-      this.onError.bind(this) as (this: WebSocket, error: Error) => void
-    );
-    // Handle WebSocket close
-    this.wsConnection.on(
-      'close',
-      this.onClose.bind(this) as (this: WebSocket, code: number, reason: Buffer) => void
-    );
-    // Handle WebSocket open
-    this.wsConnection.on('open', this.onOpen.bind(this) as (this: WebSocket) => void);
-    // Handle WebSocket ping
-    this.wsConnection.on('ping', this.onPing.bind(this) as (this: WebSocket, data: Buffer) => void);
-    // Handle WebSocket pong
-    this.wsConnection.on('pong', this.onPong.bind(this) as (this: WebSocket, data: Buffer) => void);
     parentPort.postMessage({
       id: ChargingStationWorkerMessageEvents.STARTED,
       data: { id: this.stationInfo.chargingStationId },
@@ -612,14 +630,14 @@ export default class ChargingStation {
     await this.stopMessageSequence(reason);
     for (const connectorId of this.connectors.keys()) {
       if (connectorId > 0) {
-        await this.ocppRequestService.sendMessageHandler<StatusNotificationResponse>(
-          RequestCommand.STATUS_NOTIFICATION,
-          {
-            connectorId,
-            status: ChargePointStatus.UNAVAILABLE,
-            errorCode: ChargePointErrorCode.NO_ERROR,
-          }
-        );
+        await this.ocppRequestService.requestHandler<
+          StatusNotificationRequest,
+          StatusNotificationResponse
+        >(this, RequestCommand.STATUS_NOTIFICATION, {
+          connectorId,
+          status: ChargePointStatus.UNAVAILABLE,
+          errorCode: ChargePointErrorCode.NO_ERROR,
+        });
         this.getConnectorStatus(connectorId).status = ChargePointStatus.UNAVAILABLE;
       }
     }
@@ -637,6 +655,14 @@ export default class ChargingStation {
     this.stopped = true;
   }
 
+  public async reset(reason?: StopTransactionReason): Promise<void> {
+    await this.stop(reason);
+    await Utils.sleep(this.stationInfo.resetTime);
+    this.stationInfo = this.getStationInfo();
+    this.stationInfo?.Connectors && delete this.stationInfo.Connectors;
+    this.start();
+  }
+
   public getConfigurationKey(
     key: string | StandardParametersKey,
     caseInsensitive = false
@@ -720,80 +746,67 @@ export default class ChargingStation {
   }
 
   public getChargingProfilePowerLimit(connectorId: number): number | undefined {
-    const timestamp = new Date().getTime();
-    let matchingChargingProfile: ChargingProfile;
-    let chargingSchedulePeriods: ChargingSchedulePeriod[] = [];
-    if (!Utils.isEmptyArray(this.getConnectorStatus(connectorId)?.chargingProfiles)) {
-      const chargingProfiles: ChargingProfile[] = this.getConnectorStatus(
-        connectorId
-      ).chargingProfiles.filter(
-        (chargingProfile) =>
-          timestamp >= chargingProfile.chargingSchedule?.startSchedule.getTime() &&
-          timestamp <
-            chargingProfile.chargingSchedule?.startSchedule.getTime() +
-              chargingProfile.chargingSchedule.duration &&
-          chargingProfile?.stackLevel === Math.max(...chargingProfiles.map((cp) => cp?.stackLevel))
+    let limit: number, matchingChargingProfile: ChargingProfile;
+    let chargingProfiles: ChargingProfile[] = [];
+    // Get charging profiles for connector and sort by stack level
+    chargingProfiles = this.getConnectorStatus(connectorId).chargingProfiles.sort(
+      (a, b) => b.stackLevel - a.stackLevel
+    );
+    // Get profiles on connector 0
+    if (this.getConnectorStatus(0).chargingProfiles) {
+      chargingProfiles.push(
+        ...this.getConnectorStatus(0).chargingProfiles.sort((a, b) => b.stackLevel - a.stackLevel)
       );
-      if (!Utils.isEmptyArray(chargingProfiles)) {
-        for (const chargingProfile of chargingProfiles) {
-          if (!Utils.isEmptyArray(chargingProfile.chargingSchedule.chargingSchedulePeriod)) {
-            chargingSchedulePeriods =
-              chargingProfile.chargingSchedule.chargingSchedulePeriod.filter(
-                (chargingSchedulePeriod, index) => {
-                  timestamp >=
-                    chargingProfile.chargingSchedule.startSchedule.getTime() +
-                      chargingSchedulePeriod.startPeriod &&
-                    chargingProfile.chargingSchedule.chargingSchedulePeriod[index + 1] &&
-                    timestamp <
-                      chargingProfile.chargingSchedule.startSchedule.getTime() +
-                        chargingProfile.chargingSchedule.chargingSchedulePeriod[index + 1]
-                          ?.startPeriod;
-                }
-              );
-            if (!Utils.isEmptyArray(chargingSchedulePeriods)) {
-              matchingChargingProfile = chargingProfile;
-              break;
-            }
-          }
-        }
-      }
     }
-    let limit: number;
-    if (!Utils.isEmptyArray(chargingSchedulePeriods)) {
-      switch (this.getCurrentOutType()) {
-        case CurrentType.AC:
-          limit =
-            matchingChargingProfile.chargingSchedule.chargingRateUnit === ChargingRateUnitType.WATT
-              ? chargingSchedulePeriods[0].limit
-              : ACElectricUtils.powerTotal(
-                  this.getNumberOfPhases(),
-                  this.getVoltageOut(),
-                  chargingSchedulePeriods[0].limit
-                );
-          break;
-        case CurrentType.DC:
-          limit =
-            matchingChargingProfile.chargingSchedule.chargingRateUnit === ChargingRateUnitType.WATT
-              ? chargingSchedulePeriods[0].limit
-              : DCElectricUtils.power(this.getVoltageOut(), chargingSchedulePeriods[0].limit);
+    if (!Utils.isEmptyArray(chargingProfiles)) {
+      const result = this.getLimitFromChargingProfiles(chargingProfiles);
+      if (!Utils.isNullOrUndefined(result)) {
+        limit = result.limit;
+        matchingChargingProfile = result.matchingChargingProfile;
+        switch (this.getCurrentOutType()) {
+          case CurrentType.AC:
+            limit =
+              matchingChargingProfile.chargingSchedule.chargingRateUnit ===
+              ChargingRateUnitType.WATT
+                ? limit
+                : ACElectricUtils.powerTotal(this.getNumberOfPhases(), this.getVoltageOut(), limit);
+            break;
+          case CurrentType.DC:
+            limit =
+              matchingChargingProfile.chargingSchedule.chargingRateUnit ===
+              ChargingRateUnitType.WATT
+                ? limit
+                : DCElectricUtils.power(this.getVoltageOut(), limit);
+        }
+
+        const connectorMaximumPower = this.getMaximumPower() / this.stationInfo.powerDivider;
+        if (limit > connectorMaximumPower) {
+          logger.error(
+            `${this.logPrefix()} Charging profile id ${
+              matchingChargingProfile.chargingProfileId
+            } limit is greater than connector id ${connectorId} maximum, dump charging profiles' stack: %j`,
+            this.getConnectorStatus(connectorId).chargingProfiles
+          );
+          limit = connectorMaximumPower;
+        }
       }
     }
-    const connectorMaximumPower =
-      ((this.stationInfo['maxPower'] as number) ?? this.stationInfo.maximumPower) /
-      this.stationInfo.powerDivider;
-    if (limit > connectorMaximumPower) {
-      logger.error(
-        `${this.logPrefix()} Charging profile id ${
-          matchingChargingProfile.chargingProfileId
-        } limit is greater than connector id ${connectorId} maximum, dump charging profiles' stack: %j`,
-        this.getConnectorStatus(connectorId).chargingProfiles
-      );
-      limit = connectorMaximumPower;
-    }
     return limit;
   }
 
   public setChargingProfile(connectorId: number, cp: ChargingProfile): void {
+    if (Utils.isNullOrUndefined(this.getConnectorStatus(connectorId).chargingProfiles)) {
+      logger.error(
+        `${this.logPrefix()} Trying to set a charging profile on connectorId ${connectorId} with an uninitialized charging profiles array attribute, applying deferred initialization`
+      );
+      this.getConnectorStatus(connectorId).chargingProfiles = [];
+    }
+    if (!Array.isArray(this.getConnectorStatus(connectorId).chargingProfiles)) {
+      logger.error(
+        `${this.logPrefix()} Trying to set a charging profile on connectorId ${connectorId} with an improper attribute type for the charging profiles array, applying proper type initialization`
+      );
+      this.getConnectorStatus(connectorId).chargingProfiles = [];
+    }
     let cpReplaced = false;
     if (!Utils.isEmptyArray(this.getConnectorStatus(connectorId).chargingProfiles)) {
       this.getConnectorStatus(connectorId).chargingProfiles?.forEach(
@@ -826,6 +839,12 @@ export default class ChargingStation {
     this.stopMeterValues(connectorId);
   }
 
+  public hasFeatureProfile(featureProfile: SupportedFeatureProfiles) {
+    return this.getConfigurationKey(StandardParametersKey.SupportedFeatureProfiles)?.value.includes(
+      featureProfile
+    );
+  }
+
   public bufferMessage(message: string): void {
     this.messageBuffer.add(message);
   }
@@ -880,8 +899,14 @@ export default class ChargingStation {
     try {
       const measureId = `${FileType.ChargingStationTemplate} read`;
       const beginId = PerformanceStatistics.beginMeasure(measureId);
-      template = JSON.parse(fs.readFileSync(this.templateFile, 'utf8')) as ChargingStationTemplate;
+      template =
+        (JSON.parse(fs.readFileSync(this.templateFile, 'utf8')) as ChargingStationTemplate) ??
+        ({} as ChargingStationTemplate);
       PerformanceStatistics.endMeasure(measureId, beginId);
+      template.templateHash = crypto
+        .createHash(Constants.DEFAULT_HASH_ALGORITHM)
+        .update(JSON.stringify(template))
+        .digest('hex');
     } catch (error) {
       FileUtils.handleFileException(
         this.logPrefix(),
@@ -904,11 +929,13 @@ export default class ChargingStation {
     params = params ?? {};
     params.randomSerialNumberUpperCase = params?.randomSerialNumberUpperCase ?? true;
     params.randomSerialNumber = params?.randomSerialNumber ?? true;
-    if (existingStationInfo) {
+    if (!Utils.isEmptyObject(existingStationInfo)) {
       existingStationInfo?.chargePointSerialNumber &&
         (stationInfo.chargePointSerialNumber = existingStationInfo.chargePointSerialNumber);
       existingStationInfo?.chargeBoxSerialNumber &&
         (stationInfo.chargeBoxSerialNumber = existingStationInfo.chargeBoxSerialNumber);
+      existingStationInfo?.meterSerialNumber &&
+        (stationInfo.meterSerialNumber = existingStationInfo.meterSerialNumber);
     } else {
       const serialNumberSuffix = params?.randomSerialNumber
         ? this.getRandomSerialNumberSuffix({ upperCase: params.randomSerialNumberUpperCase })
@@ -919,16 +946,26 @@ export default class ChargingStation {
       stationInfo.chargeBoxSerialNumber =
         stationInfo?.chargeBoxSerialNumberPrefix &&
         stationInfo.chargeBoxSerialNumberPrefix + serialNumberSuffix;
+      stationInfo.meterSerialNumber =
+        stationInfo?.meterSerialNumberPrefix &&
+        stationInfo.meterSerialNumberPrefix + serialNumberSuffix;
     }
   }
 
   private getStationInfoFromTemplate(): ChargingStationInfo {
-    const stationInfo: ChargingStationInfo =
-      this.getTemplateFromFile() ?? ({} as ChargingStationInfo);
-    stationInfo.hash = crypto
-      .createHash(Constants.DEFAULT_HASH_ALGORITHM)
-      .update(JSON.stringify(stationInfo))
-      .digest('hex');
+    const stationInfo: ChargingStationInfo = this.getTemplateFromFile();
+    if (Utils.isNullOrUndefined(stationInfo)) {
+      const logMsg = 'Failed to read charging station template file';
+      logger.error(`${this.logPrefix()} ${logMsg}`);
+      throw new BaseError(logMsg);
+    }
+    if (Utils.isEmptyObject(stationInfo)) {
+      logger.warn(
+        `${this.logPrefix()} Empty charging station information from template file ${
+          this.templateFile
+        }`
+      );
+    }
     const chargingStationId = this.getChargingStationId(stationInfo);
     // Deprecation template keys section
     this.warnDeprecatedTemplateKey(
@@ -962,8 +999,30 @@ export default class ChargingStation {
     return stationInfo;
   }
 
-  private getStationInfoFromFile(): ChargingStationInfo | null {
-    return this.getConfigurationFromFile()?.stationInfo ?? null;
+  private createStationInfoHash(stationInfo: ChargingStationInfo): ChargingStationInfo {
+    if (!Utils.isEmptyObject(stationInfo)) {
+      const previousInfoHash = stationInfo?.infoHash ?? '';
+      delete stationInfo.infoHash;
+      const currentInfoHash = crypto
+        .createHash(Constants.DEFAULT_HASH_ALGORITHM)
+        .update(JSON.stringify(stationInfo))
+        .digest('hex');
+      if (
+        Utils.isEmptyString(previousInfoHash) ||
+        (!Utils.isEmptyString(previousInfoHash) && currentInfoHash !== previousInfoHash)
+      ) {
+        stationInfo.infoHash = currentInfoHash;
+      } else {
+        stationInfo.infoHash = previousInfoHash;
+      }
+    }
+    return stationInfo;
+  }
+
+  private getStationInfoFromFile(): ChargingStationInfo {
+    let stationInfo = this.getConfigurationFromFile()?.stationInfo ?? ({} as ChargingStationInfo);
+    stationInfo = this.createStationInfoHash(stationInfo);
+    return stationInfo;
   }
 
   private getStationInfo(): ChargingStationInfo {
@@ -976,7 +1035,11 @@ export default class ChargingStation {
       this.hashId + '.json'
     );
     const stationInfoFromFile: ChargingStationInfo = this.getStationInfoFromFile();
-    if (stationInfoFromFile?.hash === stationInfoFromTemplate.hash) {
+    // Priority: charging station info from template > charging station info from configuration file > charging station info attribute
+    if (stationInfoFromFile?.templateHash === stationInfoFromTemplate.templateHash) {
+      if (this.stationInfo?.infoHash === stationInfoFromFile?.infoHash) {
+        return this.stationInfo;
+      }
       return stationInfoFromFile;
     }
     this.createSerialNumber(stationInfoFromTemplate, stationInfoFromFile);
@@ -988,7 +1051,7 @@ export default class ChargingStation {
   }
 
   private getOcppVersion(): OCPPVersion {
-    return this.stationInfo.ocppVersion ? this.stationInfo.ocppVersion : OCPPVersion.VERSION_16;
+    return this.stationInfo.ocppVersion ?? OCPPVersion.VERSION_16;
   }
 
   private getOcppPersistentConfiguration(): boolean {
@@ -1042,8 +1105,8 @@ export default class ChargingStation {
       }),
       ...(!Utils.isUndefined(stationInfo.iccid) && { iccid: stationInfo.iccid }),
       ...(!Utils.isUndefined(stationInfo.imsi) && { imsi: stationInfo.imsi }),
-      ...(!Utils.isUndefined(stationInfo.meterSerialNumber) && {
-        meterSerialNumber: stationInfo.meterSerialNumber,
+      ...(!Utils.isUndefined(stationInfo.meterSerialNumberPrefix) && {
+        meterSerialNumber: stationInfo.meterSerialNumberPrefix,
       }),
       ...(!Utils.isUndefined(stationInfo.meterType) && {
         meterType: stationInfo.meterType,
@@ -1060,35 +1123,18 @@ export default class ChargingStation {
     logger.info(`${this.logPrefix()} Charging station hashId '${this.hashId}'`);
     this.bootNotificationRequest = this.createBootNotificationRequest(this.stationInfo);
     this.ocppConfiguration = this.getOcppConfiguration();
-    delete this.stationInfo.Configuration;
+    this.stationInfo?.Configuration && delete this.stationInfo.Configuration;
+    this.wsConfiguredConnectionUrl = new URL(
+      this.getConfiguredSupervisionUrl().href + '/' + this.stationInfo.chargingStationId
+    );
     // Build connectors if needed
     const maxConnectors = this.getMaxNumberOfConnectors();
-    if (maxConnectors <= 0) {
-      logger.warn(
-        `${this.logPrefix()} Charging station template ${
-          this.templateFile
-        } with ${maxConnectors} connectors`
-      );
-    }
+    this.checkMaxConnectors(maxConnectors);
     const templateMaxConnectors = this.getTemplateMaxNumberOfConnectors();
-    if (templateMaxConnectors <= 0) {
-      logger.warn(
-        `${this.logPrefix()} Charging station template ${
-          this.templateFile
-        } with no connector configuration`
-      );
-    }
-    if (!this.stationInfo.Connectors[0]) {
-      logger.warn(
-        `${this.logPrefix()} Charging station template ${
-          this.templateFile
-        } with no connector Id 0 configuration`
-      );
-    }
-    // Sanity check
+    this.checkTemplateMaxConnectors(templateMaxConnectors);
     if (
       maxConnectors >
-        (this.stationInfo.Connectors[0] ? templateMaxConnectors - 1 : templateMaxConnectors) &&
+        (this.stationInfo?.Connectors[0] ? templateMaxConnectors - 1 : templateMaxConnectors) &&
       !this.stationInfo.randomConnectors
     ) {
       logger.warn(
@@ -1098,76 +1144,27 @@ export default class ChargingStation {
       );
       this.stationInfo.randomConnectors = true;
     }
-    const connectorsConfigHash = crypto
-      .createHash(Constants.DEFAULT_HASH_ALGORITHM)
-      .update(JSON.stringify(this.stationInfo.Connectors) + maxConnectors.toString())
-      .digest('hex');
-    const connectorsConfigChanged =
-      this.connectors?.size !== 0 && this.connectorsConfigurationHash !== connectorsConfigHash;
-    if (this.connectors?.size === 0 || connectorsConfigChanged) {
-      connectorsConfigChanged && this.connectors.clear();
-      this.connectorsConfigurationHash = connectorsConfigHash;
-      // Add connector Id 0
-      let lastConnector = '0';
-      for (lastConnector in this.stationInfo.Connectors) {
-        const lastConnectorId = Utils.convertToInt(lastConnector);
-        if (
-          lastConnectorId === 0 &&
-          this.getUseConnectorId0() &&
-          this.stationInfo.Connectors[lastConnector]
-        ) {
-          this.connectors.set(
-            lastConnectorId,
-            Utils.cloneObject<ConnectorStatus>(this.stationInfo.Connectors[lastConnector])
-          );
-          this.getConnectorStatus(lastConnectorId).availability = AvailabilityType.OPERATIVE;
-          if (Utils.isUndefined(this.getConnectorStatus(lastConnectorId)?.chargingProfiles)) {
-            this.getConnectorStatus(lastConnectorId).chargingProfiles = [];
-          }
-        }
-      }
-      // Generate all connectors
-      if (
-        (this.stationInfo.Connectors[0] ? templateMaxConnectors - 1 : templateMaxConnectors) > 0
-      ) {
-        for (let index = 1; index <= maxConnectors; index++) {
-          const randConnectorId = this.stationInfo.randomConnectors
-            ? Utils.getRandomInteger(Utils.convertToInt(lastConnector), 1)
-            : index;
-          this.connectors.set(
-            index,
-            Utils.cloneObject<ConnectorStatus>(this.stationInfo.Connectors[randConnectorId])
-          );
-          this.getConnectorStatus(index).availability = AvailabilityType.OPERATIVE;
-          if (Utils.isUndefined(this.getConnectorStatus(index)?.chargingProfiles)) {
-            this.getConnectorStatus(index).chargingProfiles = [];
-          }
-        }
-      }
-    }
-    // The connectors attribute need to be initialized
+    this.initializeConnectors(this.stationInfo, maxConnectors, templateMaxConnectors);
     this.stationInfo.maximumAmperage = this.getMaximumAmperage();
+    this.stationInfo = this.createStationInfoHash(this.stationInfo);
     this.saveStationInfo();
     // Avoid duplication of connectors related information in RAM
-    delete this.stationInfo.Connectors;
-    // Initialize transaction attributes on connectors
-    for (const connectorId of this.connectors.keys()) {
-      if (connectorId > 0 && !this.getConnectorStatus(connectorId)?.transactionStarted) {
-        this.initializeConnectorStatus(connectorId);
-      }
-    }
-    this.wsConfiguredConnectionUrl = new URL(
-      this.getConfiguredSupervisionUrl().href + '/' + this.stationInfo.chargingStationId
-    );
+    this.stationInfo?.Connectors && delete this.stationInfo.Connectors;
     // OCPP configuration
     this.initializeOcppConfiguration();
+    if (this.getEnableStatistics()) {
+      this.performanceStatistics = PerformanceStatistics.getInstance(
+        this.hashId,
+        this.stationInfo.chargingStationId,
+        this.wsConnectionUrl
+      );
+    }
     switch (this.getOcppVersion()) {
       case OCPPVersion.VERSION_16:
         this.ocppIncomingRequestService =
-          OCPP16IncomingRequestService.getInstance<OCPP16IncomingRequestService>(this);
+          OCPP16IncomingRequestService.getInstance<OCPP16IncomingRequestService>();
         this.ocppRequestService = OCPP16RequestService.getInstance<OCPP16RequestService>(
-          this,
-          OCPP16ResponseService.getInstance<OCPP16ResponseService>(this)
+          OCPP16ResponseService.getInstance<OCPP16ResponseService>()
         );
         break;
       default:
@@ -1182,16 +1179,15 @@ export default class ChargingStation {
       };
     }
     this.stationInfo.powerDivider = this.getPowerDivider();
-    if (this.getEnableStatistics()) {
-      this.performanceStatistics = PerformanceStatistics.getInstance(
-        this.hashId,
-        this.stationInfo.chargingStationId,
-        this.wsConnectionUrl
-      );
-    }
   }
 
   private initializeOcppConfiguration(): void {
+    if (!this.getConfigurationKey(StandardParametersKey.HeartbeatInterval)) {
+      this.addConfigurationKey(StandardParametersKey.HeartbeatInterval, '0');
+    }
+    if (!this.getConfigurationKey(StandardParametersKey.HeartBeatInterval)) {
+      this.addConfigurationKey(StandardParametersKey.HeartBeatInterval, '0', { visible: false });
+    }
     if (
       this.getSupervisionUrlOcppConfiguration() &&
       !this.getConfigurationKey(this.getSupervisionUrlOcppKey())
@@ -1219,7 +1215,7 @@ export default class ChargingStation {
     if (!this.getConfigurationKey(StandardParametersKey.SupportedFeatureProfiles)) {
       this.addConfigurationKey(
         StandardParametersKey.SupportedFeatureProfiles,
-        `${SupportedFeatureProfiles.Core},${SupportedFeatureProfiles.Local_Auth_List_Management},${SupportedFeatureProfiles.Smart_Charging}`
+        `${SupportedFeatureProfiles.Core},${SupportedFeatureProfiles.FirmwareManagement},${SupportedFeatureProfiles.LocalAuthListManagement},${SupportedFeatureProfiles.SmartCharging},${SupportedFeatureProfiles.RemoteTrigger}`
       );
     }
     this.addConfigurationKey(
@@ -1259,8 +1255,8 @@ export default class ChargingStation {
     }
     if (
       !this.getConfigurationKey(StandardParametersKey.LocalAuthListEnabled) &&
-      this.getConfigurationKey(StandardParametersKey.SupportedFeatureProfiles).value.includes(
-        SupportedFeatureProfiles.Local_Auth_List_Management
+      this.getConfigurationKey(StandardParametersKey.SupportedFeatureProfiles)?.value.includes(
+        SupportedFeatureProfiles.LocalAuthListManagement
       )
     ) {
       this.addConfigurationKey(StandardParametersKey.LocalAuthListEnabled, 'false');
@@ -1274,14 +1270,118 @@ export default class ChargingStation {
     this.saveOcppConfiguration();
   }
 
+  private initializeConnectors(
+    stationInfo: ChargingStationInfo,
+    maxConnectors: number,
+    templateMaxConnectors: number
+  ): void {
+    if (!stationInfo?.Connectors && this.connectors.size === 0) {
+      const logMsg = `${this.logPrefix()} No already defined connectors and charging station information from template ${
+        this.templateFile
+      } with no connectors configuration defined`;
+      logger.error(logMsg);
+      throw new BaseError(logMsg);
+    }
+    if (!stationInfo?.Connectors[0]) {
+      logger.warn(
+        `${this.logPrefix()} Charging station information from template ${
+          this.templateFile
+        } with no connector Id 0 configuration`
+      );
+    }
+    if (stationInfo?.Connectors) {
+      const connectorsConfigHash = crypto
+        .createHash(Constants.DEFAULT_HASH_ALGORITHM)
+        .update(JSON.stringify(stationInfo?.Connectors) + maxConnectors.toString())
+        .digest('hex');
+      const connectorsConfigChanged =
+        this.connectors?.size !== 0 && this.connectorsConfigurationHash !== connectorsConfigHash;
+      if (this.connectors?.size === 0 || connectorsConfigChanged) {
+        connectorsConfigChanged && this.connectors.clear();
+        this.connectorsConfigurationHash = connectorsConfigHash;
+        // Add connector Id 0
+        let lastConnector = '0';
+        for (lastConnector in stationInfo?.Connectors) {
+          const lastConnectorId = Utils.convertToInt(lastConnector);
+          if (
+            lastConnectorId === 0 &&
+            this.getUseConnectorId0() &&
+            stationInfo?.Connectors[lastConnector]
+          ) {
+            this.connectors.set(
+              lastConnectorId,
+              Utils.cloneObject<ConnectorStatus>(stationInfo?.Connectors[lastConnector])
+            );
+            this.getConnectorStatus(lastConnectorId).availability = AvailabilityType.OPERATIVE;
+            if (Utils.isUndefined(this.getConnectorStatus(lastConnectorId)?.chargingProfiles)) {
+              this.getConnectorStatus(lastConnectorId).chargingProfiles = [];
+            }
+          }
+        }
+        // Generate all connectors
+        if ((stationInfo?.Connectors[0] ? templateMaxConnectors - 1 : templateMaxConnectors) > 0) {
+          for (let index = 1; index <= maxConnectors; index++) {
+            const randConnectorId = stationInfo.randomConnectors
+              ? Utils.getRandomInteger(Utils.convertToInt(lastConnector), 1)
+              : index;
+            this.connectors.set(
+              index,
+              Utils.cloneObject<ConnectorStatus>(stationInfo?.Connectors[randConnectorId])
+            );
+            this.getConnectorStatus(index).availability = AvailabilityType.OPERATIVE;
+            if (Utils.isUndefined(this.getConnectorStatus(index)?.chargingProfiles)) {
+              this.getConnectorStatus(index).chargingProfiles = [];
+            }
+          }
+        }
+      }
+    } else {
+      logger.warn(
+        `${this.logPrefix()} Charging station information from template ${
+          this.templateFile
+        } with no connectors configuration defined, using already defined connectors`
+      );
+    }
+    // Initialize transaction attributes on connectors
+    for (const connectorId of this.connectors.keys()) {
+      if (connectorId > 0 && !this.getConnectorStatus(connectorId)?.transactionStarted) {
+        this.initializeConnectorStatus(connectorId);
+      }
+    }
+  }
+
+  private checkMaxConnectors(maxConnectors: number): void {
+    if (maxConnectors <= 0) {
+      logger.warn(
+        `${this.logPrefix()} Charging station information from template ${
+          this.templateFile
+        } with ${maxConnectors} connectors`
+      );
+    }
+  }
+
+  private checkTemplateMaxConnectors(templateMaxConnectors: number): void {
+    if (templateMaxConnectors === 0) {
+      logger.warn(
+        `${this.logPrefix()} Charging station information from template ${
+          this.templateFile
+        } with empty connectors configuration`
+      );
+    } else if (templateMaxConnectors < 0) {
+      logger.error(
+        `${this.logPrefix()} Charging station information from template ${
+          this.templateFile
+        } with no connectors configuration defined`
+      );
+    }
+  }
+
   private getConfigurationFromFile(): ChargingStationConfiguration | null {
     let configuration: ChargingStationConfiguration = null;
     if (this.configurationFile && fs.existsSync(this.configurationFile)) {
       try {
         const measureId = `${FileType.ChargingStationConfiguration} read`;
-        const beginId = PerformanceStatistics.beginMeasure(
-          `${FileType.ChargingStationConfiguration} read`
-        );
+        const beginId = PerformanceStatistics.beginMeasure(measureId);
         configuration = JSON.parse(
           fs.readFileSync(this.configurationFile, 'utf8')
         ) as ChargingStationConfiguration;
@@ -1311,11 +1411,21 @@ export default class ChargingStation {
             configurationData.configurationKey = this.ocppConfiguration.configurationKey;
             break;
           case Section.stationInfo:
+            if (configurationData?.stationInfo?.infoHash === this.stationInfo?.infoHash) {
+              logger.debug(
+                `${this.logPrefix()} Not saving unchanged charging station information to configuration file ${
+                  this.configurationFile
+                }`
+              );
+              return;
+            }
             configurationData.stationInfo = this.stationInfo;
             break;
           default:
             configurationData.configurationKey = this.ocppConfiguration.configurationKey;
-            configurationData.stationInfo = this.stationInfo;
+            if (configurationData?.stationInfo?.infoHash !== this.stationInfo?.infoHash) {
+              configurationData.stationInfo = this.stationInfo;
+            }
             break;
         }
         const measureId = `${FileType.ChargingStationConfiguration} write`;
@@ -1334,7 +1444,7 @@ export default class ChargingStation {
       }
     } else {
       logger.error(
-        `${this.logPrefix()} Trying to save charging station configuration to undefined file`
+        `${this.logPrefix()} Trying to save charging station configuration to undefined configuration file`
       );
     }
   }
@@ -1368,15 +1478,19 @@ export default class ChargingStation {
   }
 
   private async onOpen(): Promise<void> {
-    logger.info(
-      `${this.logPrefix()} Connected to OCPP server through ${this.wsConnectionUrl.toString()}`
-    );
-    if (!this.isInAcceptedState()) {
-      // Send BootNotification
-      let registrationRetryCount = 0;
-      do {
-        this.bootNotificationResponse =
-          await this.ocppRequestService.sendMessageHandler<BootNotificationResponse>(
+    if (this.isWebSocketConnectionOpened()) {
+      logger.info(
+        `${this.logPrefix()} Connection to OCPP server through ${this.wsConnectionUrl.toString()} succeeded`
+      );
+      if (!this.isRegistered()) {
+        // Send BootNotification
+        let registrationRetryCount = 0;
+        do {
+          this.bootNotificationResponse = await this.ocppRequestService.requestHandler<
+            BootNotificationRequest,
+            BootNotificationResponse
+          >(
+            this,
             RequestCommand.BOOT_NOTIFICATION,
             {
               chargePointModel: this.bootNotificationRequest.chargePointModel,
@@ -1391,33 +1505,38 @@ export default class ChargingStation {
             },
             { skipBufferingOnError: true }
           );
-        if (!this.isInAcceptedState()) {
-          this.getRegistrationMaxRetries() !== -1 && registrationRetryCount++;
-          await Utils.sleep(
-            this.bootNotificationResponse?.interval
-              ? this.bootNotificationResponse.interval * 1000
-              : Constants.OCPP_DEFAULT_BOOT_NOTIFICATION_INTERVAL
-          );
+          if (!this.isRegistered()) {
+            this.getRegistrationMaxRetries() !== -1 && registrationRetryCount++;
+            await Utils.sleep(
+              this.bootNotificationResponse?.interval
+                ? this.bootNotificationResponse.interval * 1000
+                : Constants.OCPP_DEFAULT_BOOT_NOTIFICATION_INTERVAL
+            );
+          }
+        } while (
+          !this.isRegistered() &&
+          (registrationRetryCount <= this.getRegistrationMaxRetries() ||
+            this.getRegistrationMaxRetries() === -1)
+        );
+      }
+      if (this.isRegistered()) {
+        if (this.isInAcceptedState()) {
+          await this.startMessageSequence();
+          this.wsConnectionRestarted && this.flushMessageBuffer();
         }
-      } while (
-        !this.isInAcceptedState() &&
-        (registrationRetryCount <= this.getRegistrationMaxRetries() ||
-          this.getRegistrationMaxRetries() === -1)
-      );
-    }
-    if (this.isInAcceptedState()) {
-      await this.startMessageSequence();
-      this.stopped && (this.stopped = false);
-      if (this.wsConnectionRestarted && this.isWebSocketConnectionOpened()) {
-        this.flushMessageBuffer();
+      } else {
+        logger.error(
+          `${this.logPrefix()} Registration failure: max retries reached (${this.getRegistrationMaxRetries()}) or retry disabled (${this.getRegistrationMaxRetries()})`
+        );
       }
+      this.stopped && (this.stopped = false);
+      this.autoReconnectRetryCount = 0;
+      this.wsConnectionRestarted = false;
     } else {
-      logger.error(
-        `${this.logPrefix()} Registration failure: max retries reached (${this.getRegistrationMaxRetries()}) or retry disabled (${this.getRegistrationMaxRetries()})`
+      logger.warn(
+        `${this.logPrefix()} Connection to OCPP server through ${this.wsConnectionUrl.toString()} failed`
       );
     }
-    this.autoReconnectRetryCount = 0;
-    this.wsConnectionRestarted = false;
   }
 
   private async onClose(code: number, reason: string): Promise<void> {
@@ -1445,100 +1564,116 @@ export default class ChargingStation {
   }
 
   private async onMessage(data: Data): Promise<void> {
-    let [messageType, messageId, commandName, commandPayload, errorDetails]: IncomingRequest = [
-      0,
-      '',
-      '' as IncomingRequestCommand,
-      {},
-      {},
-    ];
-    let responseCallback: (
-      payload: JsonType | string,
-      requestPayload: JsonType | OCPPError
-    ) => void;
-    let rejectCallback: (error: OCPPError, requestStatistic?: boolean) => void;
+    let messageType: number;
+    let messageId: string;
+    let commandName: IncomingRequestCommand;
+    let commandPayload: JsonType;
+    let errorType: ErrorType;
+    let errorMessage: string;
+    let errorDetails: JsonType;
+    let responseCallback: (payload: JsonType, requestPayload: JsonType) => void;
+    let errorCallback: (error: OCPPError, requestStatistic?: boolean) => void;
     let requestCommandName: RequestCommand | IncomingRequestCommand;
-    let requestPayload: JsonType | OCPPError;
+    let requestPayload: JsonType;
     let cachedRequest: CachedRequest;
     let errMsg: string;
     try {
-      const request = JSON.parse(data.toString()) as IncomingRequest;
+      const request = JSON.parse(data.toString()) as IncomingRequest | Response | ErrorResponse;
       if (Utils.isIterable(request)) {
-        // Parse the message
-        [messageType, messageId, commandName, commandPayload, errorDetails] = request;
-      } else {
-        throw new OCPPError(
-          ErrorType.PROTOCOL_ERROR,
-          'Incoming request is not iterable',
-          commandName
-        );
-      }
-      // Check the Type of message
-      switch (messageType) {
-        // Incoming Message
-        case MessageType.CALL_MESSAGE:
-          if (this.getEnableStatistics()) {
-            this.performanceStatistics.addRequestStatistic(commandName, messageType);
-          }
-          // Process the call
-          await this.ocppIncomingRequestService.handleRequest(
-            messageId,
-            commandName,
-            commandPayload
-          );
-          break;
-        // Outcome Message
-        case MessageType.CALL_RESULT_MESSAGE:
-          // Respond
-          cachedRequest = this.requests.get(messageId);
-          if (Utils.isIterable(cachedRequest)) {
-            [responseCallback, , , requestPayload] = cachedRequest;
-          } else {
-            throw new OCPPError(
-              ErrorType.PROTOCOL_ERROR,
-              `Cached request for message id ${messageId} response is not iterable`,
-              commandName
+        [messageType, messageId] = request;
+        // Check the type of message
+        switch (messageType) {
+          // Incoming Message
+          case MessageType.CALL_MESSAGE:
+            [, , commandName, commandPayload] = request as IncomingRequest;
+            if (this.getEnableStatistics()) {
+              this.performanceStatistics.addRequestStatistic(commandName, messageType);
+            }
+            logger.debug(
+              `${this.logPrefix()} << Command '${commandName}' received request payload: ${JSON.stringify(
+                request
+              )}`
             );
-          }
-          if (!responseCallback) {
-            // Error
-            throw new OCPPError(
-              ErrorType.INTERNAL_ERROR,
-              `Response for unknown message id ${messageId}`,
-              commandName
+            // Process the message
+            await this.ocppIncomingRequestService.incomingRequestHandler(
+              this,
+              messageId,
+              commandName,
+              commandPayload
             );
-          }
-          responseCallback(commandName, requestPayload);
-          break;
-        // Error Message
-        case MessageType.CALL_ERROR_MESSAGE:
-          cachedRequest = this.requests.get(messageId);
-          if (Utils.isIterable(cachedRequest)) {
-            [, rejectCallback, requestCommandName] = cachedRequest;
-          } else {
-            throw new OCPPError(
-              ErrorType.PROTOCOL_ERROR,
-              `Cached request for message id ${messageId} error response is not iterable`
+            break;
+          // Outcome Message
+          case MessageType.CALL_RESULT_MESSAGE:
+            [, , commandPayload] = request as Response;
+            if (!this.requests.has(messageId)) {
+              // Error
+              throw new OCPPError(
+                ErrorType.INTERNAL_ERROR,
+                `Response for unknown message id ${messageId}`,
+                null,
+                commandPayload
+              );
+            }
+            // Respond
+            cachedRequest = this.requests.get(messageId);
+            if (Utils.isIterable(cachedRequest)) {
+              [responseCallback, , requestCommandName, requestPayload] = cachedRequest;
+            } else {
+              throw new OCPPError(
+                ErrorType.PROTOCOL_ERROR,
+                `Cached request for message id ${messageId} response is not iterable`,
+                null,
+                cachedRequest as unknown as JsonType
+              );
+            }
+            logger.debug(
+              `${this.logPrefix()} << Command '${
+                requestCommandName ?? ''
+              }' received response payload: ${JSON.stringify(request)}`
             );
-          }
-          if (!rejectCallback) {
-            // Error
-            throw new OCPPError(
-              ErrorType.INTERNAL_ERROR,
-              `Error response for unknown message id ${messageId}`,
-              requestCommandName
+            responseCallback(commandPayload, requestPayload);
+            break;
+          // Error Message
+          case MessageType.CALL_ERROR_MESSAGE:
+            [, , errorType, errorMessage, errorDetails] = request as ErrorResponse;
+            if (!this.requests.has(messageId)) {
+              // Error
+              throw new OCPPError(
+                ErrorType.INTERNAL_ERROR,
+                `Error response for unknown message id ${messageId}`,
+                null,
+                { errorType, errorMessage, errorDetails }
+              );
+            }
+            cachedRequest = this.requests.get(messageId);
+            if (Utils.isIterable(cachedRequest)) {
+              [, errorCallback, requestCommandName] = cachedRequest;
+            } else {
+              throw new OCPPError(
+                ErrorType.PROTOCOL_ERROR,
+                `Cached request for message id ${messageId} error response is not iterable`,
+                null,
+                cachedRequest as unknown as JsonType
+              );
+            }
+            logger.debug(
+              `${this.logPrefix()} << Command '${
+                requestCommandName ?? ''
+              }' received error payload: ${JSON.stringify(request)}`
             );
-          }
-          rejectCallback(
-            new OCPPError(commandName, commandPayload.toString(), requestCommandName, errorDetails)
-          );
-          break;
-        // Error
-        default:
-          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-          errMsg = `${this.logPrefix()} Wrong message type ${messageType}`;
-          logger.error(errMsg);
-          throw new OCPPError(ErrorType.PROTOCOL_ERROR, errMsg);
+            errorCallback(new OCPPError(errorType, errorMessage, requestCommandName, errorDetails));
+            break;
+          // Error
+          default:
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+            errMsg = `${this.logPrefix()} Wrong message type ${messageType}`;
+            logger.error(errMsg);
+            throw new OCPPError(ErrorType.PROTOCOL_ERROR, errMsg);
+        }
+      } else {
+        throw new OCPPError(ErrorType.PROTOCOL_ERROR, 'Incoming message is not iterable', null, {
+          payload: request,
+        });
       }
     } catch (error) {
       // Log
@@ -1551,7 +1686,12 @@ export default class ChargingStation {
       );
       // Send error
       messageType === MessageType.CALL_MESSAGE &&
-        (await this.ocppRequestService.sendError(messageId, error as OCPPError, commandName));
+        (await this.ocppRequestService.sendError(
+          this,
+          messageId,
+          error as OCPPError,
+          commandName ?? requestCommandName ?? null
+        ));
     }
   }
 
@@ -1656,7 +1796,10 @@ export default class ChargingStation {
   }
 
   private getTemplateMaxNumberOfConnectors(): number {
-    return Object.keys(this.stationInfo.Connectors).length;
+    if (!this.stationInfo?.Connectors) {
+      return -1;
+    }
+    return Object.keys(this.stationInfo?.Connectors).length;
   }
 
   private getMaxNumberOfConnectors(): number {
@@ -1668,15 +1811,19 @@ export default class ChargingStation {
     } else if (!Utils.isUndefined(this.stationInfo.numberOfConnectors)) {
       maxConnectors = this.stationInfo.numberOfConnectors as number;
     } else {
-      maxConnectors = this.stationInfo.Connectors[0]
+      maxConnectors = this.stationInfo?.Connectors[0]
         ? this.getTemplateMaxNumberOfConnectors() - 1
         : this.getTemplateMaxNumberOfConnectors();
     }
     return maxConnectors;
   }
 
+  private getMaximumPower(): number {
+    return (this.stationInfo['maxPower'] as number) ?? this.stationInfo.maximumPower;
+  }
+
   private getMaximumAmperage(): number | undefined {
-    const maximumPower = (this.stationInfo['maxPower'] as number) ?? this.stationInfo.maximumPower;
+    const maximumPower = this.getMaximumPower();
     switch (this.getCurrentOutType()) {
       case CurrentType.AC:
         return ACElectricUtils.amperagePerPhaseFromPower(
@@ -1720,7 +1867,11 @@ export default class ChargingStation {
 
   private async startMessageSequence(): Promise<void> {
     if (this.stationInfo.autoRegister) {
-      await this.ocppRequestService.sendMessageHandler<BootNotificationResponse>(
+      await this.ocppRequestService.requestHandler<
+        BootNotificationRequest,
+        BootNotificationResponse
+      >(
+        this,
         RequestCommand.BOOT_NOTIFICATION,
         {
           chargePointModel: this.bootNotificationRequest.chargePointModel,
@@ -1750,14 +1901,14 @@ export default class ChargingStation {
         this.getConnectorStatus(connectorId)?.bootStatus
       ) {
         // Send status in template at startup
-        await this.ocppRequestService.sendMessageHandler<StatusNotificationResponse>(
-          RequestCommand.STATUS_NOTIFICATION,
-          {
-            connectorId,
-            status: this.getConnectorStatus(connectorId).bootStatus,
-            errorCode: ChargePointErrorCode.NO_ERROR,
-          }
-        );
+        await this.ocppRequestService.requestHandler<
+          StatusNotificationRequest,
+          StatusNotificationResponse
+        >(this, RequestCommand.STATUS_NOTIFICATION, {
+          connectorId,
+          status: this.getConnectorStatus(connectorId).bootStatus,
+          errorCode: ChargePointErrorCode.NO_ERROR,
+        });
         this.getConnectorStatus(connectorId).status =
           this.getConnectorStatus(connectorId).bootStatus;
       } else if (
@@ -1766,36 +1917,36 @@ export default class ChargingStation {
         this.getConnectorStatus(connectorId)?.bootStatus
       ) {
         // Send status in template after reset
-        await this.ocppRequestService.sendMessageHandler<StatusNotificationResponse>(
-          RequestCommand.STATUS_NOTIFICATION,
-          {
-            connectorId,
-            status: this.getConnectorStatus(connectorId).bootStatus,
-            errorCode: ChargePointErrorCode.NO_ERROR,
-          }
-        );
+        await this.ocppRequestService.requestHandler<
+          StatusNotificationRequest,
+          StatusNotificationResponse
+        >(this, RequestCommand.STATUS_NOTIFICATION, {
+          connectorId,
+          status: this.getConnectorStatus(connectorId).bootStatus,
+          errorCode: ChargePointErrorCode.NO_ERROR,
+        });
         this.getConnectorStatus(connectorId).status =
           this.getConnectorStatus(connectorId).bootStatus;
       } else if (!this.stopped && this.getConnectorStatus(connectorId)?.status) {
         // Send previous status at template reload
-        await this.ocppRequestService.sendMessageHandler<StatusNotificationResponse>(
-          RequestCommand.STATUS_NOTIFICATION,
-          {
-            connectorId,
-            status: this.getConnectorStatus(connectorId).status,
-            errorCode: ChargePointErrorCode.NO_ERROR,
-          }
-        );
+        await this.ocppRequestService.requestHandler<
+          StatusNotificationRequest,
+          StatusNotificationResponse
+        >(this, RequestCommand.STATUS_NOTIFICATION, {
+          connectorId,
+          status: this.getConnectorStatus(connectorId).status,
+          errorCode: ChargePointErrorCode.NO_ERROR,
+        });
       } else {
         // Send default status
-        await this.ocppRequestService.sendMessageHandler<StatusNotificationResponse>(
-          RequestCommand.STATUS_NOTIFICATION,
-          {
-            connectorId,
-            status: ChargePointStatus.AVAILABLE,
-            errorCode: ChargePointErrorCode.NO_ERROR,
-          }
-        );
+        await this.ocppRequestService.requestHandler<
+          StatusNotificationRequest,
+          StatusNotificationResponse
+        >(this, RequestCommand.STATUS_NOTIFICATION, {
+          connectorId,
+          status: ChargePointStatus.AVAILABLE,
+          errorCode: ChargePointErrorCode.NO_ERROR,
+        });
         this.getConnectorStatus(connectorId).status = ChargePointStatus.AVAILABLE;
       }
     }
@@ -1842,7 +1993,8 @@ export default class ChargingStation {
               connectorId,
               this.getEnergyActiveImportRegisterByTransactionId(transactionId)
             );
-            await this.ocppRequestService.sendMessageHandler<MeterValuesResponse>(
+            await this.ocppRequestService.requestHandler<MeterValuesRequest, MeterValuesResponse>(
+              this,
               RequestCommand.METER_VALUES,
               {
                 connectorId,
@@ -1851,15 +2003,15 @@ export default class ChargingStation {
               }
             );
           }
-          await this.ocppRequestService.sendMessageHandler<StopTransactionResponse>(
-            RequestCommand.STOP_TRANSACTION,
-            {
-              transactionId,
-              meterStop: this.getEnergyActiveImportRegisterByTransactionId(transactionId),
-              idTag: this.getTransactionIdTag(transactionId),
-              reason,
-            }
-          );
+          await this.ocppRequestService.requestHandler<
+            StopTransactionRequest,
+            StopTransactionResponse
+          >(this, RequestCommand.STOP_TRANSACTION, {
+            transactionId,
+            meterStop: this.getEnergyActiveImportRegisterByTransactionId(transactionId),
+            idTag: this.getTransactionIdTag(transactionId),
+            reason,
+          });
         }
       }
     }
@@ -2095,4 +2247,105 @@ export default class ChargingStation {
     this.getConnectorStatus(connectorId).energyActiveImportRegisterValue = 0;
     this.getConnectorStatus(connectorId).transactionEnergyActiveImportRegisterValue = 0;
   }
+
+  /**
+   * Charging profiles should already be sorted by connectorId and stack level (highest stack level has priority)
+   *
+   * @param {ChargingProfile[]} chargingProfiles
+   * @returns {{ limit, matchingChargingProfile }}
+   */
+  private getLimitFromChargingProfiles(chargingProfiles: ChargingProfile[]): {
+    limit: number;
+    matchingChargingProfile: ChargingProfile;
+  } | null {
+    for (const chargingProfile of chargingProfiles) {
+      // Set helpers
+      const currentMoment = moment();
+      const chargingSchedule = chargingProfile.chargingSchedule;
+      // Check type (recurring) and if it is already active
+      // Adjust the daily recurring schedule to today
+      if (
+        chargingProfile.chargingProfileKind === ChargingProfileKindType.RECURRING &&
+        chargingProfile.recurrencyKind === RecurrencyKindType.DAILY &&
+        currentMoment.isAfter(chargingSchedule.startSchedule)
+      ) {
+        const currentDate = new Date();
+        chargingSchedule.startSchedule = new Date(chargingSchedule.startSchedule);
+        chargingSchedule.startSchedule.setFullYear(
+          currentDate.getFullYear(),
+          currentDate.getMonth(),
+          currentDate.getDate()
+        );
+        // Check if the start of the schedule is yesterday
+        if (moment(chargingSchedule.startSchedule).isAfter(currentMoment)) {
+          chargingSchedule.startSchedule.setDate(currentDate.getDate() - 1);
+        }
+      } else if (moment(chargingSchedule.startSchedule).isAfter(currentMoment)) {
+        return null;
+      }
+      // Check if the charging profile is active
+      if (
+        moment(chargingSchedule.startSchedule)
+          .add(chargingSchedule.duration, 's')
+          .isAfter(currentMoment)
+      ) {
+        let lastButOneSchedule: ChargingSchedulePeriod;
+        // Search the right schedule period
+        for (const schedulePeriod of chargingSchedule.chargingSchedulePeriod) {
+          // Handling of only one period
+          if (
+            chargingSchedule.chargingSchedulePeriod.length === 1 &&
+            schedulePeriod.startPeriod === 0
+          ) {
+            const result = {
+              limit: schedulePeriod.limit,
+              matchingChargingProfile: chargingProfile,
+            };
+            logger.debug(
+              `${this.logPrefix()} Matching charging profile found for power limitation: %j`,
+              result
+            );
+            return result;
+          }
+          // Find the right schedule period
+          if (
+            moment(chargingSchedule.startSchedule)
+              .add(schedulePeriod.startPeriod, 's')
+              .isAfter(currentMoment)
+          ) {
+            // Found the schedule: last but one is the correct one
+            const result = {
+              limit: lastButOneSchedule.limit,
+              matchingChargingProfile: chargingProfile,
+            };
+            logger.debug(
+              `${this.logPrefix()} Matching charging profile found for power limitation: %j`,
+              result
+            );
+            return result;
+          }
+          // Keep it
+          lastButOneSchedule = schedulePeriod;
+          // Handle the last schedule period
+          if (
+            schedulePeriod.startPeriod ===
+            chargingSchedule.chargingSchedulePeriod[
+              chargingSchedule.chargingSchedulePeriod.length - 1
+            ].startPeriod
+          ) {
+            const result = {
+              limit: lastButOneSchedule.limit,
+              matchingChargingProfile: chargingProfile,
+            };
+            logger.debug(
+              `${this.logPrefix()} Matching charging profile found for power limitation: %j`,
+              result
+            );
+            return result;
+          }
+        }
+      }
+    }
+    return null;
+  }
 }