X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16IncomingRequestService.ts;h=b151dc5ac5a2f09d052a1c414aef6dda674d3a2a;hb=e1d9a0f4d6ff1a90048e9a694fd12b7031cc6961;hp=6e0b57be4570c808590f0df9232f4739a815e9a6;hpb=9bf0ef23c51160abc6866ad8d07eea85e308edb8;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index 6e0b57be..b151dc5a 100644
--- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@ -13,7 +13,7 @@ import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
 import {
   type ChargingStation,
   ChargingStationConfigurationUtils,
-  ChargingStationUtils,
+  checkChargingStation,
 } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
@@ -166,7 +166,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<ResetRequest>(
           'assets/json-schemas/ocpp/1.6/Reset.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -174,7 +174,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ClearCacheRequest>(
           'assets/json-schemas/ocpp/1.6/ClearCache.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -182,7 +182,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<UnlockConnectorRequest>(
           'assets/json-schemas/ocpp/1.6/UnlockConnector.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -190,7 +190,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<GetConfigurationRequest>(
           'assets/json-schemas/ocpp/1.6/GetConfiguration.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -198,7 +198,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<ChangeConfigurationRequest>(
           'assets/json-schemas/ocpp/1.6/ChangeConfiguration.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -206,7 +206,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<GetDiagnosticsRequest>(
           'assets/json-schemas/ocpp/1.6/GetDiagnostics.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -214,7 +214,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16GetCompositeScheduleRequest>(
           'assets/json-schemas/ocpp/1.6/GetCompositeSchedule.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -222,7 +222,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<SetChargingProfileRequest>(
           'assets/json-schemas/ocpp/1.6/SetChargingProfile.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -230,7 +230,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<ClearChargingProfileRequest>(
           'assets/json-schemas/ocpp/1.6/ClearChargingProfile.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -238,7 +238,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<ChangeAvailabilityRequest>(
           'assets/json-schemas/ocpp/1.6/ChangeAvailability.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -246,7 +246,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<RemoteStartTransactionRequest>(
           'assets/json-schemas/ocpp/1.6/RemoteStartTransaction.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -254,7 +254,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<RemoteStopTransactionRequest>(
           'assets/json-schemas/ocpp/1.6/RemoteStopTransaction.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -262,7 +262,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16TriggerMessageRequest>(
           'assets/json-schemas/ocpp/1.6/TriggerMessage.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -270,7 +270,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferRequest>(
           'assets/json-schemas/ocpp/1.6/DataTransfer.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -278,7 +278,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16UpdateFirmwareRequest>(
           'assets/json-schemas/ocpp/1.6/UpdateFirmware.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -286,7 +286,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ReserveNowRequest>(
           'assets/json-schemas/ocpp/1.6/ReserveNow.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -294,14 +294,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16CancelReservationRequest>(
           'assets/json-schemas/ocpp/1.6/CancelReservation.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
     ]);
     this.validatePayload = this.validatePayload.bind(this) as (
       chargingStation: ChargingStation,
       commandName: OCPP16IncomingRequestCommand,
-      commandPayload: JsonType
+      commandPayload: JsonType,
     ) => boolean;
   }
 
@@ -309,7 +309,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     chargingStation: ChargingStation,
     messageId: string,
     commandName: OCPP16IncomingRequestCommand,
-    commandPayload: JsonType
+    commandPayload: JsonType,
   ): Promise<void> {
     let response: JsonType;
     if (
@@ -323,10 +323,10 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         `${commandName} cannot be issued to handle request PDU ${JSON.stringify(
           commandPayload,
           null,
-          2
+          2,
         )} while the charging station is in pending state on the central server`,
         commandName,
-        commandPayload
+        commandPayload,
       );
     }
     if (
@@ -341,16 +341,16 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         try {
           this.validatePayload(chargingStation, commandName, commandPayload);
           // Call the method to build the response
-          response = await this.incomingRequestHandlers.get(commandName)(
+          response = await this.incomingRequestHandlers.get(commandName)!(
             chargingStation,
-            commandPayload
+            commandPayload,
           );
         } catch (error) {
           // Log
           logger.error(
             `${chargingStation.logPrefix()} ${moduleName}.incomingRequestHandler:
               Handle incoming request error:`,
-            error
+            error,
           );
           throw error;
         }
@@ -361,10 +361,10 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           `${commandName} is not implemented to handle request PDU ${JSON.stringify(
             commandPayload,
             null,
-            2
+            2,
           )}`,
           commandName,
-          commandPayload
+          commandPayload,
         );
       }
     } else {
@@ -373,10 +373,10 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         `${commandName} cannot be issued to handle request PDU ${JSON.stringify(
           commandPayload,
           null,
-          2
+          2,
         )} while the charging station is not registered on the central server.`,
         commandName,
-        commandPayload
+        commandPayload,
       );
     }
     // Send the built response
@@ -384,26 +384,26 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       chargingStation,
       messageId,
       response,
