chore: switch coding style to JS standard
[e-mobility-charging-stations-simulator.git] / src / charging-station / ocpp / 1.6 / OCPP16IncomingRequestService.ts
index f1ea435aac3fba768a8c76506e167494dacc574a..656d2cb39b16346f8ef717c8e8268ad29a2fb518 100644 (file)
@@ -1,23 +1,23 @@
 // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import { createWriteStream, readdirSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
-import { URL, fileURLToPath } from 'node:url';
+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 type { JSONSchemaType } from 'ajv'
+import { Client, type FTPResponse } from 'basic-ftp'
 import {
   type Interval,
   addSeconds,
   differenceInSeconds,
   isDate,
-  secondsToMilliseconds,
-} from 'date-fns';
-import { maxTime } from 'date-fns/constants';
-import { create } from 'tar';
+  secondsToMilliseconds
+} from 'date-fns'
+import { maxTime } from 'date-fns/constants'
+import { create } from 'tar'
 
-import { OCPP16Constants } from './OCPP16Constants.js';
-import { OCPP16ServiceUtils } from './OCPP16ServiceUtils.js';
+import { OCPP16Constants } from './OCPP16Constants.js'
+import { OCPP16ServiceUtils } from './OCPP16ServiceUtils.js'
 import {
   type ChargingStation,
   canProceedChargingProfile,
@@ -26,9 +26,9 @@ import {
   getConnectorChargingProfiles,
   prepareChargingProfileKind,
   removeExpiredReservations,
-  setConfigurationKeyValue,
-} from '../../../charging-station/index.js';
-import { OCPPError } from '../../../exception/index.js';
+  setConfigurationKeyValue
+} from '../../../charging-station/index.js'
+import { OCPPError } from '../../../exception/index.js'
 import {
   type ChangeConfigurationRequest,
   type ChangeConfigurationResponse,
@@ -94,8 +94,8 @@ import {
   type SetChargingProfileRequest,
   type SetChargingProfileResponse,
   type UnlockConnectorRequest,
-  type UnlockConnectorResponse,
-} from '../../../types/index.js';
+  type UnlockConnectorResponse
+} from '../../../types/index.js'
 import {
   Constants,
   convertToDate,
@@ -108,246 +108,249 @@ import {
   isNullOrUndefined,
   isUndefined,
   logger,
-  sleep,
-} from '../../../utils/index.js';
-import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService.js';
+  sleep
+} from '../../../utils/index.js'
+import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService.js'
 
-const moduleName = 'OCPP16IncomingRequestService';
+const moduleName = 'OCPP16IncomingRequestService'
 
 export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
-  protected jsonSchemas: Map<OCPP16IncomingRequestCommand, JSONSchemaType<JsonType>>;
-  private incomingRequestHandlers: Map<OCPP16IncomingRequestCommand, IncomingRequestHandler>;
+  protected jsonSchemas: Map<OCPP16IncomingRequestCommand, JSONSchemaType<JsonType>>
+  private readonly incomingRequestHandlers: Map<
+  OCPP16IncomingRequestCommand,
+  IncomingRequestHandler
+  >
 
-  public constructor() {
+  public constructor () {
     // if (new.target?.name === moduleName) {
-    //   throw new TypeError(`Cannot construct ${new.target?.name} instances directly`);
+    //   throw new TypeError(`Cannot construct ${new.target?.name} instances directly`)
     // }
-    super(OCPPVersion.VERSION_16);
+    super(OCPPVersion.VERSION_16)
     this.incomingRequestHandlers = new Map<OCPP16IncomingRequestCommand, IncomingRequestHandler>([
       [
         OCPP16IncomingRequestCommand.RESET,
-        this.handleRequestReset.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestReset.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.CLEAR_CACHE,
-        this.handleRequestClearCache.bind(this) as IncomingRequestHandler,
+        this.handleRequestClearCache.bind(this) as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR,
-        this.handleRequestUnlockConnector.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestUnlockConnector.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.GET_CONFIGURATION,
-        this.handleRequestGetConfiguration.bind(this) as IncomingRequestHandler,
+        this.handleRequestGetConfiguration.bind(this) as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION,
-        this.handleRequestChangeConfiguration.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestChangeConfiguration.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
-        this.handleRequestGetCompositeSchedule.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestGetCompositeSchedule.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
-        this.handleRequestSetChargingProfile.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestSetChargingProfile.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
-        this.handleRequestClearChargingProfile.bind(this) as IncomingRequestHandler,
+        this.handleRequestClearChargingProfile.bind(this) as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY,
-        this.handleRequestChangeAvailability.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestChangeAvailability.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION,
-        this.handleRequestRemoteStartTransaction.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestRemoteStartTransaction.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION,
-        this.handleRequestRemoteStopTransaction.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestRemoteStopTransaction.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
-        this.handleRequestGetDiagnostics.bind(this) as IncomingRequestHandler,
+        this.handleRequestGetDiagnostics.bind(this) as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
-        this.handleRequestTriggerMessage.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestTriggerMessage.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.DATA_TRANSFER,
-        this.handleRequestDataTransfer.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestDataTransfer.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.UPDATE_FIRMWARE,
-        this.handleRequestUpdateFirmware.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestUpdateFirmware.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.RESERVE_NOW,
-        this.handleRequestReserveNow.bind(this) as unknown as IncomingRequestHandler,
+        this.handleRequestReserveNow.bind(this) as unknown as IncomingRequestHandler
       ],
       [
         OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
-        this.handleRequestCancelReservation.bind(this) as unknown as IncomingRequestHandler,
-      ],
-    ]);
+        this.handleRequestCancelReservation.bind(this) as unknown as IncomingRequestHandler
+      ]
+    ])
     this.jsonSchemas = new Map<OCPP16IncomingRequestCommand, JSONSchemaType<JsonType>>([
       [
         OCPP16IncomingRequestCommand.RESET,
         OCPP16ServiceUtils.parseJsonSchemaFile<ResetRequest>(
           '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',
           moduleName,
-          'constructor',
-        ),
+          'constructor'
+        )
       ],
       [
         OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR,
         OCPP16ServiceUtils.parseJsonSchemaFile<UnlockConnectorRequest>(
           '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',
           moduleName,
-          'constructor',
-        ),
+          'constructor'
+        )
       ],
       [
         OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<ChangeConfigurationRequest>(
           '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',
           moduleName,
-          'constructor',
-        ),
+          'constructor'
+        )
       ],
       [
         OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16GetCompositeScheduleRequest>(
           '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',
           moduleName,
-          'constructor',
-        ),
+          'constructor'
+        )
       ],
       [
         OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ClearChargingProfileRequest>(
           'assets/json-schemas/ocpp/1.6/ClearChargingProfile.json',
           moduleName,
-          'constructor',
-        ),
+          'constructor'
+        )
       ],
       [
         OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY,
         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',
           moduleName,
-          'constructor',
-        ),
+          'constructor'
+        )
       ],
       [
         OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<RemoteStopTransactionRequest>(
           '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',
           moduleName,
-          'constructor',
-        ),
+          'constructor'
+        )
       ],
       [
         OCPP16IncomingRequestCommand.DATA_TRANSFER,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferRequest>(
           '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',
           moduleName,
-          'constructor',
-        ),
+          'constructor'
+        )
       ],
       [
         OCPP16IncomingRequestCommand.RESERVE_NOW,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ReserveNowRequest>(
           'assets/json-schemas/ocpp/1.6/ReserveNow.json',
           moduleName,
-          'constructor',
-        ),
+          '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,
-    ) => boolean;
+      commandPayload: JsonType
+    ) => boolean
   }
 
   public async incomingRequestHandler<ReqType extends JsonType, ResType extends JsonType>(
     chargingStation: ChargingStation,
     messageId: string,
     commandName: OCPP16IncomingRequestCommand,
-    commandPayload: ReqType,
+    commandPayload: ReqType
   ): Promise<void> {
-    let response: ResType;
+    let response: ResType
     if (
       chargingStation.stationInfo?.ocppStrictCompliance === true &&
-      chargingStation.inPendingState() === true &&
+      chargingStation.inPendingState() &&
       (commandName === OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION ||
         commandName === OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION)
     ) {
@@ -356,35 +359,36 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         `${commandName} cannot be issued to handle request PDU ${JSON.stringify(
           commandPayload,
           undefined,
-          2,
+          2
         )} while the charging station is in pending state on the central server`,
         commandName,
-        commandPayload,
-      );
+        commandPayload
+      )
     }
     if (
-      chargingStation.isRegistered() === true ||
+      chargingStation.isRegistered() ||
       (chargingStation.stationInfo?.ocppStrictCompliance === false &&
-        chargingStation.inUnknownState() === true)
+        chargingStation.inUnknownState())
     ) {
       if (
-        this.incomingRequestHandlers.has(commandName) === true &&
-        OCPP16ServiceUtils.isIncomingRequestCommandSupported(chargingStation, commandName) === true
+        this.incomingRequestHandlers.has(commandName) &&
+        OCPP16ServiceUtils.isIncomingRequestCommandSupported(chargingStation, commandName)
       ) {
         try {
-          this.validatePayload(chargingStation, commandName, commandPayload);
+          this.validatePayload(chargingStation, commandName, commandPayload)
           // Call the method to build the response
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           response = (await this.incomingRequestHandlers.get(commandName)!(
             chargingStation,
-            commandPayload,
-          )) as ResType;
+            commandPayload
+          )) as ResType
         } catch (error) {
           // Log
           logger.error(
             `${chargingStation.logPrefix()} ${moduleName}.incomingRequestHandler: Handle incoming request error:`,
-            error,
-          );
-          throw error;
+            error
+          )
+          throw error
         }
       } else {
         // Throw exception
@@ -393,11 +397,11 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           `${commandName} is not implemented to handle request PDU ${JSON.stringify(
             commandPayload,
             undefined,
-            2,
+            2
           )}`,
           commandName,
-          commandPayload,
-        );
+          commandPayload
+        )
       }
     } else {
       throw new OCPPError(
@@ -405,152 +409,156 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         `${commandName} cannot be issued to handle request PDU ${JSON.stringify(
           commandPayload,
           undefined,
-          2,
+          2
         )} while the charging station is not registered on the central server.`,
         commandName,
-        commandPayload,
-      );
+        commandPayload
+      )
     }
     // Send the built response
     await chargingStation.ocppRequestService.sendResponse(
       chargingStation,
       messageId,
       response,
-      commandName,
-    );
+      commandName
+    )
   }
 
