refactor: factor out remote stop transaction helper
[e-mobility-charging-stations-simulator.git] / src / charging-station / ocpp / 1.6 / OCPP16IncomingRequestService.ts
index ed66f9dfb6d0ffeeef57ca2d723bca3074844255..20cedf507ab556b110504b6202c670ed7551f5e5 100644 (file)
@@ -1,22 +1,24 @@
 // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import fs from 'node:fs';
-import path from 'node:path';
+import { createWriteStream, readdirSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
 import { URL, fileURLToPath } from 'node:url';
 
 import type { JSONSchemaType } from 'ajv';
 import { Client, type FTPResponse } from 'basic-ftp';
-import tar from 'tar';
+import { secondsToMilliseconds } from 'date-fns';
+import { create } from 'tar';
 
+import { OCPP16Constants } from './OCPP16Constants';
+import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
 import {
   type ChargingStation,
-  ChargingStationConfigurationUtils,
-  ChargingStationUtils,
+  checkChargingStation,
+  getConfigurationKey,
+  setConfigurationKeyValue,
 } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
-  type ChangeAvailabilityRequest,
-  type ChangeAvailabilityResponse,
   type ChangeConfigurationRequest,
   type ChangeConfigurationResponse,
   type ClearChargingProfileRequest,
@@ -32,11 +34,12 @@ import {
   type JsonObject,
   type JsonType,
   OCPP16AuthorizationStatus,
-  type OCPP16AuthorizeRequest,
-  type OCPP16AuthorizeResponse,
   OCPP16AvailabilityType,
   type OCPP16BootNotificationRequest,
   type OCPP16BootNotificationResponse,
+  type OCPP16CancelReservationRequest,
+  type OCPP16ChangeAvailabilityRequest,
+  type OCPP16ChangeAvailabilityResponse,
   OCPP16ChargePointErrorCode,
   OCPP16ChargePointStatus,
   type OCPP16ChargingProfile,
@@ -45,7 +48,6 @@ import {
   type OCPP16ClearCacheRequest,
   type OCPP16DataTransferRequest,
   type OCPP16DataTransferResponse,
-  OCPP16DataTransferStatus,
   OCPP16DataTransferVendorId,
   OCPP16DiagnosticsStatus,
   type OCPP16DiagnosticsStatusNotificationRequest,
@@ -60,6 +62,8 @@ import {
   OCPP16IncomingRequestCommand,
   OCPP16MessageTrigger,
   OCPP16RequestCommand,
+  type OCPP16ReserveNowRequest,
+  type OCPP16ReserveNowResponse,
   OCPP16StandardParametersKey,
   type OCPP16StartTransactionRequest,
   type OCPP16StartTransactionResponse,
@@ -75,14 +79,28 @@ import {
   OCPPVersion,
   type RemoteStartTransactionRequest,
   type RemoteStopTransactionRequest,
+  ReservationTerminationReason,
   type ResetRequest,
   type SetChargingProfileRequest,
   type SetChargingProfileResponse,
   type UnlockConnectorRequest,
   type UnlockConnectorResponse,
 } from '../../../types';
-import { Constants, Utils, logger } from '../../../utils';
-import { OCPP16Constants, OCPP16ServiceUtils, OCPPIncomingRequestService } from '../internal';
+import {
+  Constants,
+  convertToDate,
+  convertToInt,
+  formatDurationMilliSeconds,
+  getRandomInteger,
+  isEmptyArray,
+  isNotEmptyArray,
+  isNotEmptyString,
+  isNullOrUndefined,
+  isUndefined,
+  logger,
+  sleep,
+} from '../../../utils';
+import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService';
 
 const moduleName = 'OCPP16IncomingRequestService';
 
@@ -96,185 +114,230 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     // }
     super(OCPPVersion.VERSION_16);
     this.incomingRequestHandlers = new Map<OCPP16IncomingRequestCommand, IncomingRequestHandler>([
-      [OCPP16IncomingRequestCommand.RESET, this.handleRequestReset.bind(this)],
-      [OCPP16IncomingRequestCommand.CLEAR_CACHE, this.handleRequestClearCache.bind(this)],
-      [OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR, this.handleRequestUnlockConnector.bind(this)],
+      [
+        OCPP16IncomingRequestCommand.RESET,
+        this.handleRequestReset.bind(this) as unknown as IncomingRequestHandler,
+      ],
+      [
+        OCPP16IncomingRequestCommand.CLEAR_CACHE,
+        this.handleRequestClearCache.bind(this) as IncomingRequestHandler,
+      ],
+      [
+        OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR,
+        this.handleRequestUnlockConnector.bind(this) as unknown as IncomingRequestHandler,
+      ],
       [
         OCPP16IncomingRequestCommand.GET_CONFIGURATION,
-        this.handleRequestGetConfiguration.bind(this),
+        this.handleRequestGetConfiguration.bind(this) as IncomingRequestHandler,
       ],
       [
         OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION,
-        this.handleRequestChangeConfiguration.bind(this),
+        this.handleRequestChangeConfiguration.bind(this) as unknown as IncomingRequestHandler,
       ],
       [
         OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
-        this.handleRequestGetCompositeSchedule.bind(this),
+        this.handleRequestGetCompositeSchedule.bind(this) as unknown as IncomingRequestHandler,
       ],
       [
         OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
-        this.handleRequestSetChargingProfile.bind(this),
+        this.handleRequestSetChargingProfile.bind(this) as unknown as IncomingRequestHandler,
       ],
       [
         OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
-        this.handleRequestClearChargingProfile.bind(this),
+        this.handleRequestClearChargingProfile.bind(this) as IncomingRequestHandler,
       ],
       [
         OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY,
-        this.handleRequestChangeAvailability.bind(this),
+        this.handleRequestChangeAvailability.bind(this) as unknown as IncomingRequestHandler,
       ],
       [
         OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION,
-        this.handleRequestRemoteStartTransaction.bind(this),
+        this.handleRequestRemoteStartTransaction.bind(this) as unknown as IncomingRequestHandler,
       ],
       [
         OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION,
-        this.handleRequestRemoteStopTransaction.bind(this),
+        this.handleRequestRemoteStopTransaction.bind(this) as unknown as IncomingRequestHandler,
+      ],
+      [
+        OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
+        this.handleRequestGetDiagnostics.bind(this) as IncomingRequestHandler,
+      ],
+      [
+        OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
+        this.handleRequestTriggerMessage.bind(this) as unknown as IncomingRequestHandler,
+      ],
+      [
+        OCPP16IncomingRequestCommand.DATA_TRANSFER,
+        this.handleRequestDataTransfer.bind(this) as unknown as IncomingRequestHandler,
+      ],
+      [
+        OCPP16IncomingRequestCommand.UPDATE_FIRMWARE,
+        this.handleRequestUpdateFirmware.bind(this) as unknown as IncomingRequestHandler,
+      ],
+      [
+        OCPP16IncomingRequestCommand.RESERVE_NOW,
+        this.handleRequestReserveNow.bind(this) as unknown as IncomingRequestHandler,
+      ],
+      [
+        OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
+        this.handleRequestCancelReservation.bind(this) as unknown as IncomingRequestHandler,
       ],
-      [OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, this.handleRequestGetDiagnostics.bind(this)],
-      [OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, this.handleRequestTriggerMessage.bind(this)],
-      [OCPP16IncomingRequestCommand.DATA_TRANSFER, this.handleRequestDataTransfer.bind(this)],
-      [OCPP16IncomingRequestCommand.UPDATE_FIRMWARE, this.handleRequestUpdateFirmware.bind(this)],
     ]);
     this.jsonSchemas = new Map<OCPP16IncomingRequestCommand, JSONSchemaType<JsonObject>>([
       [
         OCPP16IncomingRequestCommand.RESET,
         OCPP16ServiceUtils.parseJsonSchemaFile<ResetRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/Reset.json',
+          'assets/json-schemas/ocpp/1.6/Reset.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.CLEAR_CACHE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ClearCacheRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/ClearCache.json',
+          'assets/json-schemas/ocpp/1.6/ClearCache.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR,
         OCPP16ServiceUtils.parseJsonSchemaFile<UnlockConnectorRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/UnlockConnector.json',
+          'assets/json-schemas/ocpp/1.6/UnlockConnector.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.GET_CONFIGURATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<GetConfigurationRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/GetConfiguration.json',
+          'assets/json-schemas/ocpp/1.6/GetConfiguration.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<ChangeConfigurationRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/ChangeConfiguration.json',
+          'assets/json-schemas/ocpp/1.6/ChangeConfiguration.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
         OCPP16ServiceUtils.parseJsonSchemaFile<GetDiagnosticsRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/GetDiagnostics.json',
+          'assets/json-schemas/ocpp/1.6/GetDiagnostics.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16GetCompositeScheduleRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/GetCompositeSchedule.json',
+          'assets/json-schemas/ocpp/1.6/GetCompositeSchedule.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
         OCPP16ServiceUtils.parseJsonSchemaFile<SetChargingProfileRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/SetChargingProfile.json',
+          'assets/json-schemas/ocpp/1.6/SetChargingProfile.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
         OCPP16ServiceUtils.parseJsonSchemaFile<ClearChargingProfileRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/ClearChargingProfile.json',
+          'assets/json-schemas/ocpp/1.6/ClearChargingProfile.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY,
-        OCPP16ServiceUtils.parseJsonSchemaFile<ChangeAvailabilityRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/ChangeAvailability.json',
+        OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ChangeAvailabilityRequest>(
+          'assets/json-schemas/ocpp/1.6/ChangeAvailability.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<RemoteStartTransactionRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/RemoteStartTransaction.json',
+          'assets/json-schemas/ocpp/1.6/RemoteStartTransaction.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<RemoteStopTransactionRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/RemoteStopTransaction.json',
+          'assets/json-schemas/ocpp/1.6/RemoteStopTransaction.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16TriggerMessageRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/TriggerMessage.json',
+          'assets/json-schemas/ocpp/1.6/TriggerMessage.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.DATA_TRANSFER,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/DataTransfer.json',
+          'assets/json-schemas/ocpp/1.6/DataTransfer.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
         OCPP16IncomingRequestCommand.UPDATE_FIRMWARE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16UpdateFirmwareRequest>(
-          '../../../assets/json-schemas/ocpp/1.6/UpdateFirmware.json',
+          'assets/json-schemas/ocpp/1.6/UpdateFirmware.json',
+          moduleName,
+          'constructor',
+        ),
+      ],
+      [
+        OCPP16IncomingRequestCommand.RESERVE_NOW,
+        OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ReserveNowRequest>(
+          'assets/json-schemas/ocpp/1.6/ReserveNow.json',
+          moduleName,
+          'constructor',
+        ),
+      ],
+      [
+        OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
+        OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16CancelReservationRequest>(
+          'assets/json-schemas/ocpp/1.6/CancelReservation.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
     ]);
     this.validatePayload = this.validatePayload.bind(this) as (
       chargingStation: ChargingStation,
       commandName: OCPP16IncomingRequestCommand,
-      commandPayload: JsonType
+      commandPayload: JsonType,
     ) => boolean;
   }
 
-  public async incomingRequestHandler(
+  public async incomingRequestHandler<ReqType extends JsonType, ResType extends JsonType>(
     chargingStation: ChargingStation,
     messageId: string,
     commandName: OCPP16IncomingRequestCommand,
-    commandPayload: JsonType
+    commandPayload: ReqType,
   ): Promise<void> {
-    let response: JsonType;
+    let response: ResType;
     if (
       chargingStation.getOcppStrictCompliance() === true &&
-      chargingStation.isInPendingState() === true &&
+      chargingStation.inPendingState() === true &&
       (commandName === OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION ||
         commandName === OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION)
     ) {
@@ -283,16 +346,16 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         `${commandName} cannot be issued to handle request PDU ${JSON.stringify(
           commandPayload,
           null,
-          2
+          2,
         )} while the charging station is in pending state on the central server`,
         commandName,
-        commandPayload
+        commandPayload,
       );
     }
     if (
       chargingStation.isRegistered() === true ||
       (chargingStation.getOcppStrictCompliance() === false &&
-        chargingStation.isInUnknownState() === true)
+        chargingStation.inUnknownState() === true)
     ) {
       if (
         this.incomingRequestHandlers.has(commandName) === true &&
@@ -301,15 +364,16 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         try {
           this.validatePayload(chargingStation, commandName, commandPayload);
           // Call the method to build the response
-          response = await this.incomingRequestHandlers.get(commandName)(
+          response = (await this.incomingRequestHandlers.get(commandName)!(
             chargingStation,
-            commandPayload
-          );
+            commandPayload,
+          )) as ResType;
         } catch (error) {
           // Log
           logger.error(
-            `${chargingStation.logPrefix()} ${moduleName}.incomingRequestHandler: Handle incoming request error:`,
-            error
+            `${chargingStation.logPrefix()} ${moduleName}.incomingRequestHandler:
+              Handle incoming request error:`,
+            error,
           );
           throw error;
         }
@@ -320,10 +384,10 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           `${commandName} is not implemented to handle request PDU ${JSON.stringify(
             commandPayload,
             null,
-            2
+            2,
           )}`,
           commandName,
-          commandPayload
+          commandPayload,
         );
       }
     } else {
@@ -332,10 +396,10 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         `${commandName} cannot be issued to handle request PDU ${JSON.stringify(
           commandPayload,
           null,
-          2
+          2,
         )} while the charging station is not registered on the central server.`,
         commandName,
-        commandPayload
+        commandPayload,
       );
     }
     // Send the built response
@@ -343,25 +407,26 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       chargingStation,
       messageId,
       response,
-      commandName
+      commandName,
     );
   }
 
   private validatePayload(
     chargingStation: ChargingStation,
     commandName: OCPP16IncomingRequestCommand,
-    commandPayload: JsonType
+    commandPayload: JsonType,
   ): boolean {
     if (this.jsonSchemas.has(commandName) === true) {
       return this.validateIncomingRequestPayload(
         chargingStation,
         commandName,
-        this.jsonSchemas.get(commandName),
-        commandPayload
+        this.jsonSchemas.get(commandName)!,
+        commandPayload,
       );
     }
     logger.warn(
-      `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command '${commandName}' PDU validation`
+      `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found
+        for command '${commandName}' PDU validation`,
     );
     return false;
   }
@@ -369,47 +434,47 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
   // Simulate charging station restart
   private handleRequestReset(
     chargingStation: ChargingStation,
-    commandPayload: ResetRequest
+    commandPayload: ResetRequest,
   ): GenericResponse {
     this.runInAsyncScope(
       chargingStation.reset.bind(chargingStation) as (
         this: ChargingStation,
-        ...args: any[]
+        ...args: unknown[]
       ) => Promise<void>,
       chargingStation,
-      `${commandPayload.type}Reset` as OCPP16StopTransactionReason
+      `${commandPayload.type}Reset` as OCPP16StopTransactionReason,
     ).catch(Constants.EMPTY_FUNCTION);
     logger.info(
       `${chargingStation.logPrefix()} ${
         commandPayload.type
-      } reset command received, simulating it. The station will be back online in ${Utils.formatDurationMilliSeconds(
-        chargingStation.stationInfo.resetTime
-      )}`
+      } reset command received, simulating it. The station will be
+        back online in ${formatDurationMilliSeconds(chargingStation.stationInfo.resetTime!)}`,
     );
     return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
   }
 
   private async handleRequestUnlockConnector(
     chargingStation: ChargingStation,
-    commandPayload: UnlockConnectorRequest
+    commandPayload: UnlockConnectorRequest,
   ): Promise<UnlockConnectorResponse> {
     const connectorId = commandPayload.connectorId;
-    if (chargingStation.connectors.has(connectorId) === false) {
+    if (chargingStation.hasConnector(connectorId) === false) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to unlock a non existing connector Id ${connectorId.toString()}`
+        `${chargingStation.logPrefix()} Trying to unlock a non existing
+          connector id ${connectorId.toString()}`,
       );
       return OCPP16Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED;
     }
     if (connectorId === 0) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to unlock connector Id ${connectorId.toString()}`
+        `${chargingStation.logPrefix()} Trying to unlock connector id ${connectorId.toString()}`,
       );
       return OCPP16Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED;
     }
     if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) {
       const stopResponse = await chargingStation.stopTransactionOnConnector(
         connectorId,
-        OCPP16StopTransactionReason.UNLOCK_COMMAND
+        OCPP16StopTransactionReason.UNLOCK_COMMAND,
       );
       if (stopResponse.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
         return OCPP16Constants.OCPP_RESPONSE_UNLOCKED;
@@ -419,20 +484,20 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     await OCPP16ServiceUtils.sendAndSetConnectorStatus(
       chargingStation,
       connectorId,
-      OCPP16ChargePointStatus.Available
+      OCPP16ChargePointStatus.Available,
     );
     return OCPP16Constants.OCPP_RESPONSE_UNLOCKED;
   }
 
   private handleRequestGetConfiguration(
     chargingStation: ChargingStation,
-    commandPayload: GetConfigurationRequest
+    commandPayload: GetConfigurationRequest,
   ): GetConfigurationResponse {
     const configurationKey: OCPPConfigurationKey[] = [];
     const unknownKey: string[] = [];
-    if (Utils.isUndefined(commandPayload.key) === true) {
-      for (const configuration of chargingStation.ocppConfiguration.configurationKey) {
-        if (Utils.isUndefined(configuration.visible) === true) {
+    if (isUndefined(commandPayload.key) === true) {
+      for (const configuration of chargingStation.ocppConfiguration!.configurationKey!) {
+        if (isUndefined(configuration.visible) === true) {
           configuration.visible = true;
         }
         if (configuration.visible === false) {
@@ -444,15 +509,11 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           value: configuration.value,
         });
       }
-    } else if (Utils.isNotEmptyArray(commandPayload.key) === true) {
-      for (const key of commandPayload.key) {
-        const keyFound = ChargingStationConfigurationUtils.getConfigurationKey(
-          chargingStation,
-          key,
-          true
-        );
+    } else if (isNotEmptyArray(commandPayload.key) === true) {
+      for (const key of commandPayload.key!) {
+        const keyFound = getConfigurationKey(chargingStation, key, true);
         if (keyFound) {
-          if (Utils.isUndefined(keyFound.visible) === true) {
+          if (isUndefined(keyFound.visible) === true) {
             keyFound.visible = true;
           }
           if (keyFound.visible === false) {
@@ -476,49 +537,50 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private handleRequestChangeConfiguration(
     chargingStation: ChargingStation,
-    commandPayload: ChangeConfigurationRequest
+    commandPayload: ChangeConfigurationRequest,
   ): ChangeConfigurationResponse {
-    const keyToChange = ChargingStationConfigurationUtils.getConfigurationKey(
-      chargingStation,
-      commandPayload.key,
-      true
-    );
-    if (!keyToChange) {
-      return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_NOT_SUPPORTED;
-    } else if (keyToChange && keyToChange.readonly) {
+    const keyToChange = getConfigurationKey(chargingStation, commandPayload.key, true);
+    if (keyToChange?.readonly === true) {
       return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_REJECTED;
-    } else if (keyToChange && !keyToChange.readonly) {
+    } else if (keyToChange?.readonly === false) {
       let valueChanged = false;
       if (keyToChange.value !== commandPayload.value) {
-        ChargingStationConfigurationUtils.setConfigurationKeyValue(
-          chargingStation,
-          commandPayload.key,
-          commandPayload.value,
-          true
-        );
+        setConfigurationKeyValue(chargingStation, commandPayload.key, commandPayload.value, true);
         valueChanged = true;
       }
       let triggerHeartbeatRestart = false;
-      if (keyToChange.key === OCPP16StandardParametersKey.HeartBeatInterval && valueChanged) {
-        ChargingStationConfigurationUtils.setConfigurationKeyValue(
+      if (
+        (keyToChange.key as OCPP16StandardParametersKey) ===
+          OCPP16StandardParametersKey.HeartBeatInterval &&
+        valueChanged
+      ) {
+        setConfigurationKeyValue(
           chargingStation,
           OCPP16StandardParametersKey.HeartbeatInterval,
-          commandPayload.value
+          commandPayload.value,
         );
         triggerHeartbeatRestart = true;
       }
-      if (keyToChange.key === OCPP16StandardParametersKey.HeartbeatInterval && valueChanged) {
-        ChargingStationConfigurationUtils.setConfigurationKeyValue(
+      if (
+        (keyToChange.key as OCPP16StandardParametersKey) ===
+          OCPP16StandardParametersKey.HeartbeatInterval &&
+        valueChanged
+      ) {
+        setConfigurationKeyValue(
           chargingStation,
           OCPP16StandardParametersKey.HeartBeatInterval,
-          commandPayload.value
+          commandPayload.value,
         );
         triggerHeartbeatRestart = true;
       }
       if (triggerHeartbeatRestart) {
         chargingStation.restartHeartbeat();
       }
-      if (keyToChange.key === OCPP16StandardParametersKey.WebSocketPingInterval && valueChanged) {
+      if (
+        (keyToChange.key as OCPP16StandardParametersKey) ===
+          OCPP16StandardParametersKey.WebSocketPingInterval &&
+        valueChanged
+      ) {
         chargingStation.restartWebSocketPing();
       }
       if (keyToChange.reboot) {
@@ -526,26 +588,26 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       }
       return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_ACCEPTED;
     }
+    return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_NOT_SUPPORTED;
   }
 
   private handleRequestSetChargingProfile(
     chargingStation: ChargingStation,
-    commandPayload: SetChargingProfileRequest
+    commandPayload: SetChargingProfileRequest,
   ): SetChargingProfileResponse {
     if (
       OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.SmartCharging,
-        OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE
+        OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
       ) === false
     ) {
       return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_NOT_SUPPORTED;
     }
-    if (chargingStation.connectors.has(commandPayload.connectorId) === false) {
+    if (chargingStation.hasConnector(commandPayload.connectorId) === false) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to set charging profile(s) to a non existing connector Id ${
-          commandPayload.connectorId
-        }`
+        `${chargingStation.logPrefix()} Trying to set charging profile(s) to a
+          non existing connector id ${commandPayload.connectorId}`,
       );
       return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
     }