-      commandName
+      commandName,
     );
   }
 
   private validatePayload(
     chargingStation: ChargingStation,
     commandName: OCPP16IncomingRequestCommand,
-    commandPayload: JsonType
+    commandPayload: JsonType,
   ): boolean {
     if (this.jsonSchemas.has(commandName) === true) {
       return this.validateIncomingRequestPayload(
         chargingStation,
         commandName,
-        this.jsonSchemas.get(commandName),
-        commandPayload
+        this.jsonSchemas.get(commandName)!,
+        commandPayload,
       );
     }
     logger.warn(
       `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found
-        for command '${commandName}' PDU validation`
+        for command '${commandName}' PDU validation`,
     );
     return false;
   }
@@ -411,47 +411,47 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
   // Simulate charging station restart
   private handleRequestReset(
     chargingStation: ChargingStation,
-    commandPayload: ResetRequest
+    commandPayload: ResetRequest,
   ): GenericResponse {
     this.runInAsyncScope(
       chargingStation.reset.bind(chargingStation) as (
         this: ChargingStation,
-        ...args: any[]
+        ...args: unknown[]
       ) => Promise<void>,
       chargingStation,
-      `${commandPayload.type}Reset` as OCPP16StopTransactionReason
+      `${commandPayload.type}Reset` as OCPP16StopTransactionReason,
     ).catch(Constants.EMPTY_FUNCTION);
     logger.info(
       `${chargingStation.logPrefix()} ${
         commandPayload.type
       } reset command received, simulating it. The station will be
-        back online in ${formatDurationMilliSeconds(chargingStation.stationInfo.resetTime)}`
+        back online in ${formatDurationMilliSeconds(chargingStation.stationInfo.resetTime!)}`,
     );
     return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
   }
 
   private async handleRequestUnlockConnector(
     chargingStation: ChargingStation,
-    commandPayload: UnlockConnectorRequest
+    commandPayload: UnlockConnectorRequest,
   ): Promise<UnlockConnectorResponse> {
     const connectorId = commandPayload.connectorId;
     if (chargingStation.hasConnector(connectorId) === false) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to unlock a non existing
-          connector id ${connectorId.toString()}`
+          connector id ${connectorId.toString()}`,
       );
       return OCPP16Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED;
     }
     if (connectorId === 0) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to unlock connector id ${connectorId.toString()}`
+        `${chargingStation.logPrefix()} Trying to unlock connector id ${connectorId.toString()}`,
       );
       return OCPP16Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED;
     }
     if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) {
       const stopResponse = await chargingStation.stopTransactionOnConnector(
         connectorId,
-        OCPP16StopTransactionReason.UNLOCK_COMMAND
+        OCPP16StopTransactionReason.UNLOCK_COMMAND,
       );
       if (stopResponse.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
         return OCPP16Constants.OCPP_RESPONSE_UNLOCKED;
@@ -461,18 +461,21 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     await OCPP16ServiceUtils.sendAndSetConnectorStatus(
       chargingStation,
       connectorId,
-      OCPP16ChargePointStatus.Available
+      OCPP16ChargePointStatus.Available,
     );
     return OCPP16Constants.OCPP_RESPONSE_UNLOCKED;
   }
 
   private handleRequestGetConfiguration(
     chargingStation: ChargingStation,
-    commandPayload: GetConfigurationRequest
+    commandPayload: GetConfigurationRequest,
   ): GetConfigurationResponse {
     const configurationKey: OCPPConfigurationKey[] = [];
     const unknownKey: string[] = [];
-    if (isUndefined(commandPayload.key) === true) {
+    if (
+      chargingStation.ocppConfiguration?.configurationKey &&
+      isUndefined(commandPayload.key) === true
+    ) {
       for (const configuration of chargingStation.ocppConfiguration.configurationKey) {
         if (isUndefined(configuration.visible) === true) {
           configuration.visible = true;
@@ -486,12 +489,12 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           value: configuration.value,
         });
       }
-    } else if (isNotEmptyArray(commandPayload.key) === true) {
+    } else if (commandPayload.key && isNotEmptyArray(commandPayload.key) === true) {
       for (const key of commandPayload.key) {
         const keyFound = ChargingStationConfigurationUtils.getConfigurationKey(
           chargingStation,
           key,
-          true
+          true,
         );
         if (keyFound) {
           if (isUndefined(keyFound.visible) === true) {
@@ -518,16 +521,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private handleRequestChangeConfiguration(
     chargingStation: ChargingStation,
-    commandPayload: ChangeConfigurationRequest
+    commandPayload: ChangeConfigurationRequest,
   ): ChangeConfigurationResponse {
     const keyToChange = ChargingStationConfigurationUtils.getConfigurationKey(
       chargingStation,
       commandPayload.key,
-      true
+      true,
     );
-    if (!keyToChange) {
-      return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_NOT_SUPPORTED;
-    } else if (keyToChange?.readonly === true) {
+    if (keyToChange?.readonly === true) {
       return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_REJECTED;
     } else if (keyToChange?.readonly === false) {
       let valueChanged = false;
@@ -536,31 +537,43 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           chargingStation,
           commandPayload.key,
           commandPayload.value,
-          true
+          true,
         );
         valueChanged = true;
       }
       let triggerHeartbeatRestart = false;
-      if (keyToChange.key === OCPP16StandardParametersKey.HeartBeatInterval && valueChanged) {
+      if (
+        (keyToChange.key as OCPP16StandardParametersKey) ===
+          OCPP16StandardParametersKey.HeartBeatInterval &&
+        valueChanged
+      ) {
         ChargingStationConfigurationUtils.setConfigurationKeyValue(
           chargingStation,
           OCPP16StandardParametersKey.HeartbeatInterval,
-          commandPayload.value
+          commandPayload.value,
         );
         triggerHeartbeatRestart = true;
       }
-      if (keyToChange.key === OCPP16StandardParametersKey.HeartbeatInterval && valueChanged) {
+      if (
+        (keyToChange.key as OCPP16StandardParametersKey) ===
+          OCPP16StandardParametersKey.HeartbeatInterval &&
+        valueChanged
+      ) {
         ChargingStationConfigurationUtils.setConfigurationKeyValue(
           chargingStation,
           OCPP16StandardParametersKey.HeartBeatInterval,
-          commandPayload.value
+          commandPayload.value,
         );
         triggerHeartbeatRestart = true;
       }
       if (triggerHeartbeatRestart) {
         chargingStation.restartHeartbeat();
       }
-      if (keyToChange.key === OCPP16StandardParametersKey.WebSocketPingInterval && valueChanged) {
+      if (
+        (keyToChange.key as OCPP16StandardParametersKey) ===
+          OCPP16StandardParametersKey.WebSocketPingInterval &&
+        valueChanged
+      ) {
         chargingStation.restartWebSocketPing();
       }
       if (keyToChange.reboot) {
@@ -568,17 +581,18 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       }
       return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_ACCEPTED;
     }
+    return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_NOT_SUPPORTED;
   }
 
   private handleRequestSetChargingProfile(
     chargingStation: ChargingStation,
-    commandPayload: SetChargingProfileRequest
+    commandPayload: SetChargingProfileRequest,
   ): SetChargingProfileResponse {
     if (
       OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.SmartCharging,
-        OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE
+        OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
       ) === false
     ) {
       return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_NOT_SUPPORTED;
@@ -586,7 +600,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     if (chargingStation.hasConnector(commandPayload.connectorId) === false) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to set charging profile(s) to a
-          non existing connector id ${commandPayload.connectorId}`
+          non existing connector id ${commandPayload.connectorId}`,
       );
       return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
     }
@@ -606,33 +620,33 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     ) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to set transaction charging profile(s)
-          on connector ${commandPayload.connectorId} without a started transaction`
+          on connector ${commandPayload.connectorId} without a started transaction`,
       );
       return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
     }
     OCPP16ServiceUtils.setChargingProfile(
       chargingStation,
       commandPayload.connectorId,
-      commandPayload.csChargingProfiles
+      commandPayload.csChargingProfiles,
     );
     logger.debug(
       `${chargingStation.logPrefix()} Charging profile(s) set on connector id ${
         commandPayload.connectorId
       }: %j`,
-      commandPayload.csChargingProfiles
+      commandPayload.csChargingProfiles,
     );
     return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_ACCEPTED;
   }
 
   private handleRequestGetCompositeSchedule(
     chargingStation: ChargingStation,
-    commandPayload: OCPP16GetCompositeScheduleRequest
+    commandPayload: OCPP16GetCompositeScheduleRequest,
   ): OCPP16GetCompositeScheduleResponse {
     if (
       OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.SmartCharging,
-        OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE
+        OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
       ) === false
     ) {
       return OCPP16Constants.OCPP_RESPONSE_REJECTED;
@@ -640,7 +654,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     if (chargingStation.hasConnector(commandPayload.connectorId) === false) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to get composite schedule to a
-          non existing connector id ${commandPayload.connectorId}`
+          non existing connector id ${commandPayload.connectorId}`,
       );
       return OCPP16Constants.OCPP_RESPONSE_REJECTED;
     }
@@ -651,13 +665,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     }
     const startDate = new Date();
     const endDate = new Date(startDate.getTime() + commandPayload.duration * 1000);
-    let compositeSchedule: OCPP16ChargingSchedule;
-    for (const chargingProfile of chargingStation.getConnectorStatus(commandPayload.connectorId)
-      .chargingProfiles) {
+    let compositeSchedule: OCPP16ChargingSchedule | undefined;
+    for (const chargingProfile of chargingStation.getConnectorStatus(commandPayload.connectorId)!
+      .chargingProfiles!) {
       // FIXME: build the composite schedule including the local power limit, the stack level, the charging rate unit, etc.
       if (
-        chargingProfile.chargingSchedule?.startSchedule >= startDate &&
-        chargingProfile.chargingSchedule?.startSchedule <= endDate
+        chargingProfile.chargingSchedule.startSchedule! >= startDate &&
+        chargingProfile.chargingSchedule.startSchedule! <= endDate
       ) {
         compositeSchedule = chargingProfile.chargingSchedule;
         break;
@@ -673,35 +687,35 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private handleRequestClearChargingProfile(
     chargingStation: ChargingStation,
-    commandPayload: ClearChargingProfileRequest
+    commandPayload: ClearChargingProfileRequest,
   ): ClearChargingProfileResponse {
     if (
       OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.SmartCharging,
-        OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE
+        OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
       ) === false
     ) {
       return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
     }
-    if (chargingStation.hasConnector(commandPayload.connectorId) === false) {
+    if (chargingStation.hasConnector(commandPayload.connectorId!) === false) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to clear a charging profile(s) to
-          a non existing connector id ${commandPayload.connectorId}`
+          a non existing connector id ${commandPayload.connectorId}`,
       );
       return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
     }
     if (
       !isNullOrUndefined(commandPayload.connectorId) &&
       isNotEmptyArray(
-        chargingStation.getConnectorStatus(commandPayload.connectorId)?.chargingProfiles
+        chargingStation.getConnectorStatus(commandPayload.connectorId!)?.chargingProfiles,
       )
     ) {
-      chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles = [];
+      chargingStation.getConnectorStatus(commandPayload.connectorId!)!.chargingProfiles = [];
       logger.debug(
         `${chargingStation.logPrefix()} Charging profile(s) cleared on connector id ${
           commandPayload.connectorId
-        }`
+        }`,
       );
       return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED;
     }