-  private validatePayload(
+  private validatePayload (
     chargingStation: ChargingStation,
     commandName: OCPP16IncomingRequestCommand,
-    commandPayload: JsonType,
+    commandPayload: JsonType
   ): boolean {
-    if (this.jsonSchemas.has(commandName) === true) {
+    if (this.jsonSchemas.has(commandName)) {
       return this.validateIncomingRequestPayload(
         chargingStation,
         commandName,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         this.jsonSchemas.get(commandName)!,
-        commandPayload,
-      );
+        commandPayload
+      )
     }
     logger.warn(
-      `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command '${commandName}' PDU validation`,
-    );
-    return false;
+      `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command '${commandName}' PDU validation`
+    )
+    return false
   }
 
   // Simulate charging station restart
-  private handleRequestReset(
+  private handleRequestReset (
     chargingStation: ChargingStation,
-    commandPayload: ResetRequest,
+    commandPayload: ResetRequest
   ): GenericResponse {
-    const { type } = commandPayload;
+    const { type } = commandPayload
     chargingStation
       .reset(`${type}Reset` as OCPP16StopTransactionReason)
-      .catch(Constants.EMPTY_FUNCTION);
+      .catch(Constants.EMPTY_FUNCTION)
     logger.info(
       `${chargingStation.logPrefix()} ${type} reset command received, simulating it. The station will be back online in ${formatDurationMilliSeconds(
-        chargingStation.stationInfo.resetTime!,
-      )}`,
-    );
-    return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        chargingStation.stationInfo.resetTime!
+      )}`
+    )
+    return OCPP16Constants.OCPP_RESPONSE_ACCEPTED
   }
 
-  private async handleRequestUnlockConnector(
+  private async handleRequestUnlockConnector (
     chargingStation: ChargingStation,
-    commandPayload: UnlockConnectorRequest,
+    commandPayload: UnlockConnectorRequest
   ): Promise<UnlockConnectorResponse> {
-    const { connectorId } = commandPayload;
-    if (chargingStation.hasConnector(connectorId) === false) {
+    const { connectorId } = commandPayload
+    if (!chargingStation.hasConnector(connectorId)) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to unlock a non existing connector id ${connectorId}`,
-      );
-      return OCPP16Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED;
+        `${chargingStation.logPrefix()} Trying to unlock a non existing connector id ${connectorId}`
+      )
+      return OCPP16Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED
     }
     if (connectorId === 0) {
-      logger.error(`${chargingStation.logPrefix()} Trying to unlock connector id ${connectorId}`);
-      return OCPP16Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED;
+      logger.error(`${chargingStation.logPrefix()} Trying to unlock connector id ${connectorId}`)
+      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;
+        return OCPP16Constants.OCPP_RESPONSE_UNLOCKED
       }
-      return OCPP16Constants.OCPP_RESPONSE_UNLOCK_FAILED;
+      return OCPP16Constants.OCPP_RESPONSE_UNLOCK_FAILED
     }
     await OCPP16ServiceUtils.sendAndSetConnectorStatus(
       chargingStation,
       connectorId,
-      OCPP16ChargePointStatus.Available,
-    );
-    return OCPP16Constants.OCPP_RESPONSE_UNLOCKED;
+      OCPP16ChargePointStatus.Available
+    )
+    return OCPP16Constants.OCPP_RESPONSE_UNLOCKED
   }
 
-  private handleRequestGetConfiguration(
+  private handleRequestGetConfiguration (
     chargingStation: ChargingStation,
-    commandPayload: GetConfigurationRequest,
+    commandPayload: GetConfigurationRequest
   ): GetConfigurationResponse {
-    const { key } = commandPayload;
-    const configurationKey: OCPPConfigurationKey[] = [];
-    const unknownKey: string[] = [];
-    if (isUndefined(key) === true) {
+    const { key } = commandPayload
+    const configurationKey: OCPPConfigurationKey[] = []
+    const unknownKey: string[] = []
+    if (isUndefined(key)) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       for (const configuration of chargingStation.ocppConfiguration!.configurationKey!) {
-        if (isUndefined(configuration.visible) === true) {
-          configuration.visible = true;
+        if (isUndefined(configuration.visible)) {
+          configuration.visible = true
         }
         if (configuration.visible === false) {
-          continue;
+          continue
         }
         configurationKey.push({
           key: configuration.key,
           readonly: configuration.readonly,
-          value: configuration.value,
-        });
+          value: configuration.value
+        })
       }
-    } else if (isNotEmptyArray(key) === true) {
+    } else if (isNotEmptyArray(key)) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       for (const k of key!) {
-        const keyFound = getConfigurationKey(chargingStation, k, true);
+        const keyFound = getConfigurationKey(chargingStation, k, true)
         if (keyFound !== undefined) {
-          if (isUndefined(keyFound.visible) === true) {
-            keyFound.visible = true;
+          if (isUndefined(keyFound.visible)) {
+            keyFound.visible = true
           }
           if (keyFound.visible === false) {
-            continue;
+            continue
           }
           configurationKey.push({
             key: keyFound.key,
             readonly: keyFound.readonly,
-            value: keyFound.value,
-          });
+            value: keyFound.value
+          })
         } else {
-          unknownKey.push(k);
+          unknownKey.push(k)
         }
       }
     }
     return {
       configurationKey,
-      unknownKey,
-    };
+      unknownKey
+    }
   }
 
-  private handleRequestChangeConfiguration(
+  private handleRequestChangeConfiguration (
     chargingStation: ChargingStation,
-    commandPayload: ChangeConfigurationRequest,
+    commandPayload: ChangeConfigurationRequest
   ): ChangeConfigurationResponse {
-    const { key, value } = commandPayload;
-    const keyToChange = getConfigurationKey(chargingStation, key, true);
+    const { key, value } = commandPayload
+    const keyToChange = getConfigurationKey(chargingStation, key, true)
     if (keyToChange?.readonly === true) {
-      return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_REJECTED;
+      return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_REJECTED
     } else if (keyToChange?.readonly === false) {
-      let valueChanged = false;
+      let valueChanged = false
       if (keyToChange.value !== value) {
-        setConfigurationKeyValue(chargingStation, key, value, true);
-        valueChanged = true;
+        setConfigurationKeyValue(chargingStation, key, value, true)
+        valueChanged = true
       }
-      let triggerHeartbeatRestart = false;
+      let triggerHeartbeatRestart = false
       if (
         (keyToChange.key as OCPP16StandardParametersKey) ===
           OCPP16StandardParametersKey.HeartBeatInterval &&
@@ -559,9 +567,9 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         setConfigurationKeyValue(
           chargingStation,
           OCPP16StandardParametersKey.HeartbeatInterval,
-          value,
-        );
-        triggerHeartbeatRestart = true;
+          value
+        )
+        triggerHeartbeatRestart = true
       }
       if (
         (keyToChange.key as OCPP16StandardParametersKey) ===
@@ -571,74 +579,74 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         setConfigurationKeyValue(
           chargingStation,
           OCPP16StandardParametersKey.HeartBeatInterval,
-          value,
-        );
-        triggerHeartbeatRestart = true;
+          value
+        )
+        triggerHeartbeatRestart = true
       }
       if (triggerHeartbeatRestart) {
-        chargingStation.restartHeartbeat();
+        chargingStation.restartHeartbeat()
       }
       if (
         (keyToChange.key as OCPP16StandardParametersKey) ===
           OCPP16StandardParametersKey.WebSocketPingInterval &&
         valueChanged
       ) {
-        chargingStation.restartWebSocketPing();
+        chargingStation.restartWebSocketPing()
       }
-      if (keyToChange.reboot) {
-        return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_REBOOT_REQUIRED;
+      if (keyToChange.reboot === true) {
+        return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_REBOOT_REQUIRED
       }
-      return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_ACCEPTED;
+      return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_ACCEPTED
     }
-    return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_NOT_SUPPORTED;
+    return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_NOT_SUPPORTED
   }
 
