Properly name OCPP command handler methods
[e-mobility-charging-stations-simulator.git] / src / charging-station / ocpp / 1.6 / OCPP16IncomingRequestService.ts
index 5c7f7bf696465c33a7f4852d71b61e3a6df16b6a..8d5d0a20e27d86169f0efc86ec954efcfe8e9a2b 100644 (file)
@@ -1,10 +1,63 @@
 // Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
 
-import { ChangeAvailabilityRequest, ChangeConfigurationRequest, ClearChargingProfileRequest, GetConfigurationRequest, GetDiagnosticsRequest, MessageTrigger, OCPP16AvailabilityType, OCPP16IncomingRequestCommand, OCPP16RequestCommand, OCPP16TriggerMessageRequest, RemoteStartTransactionRequest, RemoteStopTransactionRequest, ResetRequest, SetChargingProfileRequest, UnlockConnectorRequest } from '../../../types/ocpp/1.6/Requests';
-import { ChangeAvailabilityResponse, ChangeConfigurationResponse, ClearChargingProfileResponse, GetConfigurationResponse, GetDiagnosticsResponse, OCPP16TriggerMessageResponse, SetChargingProfileResponse, UnlockConnectorResponse } from '../../../types/ocpp/1.6/Responses';
-import { ChargingProfilePurposeType, OCPP16ChargingProfile } from '../../../types/ocpp/1.6/ChargingProfile';
+import {
+  ChangeAvailabilityRequest,
+  ChangeConfigurationRequest,
+  ClearChargingProfileRequest,
+  DiagnosticsStatusNotificationRequest,
+  GetConfigurationRequest,
+  GetDiagnosticsRequest,
+  MessageTrigger,
+  OCPP16AvailabilityType,
+  OCPP16BootNotificationRequest,
+  OCPP16HeartbeatRequest,
+  OCPP16IncomingRequestCommand,
+  OCPP16RequestCommand,
+  OCPP16StatusNotificationRequest,
+  OCPP16TriggerMessageRequest,
+  RemoteStartTransactionRequest,
+  RemoteStopTransactionRequest,
+  ResetRequest,
+  SetChargingProfileRequest,
+  UnlockConnectorRequest,
+} from '../../../types/ocpp/1.6/Requests';
+import {
+  ChangeAvailabilityResponse,
+  ChangeConfigurationResponse,
+  ClearChargingProfileResponse,
+  DiagnosticsStatusNotificationResponse,
+  GetConfigurationResponse,
+  GetDiagnosticsResponse,
+  OCPP16BootNotificationResponse,
+  OCPP16HeartbeatResponse,
+  OCPP16StatusNotificationResponse,
+  OCPP16TriggerMessageResponse,
+  SetChargingProfileResponse,
+  UnlockConnectorResponse,
+} from '../../../types/ocpp/1.6/Responses';
+import {
+  ChargingProfilePurposeType,
+  OCPP16ChargingProfile,
+} from '../../../types/ocpp/1.6/ChargingProfile';
 import { Client, FTPResponse } from 'basic-ftp';
-import { OCPP16AuthorizationStatus, OCPP16StopTransactionReason } from '../../../types/ocpp/1.6/Transaction';
+import {
+  OCPP16AuthorizationStatus,
+  OCPP16AuthorizeRequest,
+  OCPP16AuthorizeResponse,
+  OCPP16StartTransactionRequest,
+  OCPP16StartTransactionResponse,
+  OCPP16StopTransactionReason,
+  OCPP16StopTransactionRequest,
+  OCPP16StopTransactionResponse,
+} from '../../../types/ocpp/1.6/Transaction';
+import {
+  OCPP16MeterValuesRequest,
+  OCPP16MeterValuesResponse,
+} from '../../../types/ocpp/1.6/MeterValues';
+import {
+  OCPP16StandardParametersKey,
+  OCPP16SupportedFeatureProfiles,
+} from '../../../types/ocpp/1.6/Configuration';
 
 import type ChargingStation from '../../ChargingStation';
 import Constants from '../../../utils/Constants';
@@ -12,9 +65,10 @@ import { DefaultResponse } from '../../../types/ocpp/Responses';
 import { ErrorType } from '../../../types/ocpp/ErrorType';
 import { IncomingRequestHandler } from '../../../types/ocpp/Requests';
 import { JsonType } from '../../../types/JsonType';
+import { OCPP16ChargePointErrorCode } from '../../../types/ocpp/1.6/ChargePointErrorCode';
 import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus';
 import { OCPP16DiagnosticsStatus } from '../../../types/ocpp/1.6/DiagnosticsStatus';
-import { OCPP16StandardParametersKey } from '../../../types/ocpp/1.6/Configuration';
+import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
 import { OCPPConfigurationKey } from '../../../types/ocpp/Configuration';
 import OCPPError from '../../../exception/OCPPError';
 import OCPPIncomingRequestService from '../OCPPIncomingRequestService';
@@ -39,25 +93,65 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
       [OCPP16IncomingRequestCommand.RESET, this.handleRequestReset.bind(this)],
       [OCPP16IncomingRequestCommand.CLEAR_CACHE, this.handleRequestClearCache.bind(this)],
       [OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR, this.handleRequestUnlockConnector.bind(this)],
-      [OCPP16IncomingRequestCommand.GET_CONFIGURATION, this.handleRequestGetConfiguration.bind(this)],
-      [OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION, this.handleRequestChangeConfiguration.bind(this)],
-      [OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE, this.handleRequestSetChargingProfile.bind(this)],
-      [OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE, this.handleRequestClearChargingProfile.bind(this)],
-      [OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY, this.handleRequestChangeAvailability.bind(this)],
-      [OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION, this.handleRequestRemoteStartTransaction.bind(this)],
-      [OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION, this.handleRequestRemoteStopTransaction.bind(this)],
+      [
+        OCPP16IncomingRequestCommand.GET_CONFIGURATION,
+        this.handleRequestGetConfiguration.bind(this),
+      ],
+      [
+        OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION,
+        this.handleRequestChangeConfiguration.bind(this),
+      ],
+      [
+        OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
+        this.handleRequestSetChargingProfile.bind(this),
+      ],
+      [
+        OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
+        this.handleRequestClearChargingProfile.bind(this),
+      ],
+      [
+        OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY,
+        this.handleRequestChangeAvailability.bind(this),
+      ],
+      [
+        OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION,
+        this.handleRequestRemoteStartTransaction.bind(this),
+      ],
+      [
+        OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION,
+        this.handleRequestRemoteStopTransaction.bind(this),
+      ],
       [OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, this.handleRequestGetDiagnostics.bind(this)],
-      [OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, this.handleRequestTriggerMessage.bind(this)]
+      [OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, this.handleRequestTriggerMessage.bind(this)],
     ]);
   }
 