@@ -737,11 +751,11 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                 connectorStatus?.chargingProfiles?.splice(index, 1);
                 logger.debug(
                   `${chargingStation.logPrefix()} Matching charging profile(s) cleared: %j`,
-                  chargingProfile
+                  chargingProfile,
                 );
                 clearedCP = true;
               }
-            }
+            },
           );
         }
       };
@@ -753,7 +767,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         }
       } else {
         for (const connectorId of chargingStation.connectors.keys()) {
-          clearChargingProfiles(chargingStation.getConnectorStatus(connectorId));
+          clearChargingProfiles(chargingStation.getConnectorStatus(connectorId)!);
         }
       }
       if (clearedCP) {
@@ -765,13 +779,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private async handleRequestChangeAvailability(
     chargingStation: ChargingStation,
-    commandPayload: ChangeAvailabilityRequest
+    commandPayload: ChangeAvailabilityRequest,
   ): Promise<ChangeAvailabilityResponse> {
     const connectorId: number = commandPayload.connectorId;
     if (chargingStation.hasConnector(connectorId) === false) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to change the availability of a
-          non existing connector id ${connectorId.toString()}`
+          non existing connector id ${connectorId.toString()}`,
       );
       return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_REJECTED;
     }
@@ -791,7 +805,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           await OCPP16ServiceUtils.sendAndSetConnectorStatus(
             chargingStation,
             id,
-            chargePointStatus
+            chargePointStatus,
           );
         }
       };