-  private handleRequestSetChargingProfile(
+  private handleRequestSetChargingProfile (
     chargingStation: ChargingStation,
-    commandPayload: SetChargingProfileRequest,
+    commandPayload: SetChargingProfileRequest
   ): SetChargingProfileResponse {
     if (
-      OCPP16ServiceUtils.checkFeatureProfile(
+      !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.SmartCharging,
-        OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
-      ) === false
+        OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE
+      )
     ) {
-      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_NOT_SUPPORTED;
+      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_NOT_SUPPORTED
     }
-    const { connectorId, csChargingProfiles } = commandPayload;
-    if (chargingStation.hasConnector(connectorId) === false) {
+    const { connectorId, csChargingProfiles } = commandPayload
+    if (!chargingStation.hasConnector(connectorId)) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to set charging profile(s) to a non existing connector id ${connectorId}`,
-      );
-      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
+        `${chargingStation.logPrefix()} Trying to set charging profile(s) to a non existing connector id ${connectorId}`
+      )
+      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED
     }
     if (
       csChargingProfiles.chargingProfilePurpose ===
         OCPP16ChargingProfilePurposeType.CHARGE_POINT_MAX_PROFILE &&
       connectorId !== 0
     ) {
-      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
+      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED
     }
     if (
       csChargingProfiles.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE &&
       connectorId === 0
     ) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to set transaction charging profile(s) on connector ${connectorId}`,
-      );
-      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
+        `${chargingStation.logPrefix()} Trying to set transaction charging profile(s) on connector ${connectorId}`
+      )
+      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED
     }
-    const connectorStatus = chargingStation.getConnectorStatus(connectorId);
+    const connectorStatus = chargingStation.getConnectorStatus(connectorId)
     if (
       csChargingProfiles.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE &&
       connectorId > 0 &&
       connectorStatus?.transactionStarted === false
     ) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to set transaction charging profile(s) on connector ${connectorId} without a started transaction`,
-      );
-      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
+        `${chargingStation.logPrefix()} Trying to set transaction charging profile(s) on connector ${connectorId} without a started transaction`
+      )
+      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED
     }
     if (
       csChargingProfiles.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE &&
@@ -649,82 +657,83 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       logger.error(
         `${chargingStation.logPrefix()} Trying to set transaction charging profile(s) on connector ${connectorId} with a different transaction id ${
           csChargingProfiles.transactionId
-        } than the started transaction id ${connectorStatus?.transactionId}`,
-      );
-      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
+        } than the started transaction id ${connectorStatus?.transactionId}`
+      )
+      return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED
     }
-    OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, csChargingProfiles);
+    OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, csChargingProfiles)
     logger.debug(
       `${chargingStation.logPrefix()} Charging profile(s) set on connector id ${connectorId}: %j`,
-      csChargingProfiles,
-    );
-    return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_ACCEPTED;
+      csChargingProfiles
+    )
+    return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_ACCEPTED
   }
 
-  private handleRequestGetCompositeSchedule(
+  private handleRequestGetCompositeSchedule (
     chargingStation: ChargingStation,
-    commandPayload: OCPP16GetCompositeScheduleRequest,
+    commandPayload: OCPP16GetCompositeScheduleRequest
   ): OCPP16GetCompositeScheduleResponse {
     if (
-      OCPP16ServiceUtils.checkFeatureProfile(
+      !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.SmartCharging,
-        OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
-      ) === false
+        OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE
+      )
     ) {
-      return OCPP16Constants.OCPP_RESPONSE_REJECTED;
+      return OCPP16Constants.OCPP_RESPONSE_REJECTED
     }
-    const { connectorId, duration, chargingRateUnit } = commandPayload;
-    if (chargingStation.hasConnector(connectorId) === false) {
+    const { connectorId, duration, chargingRateUnit } = commandPayload
+    if (!chargingStation.hasConnector(connectorId)) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to get composite schedule to a non existing connector id ${connectorId}`,
-      );
-      return OCPP16Constants.OCPP_RESPONSE_REJECTED;
+        `${chargingStation.logPrefix()} Trying to get composite schedule to a non existing connector id ${connectorId}`
+      )
+      return OCPP16Constants.OCPP_RESPONSE_REJECTED
     }
     if (connectorId === 0) {
       logger.error(
-        `${chargingStation.logPrefix()} Get composite schedule on connector id ${connectorId} is not yet supported`,
-      );
-      return OCPP16Constants.OCPP_RESPONSE_REJECTED;
+        `${chargingStation.logPrefix()} Get composite schedule on connector id ${connectorId} is not yet supported`
+      )
+      return OCPP16Constants.OCPP_RESPONSE_REJECTED
     }
-    if (chargingRateUnit) {
+    if (chargingRateUnit != null) {
       logger.warn(
-        `${chargingStation.logPrefix()} Get composite schedule with a specified rate unit is not yet supported, no conversion will be done`,
-      );
+        `${chargingStation.logPrefix()} Get composite schedule with a specified rate unit is not yet supported, no conversion will be done`
+      )
     }
-    const connectorStatus = chargingStation.getConnectorStatus(connectorId)!;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const connectorStatus = chargingStation.getConnectorStatus(connectorId)!
     if (
       isEmptyArray(
-        connectorStatus?.chargingProfiles &&
-          isEmptyArray(chargingStation.getConnectorStatus(0)?.chargingProfiles),
+        connectorStatus?.chargingProfiles != null &&
+          isEmptyArray(chargingStation.getConnectorStatus(0)?.chargingProfiles)
       )
     ) {
-      return OCPP16Constants.OCPP_RESPONSE_REJECTED;
+      return OCPP16Constants.OCPP_RESPONSE_REJECTED
     }
-    const currentDate = new Date();
+    const currentDate = new Date()
     const compositeScheduleInterval: Interval = {
       start: currentDate,
-      end: addSeconds(currentDate, duration),
-    };
+      end: addSeconds(currentDate, duration)
+    }
     // Get charging profiles sorted by connector id then stack level
     const chargingProfiles: OCPP16ChargingProfile[] = getConnectorChargingProfiles(
       chargingStation,
-      connectorId,
-    );
-    let previousCompositeSchedule: OCPP16ChargingSchedule | undefined;
-    let compositeSchedule: OCPP16ChargingSchedule | undefined;
+      connectorId
+    )
+    let previousCompositeSchedule: OCPP16ChargingSchedule | undefined
+    let compositeSchedule: OCPP16ChargingSchedule | undefined
     for (const chargingProfile of chargingProfiles) {
       if (
         isNullOrUndefined(chargingProfile.chargingSchedule?.startSchedule) &&
-        connectorStatus?.transactionStarted
+        connectorStatus?.transactionStarted === true
       ) {
         logger.debug(
           `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${
             chargingProfile.chargingProfileId
-          } has no startSchedule defined. Trying to set it to the connector current transaction start date`,
-        );
+          } has no startSchedule defined. Trying to set it to the connector current transaction start date`
+        )
         // OCPP specifies that if startSchedule is not defined, it should be relative to start of the connector transaction
-        chargingProfile.chargingSchedule.startSchedule = connectorStatus?.transactionStart;
+        chargingProfile.chargingSchedule.startSchedule = connectorStatus?.transactionStart
       }
       if (
         !isNullOrUndefined(chargingProfile.chargingSchedule?.startSchedule) &&
@@ -733,11 +742,12 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         logger.warn(
           `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${
             chargingProfile.chargingProfileId
-          } startSchedule property is not a Date instance. Trying to convert it to a Date instance`,
-        );
+          } startSchedule property is not a Date instance. Trying to convert it to a Date instance`
+        )
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         chargingProfile.chargingSchedule.startSchedule = convertToDate(
-          chargingProfile.chargingSchedule?.startSchedule,
-        )!;
+          chargingProfile.chargingSchedule?.startSchedule
+        )!
       }
       if (
         !isNullOrUndefined(chargingProfile.chargingSchedule?.startSchedule) &&
@@ -746,89 +756,94 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         logger.debug(
           `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${
             chargingProfile.chargingProfileId
-          } has no duration defined and will be set to the maximum time allowed`,
-        );
+          } has no duration defined and will be set to the maximum time allowed`
+        )
         // OCPP specifies that if duration is not defined, it should be infinite
         chargingProfile.chargingSchedule.duration = differenceInSeconds(
           maxTime,
-          chargingProfile.chargingSchedule.startSchedule!,
-        );
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          chargingProfile.chargingSchedule.startSchedule!
+        )
       }
       if (
         !prepareChargingProfileKind(
           connectorStatus,
           chargingProfile,
           compositeScheduleInterval.start as Date,
-          chargingStation.logPrefix(),
+          chargingStation.logPrefix()
         )
       ) {
-        continue;
+        continue
       }
       if (
         !canProceedChargingProfile(
           chargingProfile,
           compositeScheduleInterval.start as Date,
-          chargingStation.logPrefix(),
+          chargingStation.logPrefix()
         )
       ) {
-        continue;
+        continue
       }
       compositeSchedule = OCPP16ServiceUtils.composeChargingSchedules(
         previousCompositeSchedule,
         chargingProfile.chargingSchedule,
-        compositeScheduleInterval,
-      );
-      previousCompositeSchedule = compositeSchedule;
+        compositeScheduleInterval
+      )
+      previousCompositeSchedule = compositeSchedule
     }