@@ -564,63 +626,59 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           false)
     ) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to set transaction charging profile(s) on connector ${
-          commandPayload.connectorId
-        } without a started transaction`
+        `${chargingStation.logPrefix()} Trying to set transaction charging profile(s)
+          on connector ${commandPayload.connectorId} without a started transaction`,
       );
       return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
     }
     OCPP16ServiceUtils.setChargingProfile(
       chargingStation,
       commandPayload.connectorId,
-      commandPayload.csChargingProfiles
+      commandPayload.csChargingProfiles,
     );
     logger.debug(
       `${chargingStation.logPrefix()} Charging profile(s) set on connector id ${
         commandPayload.connectorId
       }: %j`,
-      commandPayload.csChargingProfiles
+      commandPayload.csChargingProfiles,
     );
     return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_ACCEPTED;
   }
 
   private handleRequestGetCompositeSchedule(
     chargingStation: ChargingStation,
-    commandPayload: OCPP16GetCompositeScheduleRequest
+    commandPayload: OCPP16GetCompositeScheduleRequest,
   ): OCPP16GetCompositeScheduleResponse {
     if (
       OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.SmartCharging,
-        OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE
+        OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
       ) === false
     ) {
       return OCPP16Constants.OCPP_RESPONSE_REJECTED;
     }
-    if (chargingStation.connectors.has(commandPayload.connectorId) === false) {
+    if (chargingStation.hasConnector(commandPayload.connectorId) === false) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to get composite schedule to a non existing connector Id ${
-          commandPayload.connectorId
-        }`
+        `${chargingStation.logPrefix()} Trying to get composite schedule to a
+          non existing connector id ${commandPayload.connectorId}`,
       );
       return OCPP16Constants.OCPP_RESPONSE_REJECTED;
     }
     if (
-      Utils.isEmptyArray(
-        chargingStation.getConnectorStatus(commandPayload.connectorId)?.chargingProfiles
-      )
+      isEmptyArray(chargingStation.getConnectorStatus(commandPayload.connectorId)?.chargingProfiles)
     ) {
       return OCPP16Constants.OCPP_RESPONSE_REJECTED;
     }
     const startDate = new Date();