@@ -803,7 +817,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         }
       } else {
         for (const id of chargingStation.connectors.keys()) {
-          await changeAvailability(id, chargingStation.getConnectorStatus(id));
+          await changeAvailability(id, chargingStation.getConnectorStatus(id)!);
         }
       }
       return response;
@@ -814,14 +828,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           commandPayload.type === OCPP16AvailabilityType.Inoperative))
     ) {
       if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) {
-        chargingStation.getConnectorStatus(connectorId).availability = commandPayload.type;
+        chargingStation.getConnectorStatus(connectorId)!.availability = commandPayload.type;
         return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED;
       }
-      chargingStation.getConnectorStatus(connectorId).availability = commandPayload.type;
+      chargingStation.getConnectorStatus(connectorId)!.availability = commandPayload.type;
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
         connectorId,
-        chargePointStatus
+        chargePointStatus,
       );
       return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED;
     }
@@ -830,14 +844,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private async handleRequestRemoteStartTransaction(
     chargingStation: ChargingStation,
-    commandPayload: RemoteStartTransactionRequest
+    commandPayload: RemoteStartTransactionRequest,
   ): Promise<GenericResponse> {
     const { connectorId: transactionConnectorId, idTag, chargingProfile } = commandPayload;
     const reserved =
-      chargingStation.getConnectorStatus(transactionConnectorId).status ===
+      chargingStation.getConnectorStatus(transactionConnectorId)!.status ===
       OCPP16ChargePointStatus.Reserved;
     const reservedOnConnectorZero =
-      chargingStation.getConnectorStatus(0).status === OCPP16ChargePointStatus.Reserved;
+      chargingStation.getConnectorStatus(0)!.status === OCPP16ChargePointStatus.Reserved;
     if (
       (reserved &&
         !chargingStation.validateIncomingRequestWithReservation(transactionConnectorId, idTag)) ||
@@ -849,7 +863,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       return this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        idTag
+        idTag,
       );
     }
     if (
@@ -859,19 +873,19 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       return this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        idTag
+        idTag,
       );
     }
     const remoteStartTransactionLogMsg = `
       ${chargingStation.logPrefix()} Transaction remotely STARTED on ${
-      chargingStation.stationInfo.chargingStationId
-    }#${transactionConnectorId.toString()} for idTag '${idTag}'`;
+        chargingStation.stationInfo.chargingStationId
+      }#${transactionConnectorId.toString()} for idTag '${idTag}'`;
     await OCPP16ServiceUtils.sendAndSetConnectorStatus(
       chargingStation,
       transactionConnectorId,
-      OCPP16ChargePointStatus.Preparing
+      OCPP16ChargePointStatus.Preparing,
     );