-    if (compositeSchedule) {
+    if (compositeSchedule != null) {
       return {
         status: GenericStatus.Accepted,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         scheduleStart: compositeSchedule.startSchedule!,
         connectorId,
-        chargingSchedule: compositeSchedule,
-      };
+        chargingSchedule: compositeSchedule
+      }
     }
-    return OCPP16Constants.OCPP_RESPONSE_REJECTED;
+    return OCPP16Constants.OCPP_RESPONSE_REJECTED
   }
 
-  private handleRequestClearChargingProfile(
+  private handleRequestClearChargingProfile (
     chargingStation: ChargingStation,
-    commandPayload: OCPP16ClearChargingProfileRequest,
+    commandPayload: OCPP16ClearChargingProfileRequest
   ): OCPP16ClearChargingProfileResponse {
     if (
-      OCPP16ServiceUtils.checkFeatureProfile(
+      !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.SmartCharging,
-        OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
-      ) === false
+        OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE
+      )
     ) {
-      return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
+      return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN
     }
-    const { connectorId } = commandPayload;
-    if (chargingStation.hasConnector(connectorId!) === false) {
+    const { connectorId } = commandPayload
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    if (!chargingStation.hasConnector(connectorId!)) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to clear a charging profile(s) to a non existing connector id ${connectorId}`,
-      );
-      return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
+        `${chargingStation.logPrefix()} Trying to clear a charging profile(s) to a non existing connector id ${connectorId}`
+      )
+      return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN
     }
-    const connectorStatus = chargingStation.getConnectorStatus(connectorId!);
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const connectorStatus = chargingStation.getConnectorStatus(connectorId!)
     if (!isNullOrUndefined(connectorId) && isNotEmptyArray(connectorStatus?.chargingProfiles)) {
-      connectorStatus!.chargingProfiles = [];
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      connectorStatus!.chargingProfiles = []
       logger.debug(
-        `${chargingStation.logPrefix()} Charging profile(s) cleared on connector id ${connectorId}`,
-      );
-      return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED;
+        `${chargingStation.logPrefix()} Charging profile(s) cleared on connector id ${connectorId}`
+      )
+      return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED
     }
     if (isNullOrUndefined(connectorId)) {
-      let clearedCP = false;
+      let clearedCP = false
       if (chargingStation.hasEvses) {
         for (const evseStatus of chargingStation.evses.values()) {
           for (const status of evseStatus.connectors.values()) {
             clearedCP = OCPP16ServiceUtils.clearChargingProfiles(
               chargingStation,
               commandPayload,
-              status.chargingProfiles,
-            );
+              status.chargingProfiles
+            )
           }
         }
       } else {
@@ -836,238 +851,240 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           clearedCP = OCPP16ServiceUtils.clearChargingProfiles(
             chargingStation,
             commandPayload,
-            chargingStation.getConnectorStatus(id)?.chargingProfiles,
-          );
+            chargingStation.getConnectorStatus(id)?.chargingProfiles
+          )
         }
       }
       if (clearedCP) {
-        return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED;
+        return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED
       }
     }
-    return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
+    return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN
   }
 
-  private async handleRequestChangeAvailability(
+  private async handleRequestChangeAvailability (
     chargingStation: ChargingStation,
-    commandPayload: OCPP16ChangeAvailabilityRequest,
+    commandPayload: OCPP16ChangeAvailabilityRequest
   ): Promise<OCPP16ChangeAvailabilityResponse> {
-    const { connectorId, type } = commandPayload;
-    if (chargingStation.hasConnector(connectorId) === false) {
+    const { connectorId, type } = commandPayload
+    if (!chargingStation.hasConnector(connectorId)) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to change the availability of a non existing connector id ${connectorId}`,
-      );
-      return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_REJECTED;
+        `${chargingStation.logPrefix()} Trying to change the availability of a non existing connector id ${connectorId}`
+      )
+      return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_REJECTED
     }
     const chargePointStatus: OCPP16ChargePointStatus =
       type === OCPP16AvailabilityType.Operative
         ? OCPP16ChargePointStatus.Available
-        : OCPP16ChargePointStatus.Unavailable;
+        : OCPP16ChargePointStatus.Unavailable
     if (connectorId === 0) {
-      let response: OCPP16ChangeAvailabilityResponse;
+      let response: OCPP16ChangeAvailabilityResponse
       if (chargingStation.hasEvses) {
         for (const evseStatus of chargingStation.evses.values()) {
           response = await OCPP16ServiceUtils.changeAvailability(
             chargingStation,
             [...evseStatus.connectors.keys()],
             chargePointStatus,
-            type,
-          );
+            type
+          )
         }
       } else {
         response = await OCPP16ServiceUtils.changeAvailability(
           chargingStation,
           [...chargingStation.connectors.keys()],
           chargePointStatus,
-          type,
-        );
+          type
+        )
       }
-      return response!;
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      return response!
     } else if (
       connectorId > 0 &&
-      (chargingStation.isChargingStationAvailable() === true ||
-        (chargingStation.isChargingStationAvailable() === false &&
+      (chargingStation.isChargingStationAvailable() ||
+        (!chargingStation.isChargingStationAvailable() &&
           type === OCPP16AvailabilityType.Inoperative))
     ) {
       if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) {
-        chargingStation.getConnectorStatus(connectorId)!.availability = type;
-        return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        chargingStation.getConnectorStatus(connectorId)!.availability = type
+        return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED
       }
-      chargingStation.getConnectorStatus(connectorId)!.availability = type;
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      chargingStation.getConnectorStatus(connectorId)!.availability = type
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
         connectorId,
-        chargePointStatus,
-      );
-      return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED;
+        chargePointStatus
+      )
+      return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED
     }
-    return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_REJECTED;
+    return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_REJECTED
   }
 