-    const endDate = new Date(startDate.getTime() + commandPayload.duration * 1000);
-    let compositeSchedule: OCPP16ChargingSchedule;
-    for (const chargingProfile of chargingStation.getConnectorStatus(commandPayload.connectorId)
-      .chargingProfiles) {
+    const endDate = new Date(startDate.getTime() + secondsToMilliseconds(commandPayload.duration));
+    let compositeSchedule: OCPP16ChargingSchedule | undefined;
+    for (const chargingProfile of chargingStation.getConnectorStatus(commandPayload.connectorId)!
+      .chargingProfiles!) {
       // FIXME: build the composite schedule including the local power limit, the stack level, the charging rate unit, etc.
       if (
-        chargingProfile.chargingSchedule?.startSchedule >= startDate &&
-        chargingProfile.chargingSchedule?.startSchedule <= endDate
+        chargingProfile.chargingSchedule.startSchedule! >= startDate &&
+        chargingProfile.chargingSchedule.startSchedule! <= endDate
       ) {
         compositeSchedule = chargingProfile.chargingSchedule;
         break;
@@ -636,78 +694,57 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private handleRequestClearChargingProfile(
     chargingStation: ChargingStation,
-    commandPayload: ClearChargingProfileRequest
+    commandPayload: ClearChargingProfileRequest,
   ): ClearChargingProfileResponse {
     if (
       OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.SmartCharging,
-        OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE
+        OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
       ) === false
     ) {
       return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
     }
-    if (chargingStation.connectors.has(commandPayload.connectorId) === false) {
+    if (chargingStation.hasConnector(commandPayload.connectorId!) === false) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to clear a charging profile(s) to a non existing connector Id ${
-          commandPayload.connectorId
-        }`
+        `${chargingStation.logPrefix()} Trying to clear a charging profile(s) to
+          a non existing connector id ${commandPayload.connectorId}`,
       );
       return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
     }
-    const connectorStatus = chargingStation.getConnectorStatus(commandPayload.connectorId);
     if (
-      !Utils.isNullOrUndefined(commandPayload.connectorId) &&
-      Utils.isNotEmptyArray(connectorStatus?.chargingProfiles)
+      !isNullOrUndefined(commandPayload.connectorId) &&
+      isNotEmptyArray(
+        chargingStation.getConnectorStatus(commandPayload.connectorId!)?.chargingProfiles,
+      )
     ) {
-      connectorStatus.chargingProfiles = [];
+      chargingStation.getConnectorStatus(commandPayload.connectorId!)!.chargingProfiles = [];
       logger.debug(
         `${chargingStation.logPrefix()} Charging profile(s) cleared on connector id ${
           commandPayload.connectorId
-        }`
+        }`,
       );
       return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED;
     }
-    if (Utils.isNullOrUndefined(commandPayload.connectorId)) {
+    if (isNullOrUndefined(commandPayload.connectorId)) {
       let clearedCP = false;
-      for (const connectorId of chargingStation.connectors.keys()) {
-        if (
-          Utils.isNotEmptyArray(chargingStation.getConnectorStatus(connectorId)?.chargingProfiles)
-        ) {
-          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?.splice(index, 1);
-                logger.debug(
-                  `${chargingStation.logPrefix()} Matching charging profile(s) cleared: %j`,
-                  chargingProfile
-                );
-                clearedCP = true;
-              }
-            });
+      if (chargingStation.hasEvses) {
+        for (const evseStatus of chargingStation.evses.values()) {
+          for (const connectorStatus of evseStatus.connectors.values()) {
+            clearedCP = OCPP16ServiceUtils.clearChargingProfiles(
+              chargingStation,
+              commandPayload,
+              connectorStatus.chargingProfiles,
+            );
+          }
+        }
+      } else {
+        for (const connectorId of chargingStation.connectors.keys()) {
+          clearedCP = OCPP16ServiceUtils.clearChargingProfiles(
+            chargingStation,
+            commandPayload,
+            chargingStation.getConnectorStatus(connectorId)?.chargingProfiles,
+          );
         }
       }
       if (clearedCP) {
@@ -719,51 +756,59 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private async handleRequestChangeAvailability(
     chargingStation: ChargingStation,
-    commandPayload: ChangeAvailabilityRequest
-  ): Promise<ChangeAvailabilityResponse> {
+    commandPayload: OCPP16ChangeAvailabilityRequest,
+  ): Promise<OCPP16ChangeAvailabilityResponse> {
     const connectorId: number = commandPayload.connectorId;
-    if (chargingStation.connectors.has(connectorId) === false) {
+    if (chargingStation.hasConnector(connectorId) === false) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to change the availability of a non existing connector Id ${connectorId.toString()}`
+        `${chargingStation.logPrefix()} Trying to change the availability of a
+          non existing connector id ${connectorId.toString()}`,
       );
       return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_REJECTED;
     }
     const chargePointStatus: OCPP16ChargePointStatus =
-      commandPayload.type === OCPP16AvailabilityType.OPERATIVE
+      commandPayload.type === OCPP16AvailabilityType.Operative
         ? OCPP16ChargePointStatus.Available
         : OCPP16ChargePointStatus.Unavailable;
     if (connectorId === 0) {
-      let response: ChangeAvailabilityResponse =
-        OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED;
-      for (const id of chargingStation.connectors.keys()) {
-        if (chargingStation.getConnectorStatus(id)?.transactionStarted === true) {
-          response = OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED;
+      let response: OCPP16ChangeAvailabilityResponse;
+      if (chargingStation.hasEvses) {
+        for (const evseStatus of chargingStation.evses.values()) {
+          for (const id of evseStatus.connectors.keys()) {
+            response = await OCPP16ServiceUtils.changeAvailability(
+              chargingStation,
+              id,
+              chargePointStatus,
+              commandPayload.type,
+            );
+          }
         }
-        chargingStation.getConnectorStatus(id).availability = commandPayload.type;
-        if (response === OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED) {
-          await OCPP16ServiceUtils.sendAndSetConnectorStatus(
+      } else {
+        for (const id of chargingStation.connectors.keys()) {
+          response = await OCPP16ServiceUtils.changeAvailability(
             chargingStation,
             id,
-            chargePointStatus
+            chargePointStatus,
+            commandPayload.type,
           );
         }
       }
-      return response;
+      return response!;
     } else if (
       connectorId > 0 &&
       (chargingStation.isChargingStationAvailable() === true ||
         (chargingStation.isChargingStationAvailable() === false &&
-          commandPayload.type === OCPP16AvailabilityType.INOPERATIVE))
+          commandPayload.type === OCPP16AvailabilityType.Inoperative))
     ) {
       if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) {
-        chargingStation.getConnectorStatus(connectorId).availability = commandPayload.type;
+        chargingStation.getConnectorStatus(connectorId)!.availability = commandPayload.type;
         return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED;
       }
-      chargingStation.getConnectorStatus(connectorId).availability = commandPayload.type;
+      chargingStation.getConnectorStatus(connectorId)!.availability = commandPayload.type;
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
         connectorId,
-        chargePointStatus
+        chargePointStatus,
       );
       return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED;
     }
@@ -772,149 +817,137 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private async handleRequestRemoteStartTransaction(
     chargingStation: ChargingStation,
-    commandPayload: RemoteStartTransactionRequest
+    commandPayload: RemoteStartTransactionRequest,
   ): Promise<GenericResponse> {
-    const transactionConnectorId = commandPayload.connectorId;
-    if (chargingStation.connectors.has(transactionConnectorId) === true) {
-      const remoteStartTransactionLogMsg = `${chargingStation.logPrefix()} Transaction remotely STARTED on ${
-        chargingStation.stationInfo.chargingStationId
-      }#${transactionConnectorId.toString()} for idTag '${commandPayload.idTag}'`;
-      await OCPP16ServiceUtils.sendAndSetConnectorStatus(
+    const { connectorId: transactionConnectorId, idTag, chargingProfile } = commandPayload;
+    if (chargingStation.hasConnector(transactionConnectorId) === false) {
+      return this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        OCPP16ChargePointStatus.Preparing
+        idTag,
       );
-      const connectorStatus = chargingStation.getConnectorStatus(transactionConnectorId);
+    }
+    if (
+      !chargingStation.isChargingStationAvailable() ||
+      !chargingStation.isConnectorAvailable(transactionConnectorId)
+    ) {
+      return this.notifyRemoteStartTransactionRejected(
+        chargingStation,
+        transactionConnectorId,
+        idTag,
+      );
+    }
+    if (
+      (chargingStation.getConnectorStatus(transactionConnectorId)?.status ===
+        OCPP16ChargePointStatus.Reserved &&
+        chargingStation.getReservationBy('connectorId', transactionConnectorId)?.idTag !== idTag) ||
+      (chargingStation.getConnectorStatus(0)?.status === OCPP16ChargePointStatus.Reserved &&
+        chargingStation.getReservationBy('connectorId', 0)?.idTag !== idTag)
+    ) {
+      return OCPP16Constants.OCPP_RESPONSE_REJECTED;
+    }
+    const remoteStartTransactionLogMsg = `
+      ${chargingStation.logPrefix()} Transaction remotely STARTED on ${
+        chargingStation.stationInfo.chargingStationId
+      }#${transactionConnectorId.toString()} for idTag '${idTag}'`;
+    await OCPP16ServiceUtils.sendAndSetConnectorStatus(
+      chargingStation,
+      transactionConnectorId,
+      OCPP16ChargePointStatus.Preparing,
+    );
+    const connectorStatus = chargingStation.getConnectorStatus(transactionConnectorId)!;
+    // Authorization check required
+    if (
+      chargingStation.getAuthorizeRemoteTxRequests() === true &&
+      (await OCPP16ServiceUtils.isIdTagAuthorized(chargingStation, transactionConnectorId, idTag))
+    ) {
+      // Authorization successful, start transaction
       if (
-        chargingStation.isChargingStationAvailable() === true &&
-        chargingStation.isConnectorAvailable(transactionConnectorId) === true
+        this.setRemoteStartTransactionChargingProfile(
+          chargingStation,
+          transactionConnectorId,
+          chargingProfile!,
+        ) === true
       ) {
-        // Check if authorized
-        if (chargingStation.getAuthorizeRemoteTxRequests() === true) {
-          let authorized = false;
-          if (
-            chargingStation.getLocalAuthListEnabled() === true &&
-            chargingStation.hasIdTags() === true &&
-            Utils.isNotEmptyString(
-              chargingStation.idTagsCache
-                .getIdTags(ChargingStationUtils.getIdTagsFile(chargingStation.stationInfo))
-                ?.find((idTag) => idTag === commandPayload.idTag)
-            )
-          ) {
-            connectorStatus.localAuthorizeIdTag = commandPayload.idTag;
-            connectorStatus.idTagLocalAuthorized = true;
-            authorized = true;
-          } else if (chargingStation.getMustAuthorizeAtRemoteStart() === true) {
-            connectorStatus.authorizeIdTag = commandPayload.idTag;
-            const authorizeResponse: OCPP16AuthorizeResponse =
-              await chargingStation.ocppRequestService.requestHandler<
-                OCPP16AuthorizeRequest,
-                OCPP16AuthorizeResponse
-              >(chargingStation, OCPP16RequestCommand.AUTHORIZE, {
-                idTag: commandPayload.idTag,
-              });
-            if (authorizeResponse?.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
-              authorized = true;
-            }
-          } else {
-            logger.warn(
-              `${chargingStation.logPrefix()} The charging station configuration expects authorize at remote start transaction but local authorization or authorize isn't enabled`
-            );
-          }
-          if (authorized === true) {
-            // Authorization successful, start transaction
-            if (
-              this.setRemoteStartTransactionChargingProfile(
-                chargingStation,
-                transactionConnectorId,
-                commandPayload.chargingProfile
-              ) === true
-            ) {
-              connectorStatus.transactionRemoteStarted = true;
-              if (
-                (
-                  await chargingStation.ocppRequestService.requestHandler<
-                    OCPP16StartTransactionRequest,
-                    OCPP16StartTransactionResponse
-                  >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, {
-                    connectorId: transactionConnectorId,
-                    idTag: commandPayload.idTag,
-                  })
-                ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
-              ) {
-                logger.debug(remoteStartTransactionLogMsg);
-                return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
-              }
-              return this.notifyRemoteStartTransactionRejected(
-                chargingStation,
-                transactionConnectorId,
-                commandPayload.idTag
-              );
-            }
-            return this.notifyRemoteStartTransactionRejected(
-              chargingStation,
-              transactionConnectorId,
-              commandPayload.idTag
-            );
-          }
-          return this.notifyRemoteStartTransactionRejected(
-            chargingStation,
-            transactionConnectorId,
-            commandPayload.idTag
-          );
-        }
-        // No authorization check required, start transaction
+        connectorStatus.transactionRemoteStarted = true;
         if (
-          this.setRemoteStartTransactionChargingProfile(
-            chargingStation,
-            transactionConnectorId,
-            commandPayload.chargingProfile
-          ) === true
+          (
+            await chargingStation.ocppRequestService.requestHandler<
+              OCPP16StartTransactionRequest,
+              OCPP16StartTransactionResponse
+            >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, {
+              connectorId: transactionConnectorId,
+              idTag,
+              reservationId: chargingStation.getReservationBy(
+                'connectorId',
+                chargingStation.getConnectorStatus(0)?.status === OCPP16ChargePointStatus.Reserved
+                  ? 0
+                  : transactionConnectorId,
+              )!,
+            })
+          ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
         ) {
-          connectorStatus.transactionRemoteStarted = true;
-          if (
-            (
-              await chargingStation.ocppRequestService.requestHandler<
-                OCPP16StartTransactionRequest,
-                OCPP16StartTransactionResponse
-              >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, {
-                connectorId: transactionConnectorId,
-                idTag: commandPayload.idTag,
-              })
-            ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
-          ) {
-            logger.debug(remoteStartTransactionLogMsg);
-            return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
-          }
-          return this.notifyRemoteStartTransactionRejected(
-            chargingStation,
-            transactionConnectorId,
-            commandPayload.idTag
-          );
+          logger.debug(remoteStartTransactionLogMsg);
+          return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
         }
         return this.notifyRemoteStartTransactionRejected(
           chargingStation,
           transactionConnectorId,
-          commandPayload.idTag
+          idTag,
         );
       }
       return this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        commandPayload.idTag
+        idTag,
+      );
+    }
+    // No authorization check required, start transaction
+    if (
+      this.setRemoteStartTransactionChargingProfile(
+        chargingStation,
+        transactionConnectorId,
+        chargingProfile!,
+      ) === true
+    ) {
+      connectorStatus.transactionRemoteStarted = true;
+      if (
+        (
+          await chargingStation.ocppRequestService.requestHandler<
+            OCPP16StartTransactionRequest,
+            OCPP16StartTransactionResponse
+          >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, {
+            connectorId: transactionConnectorId,
+            idTag,
+            reservationId: chargingStation.getReservationBy(
+              'connectorId',
+              chargingStation.getConnectorStatus(0)?.status === OCPP16ChargePointStatus.Reserved
+                ? 0
+                : transactionConnectorId,
+            )!,
+          })
+        ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
+      ) {
+        logger.debug(remoteStartTransactionLogMsg);
+        return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
+      }
+      return this.notifyRemoteStartTransactionRejected(
+        chargingStation,
+        transactionConnectorId,
+        idTag,
       );
     }
     return this.notifyRemoteStartTransactionRejected(
       chargingStation,
       transactionConnectorId,
-      commandPayload.idTag
+      idTag,
     );
   }
 
   private async notifyRemoteStartTransactionRejected(
     chargingStation: ChargingStation,
     connectorId: number,
-    idTag: string
+    idTag: string,
   ): Promise<GenericResponse> {
     if (
       chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.Available
@@ -922,13 +955,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
         connectorId,
-        OCPP16ChargePointStatus.Available
+        OCPP16ChargePointStatus.Available,
       );
     }
     logger.warn(
-      `${chargingStation.logPrefix()} Remote starting transaction REJECTED on connector Id ${connectorId.toString()}, idTag '${idTag}', availability '${
-        chargingStation.getConnectorStatus(connectorId)?.availability
-      }', status '${chargingStation.getConnectorStatus(connectorId)?.status}'`
+      `${chargingStation.logPrefix()} Remote starting transaction REJECTED on connector id
+        ${connectorId.toString()}, idTag '${idTag}', availability '${chargingStation.getConnectorStatus(
+          connectorId,
+        )?.availability}', status '${chargingStation.getConnectorStatus(connectorId)?.status}'`,
     );
     return OCPP16Constants.OCPP_RESPONSE_REJECTED;
   }
@@ -936,98 +970,117 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
   private setRemoteStartTransactionChargingProfile(
     chargingStation: ChargingStation,
     connectorId: number,
-    cp: OCPP16ChargingProfile
+    chargingProfile: OCPP16ChargingProfile,
   ): boolean {
-    if (cp && cp.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE) {
-      OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, cp);
+    if (
+      chargingProfile &&
+      chargingProfile.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE
+    ) {
+      OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, chargingProfile);
       logger.debug(
-        `${chargingStation.logPrefix()} Charging profile(s) set at remote start transaction on connector id ${connectorId}: %j`,
-        cp
+        `${chargingStation.logPrefix()} Charging profile(s) set at remote start transaction
+          on connector id ${connectorId}: %j`,
+        chargingProfile,
       );
       return true;
-    } else if (cp && cp.chargingProfilePurpose !== OCPP16ChargingProfilePurposeType.TX_PROFILE) {
+    } else if (
+      chargingProfile &&
+      chargingProfile.chargingProfilePurpose !== OCPP16ChargingProfilePurposeType.TX_PROFILE
+    ) {
       logger.warn(
         `${chargingStation.logPrefix()} Not allowed to set ${
-          cp.chargingProfilePurpose
-        } charging profile(s) at remote start transaction`
+          chargingProfile.chargingProfilePurpose
+        } charging profile(s) at remote start transaction`,
       );
       return false;
-    } else if (!cp) {
-      return true;
     }
+    return true;
   }
 
   private async handleRequestRemoteStopTransaction(
     chargingStation: ChargingStation,
-    commandPayload: RemoteStopTransactionRequest
+    commandPayload: RemoteStopTransactionRequest,
   ): Promise<GenericResponse> {
     const transactionId = commandPayload.transactionId;
-    for (const connectorId of chargingStation.connectors.keys()) {
-      if (
-        connectorId > 0 &&
-        chargingStation.getConnectorStatus(connectorId)?.transactionId === transactionId
-      ) {
-        await OCPP16ServiceUtils.sendAndSetConnectorStatus(
-          chargingStation,
-          connectorId,
-          OCPP16ChargePointStatus.Finishing
-        );
-        const stopResponse = await chargingStation.stopTransactionOnConnector(
-          connectorId,
-          OCPP16StopTransactionReason.REMOTE
-        );
-        if (stopResponse.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
-          return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
+    if (chargingStation.hasEvses) {
+      for (const [evseId, evseStatus] of chargingStation.evses) {
+        if (evseId > 0) {
+          for (const [connectorId, connectorStatus] of evseStatus.connectors) {
+            if (connectorStatus.transactionId === transactionId) {
+              return OCPP16ServiceUtils.remoteStopTransaction(chargingStation, connectorId);
+            }
+          }
+        }
+      }
+    } else {
+      for (const connectorId of chargingStation.connectors.keys()) {
+        if (
+          connectorId > 0 &&
+          chargingStation.getConnectorStatus(connectorId)?.transactionId === transactionId
+        ) {
+          return OCPP16ServiceUtils.remoteStopTransaction(chargingStation, connectorId);
         }
-        return OCPP16Constants.OCPP_RESPONSE_REJECTED;
       }
     }
     logger.warn(
-      `${chargingStation.logPrefix()} Trying to remote stop a non existing transaction ${transactionId.toString()}`
+      `${chargingStation.logPrefix()} Trying to remote stop a non existing transaction with id:
+        ${transactionId.toString()}`,
     );
     return OCPP16Constants.OCPP_RESPONSE_REJECTED;
   }
 
   private handleRequestUpdateFirmware(
     chargingStation: ChargingStation,
-    commandPayload: OCPP16UpdateFirmwareRequest
+    commandPayload: OCPP16UpdateFirmwareRequest,
   ): OCPP16UpdateFirmwareResponse {
     if (
       OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.FirmwareManagement,
-        OCPP16IncomingRequestCommand.UPDATE_FIRMWARE
+        OCPP16IncomingRequestCommand.UPDATE_FIRMWARE,
       ) === false
     ) {
       logger.warn(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware: Cannot simulate firmware update: feature profile not supported`
+        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware:
+          Cannot simulate firmware update: feature profile not supported`,
       );
       return OCPP16Constants.OCPP_RESPONSE_EMPTY;
     }
     if (
-      !Utils.isNullOrUndefined(chargingStation.stationInfo.firmwareStatus) &&
+      !isNullOrUndefined(chargingStation.stationInfo.firmwareStatus) &&
       chargingStation.stationInfo.firmwareStatus !== OCPP16FirmwareStatus.Installed
     ) {
       logger.warn(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware: Cannot simulate firmware update: firmware update is already in progress`
+        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware:
+          Cannot simulate firmware update: firmware update is already in progress`,
       );
       return OCPP16Constants.OCPP_RESPONSE_EMPTY;
     }
-    const retrieveDate = Utils.convertToDate(commandPayload.retrieveDate);
+    const retrieveDate = convertToDate(commandPayload.retrieveDate)!;
     const now = Date.now();
     if (retrieveDate?.getTime() <= now) {
       this.runInAsyncScope(
         this.updateFirmwareSimulation.bind(this) as (
           this: OCPP16IncomingRequestService,
-          ...args: any[]
+          ...args: unknown[]
         ) => Promise<void>,
         this,
-        chargingStation
+        chargingStation,
       ).catch(Constants.EMPTY_FUNCTION);
     } else {
-      setTimeout(() => {
-        this.updateFirmwareSimulation(chargingStation).catch(Constants.EMPTY_FUNCTION);
-      }, retrieveDate?.getTime() - now);
+      setTimeout(
+        () => {
+          this.runInAsyncScope(
+            this.updateFirmwareSimulation.bind(this) as (
+              this: OCPP16IncomingRequestService,
+              ...args: unknown[]
+            ) => Promise<void>,
+            this,
+            chargingStation,
+          ).catch(Constants.EMPTY_FUNCTION);
+        },
+        retrieveDate?.getTime() - now,
+      );
     }
     return OCPP16Constants.OCPP_RESPONSE_EMPTY;
   }
@@ -1035,24 +1088,37 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
   private async updateFirmwareSimulation(
     chargingStation: ChargingStation,
     maxDelay = 30,
-    minDelay = 15
+    minDelay = 15,
   ): Promise<void> {
-    if (
-      ChargingStationUtils.checkChargingStation(chargingStation, chargingStation.logPrefix()) ===
-      false
-    ) {
+    if (checkChargingStation(chargingStation, chargingStation.logPrefix()) === false) {
       return;
     }
-    for (const connectorId of chargingStation.connectors.keys()) {
-      if (
-        connectorId > 0 &&
-        chargingStation.getConnectorStatus(connectorId)?.transactionStarted === false
-      ) {
-        await OCPP16ServiceUtils.sendAndSetConnectorStatus(
-          chargingStation,
-          connectorId,
-          OCPP16ChargePointStatus.Unavailable
-        );
+    if (chargingStation.hasEvses) {
+      for (const [evseId, evseStatus] of chargingStation.evses) {
+        if (evseId > 0) {
+          for (const [connectorId, connectorStatus] of evseStatus.connectors) {
+            if (connectorStatus?.transactionStarted === false) {
+              await OCPP16ServiceUtils.sendAndSetConnectorStatus(
+                chargingStation,
+                connectorId,
+                OCPP16ChargePointStatus.Unavailable,
+              );
+            }
+          }
+        }
+      }
+    } else {
+      for (const connectorId of chargingStation.connectors.keys()) {
+        if (
+          connectorId > 0 &&
+          chargingStation.getConnectorStatus(connectorId)?.transactionStarted === false
+        ) {
+          await OCPP16ServiceUtils.sendAndSetConnectorStatus(
+            chargingStation,
+            connectorId,
+            OCPP16ChargePointStatus.Unavailable,
+          );
+        }
       }
     }
     await chargingStation.ocppRequestService.requestHandler<
@@ -1066,7 +1132,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       chargingStation.stationInfo?.firmwareUpgrade?.failureStatus ===
       OCPP16FirmwareStatus.DownloadFailed
     ) {
-      await Utils.sleep(Utils.getRandomInteger(maxDelay, minDelay) * 1000);
+      await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)));
       await chargingStation.ocppRequestService.requestHandler<
         OCPP16FirmwareStatusNotificationRequest,
         OCPP16FirmwareStatusNotificationResponse
@@ -1077,7 +1143,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         chargingStation.stationInfo?.firmwareUpgrade?.failureStatus;
       return;
     }
-    await Utils.sleep(Utils.getRandomInteger(maxDelay, minDelay) * 1000);
+    await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)));
     await chargingStation.ocppRequestService.requestHandler<
       OCPP16FirmwareStatusNotificationRequest,
       OCPP16FirmwareStatusNotificationResponse
@@ -1088,48 +1154,54 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     let wasTransactionsStarted = false;
     let transactionsStarted: boolean;
     do {
-      let trxCount = 0;
-      for (const connectorId of chargingStation.connectors.keys()) {
-        if (
-          connectorId > 0 &&
-          chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true
-        ) {
-          trxCount++;
-        }
-      }
-      if (trxCount > 0) {
-        const waitTime = 15 * 1000;
+      const runningTransactions = chargingStation.getNumberOfRunningTransactions();
+      if (runningTransactions > 0) {
+        const waitTime = secondsToMilliseconds(15);
         logger.debug(
-          `${chargingStation.logPrefix()} ${moduleName}.updateFirmwareSimulation: ${trxCount} transaction(s) in progress, waiting ${
-            waitTime / 1000
-          } seconds before continuing firmware update simulation`
+          `${chargingStation.logPrefix()} ${moduleName}.updateFirmwareSimulation:
+            ${runningTransactions} transaction(s) in progress, waiting ${formatDurationMilliSeconds(
+              waitTime,
+            )} before continuing firmware update simulation`,
         );
-        await Utils.sleep(waitTime);
+        await sleep(waitTime);
         transactionsStarted = true;
         wasTransactionsStarted = true;
       } else {
-        for (const connectorId of chargingStation.connectors.keys()) {
-          if (
-            connectorId > 0 &&
-            chargingStation.getConnectorStatus(connectorId)?.status !==
-              OCPP16ChargePointStatus.Unavailable
-          ) {
-            await OCPP16ServiceUtils.sendAndSetConnectorStatus(
-              chargingStation,
-              connectorId,
-              OCPP16ChargePointStatus.Unavailable
-            );
+        if (chargingStation.hasEvses) {
+          for (const [evseId, evseStatus] of chargingStation.evses) {
+            if (evseId > 0) {
+              for (const [connectorId, connectorStatus] of evseStatus.connectors) {
+                if (connectorStatus?.status !== OCPP16ChargePointStatus.Unavailable) {
+                  await OCPP16ServiceUtils.sendAndSetConnectorStatus(
+                    chargingStation,
+                    connectorId,
+                    OCPP16ChargePointStatus.Unavailable,
+                  );
+                }
+              }
+            }
+          }
+        } else {
+          for (const connectorId of chargingStation.connectors.keys()) {
+            if (
+              connectorId > 0 &&
+              chargingStation.getConnectorStatus(connectorId)?.status !==
+                OCPP16ChargePointStatus.Unavailable
+            ) {
+              await OCPP16ServiceUtils.sendAndSetConnectorStatus(
+                chargingStation,
+                connectorId,
+                OCPP16ChargePointStatus.Unavailable,
+              );
+            }
           }
         }
         transactionsStarted = false;
       }
     } while (transactionsStarted);
     !wasTransactionsStarted &&
-      (await Utils.sleep(Utils.getRandomInteger(maxDelay, minDelay) * 1000));
-    if (
-      ChargingStationUtils.checkChargingStation(chargingStation, chargingStation.logPrefix()) ===
-      false
-    ) {
+      (await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay))));
+    if (checkChargingStation(chargingStation, chargingStation.logPrefix()) === false) {
       return;
     }
     await chargingStation.ocppRequestService.requestHandler<
@@ -1143,7 +1215,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       chargingStation.stationInfo?.firmwareUpgrade?.failureStatus ===
       OCPP16FirmwareStatus.InstallationFailed
     ) {
-      await Utils.sleep(Utils.getRandomInteger(maxDelay, minDelay) * 1000);
+      await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)));
       await chargingStation.ocppRequestService.requestHandler<
         OCPP16FirmwareStatusNotificationRequest,
         OCPP16FirmwareStatusNotificationResponse
@@ -1155,51 +1227,51 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       return;
     }
     if (chargingStation.stationInfo?.firmwareUpgrade?.reset === true) {
-      await Utils.sleep(Utils.getRandomInteger(maxDelay, minDelay) * 1000);
+      await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)));
       await chargingStation.reset(OCPP16StopTransactionReason.REBOOT);
     }
   }
 
   private async handleRequestGetDiagnostics(
     chargingStation: ChargingStation,
-    commandPayload: GetDiagnosticsRequest
+    commandPayload: GetDiagnosticsRequest,
   ): Promise<GetDiagnosticsResponse> {
     if (
       OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.FirmwareManagement,
-        OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+        OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
       ) === false
     ) {
       logger.warn(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: Cannot get diagnostics: feature profile not supported`
+        `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics:
+          Cannot get diagnostics: feature profile not supported`,
       );
       return OCPP16Constants.OCPP_RESPONSE_EMPTY;
     }
     const uri = new URL(commandPayload.location);
     if (uri.protocol.startsWith('ftp:')) {
-      let ftpClient: Client;
+      let ftpClient: Client | undefined;
       try {
-        const logFiles = fs
-          .readdirSync(path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../'))
+        const logFiles = readdirSync(resolve(dirname(fileURLToPath(import.meta.url)), '../'))
           .filter((file) => file.endsWith('.log'))
-          .map((file) => path.join('./', file));
+          .map((file) => join('./', file));
         const diagnosticsArchive = `${chargingStation.stationInfo.chargingStationId}_logs.tar.gz`;
-        tar.create({ gzip: true }, logFiles).pipe(fs.createWriteStream(diagnosticsArchive));
+        create({ gzip: true }, logFiles).pipe(createWriteStream(diagnosticsArchive));
         ftpClient = new Client();
         const accessResponse = await ftpClient.access({
           host: uri.host,
-          ...(Utils.isNotEmptyString(uri.port) && { port: Utils.convertToInt(uri.port) }),
-          ...(Utils.isNotEmptyString(uri.username) && { user: uri.username }),
-          ...(Utils.isNotEmptyString(uri.password) && { password: uri.password }),
+          ...(isNotEmptyString(uri.port) && { port: convertToInt(uri.port) }),
+          ...(isNotEmptyString(uri.username) && { user: uri.username }),
+          ...(isNotEmptyString(uri.password) && { password: uri.password }),
         });
-        let uploadResponse: FTPResponse;
+        let uploadResponse: FTPResponse | undefined;
         if (accessResponse.code === 220) {
           ftpClient.trackProgress((info) => {
             logger.info(
               `${chargingStation.logPrefix()} ${
                 info.bytes / 1024
-              } bytes transferred from diagnostics archive ${info.name}`
+              } bytes transferred from diagnostics archive ${info.name}`,
             );
             chargingStation.ocppRequestService
               .requestHandler<
@@ -1210,19 +1282,15 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
               })
               .catch((error) => {
                 logger.error(
-                  `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: Error while sending '${
-                    OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION
-                  }'`,
-                  error
+                  `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics:
+                    Error while sending '${OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION}'`,
+                  error,
                 );
               });
           });
           uploadResponse = await ftpClient.uploadFrom(
-            path.join(
-              path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../../../'),
-              diagnosticsArchive
-            ),
-            `${uri.pathname}${diagnosticsArchive}`
+            join(resolve(dirname(fileURLToPath(import.meta.url)), '../'), diagnosticsArchive),
+            `${uri.pathname}${diagnosticsArchive}`,
           );
           if (uploadResponse.code === 226) {
             await chargingStation.ocppRequestService.requestHandler<
@@ -1241,7 +1309,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
             `Diagnostics transfer failed with error code ${accessResponse.code.toString()}${
               uploadResponse?.code && `|${uploadResponse?.code.toString()}`
             }`,
-            OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+            OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
           );
         }
         throw new OCPPError(
@@ -1249,7 +1317,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           `Diagnostics transfer failed with error code ${accessResponse.code.toString()}${
             uploadResponse?.code && `|${uploadResponse?.code.toString()}`
           }`,
-          OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+          OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
         );
       } catch (error) {
         await chargingStation.ocppRequestService.requestHandler<
@@ -1261,18 +1329,18 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         if (ftpClient) {
           ftpClient.close();
         }
-        return this.handleIncomingRequestError(
+        return this.handleIncomingRequestError<GetDiagnosticsResponse>(
           chargingStation,
           OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
           error as Error,
-          { errorResponse: OCPP16Constants.OCPP_RESPONSE_EMPTY }
-        );
+          { errorResponse: OCPP16Constants.OCPP_RESPONSE_EMPTY },
+        )!;
       }
     } else {
       logger.error(
         `${chargingStation.logPrefix()} Unsupported protocol ${
           uri.protocol
-        } to transfer the diagnostic logs archive`
+        } to transfer the diagnostic logs archive`,
       );
       await chargingStation.ocppRequestService.requestHandler<
         OCPP16DiagnosticsStatusNotificationRequest,
@@ -1286,17 +1354,17 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private handleRequestTriggerMessage(
     chargingStation: ChargingStation,
-    commandPayload: OCPP16TriggerMessageRequest
+    commandPayload: OCPP16TriggerMessageRequest,
   ): OCPP16TriggerMessageResponse {
     if (
       !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.RemoteTrigger,
-        OCPP16IncomingRequestCommand.TRIGGER_MESSAGE
+        OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
       ) ||
       !OCPP16ServiceUtils.isMessageTriggerSupported(
         chargingStation,
-        commandPayload.requestedMessage
+        commandPayload.requestedMessage,
       )
     ) {
       return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED;
@@ -1305,7 +1373,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       !OCPP16ServiceUtils.isConnectorIdValid(
         chargingStation,
         OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
-        commandPayload.connectorId
+        commandPayload.connectorId!,
       )
     ) {
       return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED;
@@ -1319,7 +1387,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                 chargingStation,
                 OCPP16RequestCommand.BOOT_NOTIFICATION,
                 chargingStation.bootNotificationRequest,
-                { skipBufferingOnError: true, triggerMessage: true }
+                { skipBufferingOnError: true, triggerMessage: true },
               )
               .then((response) => {
                 chargingStation.bootNotificationResponse = response;
@@ -1336,14 +1404,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                 null,
                 {
                   triggerMessage: true,
-                }
+                },
               )
               .catch(Constants.EMPTY_FUNCTION);
           }, OCPP16Constants.OCPP_TRIGGER_MESSAGE_DELAY);
           return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED;
         case OCPP16MessageTrigger.StatusNotification:
           setTimeout(() => {
-            if (!Utils.isNullOrUndefined(commandPayload?.connectorId)) {
+            if (!isNullOrUndefined(commandPayload?.connectorId)) {
               chargingStation.ocppRequestService
                 .requestHandler<OCPP16StatusNotificationRequest, OCPP16StatusNotificationResponse>(
                   chargingStation,
@@ -1351,32 +1419,57 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                   {
                     connectorId: commandPayload.connectorId,
                     errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-                    status: chargingStation.getConnectorStatus(commandPayload.connectorId)?.status,
+                    status: chargingStation.getConnectorStatus(commandPayload.connectorId!)?.status,
                   },
                   {
                     triggerMessage: true,
-                  }
+                  },
                 )
                 .catch(Constants.EMPTY_FUNCTION);
             } else {
-              for (const connectorId of chargingStation.connectors.keys()) {
-                chargingStation.ocppRequestService
-                  .requestHandler<
-                    OCPP16StatusNotificationRequest,
-                    OCPP16StatusNotificationResponse
-                  >(
-                    chargingStation,
-                    OCPP16RequestCommand.STATUS_NOTIFICATION,
-                    {
-                      connectorId,
-                      errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-                      status: chargingStation.getConnectorStatus(connectorId)?.status,
-                    },
-                    {
-                      triggerMessage: true,
-                    }
-                  )
-                  .catch(Constants.EMPTY_FUNCTION);
+              // eslint-disable-next-line no-lonely-if
+              if (chargingStation.hasEvses) {
+                for (const evseStatus of chargingStation.evses.values()) {
+                  for (const [connectorId, connectorStatus] of evseStatus.connectors) {
+                    chargingStation.ocppRequestService
+                      .requestHandler<
+                        OCPP16StatusNotificationRequest,
+                        OCPP16StatusNotificationResponse
+                      >(
+                        chargingStation,
+                        OCPP16RequestCommand.STATUS_NOTIFICATION,
+                        {
+                          connectorId,
+                          errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+                          status: connectorStatus.status,
+                        },
+                        {
+                          triggerMessage: true,
+                        },
+                      )
+                      .catch(Constants.EMPTY_FUNCTION);
+                  }
+                }
+              } else {
+                for (const connectorId of chargingStation.connectors.keys()) {
+                  chargingStation.ocppRequestService
+                    .requestHandler<
+                      OCPP16StatusNotificationRequest,
+                      OCPP16StatusNotificationResponse
+                    >(
+                      chargingStation,
+                      OCPP16RequestCommand.STATUS_NOTIFICATION,
+                      {
+                        connectorId,
+                        errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+                        status: chargingStation.getConnectorStatus(connectorId)?.status,
+                      },
+                      {
+                        triggerMessage: true,
+                      },
+                    )
+                    .catch(Constants.EMPTY_FUNCTION);
+                }
               }
             }
           }, OCPP16Constants.OCPP_TRIGGER_MESSAGE_DELAY);
@@ -1385,35 +1478,138 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED;
       }
     } catch (error) {
-      return this.handleIncomingRequestError(
+      return this.handleIncomingRequestError<OCPP16TriggerMessageResponse>(
         chargingStation,
         OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
         error as Error,
-        { errorResponse: OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED }
-      );
+        { errorResponse: OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED },
+      )!;
     }
   }
 
   private handleRequestDataTransfer(
     chargingStation: ChargingStation,
-    commandPayload: OCPP16DataTransferRequest
+    commandPayload: OCPP16DataTransferRequest,
   ): OCPP16DataTransferResponse {
     try {
       if (Object.values(OCPP16DataTransferVendorId).includes(commandPayload.vendorId)) {
-        return {
-          status: OCPP16DataTransferStatus.ACCEPTED,
-        };
+        return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_ACCEPTED;
       }
-      return {
-        status: OCPP16DataTransferStatus.UNKNOWN_VENDOR_ID,
-      };
+      return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_UNKNOWN_VENDOR_ID;
     } catch (error) {
-      return this.handleIncomingRequestError(
+      return this.handleIncomingRequestError<OCPP16DataTransferResponse>(
         chargingStation,
         OCPP16IncomingRequestCommand.DATA_TRANSFER,
         error as Error,
-        { errorResponse: OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED }
+        { errorResponse: OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED },
+      )!;
+    }
+  }
+
+  private async handleRequestReserveNow(
+    chargingStation: ChargingStation,
+    commandPayload: OCPP16ReserveNowRequest,
+  ): Promise<OCPP16ReserveNowResponse> {
+    if (
+      !OCPP16ServiceUtils.checkFeatureProfile(
+        chargingStation,
+        OCPP16SupportedFeatureProfiles.Reservation,
+        OCPP16IncomingRequestCommand.RESERVE_NOW,
+      )
+    ) {
+      return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
+    }
+    const { reservationId, idTag, connectorId } = commandPayload;
+    let response: OCPP16ReserveNowResponse;
+    try {
+      if (connectorId > 0 && !chargingStation.isConnectorAvailable(connectorId)) {
+        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
+      }
+      if (connectorId === 0 && !chargingStation.getReserveConnectorZeroSupported()) {
+        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
+      }
+      if (!(await OCPP16ServiceUtils.isIdTagAuthorized(chargingStation, connectorId, idTag))) {
+        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
+      }
+      switch (chargingStation.getConnectorStatus(connectorId)!.status) {
+        case OCPP16ChargePointStatus.Faulted:
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED;
+          break;
+        case OCPP16ChargePointStatus.Preparing:
+        case OCPP16ChargePointStatus.Charging:
+        case OCPP16ChargePointStatus.SuspendedEV:
+        case OCPP16ChargePointStatus.SuspendedEVSE:
+        case OCPP16ChargePointStatus.Finishing:
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_OCCUPIED;
+          break;
+        case OCPP16ChargePointStatus.Unavailable:
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_UNAVAILABLE;
+          break;
+        case OCPP16ChargePointStatus.Reserved:
+          if (!chargingStation.isConnectorReservable(reservationId, idTag, connectorId)) {
+            response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_OCCUPIED;
+            break;
+          }
+        // eslint-disable-next-line no-fallthrough
+        default:
+          if (!chargingStation.isConnectorReservable(reservationId, idTag)) {
+            response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_OCCUPIED;
+            break;
+          }
+          await chargingStation.addReservation({
+            id: commandPayload.reservationId,
+            ...commandPayload,
+          });
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_ACCEPTED;
+          break;
+      }
+      return response;
+    } catch (error) {
+      chargingStation.getConnectorStatus(connectorId)!.status = OCPP16ChargePointStatus.Available;
+      return this.handleIncomingRequestError<OCPP16ReserveNowResponse>(
+        chargingStation,
+        OCPP16IncomingRequestCommand.RESERVE_NOW,
+        error as Error,
+        { errorResponse: OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED },
+      )!;
+    }
+  }
+
+  private async handleRequestCancelReservation(
+    chargingStation: ChargingStation,
+    commandPayload: OCPP16CancelReservationRequest,
+  ): Promise<GenericResponse> {
+    if (
+      !OCPP16ServiceUtils.checkFeatureProfile(
+        chargingStation,
+        OCPP16SupportedFeatureProfiles.Reservation,
+        OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
+      )
+    ) {
+      return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED;
+    }
+    try {
+      const { reservationId } = commandPayload;
+      const reservation = chargingStation.getReservationBy('reservationId', reservationId);
+      if (isUndefined(reservation)) {
+        logger.error(
+          `${chargingStation.logPrefix()} Reservation with ID ${reservationId}
+            does not exist on charging station`,
+        );
+        return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED;
+      }
+      await chargingStation.removeReservation(
+        reservation!,
+        ReservationTerminationReason.RESERVATION_CANCELED,
       );
+      return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_ACCEPTED;
+    } catch (error) {
+      return this.handleIncomingRequestError<GenericResponse>(
+        chargingStation,
+        OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
+        error as Error,
+        { errorResponse: OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED },
+      )!;
     }
   }
 }