-    const connectorStatus = chargingStation.getConnectorStatus(transactionConnectorId);
+    const connectorStatus = chargingStation.getConnectorStatus(transactionConnectorId)!;
     // Check if authorized
     if (
       chargingStation.getAuthorizeRemoteTxRequests() &&
@@ -882,7 +896,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         this.setRemoteStartTransactionChargingProfile(
           chargingStation,
           transactionConnectorId,
-          chargingProfile
+          chargingProfile!,
         ) === true
       ) {
         connectorStatus.transactionRemoteStarted = true;
@@ -893,12 +907,12 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         if (reserved || reservedOnConnectorZero) {
           const reservation = chargingStation.getReservationBy(
             ReservationFilterKey.CONNECTOR_ID,
-            reservedOnConnectorZero ? 0 : transactionConnectorId
-          );
+            reservedOnConnectorZero ? 0 : transactionConnectorId,
+          )!;
           startTransactionPayload.reservationId = reservation.id;
           await chargingStation.removeReservation(
             reservation,
-            ReservationTerminationReason.TRANSACTION_STARTED
+            ReservationTerminationReason.TRANSACTION_STARTED,
           );
         }
         if (
@@ -915,13 +929,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         return this.notifyRemoteStartTransactionRejected(
           chargingStation,
           transactionConnectorId,
-          idTag
+          idTag,
         );
       }
       return this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        idTag
+        idTag,
       );
     }
     // No authorization check required, start transaction
@@ -929,7 +943,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       this.setRemoteStartTransactionChargingProfile(
         chargingStation,
         transactionConnectorId,
-        chargingProfile
+        chargingProfile!,
       ) === true
     ) {
       connectorStatus.transactionRemoteStarted = true;
@@ -950,20 +964,20 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       return this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        idTag
+        idTag,
       );
     }
     return this.notifyRemoteStartTransactionRejected(
       chargingStation,
       transactionConnectorId,
-      idTag
+      idTag,
     );
   }
 
   private async notifyRemoteStartTransactionRejected(
     chargingStation: ChargingStation,
     connectorId: number,
-    idTag: string
+    idTag: string,
   ): Promise<GenericResponse> {
     if (
       chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.Available
@@ -971,14 +985,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
         connectorId,
-        OCPP16ChargePointStatus.Available
+        OCPP16ChargePointStatus.Available,
       );
     }
     logger.warn(
       `${chargingStation.logPrefix()} Remote starting transaction REJECTED on connector id
-        ${connectorId.toString()}, idTag '${idTag}', availability '${
-        chargingStation.getConnectorStatus(connectorId)?.availability
-      }', status '${chargingStation.getConnectorStatus(connectorId)?.status}'`
+        ${connectorId.toString()}, idTag '${idTag}', availability '${chargingStation.getConnectorStatus(
+          connectorId,
+        )?.availability}', status '${chargingStation.getConnectorStatus(connectorId)?.status}'`,
     );
     return OCPP16Constants.OCPP_RESPONSE_REJECTED;
   }