-  private async handleRequestRemoteStartTransaction(
+  private async handleRequestRemoteStartTransaction (
     chargingStation: ChargingStation,
-    commandPayload: RemoteStartTransactionRequest,
+    commandPayload: RemoteStartTransactionRequest
   ): Promise<GenericResponse> {
-    const { connectorId: transactionConnectorId, idTag, chargingProfile } = commandPayload;
-    if (chargingStation.hasConnector(transactionConnectorId) === false) {
-      return this.notifyRemoteStartTransactionRejected(
+    const { connectorId: transactionConnectorId, idTag, chargingProfile } = commandPayload
+    if (!chargingStation.hasConnector(transactionConnectorId)) {
+      return await this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        idTag,
-      );
+        idTag
+      )
     }
     if (
       !chargingStation.isChargingStationAvailable() ||
       !chargingStation.isConnectorAvailable(transactionConnectorId)
     ) {
-      return this.notifyRemoteStartTransactionRejected(
+      return await this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        idTag,
-      );
+        idTag
+      )
     }
     const remoteStartTransactionLogMsg = `
       ${chargingStation.logPrefix()} Transaction remotely STARTED on ${
         chargingStation.stationInfo.chargingStationId
-      }#${transactionConnectorId} for idTag '${idTag}'`;
+      }#${transactionConnectorId} for idTag '${idTag}'`
     await OCPP16ServiceUtils.sendAndSetConnectorStatus(
       chargingStation,
       transactionConnectorId,
-      OCPP16ChargePointStatus.Preparing,
-    );
-    const connectorStatus = chargingStation.getConnectorStatus(transactionConnectorId)!;
+      OCPP16ChargePointStatus.Preparing
+    )
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const connectorStatus = chargingStation.getConnectorStatus(transactionConnectorId)!
     // Authorization check required
     if (
-      chargingStation.getAuthorizeRemoteTxRequests() === true &&
+      chargingStation.getAuthorizeRemoteTxRequests() &&
       (await OCPP16ServiceUtils.isIdTagAuthorized(chargingStation, transactionConnectorId, idTag))
     ) {
       // Authorization successful, start transaction
       if (
-        (chargingProfile &&
+        (chargingProfile != null &&
           this.setRemoteStartTransactionChargingProfile(
             chargingStation,
             transactionConnectorId,
-            chargingProfile,
-            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-          ) === true) ||
-        !chargingProfile
+            chargingProfile
+          )) ||
+        chargingProfile == null
       ) {
-        connectorStatus.transactionRemoteStarted = true;
+        connectorStatus.transactionRemoteStarted = true
         if (
           (
             await chargingStation.ocppRequestService.requestHandler<
-              OCPP16StartTransactionRequest,
-              OCPP16StartTransactionResponse
+            OCPP16StartTransactionRequest,
+            OCPP16StartTransactionResponse
             >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, {
               connectorId: transactionConnectorId,
-              idTag,
+              idTag
             })
           ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
         ) {
-          logger.debug(remoteStartTransactionLogMsg);
-          return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
+          logger.debug(remoteStartTransactionLogMsg)
+          return OCPP16Constants.OCPP_RESPONSE_ACCEPTED
         }
-        return this.notifyRemoteStartTransactionRejected(
+        return await this.notifyRemoteStartTransactionRejected(
           chargingStation,
           transactionConnectorId,
-          idTag,
-        );
+          idTag
+        )
       }
-      return this.notifyRemoteStartTransactionRejected(
+      return await this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        idTag,
-      );
+        idTag
+      )
     }
     // No authorization check required, start transaction
     if (
-      (chargingProfile &&
+      (chargingProfile != null &&
         this.setRemoteStartTransactionChargingProfile(
           chargingStation,
           transactionConnectorId,
-          chargingProfile,
-          // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        ) === true) ||
-      !chargingProfile
+          chargingProfile
+        )) ||
+      chargingProfile == null
     ) {
-      connectorStatus.transactionRemoteStarted = true;
+      connectorStatus.transactionRemoteStarted = true
       if (
         (
           await chargingStation.ocppRequestService.requestHandler<
-            OCPP16StartTransactionRequest,
-            OCPP16StartTransactionResponse
+          OCPP16StartTransactionRequest,
+          OCPP16StartTransactionResponse
           >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, {
             connectorId: transactionConnectorId,
-            idTag,
+            idTag
           })
         ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
       ) {
-        logger.debug(remoteStartTransactionLogMsg);
-        return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
+        logger.debug(remoteStartTransactionLogMsg)
+        return OCPP16Constants.OCPP_RESPONSE_ACCEPTED
       }
-      return this.notifyRemoteStartTransactionRejected(
+      return await this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        idTag,
-      );
+        idTag
+      )
     }
-    return this.notifyRemoteStartTransactionRejected(
+    return await this.notifyRemoteStartTransactionRejected(
       chargingStation,
       transactionConnectorId,
-      idTag,
-    );
+      idTag
+    )
   }
 
-  private async notifyRemoteStartTransactionRejected(
+  private async notifyRemoteStartTransactionRejected (
     chargingStation: ChargingStation,
     connectorId: number,
-    idTag: string,
+    idTag: string
   ): Promise<GenericResponse> {
-    const connectorStatus = chargingStation.getConnectorStatus(connectorId);
+    const connectorStatus = chargingStation.getConnectorStatus(connectorId)
     if (connectorStatus?.status !== OCPP16ChargePointStatus.Available) {
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
         connectorId,
-        OCPP16ChargePointStatus.Available,
-      );
+        OCPP16ChargePointStatus.Available
+      )
     }
     logger.warn(
-      `${chargingStation.logPrefix()} Remote starting transaction REJECTED on connector id ${connectorId}, idTag '${idTag}', availability '${connectorStatus?.availability}', status '${connectorStatus?.status}'`,
-    );
-    return OCPP16Constants.OCPP_RESPONSE_REJECTED;
+      `${chargingStation.logPrefix()} Remote starting transaction REJECTED on connector id ${connectorId}, idTag '${idTag}', availability '${connectorStatus?.availability}', status '${connectorStatus?.status}'`
+    )
+    return OCPP16Constants.OCPP_RESPONSE_REJECTED
   }
 
-  private setRemoteStartTransactionChargingProfile(
+  private setRemoteStartTransactionChargingProfile (
     chargingStation: ChargingStation,
     connectorId: number,
-    chargingProfile: OCPP16ChargingProfile,
+    chargingProfile: OCPP16ChargingProfile
   ): boolean {
     if (chargingProfile?.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE) {
-      OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, chargingProfile);
+      OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, chargingProfile)
       logger.debug(
         `${chargingStation.logPrefix()} Charging profile(s) set at remote start transaction on connector id ${connectorId}: %j`,
-        chargingProfile,
-      );
-      return true;
+        chargingProfile
+      )
+      return true
     }
     logger.warn(
       `${chargingStation.logPrefix()} Not allowed to set ${
         chargingProfile.chargingProfilePurpose
-      } charging profile(s) at remote start transaction`,
-    );
-    return false;
+      } charging profile(s) at remote start transaction`
+    )
+    return false
   }
 
-  private async handleRequestRemoteStopTransaction(
+  private async handleRequestRemoteStopTransaction (
     chargingStation: ChargingStation,
-    commandPayload: RemoteStopTransactionRequest,
+    commandPayload: RemoteStopTransactionRequest
   ): Promise<GenericResponse> {
-    const { transactionId } = commandPayload;
+    const { transactionId } = commandPayload
     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);
+              return await OCPP16ServiceUtils.remoteStopTransaction(chargingStation, connectorId)
             }
           }
         }
@@ -1078,64 +1095,65 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           connectorId > 0 &&
           chargingStation.getConnectorStatus(connectorId)?.transactionId === transactionId
         ) {
-          return OCPP16ServiceUtils.remoteStopTransaction(chargingStation, connectorId);
+          return await OCPP16ServiceUtils.remoteStopTransaction(chargingStation, connectorId)
         }
       }
     }
     logger.warn(
-      `${chargingStation.logPrefix()} Trying to remote stop a non existing transaction with id ${transactionId}`,
-    );
-    return OCPP16Constants.OCPP_RESPONSE_REJECTED;
+      `${chargingStation.logPrefix()} Trying to remote stop a non existing transaction with id ${transactionId}`
+    )
+    return OCPP16Constants.OCPP_RESPONSE_REJECTED
   }
 
-  private handleRequestUpdateFirmware(
+  private handleRequestUpdateFirmware (
     chargingStation: ChargingStation,
-    commandPayload: OCPP16UpdateFirmwareRequest,
+    commandPayload: OCPP16UpdateFirmwareRequest
   ): OCPP16UpdateFirmwareResponse {
     if (
-      OCPP16ServiceUtils.checkFeatureProfile(
+      !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.FirmwareManagement,
-        OCPP16IncomingRequestCommand.UPDATE_FIRMWARE,
-      ) === false
+        OCPP16IncomingRequestCommand.UPDATE_FIRMWARE
+      )
     ) {
       logger.warn(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware: Cannot simulate firmware update: feature profile not supported`,
-      );
-      return OCPP16Constants.OCPP_RESPONSE_EMPTY;
+        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware: Cannot simulate firmware update: feature profile not supported`
+      )
+      return OCPP16Constants.OCPP_RESPONSE_EMPTY
     }
-    let { retrieveDate } = commandPayload;
+    let { retrieveDate } = commandPayload
     if (
       !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`,