-  public async handleRequest(messageId: string, commandName: OCPP16IncomingRequestCommand, commandPayload: JsonType): Promise<void> {
+  public async incomingRequestHandler(
+    messageId: string,
+    commandName: OCPP16IncomingRequestCommand,
+    commandPayload: JsonType
+  ): Promise<void> {
     let result: JsonType;
-    if (this.chargingStation.getOcppStrictCompliance() && (this.chargingStation.isInPendingState()
-      && (commandName === OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION || commandName === OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION))) {
-      throw new OCPPError(ErrorType.SECURITY_ERROR, `${commandName} cannot be issued to handle request payload ${JSON.stringify(commandPayload, null, 2)} while the charging station is in pending state on the central server`, commandName);
+    if (
+      this.chargingStation.getOcppStrictCompliance() &&
+      this.chargingStation.isInPendingState() &&
+      (commandName === OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION ||
+        commandName === OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION)
+    ) {
+      throw new OCPPError(
+        ErrorType.SECURITY_ERROR,
+        `${commandName} cannot be issued to handle request payload ${JSON.stringify(
+          commandPayload,
+          null,
+          2
+        )} while the charging station is in pending state on the central server`,
+        commandName
+      );
     }
-    if (this.chargingStation.isRegistered() || (!this.chargingStation.getOcppStrictCompliance() && this.chargingStation.isInUnknownState())) {
+    if (
+      this.chargingStation.isRegistered() ||
+      (!this.chargingStation.getOcppStrictCompliance() && this.chargingStation.isInUnknownState())
+    ) {
       if (this.incomingRequestHandlers.has(commandName)) {
         try {
           // Call the method to build the result
@@ -69,10 +163,26 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
         }
       } else {
         // Throw exception
-        throw new OCPPError(ErrorType.NOT_IMPLEMENTED, `${commandName} is not implemented to handle request payload ${JSON.stringify(commandPayload, null, 2)}`, commandName);
+        throw new OCPPError(
+          ErrorType.NOT_IMPLEMENTED,
+          `${commandName} is not implemented to handle request payload ${JSON.stringify(
+            commandPayload,
+            null,
+            2
+          )}`,
+          commandName
+        );
       }
     } else {
-      throw new OCPPError(ErrorType.SECURITY_ERROR, `${commandName} cannot be issued to handle request payload ${JSON.stringify(commandPayload, null, 2)} while the charging station is not registered on the central server.`, commandName);
+      throw new OCPPError(
+        ErrorType.SECURITY_ERROR,
+        `${commandName} cannot be issued to handle request payload ${JSON.stringify(
+          commandPayload,
+          null,
+          2
+        )} while the charging station is not registered on the central server.`,
+        commandName
+      );
     }
     // Send the built result
     await this.chargingStation.ocppRequestService.sendResult(messageId, result, commandName);
@@ -82,11 +192,19 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
   private handleRequestReset(commandPayload: ResetRequest): DefaultResponse {
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     setImmediate(async (): Promise<void> => {
-      await this.chargingStation.stop(commandPayload.type + 'Reset' as OCPP16StopTransactionReason);
+      await this.chargingStation.stop(
+        (commandPayload.type + 'Reset') as OCPP16StopTransactionReason
+      );
       await Utils.sleep(this.chargingStation.stationInfo.resetTime);
       this.chargingStation.start();
     });
-    logger.info(`${this.chargingStation.logPrefix()} ${commandPayload.type} reset command received, simulating it. The station will be back online in ${Utils.formatDurationMilliSeconds(this.chargingStation.stationInfo.resetTime)}`);
+    logger.info(
+      `${this.chargingStation.logPrefix()} ${
+        commandPayload.type
+      } reset command received, simulating it. The station will be back online in ${Utils.formatDurationMilliSeconds(
+        this.chargingStation.stationInfo.resetTime
+      )}`
+    );
     return Constants.OCPP_RESPONSE_ACCEPTED;
   }
 
@@ -94,33 +212,71 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
     return Constants.OCPP_RESPONSE_ACCEPTED;
   }
 
-  private async handleRequestUnlockConnector(commandPayload: UnlockConnectorRequest): Promise<UnlockConnectorResponse> {
+  private async handleRequestUnlockConnector(
+    commandPayload: UnlockConnectorRequest
+  ): Promise<UnlockConnectorResponse> {
     const connectorId = commandPayload.connectorId;
     if (connectorId === 0) {
-      logger.error(this.chargingStation.logPrefix() + ' Trying to unlock connector ' + connectorId.toString());
+      logger.error(
+        this.chargingStation.logPrefix() + ' Trying to unlock connector ' + connectorId.toString()
+      );
       return Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED;
     }
     if (this.chargingStation.getConnectorStatus(connectorId)?.transactionStarted) {
       const transactionId = this.chargingStation.getConnectorStatus(connectorId).transactionId;
-      const stopResponse = await this.chargingStation.ocppRequestService.sendStopTransaction(transactionId,
-        this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId),
-        this.chargingStation.getTransactionIdTag(transactionId),
-        OCPP16StopTransactionReason.UNLOCK_COMMAND);
+      if (
+        this.chargingStation.getBeginEndMeterValues() &&
+        this.chargingStation.getOcppStrictCompliance() &&
+        !this.chargingStation.getOutOfOrderEndMeterValues()
+      ) {
+        // FIXME: Implement OCPP version agnostic helpers
+        const transactionEndMeterValue = OCPP16ServiceUtils.buildTransactionEndMeterValue(
+          this.chargingStation,
+          connectorId,
+          this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId)
+        );
+        await this.chargingStation.ocppRequestService.requestHandler<
+          OCPP16MeterValuesRequest,
+          OCPP16MeterValuesResponse
+        >(OCPP16RequestCommand.METER_VALUES, {
+          connectorId,
+          transactionId,
+          meterValue: transactionEndMeterValue,
+        });
+      }
+      const stopResponse = await this.chargingStation.ocppRequestService.requestHandler<
+        OCPP16StopTransactionRequest,
+        OCPP16StopTransactionResponse
+      >(OCPP16RequestCommand.STOP_TRANSACTION, {
+        transactionId,
+        meterStop: this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId),
+        idTag: this.chargingStation.getTransactionIdTag(transactionId),
+        reason: OCPP16StopTransactionReason.UNLOCK_COMMAND,
+      });
       if (stopResponse.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
         return Constants.OCPP_RESPONSE_UNLOCKED;
       }
       return Constants.OCPP_RESPONSE_UNLOCK_FAILED;
     }
-    await this.chargingStation.ocppRequestService.sendStatusNotification(connectorId, OCPP16ChargePointStatus.AVAILABLE);
+    await this.chargingStation.ocppRequestService.requestHandler<
+      OCPP16StatusNotificationRequest,
+      OCPP16StatusNotificationResponse
+    >(OCPP16RequestCommand.STATUS_NOTIFICATION, {
+      connectorId,
+      status: OCPP16ChargePointStatus.AVAILABLE,
+      errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+    });
     this.chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.AVAILABLE;
     return Constants.OCPP_RESPONSE_UNLOCKED;
   }
 
-  private handleRequestGetConfiguration(commandPayload: GetConfigurationRequest): GetConfigurationResponse {
+  private handleRequestGetConfiguration(
+    commandPayload: GetConfigurationRequest
+  ): GetConfigurationResponse {
     const configurationKey: OCPPConfigurationKey[] = [];
     const unknownKey: string[] = [];
     if (Utils.isEmptyArray(commandPayload.key)) {
-      for (const configuration of this.chargingStation.configuration.configurationKey) {
+      for (const configuration of this.chargingStation.ocppConfiguration.configurationKey) {
         if (Utils.isUndefined(configuration.visible)) {
           configuration.visible = true;
         }
@@ -159,13 +315,25 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
     };
   }
 
-  private handleRequestChangeConfiguration(commandPayload: ChangeConfigurationRequest): ChangeConfigurationResponse {
+  private handleRequestChangeConfiguration(
+    commandPayload: ChangeConfigurationRequest
+  ): ChangeConfigurationResponse {
     // JSON request fields type sanity check
     if (!Utils.isString(commandPayload.key)) {
-      logger.error(`${this.chargingStation.logPrefix()} ${OCPP16RequestCommand.CHANGE_CONFIGURATION} request key field is not a string:`, commandPayload);
+      logger.error(
+        `${this.chargingStation.logPrefix()} ${
+          OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION
+        } request key field is not a string:`,
+        commandPayload
+      );
     }
     if (!Utils.isString(commandPayload.value)) {
-      logger.error(`${this.chargingStation.logPrefix()} ${OCPP16RequestCommand.CHANGE_CONFIGURATION} request value field is not a string:`, commandPayload);
+      logger.error(
+        `${this.chargingStation.logPrefix()} ${
+          OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION
+        } request value field is not a string:`,
+        commandPayload
+      );
     }
     const keyToChange = this.chargingStation.getConfigurationKey(commandPayload.key, true);
     if (!keyToChange) {
@@ -173,19 +341,28 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
     } else if (keyToChange && keyToChange.readonly) {
       return Constants.OCPP_CONFIGURATION_RESPONSE_REJECTED;
     } else if (keyToChange && !keyToChange.readonly) {
-      const keyIndex = this.chargingStation.configuration.configurationKey.indexOf(keyToChange);
       let valueChanged = false;
-      if (this.chargingStation.configuration.configurationKey[keyIndex].value !== commandPayload.value) {
-        this.chargingStation.configuration.configurationKey[keyIndex].value = commandPayload.value;
+      if (keyToChange.value !== commandPayload.value) {
+        this.chargingStation.setConfigurationKeyValue(
+          commandPayload.key,
+          commandPayload.value,
+          true
+        );
         valueChanged = true;
       }
       let triggerHeartbeatRestart = false;
       if (keyToChange.key === OCPP16StandardParametersKey.HeartBeatInterval && valueChanged) {
-        this.chargingStation.setConfigurationKeyValue(OCPP16StandardParametersKey.HeartbeatInterval, commandPayload.value);
+        this.chargingStation.setConfigurationKeyValue(
+          OCPP16StandardParametersKey.HeartbeatInterval,
+          commandPayload.value
+        );
         triggerHeartbeatRestart = true;
       }
       if (keyToChange.key === OCPP16StandardParametersKey.HeartbeatInterval && valueChanged) {
-        this.chargingStation.setConfigurationKeyValue(OCPP16StandardParametersKey.HeartBeatInterval, commandPayload.value);
+        this.chargingStation.setConfigurationKeyValue(
+          OCPP16StandardParametersKey.HeartBeatInterval,
+          commandPayload.value
+        );
         triggerHeartbeatRestart = true;
       }
       if (triggerHeartbeatRestart) {
@@ -201,56 +378,127 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
     }
   }
 
-  private handleRequestSetChargingProfile(commandPayload: SetChargingProfileRequest): SetChargingProfileResponse {
+  private handleRequestSetChargingProfile(
+    commandPayload: SetChargingProfileRequest
+  ): SetChargingProfileResponse {
+    if (
+      !OCPP16ServiceUtils.checkFeatureProfile(
+        this.chargingStation,
+        OCPP16SupportedFeatureProfiles.SmartCharging,
+        OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE
+      )
+    ) {
+      return Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_NOT_SUPPORTED;
+    }
     if (!this.chargingStation.getConnectorStatus(commandPayload.connectorId)) {
-      logger.error(`${this.chargingStation.logPrefix()} Trying to set charging profile(s) to a non existing connector Id ${commandPayload.connectorId}`);
+      logger.error(
+        `${this.chargingStation.logPrefix()} Trying to set charging profile(s) to a non existing connector Id ${
+          commandPayload.connectorId
+        }`
+      );
       return Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
     }
-    if (commandPayload.csChargingProfiles.chargingProfilePurpose === ChargingProfilePurposeType.CHARGE_POINT_MAX_PROFILE && commandPayload.connectorId !== 0) {
+    if (
+      commandPayload.csChargingProfiles.chargingProfilePurpose ===
+        ChargingProfilePurposeType.CHARGE_POINT_MAX_PROFILE &&
+      commandPayload.connectorId !== 0
+    ) {
       return Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
     }
-    if (commandPayload.csChargingProfiles.chargingProfilePurpose === ChargingProfilePurposeType.TX_PROFILE && (commandPayload.connectorId === 0 || !this.chargingStation.getConnectorStatus(commandPayload.connectorId)?.transactionStarted)) {
+    if (
+      commandPayload.csChargingProfiles.chargingProfilePurpose ===
+        ChargingProfilePurposeType.TX_PROFILE &&
+      (commandPayload.connectorId === 0 ||
+        !this.chargingStation.getConnectorStatus(commandPayload.connectorId)?.transactionStarted)
+    ) {
       return Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
     }
-    this.chargingStation.setChargingProfile(commandPayload.connectorId, commandPayload.csChargingProfiles);
-    logger.debug(`${this.chargingStation.logPrefix()} Charging profile(s) set, dump their stack: %j`, this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles);
+    this.chargingStation.setChargingProfile(
+      commandPayload.connectorId,
+      commandPayload.csChargingProfiles
+    );
+    logger.debug(
+      `${this.chargingStation.logPrefix()} Charging profile(s) set on connector id ${
+        commandPayload.connectorId
+      }, dump their stack: %j`,
+      this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles
+    );
     return Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_ACCEPTED;
   }
 
-  private handleRequestClearChargingProfile(commandPayload: ClearChargingProfileRequest): ClearChargingProfileResponse {
-    if (!this.chargingStation.getConnectorStatus(commandPayload.connectorId)) {
-      logger.error(`${this.chargingStation.logPrefix()} Trying to clear a charging profile(s) to a non existing connector Id ${commandPayload.connectorId}`);
+  private handleRequestClearChargingProfile(
+    commandPayload: ClearChargingProfileRequest
+  ): ClearChargingProfileResponse {
+    if (
+      !OCPP16ServiceUtils.checkFeatureProfile(
+        this.chargingStation,
+        OCPP16SupportedFeatureProfiles.SmartCharging,
+        OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE
+      )
+    ) {
+      return Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
+    }
+    const connectorStatus = this.chargingStation.getConnectorStatus(commandPayload.connectorId);
+    if (!connectorStatus) {
+      logger.error(
+        `${this.chargingStation.logPrefix()} Trying to clear a charging profile(s) to a non existing connector Id ${
+          commandPayload.connectorId
+        }`
+      );
       return Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
     }
-    if (commandPayload.connectorId && !Utils.isEmptyArray(this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles)) {
-      this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles = [];
-      logger.debug(`${this.chargingStation.logPrefix()} Charging profile(s) cleared, dump their stack: %j`, this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles);
+    if (commandPayload.connectorId && !Utils.isEmptyArray(connectorStatus.chargingProfiles)) {
+      connectorStatus.chargingProfiles = [];
+      logger.debug(
+        `${this.chargingStation.logPrefix()} Charging profile(s) cleared on connector id ${
+          commandPayload.connectorId
+        }, dump their stack: %j`,
+        connectorStatus.chargingProfiles
+      );
       return Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED;
     }
     if (!commandPayload.connectorId) {
       let clearedCP = false;
       for (const connectorId of this.chargingStation.connectors.keys()) {
-        if (!Utils.isEmptyArray(this.chargingStation.getConnectorStatus(connectorId).chargingProfiles)) {
-          this.chargingStation.getConnectorStatus(connectorId).chargingProfiles?.forEach((chargingProfile: OCPP16ChargingProfile, index: number) => {
-            let clearCurrentCP = false;
-            if (chargingProfile.chargingProfileId === commandPayload.id) {
-              clearCurrentCP = true;
-            }
-            if (!commandPayload.chargingProfilePurpose && chargingProfile.stackLevel === commandPayload.stackLevel) {
-              clearCurrentCP = true;
-            }
-            if (!chargingProfile.stackLevel && chargingProfile.chargingProfilePurpose === commandPayload.chargingProfilePurpose) {
-              clearCurrentCP = true;
-            }
-            if (chargingProfile.stackLevel === commandPayload.stackLevel && chargingProfile.chargingProfilePurpose === commandPayload.chargingProfilePurpose) {
-              clearCurrentCP = true;
-            }
-            if (clearCurrentCP) {
-              this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles[index] = {} as OCPP16ChargingProfile;
-              logger.debug(`${this.chargingStation.logPrefix()} Charging profile(s) cleared, dump their stack: %j`, this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles);
-              clearedCP = true;
-            }
-          });
+        if (
+          !Utils.isEmptyArray(this.chargingStation.getConnectorStatus(connectorId).chargingProfiles)
+        ) {
+          this.chargingStation
+            .getConnectorStatus(connectorId)
+            .chargingProfiles?.forEach((chargingProfile: OCPP16ChargingProfile, index: number) => {
+              let clearCurrentCP = false;
+              if (chargingProfile.chargingProfileId === commandPayload.id) {
+                clearCurrentCP = true;
+              }
+              if (
+                !commandPayload.chargingProfilePurpose &&
+                chargingProfile.stackLevel === commandPayload.stackLevel
+              ) {
+                clearCurrentCP = true;
+              }
+              if (
+                !chargingProfile.stackLevel &&
+                chargingProfile.chargingProfilePurpose === commandPayload.chargingProfilePurpose
+              ) {
+                clearCurrentCP = true;
+              }
+              if (
+                chargingProfile.stackLevel === commandPayload.stackLevel &&
+                chargingProfile.chargingProfilePurpose === commandPayload.chargingProfilePurpose
+              ) {
+                clearCurrentCP = true;
+              }
+              if (clearCurrentCP) {
+                connectorStatus.chargingProfiles[index] = {} as OCPP16ChargingProfile;
+                logger.debug(
+                  `${this.chargingStation.logPrefix()} Matching charging profile(s) cleared on connector id ${
+                    commandPayload.connectorId
+                  }, dump their stack: %j`,
+                  connectorStatus.chargingProfiles
+                );
+                clearedCP = true;
+              }
+            });
         }
       }
       if (clearedCP) {
@@ -260,15 +508,20 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
     return Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
   }
 
-  private async handleRequestChangeAvailability(commandPayload: ChangeAvailabilityRequest): Promise<ChangeAvailabilityResponse> {
+  private async handleRequestChangeAvailability(
+    commandPayload: ChangeAvailabilityRequest
+  ): Promise<ChangeAvailabilityResponse> {
     const connectorId: number = commandPayload.connectorId;
     if (!this.chargingStation.getConnectorStatus(connectorId)) {
-      logger.error(`${this.chargingStation.logPrefix()} Trying to change the availability of a non existing connector Id ${connectorId.toString()}`);
+      logger.error(
+        `${this.chargingStation.logPrefix()} Trying to change the availability of a non existing connector Id ${connectorId.toString()}`
+      );
       return Constants.OCPP_AVAILABILITY_RESPONSE_REJECTED;
     }
-    const chargePointStatus: OCPP16ChargePointStatus = commandPayload.type === OCPP16AvailabilityType.OPERATIVE
-      ? OCPP16ChargePointStatus.AVAILABLE
-      : OCPP16ChargePointStatus.UNAVAILABLE;
+    const chargePointStatus: OCPP16ChargePointStatus =
+      commandPayload.type === OCPP16AvailabilityType.OPERATIVE
+        ? OCPP16ChargePointStatus.AVAILABLE
+        : OCPP16ChargePointStatus.UNAVAILABLE;
     if (connectorId === 0) {
       let response: ChangeAvailabilityResponse = Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED;
       for (const id of this.chargingStation.connectors.keys()) {
@@ -277,184 +530,484 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
         }
         this.chargingStation.getConnectorStatus(id).availability = commandPayload.type;
         if (response === Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED) {
-          await this.chargingStation.ocppRequestService.sendStatusNotification(id, chargePointStatus);
+          await this.chargingStation.ocppRequestService.requestHandler<
+            OCPP16StatusNotificationRequest,
+            OCPP16StatusNotificationResponse
+          >(OCPP16RequestCommand.STATUS_NOTIFICATION, {
+            connectorId: id,
+            status: chargePointStatus,
+            errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+          });
           this.chargingStation.getConnectorStatus(id).status = chargePointStatus;
         }
       }
       return response;
-    } else if (connectorId > 0 && (this.chargingStation.getConnectorStatus(0).availability === OCPP16AvailabilityType.OPERATIVE || (this.chargingStation.getConnectorStatus(0).availability === OCPP16AvailabilityType.INOPERATIVE && commandPayload.type === OCPP16AvailabilityType.INOPERATIVE))) {
+    } else if (
+      connectorId > 0 &&
+      (this.chargingStation.getConnectorStatus(0).availability ===
+        OCPP16AvailabilityType.OPERATIVE ||
+        (this.chargingStation.getConnectorStatus(0).availability ===
+          OCPP16AvailabilityType.INOPERATIVE &&
+          commandPayload.type === OCPP16AvailabilityType.INOPERATIVE))
+    ) {
       if (this.chargingStation.getConnectorStatus(connectorId)?.transactionStarted) {
         this.chargingStation.getConnectorStatus(connectorId).availability = commandPayload.type;
         return Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED;
       }
       this.chargingStation.getConnectorStatus(connectorId).availability = commandPayload.type;
-      await this.chargingStation.ocppRequestService.sendStatusNotification(connectorId, chargePointStatus);
+      await this.chargingStation.ocppRequestService.requestHandler<
+        OCPP16StatusNotificationRequest,
+        OCPP16StatusNotificationResponse
+      >(OCPP16RequestCommand.STATUS_NOTIFICATION, {
+        connectorId,
+        status: chargePointStatus,
+        errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+      });
       this.chargingStation.getConnectorStatus(connectorId).status = chargePointStatus;
       return Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED;
     }
     return Constants.OCPP_AVAILABILITY_RESPONSE_REJECTED;
   }
 
-  private async handleRequestRemoteStartTransaction(commandPayload: RemoteStartTransactionRequest): Promise<DefaultResponse> {
-    const transactionConnectorId: number = commandPayload.connectorId;
+  private async handleRequestRemoteStartTransaction(
+    commandPayload: RemoteStartTransactionRequest
+  ): Promise<DefaultResponse> {
+    const transactionConnectorId = commandPayload.connectorId;
+    const connectorStatus = this.chargingStation.getConnectorStatus(transactionConnectorId);
     if (transactionConnectorId) {
-      await this.chargingStation.ocppRequestService.sendStatusNotification(transactionConnectorId, OCPP16ChargePointStatus.PREPARING);
-      this.chargingStation.getConnectorStatus(transactionConnectorId).status = OCPP16ChargePointStatus.PREPARING;
-      if (this.chargingStation.isChargingStationAvailable() && this.chargingStation.isConnectorAvailable(transactionConnectorId)) {
+      await this.chargingStation.ocppRequestService.requestHandler<
+        OCPP16StatusNotificationRequest,
+        OCPP16StatusNotificationResponse
+      >(OCPP16RequestCommand.STATUS_NOTIFICATION, {
+        connectorId: transactionConnectorId,
+        status: OCPP16ChargePointStatus.PREPARING,
+        errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+      });
+      connectorStatus.status = OCPP16ChargePointStatus.PREPARING;
+      if (this.chargingStation.isChargingStationAvailable() && connectorStatus) {
         // Check if authorized
         if (this.chargingStation.getAuthorizeRemoteTxRequests()) {
           let authorized = false;
-          if (this.chargingStation.getLocalAuthListEnabled() && this.chargingStation.hasAuthorizedTags()
-            && this.chargingStation.authorizedTags.find((value) => value === commandPayload.idTag)) {
-            this.chargingStation.getConnectorStatus(transactionConnectorId).localAuthorizeIdTag = commandPayload.idTag;
-            this.chargingStation.getConnectorStatus(transactionConnectorId).idTagLocalAuthorized = true;
+          if (
+            this.chargingStation.getLocalAuthListEnabled() &&
+            this.chargingStation.hasAuthorizedTags() &&
+            this.chargingStation.authorizedTags.find((value) => value === commandPayload.idTag)
+          ) {
+            connectorStatus.localAuthorizeIdTag = commandPayload.idTag;
+            connectorStatus.idTagLocalAuthorized = true;
             authorized = true;
           } else if (this.chargingStation.getMayAuthorizeAtRemoteStart()) {
-            const authorizeResponse = await this.chargingStation.ocppRequestService.sendAuthorize(transactionConnectorId, commandPayload.idTag);
+            connectorStatus.authorizeIdTag = commandPayload.idTag;
+            const authorizeResponse: OCPP16AuthorizeResponse =
+              await this.chargingStation.ocppRequestService.requestHandler<
+                OCPP16AuthorizeRequest,
+                OCPP16AuthorizeResponse
+              >(OCPP16RequestCommand.AUTHORIZE, {
+                idTag: commandPayload.idTag,
+              });
             if (authorizeResponse?.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
               authorized = true;
             }
           } else {
-            logger.warn(`${this.chargingStation.logPrefix()} The charging station configuration expects authorize at remote start transaction but local authorization or authorize isn't enabled`);
+            logger.warn(
+              `${this.chargingStation.logPrefix()} The charging station configuration expects authorize at remote start transaction but local authorization or authorize isn't enabled`
+            );
           }
           if (authorized) {
             // Authorization successful, start transaction
-            if (this.setRemoteStartTransactionChargingProfile(transactionConnectorId, commandPayload.chargingProfile)) {
-              this.chargingStation.getConnectorStatus(transactionConnectorId).transactionRemoteStarted = true;
-              if ((await this.chargingStation.ocppRequestService.sendStartTransaction(transactionConnectorId, commandPayload.idTag)).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) {
-                logger.debug(this.chargingStation.logPrefix() + ' Transaction remotely STARTED on ' + this.chargingStation.stationInfo.chargingStationId + '#' + transactionConnectorId.toString() + ' for idTag ' + commandPayload.idTag);
+            if (
+              this.setRemoteStartTransactionChargingProfile(
+                transactionConnectorId,
+                commandPayload.chargingProfile
+              )
+            ) {
+              connectorStatus.transactionRemoteStarted = true;
+              if (
+                (
+                  await this.chargingStation.ocppRequestService.requestHandler<
+                    OCPP16StartTransactionRequest,
+                    OCPP16StartTransactionResponse
+                  >(OCPP16RequestCommand.START_TRANSACTION, {
+                    connectorId: transactionConnectorId,
+                    idTag: commandPayload.idTag,
+                  })
+                ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
+              ) {
+                logger.debug(
+                  this.chargingStation.logPrefix() +
+                    ' Transaction remotely STARTED on ' +
+                    this.chargingStation.stationInfo.chargingStationId +
+                    '#' +
+                    transactionConnectorId.toString() +
+                    ' for idTag ' +
+                    commandPayload.idTag
+                );
                 return Constants.OCPP_RESPONSE_ACCEPTED;
               }
-              return this.notifyRemoteStartTransactionRejected(transactionConnectorId, commandPayload.idTag);
+              return this.notifyRemoteStartTransactionRejected(
+                transactionConnectorId,
+                commandPayload.idTag
+              );
             }
-            return this.notifyRemoteStartTransactionRejected(transactionConnectorId, commandPayload.idTag);
+            return this.notifyRemoteStartTransactionRejected(
+              transactionConnectorId,
+              commandPayload.idTag
+            );
           }
-          return this.notifyRemoteStartTransactionRejected(transactionConnectorId, commandPayload.idTag);
+          return this.notifyRemoteStartTransactionRejected(
+            transactionConnectorId,
+            commandPayload.idTag
+          );
         }
         // No authorization check required, start transaction
-        if (this.setRemoteStartTransactionChargingProfile(transactionConnectorId, commandPayload.chargingProfile)) {
-          this.chargingStation.getConnectorStatus(transactionConnectorId).transactionRemoteStarted = true;
-          if ((await this.chargingStation.ocppRequestService.sendStartTransaction(transactionConnectorId, commandPayload.idTag)).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) {
-            logger.debug(this.chargingStation.logPrefix() + ' Transaction remotely STARTED on ' + this.chargingStation.stationInfo.chargingStationId + '#' + transactionConnectorId.toString() + ' for idTag ' + commandPayload.idTag);
+        if (
+          this.setRemoteStartTransactionChargingProfile(
+            transactionConnectorId,
+            commandPayload.chargingProfile
+          )
+        ) {
+          connectorStatus.transactionRemoteStarted = true;
+          if (
+            (
+              await this.chargingStation.ocppRequestService.requestHandler<
+                OCPP16StartTransactionRequest,
+                OCPP16StartTransactionResponse
+              >(OCPP16RequestCommand.START_TRANSACTION, {
+                connectorId: transactionConnectorId,
+                idTag: commandPayload.idTag,
+              })
+            ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
+          ) {
+            logger.debug(
+              this.chargingStation.logPrefix() +
+                ' Transaction remotely STARTED on ' +
+                this.chargingStation.stationInfo.chargingStationId +
+                '#' +
+                transactionConnectorId.toString() +
+                ' for idTag ' +
+                commandPayload.idTag
+            );
             return Constants.OCPP_RESPONSE_ACCEPTED;
           }
-          return this.notifyRemoteStartTransactionRejected(transactionConnectorId, commandPayload.idTag);
+          return this.notifyRemoteStartTransactionRejected(
+            transactionConnectorId,
+            commandPayload.idTag
+          );
         }
-        return this.notifyRemoteStartTransactionRejected(transactionConnectorId, commandPayload.idTag);
+        return this.notifyRemoteStartTransactionRejected(
+          transactionConnectorId,
+          commandPayload.idTag
+        );
       }
-      return this.notifyRemoteStartTransactionRejected(transactionConnectorId, commandPayload.idTag);
+      return this.notifyRemoteStartTransactionRejected(
+        transactionConnectorId,
+        commandPayload.idTag
+      );
     }
     return this.notifyRemoteStartTransactionRejected(transactionConnectorId, commandPayload.idTag);
   }
 
-  private async notifyRemoteStartTransactionRejected(connectorId: number, idTag: string): Promise<DefaultResponse> {
-    if (this.chargingStation.getConnectorStatus(connectorId).status !== OCPP16ChargePointStatus.AVAILABLE) {
-      await this.chargingStation.ocppRequestService.sendStatusNotification(connectorId, OCPP16ChargePointStatus.AVAILABLE);
-      this.chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.AVAILABLE;
+  private async notifyRemoteStartTransactionRejected(
+    connectorId: number,
+    idTag: string
+  ): Promise<DefaultResponse> {
+    if (
+      this.chargingStation.getConnectorStatus(connectorId).status !==
+      OCPP16ChargePointStatus.AVAILABLE
+    ) {
+      await this.chargingStation.ocppRequestService.requestHandler<
+        OCPP16StatusNotificationRequest,
+        OCPP16StatusNotificationResponse
+      >(OCPP16RequestCommand.STATUS_NOTIFICATION, {
+        connectorId,
+        status: OCPP16ChargePointStatus.AVAILABLE,
+        errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+      });
+      this.chargingStation.getConnectorStatus(connectorId).status =
+        OCPP16ChargePointStatus.AVAILABLE;
     }
-    logger.warn(this.chargingStation.logPrefix() + ' Remote starting transaction REJECTED on connector Id ' + connectorId.toString() + ', idTag ' + idTag + ', availability ' + this.chargingStation.getConnectorStatus(connectorId).availability + ', status ' + this.chargingStation.getConnectorStatus(connectorId).status);
+    logger.warn(
+      this.chargingStation.logPrefix() +
+        ' Remote starting transaction REJECTED on connector Id ' +
+        connectorId.toString() +
+        ', idTag ' +
+        idTag +
+        ', availability ' +
+        this.chargingStation.getConnectorStatus(connectorId).availability +
+        ', status ' +
+        this.chargingStation.getConnectorStatus(connectorId).status
+    );
     return Constants.OCPP_RESPONSE_REJECTED;
   }
 
-  private setRemoteStartTransactionChargingProfile(connectorId: number, cp: OCPP16ChargingProfile): boolean {
+  private setRemoteStartTransactionChargingProfile(
+    connectorId: number,
+    cp: OCPP16ChargingProfile
+  ): boolean {
     if (cp && cp.chargingProfilePurpose === ChargingProfilePurposeType.TX_PROFILE) {
       this.chargingStation.setChargingProfile(connectorId, cp);
-      logger.debug(`${this.chargingStation.logPrefix()} Charging profile(s) set at remote start transaction, dump their stack: %j`, this.chargingStation.getConnectorStatus(connectorId).chargingProfiles);
+      logger.debug(
+        `${this.chargingStation.logPrefix()} Charging profile(s) set at remote start transaction on connector id ${connectorId}, dump their stack: %j`,
+        this.chargingStation.getConnectorStatus(connectorId).chargingProfiles
+      );
       return true;
     } else if (cp && cp.chargingProfilePurpose !== ChargingProfilePurposeType.TX_PROFILE) {
-      logger.warn(`${this.chargingStation.logPrefix()} Not allowed to set ${cp.chargingProfilePurpose} charging profile(s) at remote start transaction`);
+      logger.warn(
+        `${this.chargingStation.logPrefix()} Not allowed to set ${
+          cp.chargingProfilePurpose
+        } charging profile(s) at remote start transaction`
+      );
       return false;
     } else if (!cp) {
       return true;
     }
   }
 
-  private async handleRequestRemoteStopTransaction(commandPayload: RemoteStopTransactionRequest): Promise<DefaultResponse> {
+  private async handleRequestRemoteStopTransaction(
+    commandPayload: RemoteStopTransactionRequest
+  ): Promise<DefaultResponse> {
     const transactionId = commandPayload.transactionId;
     for (const connectorId of this.chargingStation.connectors.keys()) {
-      if (connectorId > 0 && this.chargingStation.getConnectorStatus(connectorId)?.transactionId === transactionId) {
-        await this.chargingStation.ocppRequestService.sendStatusNotification(connectorId, OCPP16ChargePointStatus.FINISHING);
-        this.chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.FINISHING;
-        await this.chargingStation.ocppRequestService.sendStopTransaction(transactionId, this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId),
-          this.chargingStation.getTransactionIdTag(transactionId));
+      if (
+        connectorId > 0 &&
+        this.chargingStation.getConnectorStatus(connectorId)?.transactionId === transactionId
+      ) {
+        await this.chargingStation.ocppRequestService.requestHandler<
+          OCPP16StatusNotificationRequest,
+          OCPP16StatusNotificationResponse
+        >(OCPP16RequestCommand.STATUS_NOTIFICATION, {
+          connectorId,
+          status: OCPP16ChargePointStatus.FINISHING,
+          errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+        });
+        this.chargingStation.getConnectorStatus(connectorId).status =
+          OCPP16ChargePointStatus.FINISHING;
+        if (
+          this.chargingStation.getBeginEndMeterValues() &&
+          this.chargingStation.getOcppStrictCompliance() &&
+          !this.chargingStation.getOutOfOrderEndMeterValues()
+        ) {
+          // FIXME: Implement OCPP version agnostic helpers
+          const transactionEndMeterValue = OCPP16ServiceUtils.buildTransactionEndMeterValue(
+            this.chargingStation,
+            connectorId,
+            this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId)
+          );
+          await this.chargingStation.ocppRequestService.requestHandler<
+            OCPP16MeterValuesRequest,
+            OCPP16MeterValuesResponse
+          >(OCPP16RequestCommand.METER_VALUES, {
+            connectorId,
+            transactionId,
+            meterValue: transactionEndMeterValue,
+          });
+        }
+        await this.chargingStation.ocppRequestService.requestHandler<
+          OCPP16StopTransactionRequest,
+          OCPP16StopTransactionResponse
+        >(OCPP16RequestCommand.STOP_TRANSACTION, {
+          transactionId,
+          meterStop:
+            this.chargingStation.getEnergyActiveImportRegisterByTransactionId(transactionId),
+          idTag: this.chargingStation.getTransactionIdTag(transactionId),
+        });
         return Constants.OCPP_RESPONSE_ACCEPTED;
       }
     }
-    logger.info(this.chargingStation.logPrefix() + ' Trying to remote stop a non existing transaction ' + transactionId.toString());
+    logger.info(
+      this.chargingStation.logPrefix() +
+        ' Trying to remote stop a non existing transaction ' +
+        transactionId.toString()
+    );
     return Constants.OCPP_RESPONSE_REJECTED;
   }
 
-  private async handleRequestGetDiagnostics(commandPayload: GetDiagnosticsRequest): Promise<GetDiagnosticsResponse> {
-    logger.debug(this.chargingStation.logPrefix() + ' ' + OCPP16IncomingRequestCommand.GET_DIAGNOSTICS + ' request received: %j', commandPayload);
+  private async handleRequestGetDiagnostics(
+    commandPayload: GetDiagnosticsRequest
+  ): Promise<GetDiagnosticsResponse> {
+    if (
+      !OCPP16ServiceUtils.checkFeatureProfile(
+        this.chargingStation,
+        OCPP16SupportedFeatureProfiles.FirmwareManagement,
+        OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+      )
+    ) {
+      return Constants.OCPP_RESPONSE_EMPTY;
+    }
+    logger.debug(
+      this.chargingStation.logPrefix() +
+        ' ' +
+        OCPP16IncomingRequestCommand.GET_DIAGNOSTICS +
+        ' request received: %j',
+      commandPayload
+    );
     const uri = new URL(commandPayload.location);
     if (uri.protocol.startsWith('ftp:')) {
       let ftpClient: Client;
       try {
-        const logFiles = fs.readdirSync(path.resolve(__dirname, '../../../../')).filter((file) => file.endsWith('.log')).map((file) => path.join('./', file));
-        const diagnosticsArchive = this.chargingStation.stationInfo.chargingStationId + '_logs.tar.gz';
+        const logFiles = fs
+          .readdirSync(path.resolve(__dirname, '../../../../'))
+          .filter((file) => file.endsWith('.log'))
+          .map((file) => path.join('./', file));
+        const diagnosticsArchive =
+          this.chargingStation.stationInfo.chargingStationId + '_logs.tar.gz';
         tar.create({ gzip: true }, logFiles).pipe(fs.createWriteStream(diagnosticsArchive));
         ftpClient = new Client();
         const accessResponse = await ftpClient.access({
           host: uri.host,
-          ...(uri.port !== '') && { port: Utils.convertToInt(uri.port) },
-          ...(uri.username !== '') && { user: uri.username },
-          ...(uri.password !== '') && { password: uri.password },
+          ...(!Utils.isEmptyString(uri.port) && { port: Utils.convertToInt(uri.port) }),
+          ...(!Utils.isEmptyString(uri.username) && { user: uri.username }),
+          ...(!Utils.isEmptyString(uri.password) && { password: uri.password }),
         });
         let uploadResponse: FTPResponse;
         if (accessResponse.code === 220) {
           // eslint-disable-next-line @typescript-eslint/no-misused-promises
           ftpClient.trackProgress(async (info) => {
-            logger.info(`${this.chargingStation.logPrefix()} ${info.bytes / 1024} bytes transferred from diagnostics archive ${info.name}`);
-            await this.chargingStation.ocppRequestService.sendDiagnosticsStatusNotification(OCPP16DiagnosticsStatus.Uploading);
+            logger.info(
+              `${this.chargingStation.logPrefix()} ${
+                info.bytes / 1024
+              } bytes transferred from diagnostics archive ${info.name}`
+            );
+            await this.chargingStation.ocppRequestService.requestHandler<
+              DiagnosticsStatusNotificationRequest,
+              DiagnosticsStatusNotificationResponse
+            >(OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
+              status: OCPP16DiagnosticsStatus.Uploading,
+            });
           });
-          uploadResponse = await ftpClient.uploadFrom(path.join(path.resolve(__dirname, '../../../../'), diagnosticsArchive), uri.pathname + diagnosticsArchive);
+          uploadResponse = await ftpClient.uploadFrom(
+            path.join(path.resolve(__dirname, '../../../../'), diagnosticsArchive),
+            uri.pathname + diagnosticsArchive
+          );
           if (uploadResponse.code === 226) {
-            await this.chargingStation.ocppRequestService.sendDiagnosticsStatusNotification(OCPP16DiagnosticsStatus.Uploaded);
+            await this.chargingStation.ocppRequestService.requestHandler<
+              DiagnosticsStatusNotificationRequest,
+              DiagnosticsStatusNotificationResponse
+            >(OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
+              status: OCPP16DiagnosticsStatus.Uploaded,
+            });
             if (ftpClient) {
               ftpClient.close();
             }
             return { fileName: diagnosticsArchive };
           }
-          throw new OCPPError(ErrorType.GENERIC_ERROR, `Diagnostics transfer failed with error code ${accessResponse.code.toString()}${uploadResponse?.code && '|' + uploadResponse?.code.toString()}`, OCPP16IncomingRequestCommand.GET_DIAGNOSTICS);
+          throw new OCPPError(
+            ErrorType.GENERIC_ERROR,
+            `Diagnostics transfer failed with error code ${accessResponse.code.toString()}${
+              uploadResponse?.code && '|' + uploadResponse?.code.toString()
+            }`,
+            OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+          );
         }
-        throw new OCPPError(ErrorType.GENERIC_ERROR, `Diagnostics transfer failed with error code ${accessResponse.code.toString()}${uploadResponse?.code && '|' + uploadResponse?.code.toString()}`, OCPP16IncomingRequestCommand.GET_DIAGNOSTICS);
+        throw new OCPPError(
+          ErrorType.GENERIC_ERROR,
+          `Diagnostics transfer failed with error code ${accessResponse.code.toString()}${
+            uploadResponse?.code && '|' + uploadResponse?.code.toString()
+          }`,
+          OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+        );
       } catch (error) {
-        await this.chargingStation.ocppRequestService.sendDiagnosticsStatusNotification(OCPP16DiagnosticsStatus.UploadFailed);
+        await this.chargingStation.ocppRequestService.requestHandler<
+          DiagnosticsStatusNotificationRequest,
+          DiagnosticsStatusNotificationResponse
+        >(OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
+          status: OCPP16DiagnosticsStatus.UploadFailed,
+        });
         if (ftpClient) {
           ftpClient.close();
         }
-        return this.handleIncomingRequestError(OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, error as Error, Constants.OCPP_RESPONSE_EMPTY);
+        return this.handleIncomingRequestError(
+          OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
+          error as Error,
+          { errorResponse: Constants.OCPP_RESPONSE_EMPTY }
+        );
       }
     } else {
-      logger.error(`${this.chargingStation.logPrefix()} Unsupported protocol ${uri.protocol} to transfer the diagnostic logs archive`);
-      await this.chargingStation.ocppRequestService.sendDiagnosticsStatusNotification(OCPP16DiagnosticsStatus.UploadFailed);
+      logger.error(
+        `${this.chargingStation.logPrefix()} Unsupported protocol ${
+          uri.protocol
+        } to transfer the diagnostic logs archive`
+      );
+      await this.chargingStation.ocppRequestService.requestHandler<
+        DiagnosticsStatusNotificationRequest,
+        DiagnosticsStatusNotificationResponse
+      >(OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
+        status: OCPP16DiagnosticsStatus.UploadFailed,
+      });
       return Constants.OCPP_RESPONSE_EMPTY;
     }
   }
 
-  private handleRequestTriggerMessage(commandPayload: OCPP16TriggerMessageRequest): OCPP16TriggerMessageResponse {
+  private handleRequestTriggerMessage(
+    commandPayload: OCPP16TriggerMessageRequest
+  ): OCPP16TriggerMessageResponse {
+    if (
+      !OCPP16ServiceUtils.checkFeatureProfile(
+        this.chargingStation,
+        OCPP16SupportedFeatureProfiles.RemoteTrigger,
+        OCPP16IncomingRequestCommand.TRIGGER_MESSAGE
+      )
+    ) {
+      return Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED;
+    }
     try {
       switch (commandPayload.requestedMessage) {
         case MessageTrigger.BootNotification:
           setTimeout(() => {
-            this.chargingStation.ocppRequestService.sendBootNotification(this.chargingStation.getBootNotificationRequest().chargePointModel,
-              this.chargingStation.getBootNotificationRequest().chargePointVendor, this.chargingStation.getBootNotificationRequest().chargeBoxSerialNumber,
-              this.chargingStation.getBootNotificationRequest().firmwareVersion, this.chargingStation.getBootNotificationRequest().chargePointSerialNumber,
-              this.chargingStation.getBootNotificationRequest().iccid, this.chargingStation.getBootNotificationRequest().imsi,
-              this.chargingStation.getBootNotificationRequest().meterSerialNumber, this.chargingStation.getBootNotificationRequest().meterType,
-              { triggerMessage: true }).catch(() => { /* This is intentional */ });
+            this.chargingStation.ocppRequestService
+              .requestHandler<OCPP16BootNotificationRequest, OCPP16BootNotificationResponse>(
+                OCPP16RequestCommand.BOOT_NOTIFICATION,
+                {
+                  chargePointModel:
+                    this.chargingStation.getBootNotificationRequest().chargePointModel,
+                  chargePointVendor:
+                    this.chargingStation.getBootNotificationRequest().chargePointVendor,
+                  chargeBoxSerialNumber:
+                    this.chargingStation.getBootNotificationRequest().chargeBoxSerialNumber,
+                  firmwareVersion:
+                    this.chargingStation.getBootNotificationRequest().firmwareVersion,
+                  chargePointSerialNumber:
+                    this.chargingStation.getBootNotificationRequest().chargePointSerialNumber,
+                  iccid: this.chargingStation.getBootNotificationRequest().iccid,
+                  imsi: this.chargingStation.getBootNotificationRequest().imsi,
+                  meterSerialNumber:
+                    this.chargingStation.getBootNotificationRequest().meterSerialNumber,
+                  meterType: this.chargingStation.getBootNotificationRequest().meterType,
+                },
+                { skipBufferingOnError: true, triggerMessage: true }
+              )
+              .then((value) => {
+                this.chargingStation.bootNotificationResponse = value;
+              })
+              .catch(() => {
+                /* This is intentional */
+              });
           }, Constants.OCPP_TRIGGER_MESSAGE_DELAY);
           return Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED;
         case MessageTrigger.Heartbeat:
           setTimeout(() => {
-            this.chargingStation.ocppRequestService.sendHeartbeat({ triggerMessage: true }).catch(() => { /* This is intentional */ });
+            this.chargingStation.ocppRequestService
+              .requestHandler<OCPP16HeartbeatRequest, OCPP16HeartbeatResponse>(
+                OCPP16RequestCommand.HEARTBEAT,
+                null,
+                {
+                  triggerMessage: true,
+                }
+              )
+              .catch(() => {
+                /* This is intentional */
+              });
           }, Constants.OCPP_TRIGGER_MESSAGE_DELAY);
           return Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED;
         default:
           return Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED;
       }
     } catch (error) {
-      return this.handleIncomingRequestError(OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, error as Error, Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED);
+      return this.handleIncomingRequestError(
+        OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
+        error as Error,
+        { errorResponse: Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED }
+      );
     }
   }
 }