@@ -986,42 +1000,41 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
   private setRemoteStartTransactionChargingProfile(
     chargingStation: ChargingStation,
     connectorId: number,
-    cp: OCPP16ChargingProfile
+    cp: OCPP16ChargingProfile,
   ): boolean {
     if (cp && cp.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE) {
       OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, cp);
       logger.debug(
         `${chargingStation.logPrefix()} Charging profile(s) set at remote start transaction
           on connector id ${connectorId}: %j`,
-        cp
+        cp,
       );
       return true;
     } else if (cp && cp.chargingProfilePurpose !== OCPP16ChargingProfilePurposeType.TX_PROFILE) {
       logger.warn(
         `${chargingStation.logPrefix()} Not allowed to set ${
           cp.chargingProfilePurpose
-        } charging profile(s) at remote start transaction`
+        } charging profile(s) at remote start transaction`,
       );
       return false;
-    } else if (!cp) {
-      return true;
     }
+    return true;
   }
 
   private async handleRequestRemoteStopTransaction(
     chargingStation: ChargingStation,
-    commandPayload: RemoteStopTransactionRequest
+    commandPayload: RemoteStopTransactionRequest,
   ): Promise<GenericResponse> {
     const transactionId = commandPayload.transactionId;
     const remoteStopTransaction = async (connectorId: number): Promise<GenericResponse> => {
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
         connectorId,
-        OCPP16ChargePointStatus.Finishing
+        OCPP16ChargePointStatus.Finishing,
       );
       const stopResponse = await chargingStation.stopTransactionOnConnector(
         connectorId,
-        OCPP16StopTransactionReason.REMOTE
+        OCPP16StopTransactionReason.REMOTE,
       );
       if (stopResponse.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
         return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
@@ -1050,25 +1063,25 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     }
     logger.warn(
       `${chargingStation.logPrefix()} Trying to remote stop a non existing transaction with id:
-        ${transactionId.toString()}`
+        ${transactionId.toString()}`,
     );
     return OCPP16Constants.OCPP_RESPONSE_REJECTED;
   }
 
   private handleRequestUpdateFirmware(
     chargingStation: ChargingStation,
-    commandPayload: OCPP16UpdateFirmwareRequest
+    commandPayload: OCPP16UpdateFirmwareRequest,
   ): OCPP16UpdateFirmwareResponse {
     if (
       OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.FirmwareManagement,
-        OCPP16IncomingRequestCommand.UPDATE_FIRMWARE
+        OCPP16IncomingRequestCommand.UPDATE_FIRMWARE,
       ) === false
     ) {
       logger.warn(
         `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware:
-          Cannot simulate firmware update: feature profile not supported`
+          Cannot simulate firmware update: feature profile not supported`,
       );
       return OCPP16Constants.OCPP_RESPONSE_EMPTY;
     }
@@ -1078,32 +1091,35 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     ) {
       logger.warn(
         `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware:
-          Cannot simulate firmware update: firmware update is already in progress`
+          Cannot simulate firmware update: firmware update is already in progress`,
       );
       return OCPP16Constants.OCPP_RESPONSE_EMPTY;
     }
-    const retrieveDate = convertToDate(commandPayload.retrieveDate);
+    const retrieveDate = convertToDate(commandPayload.retrieveDate)!;
     const now = Date.now();
     if (retrieveDate?.getTime() <= now) {
       this.runInAsyncScope(
         this.updateFirmwareSimulation.bind(this) as (
           this: OCPP16IncomingRequestService,
-          ...args: any[]
+          ...args: unknown[]
         ) => Promise<void>,
         this,
-        chargingStation
+        chargingStation,
       ).catch(Constants.EMPTY_FUNCTION);
     } else {
-      setTimeout(() => {
-        this.runInAsyncScope(
-          this.updateFirmwareSimulation.bind(this) as (
-            this: OCPP16IncomingRequestService,
-            ...args: any[]
-          ) => Promise<void>,
-          this,
-          chargingStation
-        ).catch(Constants.EMPTY_FUNCTION);
-      }, retrieveDate?.getTime() - now);
+      setTimeout(
+        () => {
+          this.runInAsyncScope(
+            this.updateFirmwareSimulation.bind(this) as (
+              this: OCPP16IncomingRequestService,
+              ...args: unknown[]
+            ) => Promise<void>,
+            this,
+            chargingStation,
+          ).catch(Constants.EMPTY_FUNCTION);
+        },
+        retrieveDate?.getTime() - now,
+      );
     }
     return OCPP16Constants.OCPP_RESPONSE_EMPTY;
   }
@@ -1111,12 +1127,9 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
   private async updateFirmwareSimulation(
     chargingStation: ChargingStation,
     maxDelay = 30,
-    minDelay = 15
+    minDelay = 15,
   ): Promise<void> {
-    if (
-      ChargingStationUtils.checkChargingStation(chargingStation, chargingStation.logPrefix()) ===
-      false
-    ) {
+    if (checkChargingStation(chargingStation, chargingStation.logPrefix()) === false) {
       return;
     }
     if (chargingStation.hasEvses) {
@@ -1127,7 +1140,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
               await OCPP16ServiceUtils.sendAndSetConnectorStatus(
                 chargingStation,
                 connectorId,
-                OCPP16ChargePointStatus.Unavailable
+                OCPP16ChargePointStatus.Unavailable,
               );
             }
           }
@@ -1142,7 +1155,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           await OCPP16ServiceUtils.sendAndSetConnectorStatus(
             chargingStation,
             connectorId,
-            OCPP16ChargePointStatus.Unavailable
+            OCPP16ChargePointStatus.Unavailable,
           );
         }
       }