-      );
-      return OCPP16Constants.OCPP_RESPONSE_EMPTY;
+        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware: Cannot simulate firmware update: firmware update is already in progress`
+      )
+      return OCPP16Constants.OCPP_RESPONSE_EMPTY
     }
-    retrieveDate = convertToDate(retrieveDate)!;
-    const now = Date.now();
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    retrieveDate = convertToDate(retrieveDate)!
+    const now = Date.now()
     if (retrieveDate?.getTime() <= now) {
-      this.updateFirmwareSimulation(chargingStation).catch(Constants.EMPTY_FUNCTION);
+      this.updateFirmwareSimulation(chargingStation).catch(Constants.EMPTY_FUNCTION)
     } else {
       setTimeout(
         () => {
-          this.updateFirmwareSimulation(chargingStation).catch(Constants.EMPTY_FUNCTION);
+          this.updateFirmwareSimulation(chargingStation).catch(Constants.EMPTY_FUNCTION)
         },
-        retrieveDate?.getTime() - now,
-      );
+        retrieveDate?.getTime() - now
+      )
     }
-    return OCPP16Constants.OCPP_RESPONSE_EMPTY;
+    return OCPP16Constants.OCPP_RESPONSE_EMPTY
   }
 
-  private async updateFirmwareSimulation(
+  private async updateFirmwareSimulation (
     chargingStation: ChargingStation,
     maxDelay = 30,
-    minDelay = 15,
+    minDelay = 15
   ): Promise<void> {
-    if (checkChargingStation(chargingStation, chargingStation.logPrefix()) === false) {
-      return;
+    if (!checkChargingStation(chargingStation, chargingStation.logPrefix())) {
+      return
     }
     if (chargingStation.hasEvses) {
       for (const [evseId, evseStatus] of chargingStation.evses) {
@@ -1145,8 +1163,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
               await OCPP16ServiceUtils.sendAndSetConnectorStatus(
                 chargingStation,
                 connectorId,
-                OCPP16ChargePointStatus.Unavailable,
-              );
+                OCPP16ChargePointStatus.Unavailable
+              )
             }
           }
         }
@@ -1160,55 +1178,55 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           await OCPP16ServiceUtils.sendAndSetConnectorStatus(
             chargingStation,
             connectorId,
-            OCPP16ChargePointStatus.Unavailable,
-          );
+            OCPP16ChargePointStatus.Unavailable
+          )
         }
       }
     }
     await chargingStation.ocppRequestService.requestHandler<
-      OCPP16FirmwareStatusNotificationRequest,
-      OCPP16FirmwareStatusNotificationResponse
+    OCPP16FirmwareStatusNotificationRequest,
+    OCPP16FirmwareStatusNotificationResponse
     >(chargingStation, OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, {
-      status: OCPP16FirmwareStatus.Downloading,
-    });
-    chargingStation.stationInfo.firmwareStatus = OCPP16FirmwareStatus.Downloading;
+      status: OCPP16FirmwareStatus.Downloading
+    })
+    chargingStation.stationInfo.firmwareStatus = OCPP16FirmwareStatus.Downloading
     if (
       chargingStation.stationInfo?.firmwareUpgrade?.failureStatus ===
       OCPP16FirmwareStatus.DownloadFailed
     ) {
-      await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)));
+      await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)))
       await chargingStation.ocppRequestService.requestHandler<
-        OCPP16FirmwareStatusNotificationRequest,
-        OCPP16FirmwareStatusNotificationResponse
+      OCPP16FirmwareStatusNotificationRequest,
+      OCPP16FirmwareStatusNotificationResponse
       >(chargingStation, OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, {
-        status: chargingStation.stationInfo?.firmwareUpgrade?.failureStatus,
-      });
+        status: chargingStation.stationInfo?.firmwareUpgrade?.failureStatus
+      })
       chargingStation.stationInfo.firmwareStatus =
-        chargingStation.stationInfo?.firmwareUpgrade?.failureStatus;
-      return;
+        chargingStation.stationInfo?.firmwareUpgrade?.failureStatus
+      return
     }
-    await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)));
+    await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)))
     await chargingStation.ocppRequestService.requestHandler<
-      OCPP16FirmwareStatusNotificationRequest,
-      OCPP16FirmwareStatusNotificationResponse
+    OCPP16FirmwareStatusNotificationRequest,
+    OCPP16FirmwareStatusNotificationResponse
     >(chargingStation, OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, {
-      status: OCPP16FirmwareStatus.Downloaded,
-    });
-    chargingStation.stationInfo.firmwareStatus = OCPP16FirmwareStatus.Downloaded;
-    let wasTransactionsStarted = false;
-    let transactionsStarted: boolean;
+      status: OCPP16FirmwareStatus.Downloaded
+    })
+    chargingStation.stationInfo.firmwareStatus = OCPP16FirmwareStatus.Downloaded
+    let wasTransactionsStarted = false
+    let transactionsStarted: boolean
     do {
-      const runningTransactions = chargingStation.getNumberOfRunningTransactions();
+      const runningTransactions = chargingStation.getNumberOfRunningTransactions()
       if (runningTransactions > 0) {
-        const waitTime = secondsToMilliseconds(15);
+        const waitTime = secondsToMilliseconds(15)
         logger.debug(
           `${chargingStation.logPrefix()} ${moduleName}.updateFirmwareSimulation: ${runningTransactions} transaction(s) in progress, waiting ${formatDurationMilliSeconds(
-            waitTime,
-          )} before continuing firmware update simulation`,
-        );
-        await sleep(waitTime);
-        transactionsStarted = true;
-        wasTransactionsStarted = true;
+            waitTime
+          )} before continuing firmware update simulation`
+        )
+        await sleep(waitTime)
+        transactionsStarted = true
+        wasTransactionsStarted = true
       } else {
         if (chargingStation.hasEvses) {
           for (const [evseId, evseStatus] of chargingStation.evses) {
@@ -1218,8 +1236,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                   await OCPP16ServiceUtils.sendAndSetConnectorStatus(
                     chargingStation,
                     connectorId,
-                    OCPP16ChargePointStatus.Unavailable,
-                  );
+                    OCPP16ChargePointStatus.Unavailable
+                  )
                 }
               }
             }
@@ -1234,191 +1252,193 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
               await OCPP16ServiceUtils.sendAndSetConnectorStatus(
                 chargingStation,
                 connectorId,
-                OCPP16ChargePointStatus.Unavailable,
-              );
+                OCPP16ChargePointStatus.Unavailable
+              )
             }
           }
         }
-        transactionsStarted = false;
+        transactionsStarted = false
       }
-    } while (transactionsStarted);
+    } while (transactionsStarted)
     !wasTransactionsStarted &&
-      (await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay))));
-    if (checkChargingStation(chargingStation, chargingStation.logPrefix()) === false) {
-      return;
+      (await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay))))
+    if (!checkChargingStation(chargingStation, chargingStation.logPrefix())) {
+      return
     }
     await chargingStation.ocppRequestService.requestHandler<
-      OCPP16FirmwareStatusNotificationRequest,
-      OCPP16FirmwareStatusNotificationResponse
+    OCPP16FirmwareStatusNotificationRequest,
+    OCPP16FirmwareStatusNotificationResponse
     >(chargingStation, OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, {
-      status: OCPP16FirmwareStatus.Installing,
-    });
-    chargingStation.stationInfo.firmwareStatus = OCPP16FirmwareStatus.Installing;
+      status: OCPP16FirmwareStatus.Installing
+    })
+    chargingStation.stationInfo.firmwareStatus = OCPP16FirmwareStatus.Installing
     if (
       chargingStation.stationInfo?.firmwareUpgrade?.failureStatus ===
       OCPP16FirmwareStatus.InstallationFailed
     ) {
-      await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)));
+      await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)))
       await chargingStation.ocppRequestService.requestHandler<
-        OCPP16FirmwareStatusNotificationRequest,
-        OCPP16FirmwareStatusNotificationResponse
+      OCPP16FirmwareStatusNotificationRequest,
+      OCPP16FirmwareStatusNotificationResponse
       >(chargingStation, OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, {
-        status: chargingStation.stationInfo?.firmwareUpgrade?.failureStatus,
-      });
+        status: chargingStation.stationInfo?.firmwareUpgrade?.failureStatus
+      })
       chargingStation.stationInfo.firmwareStatus =
-        chargingStation.stationInfo?.firmwareUpgrade?.failureStatus;
-      return;
+        chargingStation.stationInfo?.firmwareUpgrade?.failureStatus
+      return
     }
     if (chargingStation.stationInfo?.firmwareUpgrade?.reset === true) {
-      await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)));
-      await chargingStation.reset(OCPP16StopTransactionReason.REBOOT);
+      await sleep(secondsToMilliseconds(getRandomInteger(maxDelay, minDelay)))
+      await chargingStation.reset(OCPP16StopTransactionReason.REBOOT)
     }
   }
 
-  private async handleRequestGetDiagnostics(
+  private async handleRequestGetDiagnostics (
     chargingStation: ChargingStation,
-    commandPayload: GetDiagnosticsRequest,
+    commandPayload: GetDiagnosticsRequest
   ): Promise<GetDiagnosticsResponse> {
     if (
-      OCPP16ServiceUtils.checkFeatureProfile(
+      !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.FirmwareManagement,
-        OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
-      ) === false
+        OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+      )
     ) {
       logger.warn(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: Cannot get diagnostics: feature profile not supported`,
-      );
-      return OCPP16Constants.OCPP_RESPONSE_EMPTY;
+        `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: Cannot get diagnostics: feature profile not supported`
+      )
+      return OCPP16Constants.OCPP_RESPONSE_EMPTY
     }
-    const { location } = commandPayload;
-    const uri = new URL(location);
+    const { location } = commandPayload
+    const uri = new URL(location)
     if (uri.protocol.startsWith('ftp:')) {
-      let ftpClient: Client | undefined;
+      let ftpClient: Client | undefined
       try {
         const logFiles = readdirSync(resolve(dirname(fileURLToPath(import.meta.url)), '../'))
           .filter((file) => file.endsWith('.log'))
-          .map((file) => join('./', file));
-        const diagnosticsArchive = `${chargingStation.stationInfo.chargingStationId}_logs.tar.gz`;
-        create({ gzip: true }, logFiles).pipe(createWriteStream(diagnosticsArchive));
-        ftpClient = new Client();
+          .map((file) => join('./', file))
+        const diagnosticsArchive = `${chargingStation.stationInfo.chargingStationId}_logs.tar.gz`
+        create({ gzip: true }, logFiles).pipe(createWriteStream(diagnosticsArchive))
+        ftpClient = new Client()
         const accessResponse = await ftpClient.access({
           host: uri.host,
           ...(isNotEmptyString(uri.port) && { port: convertToInt(uri.port) }),
           ...(isNotEmptyString(uri.username) && { user: uri.username }),
-          ...(isNotEmptyString(uri.password) && { password: uri.password }),
-        });
-        let uploadResponse: FTPResponse | undefined;
+          ...(isNotEmptyString(uri.password) && { password: uri.password })
+        })
+        let uploadResponse: FTPResponse | undefined
         if (accessResponse.code === 220) {
           ftpClient.trackProgress((info) => {
             logger.info(
               `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: ${
                 info.bytes / 1024
-              } bytes transferred from diagnostics archive ${info.name}`,
-            );
+              } bytes transferred from diagnostics archive ${info.name}`
+            )
             chargingStation.ocppRequestService
               .requestHandler<
-                OCPP16DiagnosticsStatusNotificationRequest,
-                OCPP16DiagnosticsStatusNotificationResponse
-              >(chargingStation, OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
-                status: OCPP16DiagnosticsStatus.Uploading,
-              })
+            OCPP16DiagnosticsStatusNotificationRequest,
+            OCPP16DiagnosticsStatusNotificationResponse
+            >(chargingStation, OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
+              status: OCPP16DiagnosticsStatus.Uploading
+            })
               .catch((error) => {
                 logger.error(
                   `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: Error while sending '${
                     OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION
                   }'`,
-                  error,
-                );
-              });
-          });
+                  error
+                )
+              })
+          })
           uploadResponse = await ftpClient.uploadFrom(
             join(resolve(dirname(fileURLToPath(import.meta.url)), '../'), diagnosticsArchive),
-            `${uri.pathname}${diagnosticsArchive}`,
-          );
+            `${uri.pathname}${diagnosticsArchive}`
+          )
           if (uploadResponse.code === 226) {
             await chargingStation.ocppRequestService.requestHandler<
-              OCPP16DiagnosticsStatusNotificationRequest,
-              OCPP16DiagnosticsStatusNotificationResponse
+            OCPP16DiagnosticsStatusNotificationRequest,
+            OCPP16DiagnosticsStatusNotificationResponse
             >(chargingStation, OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
-              status: OCPP16DiagnosticsStatus.Uploaded,
-            });
-            if (ftpClient) {
-              ftpClient.close();
+              status: OCPP16DiagnosticsStatus.Uploaded
+            })
+            if (ftpClient != null) {
+              ftpClient.close()
             }
-            return { fileName: diagnosticsArchive };
+            return { fileName: diagnosticsArchive }
           }
           throw new OCPPError(
             ErrorType.GENERIC_ERROR,
             `Diagnostics transfer failed with error code ${accessResponse.code}${
-              uploadResponse?.code && `|${uploadResponse?.code}`
+              uploadResponse?.code != null && `|${uploadResponse?.code}`
             }`,
-            OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
-          );
+            OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+          )
         }
         throw new OCPPError(
           ErrorType.GENERIC_ERROR,
           `Diagnostics transfer failed with error code ${accessResponse.code}${
-            uploadResponse?.code && `|${uploadResponse?.code}`
+            uploadResponse?.code != null && `|${uploadResponse?.code}`
           }`,
-          OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
-        );
+          OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+        )
       } catch (error) {
         await chargingStation.ocppRequestService.requestHandler<
-          OCPP16DiagnosticsStatusNotificationRequest,
-          OCPP16DiagnosticsStatusNotificationResponse
+        OCPP16DiagnosticsStatusNotificationRequest,
+        OCPP16DiagnosticsStatusNotificationResponse
         >(chargingStation, OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
-          status: OCPP16DiagnosticsStatus.UploadFailed,
-        });
-        if (ftpClient) {
-          ftpClient.close();
+          status: OCPP16DiagnosticsStatus.UploadFailed
+        })
+        if (ftpClient != null) {
+          ftpClient.close()
         }
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         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,
-        OCPP16DiagnosticsStatusNotificationResponse
+      OCPP16DiagnosticsStatusNotificationRequest,
+      OCPP16DiagnosticsStatusNotificationResponse
       >(chargingStation, OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
-        status: OCPP16DiagnosticsStatus.UploadFailed,
-      });
-      return OCPP16Constants.OCPP_RESPONSE_EMPTY;
+        status: OCPP16DiagnosticsStatus.UploadFailed
+      })
+      return OCPP16Constants.OCPP_RESPONSE_EMPTY
     }
   }
 