@@ -1186,8 +1199,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         logger.debug(
           `${chargingStation.logPrefix()} ${moduleName}.updateFirmwareSimulation:
             ${runningTransactions} transaction(s) in progress, waiting ${
-            waitTime / 1000
-          } seconds before continuing firmware update simulation`
+              waitTime / 1000
+            } seconds before continuing firmware update simulation`,
         );
         await sleep(waitTime);
         transactionsStarted = true;
@@ -1201,7 +1214,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                   await OCPP16ServiceUtils.sendAndSetConnectorStatus(
                     chargingStation,
                     connectorId,
-                    OCPP16ChargePointStatus.Unavailable
+                    OCPP16ChargePointStatus.Unavailable,
                   );
                 }
               }
@@ -1217,7 +1230,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
               await OCPP16ServiceUtils.sendAndSetConnectorStatus(
                 chargingStation,
                 connectorId,
-                OCPP16ChargePointStatus.Unavailable
+                OCPP16ChargePointStatus.Unavailable,
               );
             }
           }
@@ -1226,10 +1239,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       }
     } while (transactionsStarted);
     !wasTransactionsStarted && (await sleep(getRandomInteger(maxDelay, minDelay) * 1000));
-    if (
-      ChargingStationUtils.checkChargingStation(chargingStation, chargingStation.logPrefix()) ===
-      false
-    ) {
+    if (checkChargingStation(chargingStation, chargingStation.logPrefix()) === false) {
       return;
     }
     await chargingStation.ocppRequestService.requestHandler<
@@ -1262,24 +1272,24 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private async handleRequestGetDiagnostics(
     chargingStation: ChargingStation,
-    commandPayload: GetDiagnosticsRequest
+    commandPayload: GetDiagnosticsRequest,
   ): Promise<GetDiagnosticsResponse> {
     if (
       OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.FirmwareManagement,
-        OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+        OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
       ) === false
     ) {
       logger.warn(
         `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics:
-          Cannot get diagnostics: feature profile not supported`
+          Cannot get diagnostics: feature profile not supported`,
       );
       return OCPP16Constants.OCPP_RESPONSE_EMPTY;
     }
     const uri = new URL(commandPayload.location);
     if (uri.protocol.startsWith('ftp:')) {
-      let ftpClient: Client;
+      let ftpClient: Client | undefined;
       try {
         const logFiles = readdirSync(resolve(dirname(fileURLToPath(import.meta.url)), '../'))
           .filter((file) => file.endsWith('.log'))
@@ -1293,13 +1303,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           ...(isNotEmptyString(uri.username) && { user: uri.username }),
           ...(isNotEmptyString(uri.password) && { password: uri.password }),
         });
-        let uploadResponse: FTPResponse;
+        let uploadResponse: FTPResponse | undefined;
         if (accessResponse.code === 220) {
           ftpClient.trackProgress((info) => {
             logger.info(
               `${chargingStation.logPrefix()} ${
                 info.bytes / 1024
-              } bytes transferred from diagnostics archive ${info.name}`
+              } bytes transferred from diagnostics archive ${info.name}`,
             );
             chargingStation.ocppRequestService
               .requestHandler<
@@ -1312,13 +1322,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                 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<
@@ -1337,7 +1347,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
             `Diagnostics transfer failed with error code ${accessResponse.code.toString()}${
               uploadResponse?.code && `|${uploadResponse?.code.toString()}`
             }`,
-            OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+            OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
           );
         }
         throw new OCPPError(
@@ -1345,7 +1355,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           `Diagnostics transfer failed with error code ${accessResponse.code.toString()}${
             uploadResponse?.code && `|${uploadResponse?.code.toString()}`
           }`,
-          OCPP16IncomingRequestCommand.GET_DIAGNOSTICS
+          OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
         );
       } catch (error) {
         await chargingStation.ocppRequestService.requestHandler<
@@ -1357,18 +1367,18 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         if (ftpClient) {
           ftpClient.close();
         }
-        return this.handleIncomingRequestError(
+        return this.handleIncomingRequestError<GetDiagnosticsResponse>(
           chargingStation,
           OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
           error as Error,
-          { errorResponse: OCPP16Constants.OCPP_RESPONSE_EMPTY }
-        );
+          { errorResponse: OCPP16Constants.OCPP_RESPONSE_EMPTY },
+        )!;
       }
     } else {
       logger.error(
         `${chargingStation.logPrefix()} Unsupported protocol ${
           uri.protocol
-        } to transfer the diagnostic logs archive`
+        } to transfer the diagnostic logs archive`,
       );
       await chargingStation.ocppRequestService.requestHandler<
         OCPP16DiagnosticsStatusNotificationRequest,
@@ -1382,17 +1392,17 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
 
   private handleRequestTriggerMessage(
     chargingStation: ChargingStation,
-    commandPayload: OCPP16TriggerMessageRequest
+    commandPayload: OCPP16TriggerMessageRequest,
   ): OCPP16TriggerMessageResponse {
     if (
       !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.RemoteTrigger,
-        OCPP16IncomingRequestCommand.TRIGGER_MESSAGE
+        OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
       ) ||
       !OCPP16ServiceUtils.isMessageTriggerSupported(
         chargingStation,
-        commandPayload.requestedMessage
+        commandPayload.requestedMessage,
       )
     ) {
       return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED;
@@ -1401,7 +1411,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       !OCPP16ServiceUtils.isConnectorIdValid(
         chargingStation,
         OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
-        commandPayload.connectorId
+        commandPayload.connectorId!,
       )
     ) {
       return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED;
@@ -1415,7 +1425,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                 chargingStation,
                 OCPP16RequestCommand.BOOT_NOTIFICATION,
                 chargingStation.bootNotificationRequest,
-                { skipBufferingOnError: true, triggerMessage: true }
+                { skipBufferingOnError: true, triggerMessage: true },
               )
               .then((response) => {
                 chargingStation.bootNotificationResponse = response;
@@ -1432,7 +1442,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                 null,
                 {
                   triggerMessage: true,
-                }
+                },
               )
               .catch(Constants.EMPTY_FUNCTION);
           }, OCPP16Constants.OCPP_TRIGGER_MESSAGE_DELAY);