-  private handleRequestTriggerMessage(
+  private handleRequestTriggerMessage (
     chargingStation: ChargingStation,
-    commandPayload: OCPP16TriggerMessageRequest,
+    commandPayload: OCPP16TriggerMessageRequest
   ): OCPP16TriggerMessageResponse {
-    const { requestedMessage, connectorId } = commandPayload;
+    const { requestedMessage, connectorId } = commandPayload
     if (
       !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.RemoteTrigger,
-        OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
+        OCPP16IncomingRequestCommand.TRIGGER_MESSAGE
       ) ||
       !OCPP16ServiceUtils.isMessageTriggerSupported(chargingStation, requestedMessage)
     ) {
-      return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED;
+      return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED
     }
     if (
       !OCPP16ServiceUtils.isConnectorIdValid(
         chargingStation,
         OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
-        connectorId!,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        connectorId!
       )
     ) {
-      return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED;
+      return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED
     }
     try {
       switch (requestedMessage) {
@@ -1426,233 +1446,240 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           setTimeout(() => {
             chargingStation.ocppRequestService
               .requestHandler<OCPP16BootNotificationRequest, OCPP16BootNotificationResponse>(
-                chargingStation,
-                OCPP16RequestCommand.BOOT_NOTIFICATION,
-                chargingStation.bootNotificationRequest,
-                { skipBufferingOnError: true, triggerMessage: true },
-              )
+              chargingStation,
+              OCPP16RequestCommand.BOOT_NOTIFICATION,
+              chargingStation.bootNotificationRequest,
+              { skipBufferingOnError: true, triggerMessage: true }
+            )
               .then((response) => {
-                chargingStation.bootNotificationResponse = response;
+                chargingStation.bootNotificationResponse = response
               })
-              .catch(Constants.EMPTY_FUNCTION);
-          }, OCPP16Constants.OCPP_TRIGGER_MESSAGE_DELAY);
-          return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED;
+              .catch(Constants.EMPTY_FUNCTION)
+          }, OCPP16Constants.OCPP_TRIGGER_MESSAGE_DELAY)
+          return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED
         case OCPP16MessageTrigger.Heartbeat:
           setTimeout(() => {
             chargingStation.ocppRequestService
               .requestHandler<OCPP16HeartbeatRequest, OCPP16HeartbeatResponse>(
-                chargingStation,
-                OCPP16RequestCommand.HEARTBEAT,
-                undefined,
-                {
-                  triggerMessage: true,
-                },
-              )
-              .catch(Constants.EMPTY_FUNCTION);
-          }, OCPP16Constants.OCPP_TRIGGER_MESSAGE_DELAY);
-          return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED;
+              chargingStation,
+              OCPP16RequestCommand.HEARTBEAT,
+              undefined,
+              {
+                triggerMessage: true
+              }
+            )
+              .catch(Constants.EMPTY_FUNCTION)
+          }, OCPP16Constants.OCPP_TRIGGER_MESSAGE_DELAY)
+          return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED
         case OCPP16MessageTrigger.StatusNotification:
           setTimeout(() => {
             if (!isNullOrUndefined(connectorId)) {
               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);
+                chargingStation,
+                OCPP16RequestCommand.STATUS_NOTIFICATION,
+                {
+                  connectorId,
+                  errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+                  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                  status: chargingStation.getConnectorStatus(connectorId!)?.status
+                },
+                {
+                  triggerMessage: true
+                }
+              )
+                .catch(Constants.EMPTY_FUNCTION)
             } else {
-              // eslint-disable-next-line no-lonely-if
               if (chargingStation.hasEvses) {
                 for (const evseStatus of chargingStation.evses.values()) {
                   for (const [id, connectorStatus] of evseStatus.connectors) {
                     chargingStation.ocppRequestService
                       .requestHandler<
-                        OCPP16StatusNotificationRequest,
-                        OCPP16StatusNotificationResponse
-                      >(
-                        chargingStation,
-                        OCPP16RequestCommand.STATUS_NOTIFICATION,
-                        {
-                          connectorId: id,
-                          errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-                          status: connectorStatus.status,
-                        },
-                        {
-                          triggerMessage: true,
-                        },
-                      )
-                      .catch(Constants.EMPTY_FUNCTION);
-                  }
-                }
-              } else {
-                for (const id of chargingStation.connectors.keys()) {
-                  chargingStation.ocppRequestService
-                    .requestHandler<
-                      OCPP16StatusNotificationRequest,
-                      OCPP16StatusNotificationResponse
+                    OCPP16StatusNotificationRequest,
+                    OCPP16StatusNotificationResponse
                     >(
                       chargingStation,
                       OCPP16RequestCommand.STATUS_NOTIFICATION,
                       {
                         connectorId: id,
                         errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-                        status: chargingStation.getConnectorStatus(id)?.status,
+                        status: connectorStatus.status
                       },
                       {
-                        triggerMessage: true,
-                      },
+                        triggerMessage: true
+                      }
                     )
-                    .catch(Constants.EMPTY_FUNCTION);
+                      .catch(Constants.EMPTY_FUNCTION)
+                  }
+                }
+              } else {
+                for (const id of chargingStation.connectors.keys()) {
+                  chargingStation.ocppRequestService
+                    .requestHandler<
+                  OCPP16StatusNotificationRequest,
+                  OCPP16StatusNotificationResponse
+                  >(
+                    chargingStation,
+                    OCPP16RequestCommand.STATUS_NOTIFICATION,
+                    {
+                      connectorId: id,
+                      errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+                      status: chargingStation.getConnectorStatus(id)?.status
+                    },
+                    {
+                      triggerMessage: true
+                    }
+                  )
+                    .catch(Constants.EMPTY_FUNCTION)
                 }
               }
             }
-          }, OCPP16Constants.OCPP_TRIGGER_MESSAGE_DELAY);
-          return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED;
+          }, OCPP16Constants.OCPP_TRIGGER_MESSAGE_DELAY)
+          return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_ACCEPTED
         default:
-          return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED;
+          return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED
       }
     } catch (error) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       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(
+  private handleRequestDataTransfer (
     chargingStation: ChargingStation,
-    commandPayload: OCPP16DataTransferRequest,
+    commandPayload: OCPP16DataTransferRequest
   ): OCPP16DataTransferResponse {
-    const { vendorId } = commandPayload;
+    const { vendorId } = commandPayload
     try {
       if (Object.values(OCPP16DataTransferVendorId).includes(vendorId)) {
-        return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_ACCEPTED;
+        return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_ACCEPTED
       }
-      return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_UNKNOWN_VENDOR_ID;
+      return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_UNKNOWN_VENDOR_ID
     } catch (error) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       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(
+  private async handleRequestReserveNow (
     chargingStation: ChargingStation,
-    commandPayload: OCPP16ReserveNowRequest,
+    commandPayload: OCPP16ReserveNowRequest
   ): Promise<OCPP16ReserveNowResponse> {
     if (
       !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.Reservation,
-        OCPP16IncomingRequestCommand.RESERVE_NOW,
+        OCPP16IncomingRequestCommand.RESERVE_NOW
       )
     ) {
-      return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
+      return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED
     }
-    const { reservationId, idTag, connectorId } = commandPayload;
-    let response: OCPP16ReserveNowResponse;
+    const { reservationId, idTag, connectorId } = commandPayload
+    let response: OCPP16ReserveNowResponse
     try {
       if (connectorId > 0 && !chargingStation.isConnectorAvailable(connectorId)) {
-        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
+        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED
       }
       if (connectorId === 0 && !chargingStation.getReserveConnectorZeroSupported()) {
-        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
+        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED
       }
       if (!(await OCPP16ServiceUtils.isIdTagAuthorized(chargingStation, connectorId, idTag))) {
-        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
+        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED
       }
-      await removeExpiredReservations(chargingStation);
+      await removeExpiredReservations(chargingStation)
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       switch (chargingStation.getConnectorStatus(connectorId)!.status) {
         case OCPP16ChargePointStatus.Faulted:
-          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED;
-          break;
+          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;
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_OCCUPIED
+          break
         case OCPP16ChargePointStatus.Unavailable:
-          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_UNAVAILABLE;
-          break;
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_UNAVAILABLE
+          break
         case OCPP16ChargePointStatus.Reserved:
           if (!chargingStation.isConnectorReservable(reservationId, idTag, connectorId)) {
-            response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_OCCUPIED;
-            break;
+            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;
+            response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_OCCUPIED
+            break
           }
           await chargingStation.addReservation({
             id: commandPayload.reservationId,
-            ...commandPayload,
-          });
-          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_ACCEPTED;
-          break;
+            ...commandPayload
+          })
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_ACCEPTED
+          break
       }
-      return response;
+      return response
     } catch (error) {
-      chargingStation.getConnectorStatus(connectorId)!.status = OCPP16ChargePointStatus.Available;
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      chargingStation.getConnectorStatus(connectorId)!.status = OCPP16ChargePointStatus.Available
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       return this.handleIncomingRequestError<OCPP16ReserveNowResponse>(
         chargingStation,
         OCPP16IncomingRequestCommand.RESERVE_NOW,
         error as Error,
-        { errorResponse: OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED },
-      )!;
+        { errorResponse: OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED }
+      )!
     }
   }
 
-  private async handleRequestCancelReservation(
+  private async handleRequestCancelReservation (
     chargingStation: ChargingStation,
-    commandPayload: OCPP16CancelReservationRequest,
+    commandPayload: OCPP16CancelReservationRequest
   ): Promise<GenericResponse> {
     if (
       !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.Reservation,
-        OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
+        OCPP16IncomingRequestCommand.CANCEL_RESERVATION
       )
     ) {
-      return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED;
+      return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED
     }
     try {
-      const { reservationId } = commandPayload;
-      const reservation = chargingStation.getReservationBy('reservationId', reservationId);
+      const { reservationId } = commandPayload
+      const reservation = chargingStation.getReservationBy('reservationId', reservationId)
       if (isUndefined(reservation)) {
         logger.debug(
-          `${chargingStation.logPrefix()} Reservation with id ${reservationId} does not exist on charging station`,
-        );
-        return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED;
+          `${chargingStation.logPrefix()} Reservation with id ${reservationId} does not exist on charging station`
+        )
+        return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED
       }
       await chargingStation.removeReservation(
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         reservation!,
-        ReservationTerminationReason.RESERVATION_CANCELED,
-      );
-      return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_ACCEPTED;
+        ReservationTerminationReason.RESERVATION_CANCELED
+      )
+      return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_ACCEPTED
     } catch (error) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       return this.handleIncomingRequestError<GenericResponse>(
         chargingStation,
         OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
         error as Error,
-        { errorResponse: OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED },
-      )!;
+        { errorResponse: OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED }
+      )!
     }
   }
 }