@@ -1447,11 +1457,11 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                   {
                     connectorId: commandPayload.connectorId,
                     errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-                    status: chargingStation.getConnectorStatus(commandPayload.connectorId)?.status,
+                    status: chargingStation.getConnectorStatus(commandPayload.connectorId!)?.status,
                   },
                   {
                     triggerMessage: true,
-                  }
+                  },
                 )
                 .catch(Constants.EMPTY_FUNCTION);
             } else {
@@ -1473,7 +1483,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                         },
                         {
                           triggerMessage: true,
-                        }
+                        },
                       )
                       .catch(Constants.EMPTY_FUNCTION);
                   }
@@ -1494,7 +1504,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                       },
                       {
                         triggerMessage: true,
-                      }
+                      },
                     )
                     .catch(Constants.EMPTY_FUNCTION);
                 }
@@ -1506,18 +1516,18 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           return OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_NOT_IMPLEMENTED;
       }
     } catch (error) {
-      return this.handleIncomingRequestError(
+      return this.handleIncomingRequestError<OCPP16TriggerMessageResponse>(
         chargingStation,
         OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
         error as Error,
-        { errorResponse: OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED }
-      );
+        { errorResponse: OCPP16Constants.OCPP_TRIGGER_MESSAGE_RESPONSE_REJECTED },
+      )!;
     }
   }
 
   private handleRequestDataTransfer(
     chargingStation: ChargingStation,
-    commandPayload: OCPP16DataTransferRequest
+    commandPayload: OCPP16DataTransferRequest,
   ): OCPP16DataTransferResponse {
     try {
       if (Object.values(OCPP16DataTransferVendorId).includes(commandPayload.vendorId)) {
@@ -1525,24 +1535,24 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       }
       return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_UNKNOWN_VENDOR_ID;
     } catch (error) {
-      return this.handleIncomingRequestError(
+      return this.handleIncomingRequestError<OCPP16DataTransferResponse>(
         chargingStation,
         OCPP16IncomingRequestCommand.DATA_TRANSFER,
         error as Error,
-        { errorResponse: OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED }
-      );
+        { errorResponse: OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED },
+      )!;
     }
   }
 
   private async handleRequestReserveNow(
     chargingStation: ChargingStation,
-    commandPayload: OCPP16ReserveNowRequest
+    commandPayload: OCPP16ReserveNowRequest,
   ): Promise<OCPP16ReserveNowResponse> {
     if (
       !OCPP16ServiceUtils.checkFeatureProfile(
         chargingStation,
         OCPP16SupportedFeatureProfiles.Reservation,
-        OCPP16IncomingRequestCommand.RESERVE_NOW
+        OCPP16IncomingRequestCommand.RESERVE_NOW,
       )
     ) {
       return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
@@ -1559,7 +1569,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       if (!(await OCPP16ServiceUtils.isIdTagAuthorized(chargingStation, connectorId, idTag))) {
         return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
       }
-      switch (chargingStation.getConnectorStatus(connectorId).status) {
+      switch (chargingStation.getConnectorStatus(connectorId)!.status) {
         case OCPP16ChargePointStatus.Faulted:
           response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED;
           break;
@@ -1593,25 +1603,25 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       }
       return response;
     } catch (error) {
-      chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.Available;
-      return this.handleIncomingRequestError(
+      chargingStation.getConnectorStatus(connectorId)!.status = OCPP16ChargePointStatus.Available;
+      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(
     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;
@@ -1622,22 +1632,22 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       if (!exists) {
         logger.error(
           `${chargingStation.logPrefix()} Reservation with ID ${reservationId}
-            does not exist on charging station`
+            does not exist on charging station`,
         );
         return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED;
       }
       await chargingStation.removeReservation(
-        reservation,
-        ReservationTerminationReason.RESERVATION_CANCELED
+        reservation!,
+        ReservationTerminationReason.RESERVATION_CANCELED,
       );
       return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_ACCEPTED;
     } catch (error) {
-      return this.handleIncomingRequestError(
+      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 },
+      )!;
     }
   }
 }