X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16ResponseService.ts;h=0f697f630fe079a0b0e9aa72c6c13ed2154e631c;hb=cfdf901dfbdf4cf745a1ced9b7870251cb9c6f10;hp=543e2eda6e84e0a98dc8862c25c36c3d92b2dd93;hpb=66dd344779f5258bbf4c76b386d005c0c2160b11;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
index 543e2eda..0f697f63 100644
--- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
@@ -3,12 +3,14 @@
 import { parentPort } from 'node:worker_threads';
 
 import type { JSONSchemaType } from 'ajv';
+import { secondsToMilliseconds } from 'date-fns';
 
 import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
 import {
   type ChargingStation,
-  ChargingStationConfigurationUtils,
-  ChargingStationUtils,
+  addConfigurationKey,
+  getConfigurationKey,
+  resetConnectorStatus,
 } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
@@ -25,7 +27,6 @@ import {
   type OCPP16AuthorizeRequest,
   type OCPP16AuthorizeResponse,
   type OCPP16BootNotificationResponse,
-  type OCPP16CancelReservationResponse,
   OCPP16ChargePointStatus,
   type OCPP16DataTransferResponse,
   type OCPP16DiagnosticsStatusNotificationResponse,
@@ -47,11 +48,18 @@ import {
   type OCPP16UpdateFirmwareResponse,
   OCPPVersion,
   RegistrationStatusEnumType,
+  ReservationTerminationReason,
   type ResponseHandler,
   type SetChargingProfileResponse,
   type UnlockConnectorResponse,
 } from '../../../types';
-import { Constants, MessageChannelUtils, Utils, logger } from '../../../utils';
+import {
+  Constants,
+  buildUpdatedMessage,
+  convertToInt,
+  isNullOrUndefined,
+  logger,
+} from '../../../utils';
 import { OCPPResponseService } from '../OCPPResponseService';
 
 const moduleName = 'OCPP16ResponseService';
@@ -71,16 +79,34 @@ export class OCPP16ResponseService extends OCPPResponseService {
     // }
     super(OCPPVersion.VERSION_16);
     this.responseHandlers = new Map<OCPP16RequestCommand, ResponseHandler>([
-      [OCPP16RequestCommand.BOOT_NOTIFICATION, this.handleResponseBootNotification.bind(this)],
-      [OCPP16RequestCommand.HEARTBEAT, this.emptyResponseHandler.bind(this)],
-      [OCPP16RequestCommand.AUTHORIZE, this.handleResponseAuthorize.bind(this)],
-      [OCPP16RequestCommand.START_TRANSACTION, this.handleResponseStartTransaction.bind(this)],
-      [OCPP16RequestCommand.STOP_TRANSACTION, this.handleResponseStopTransaction.bind(this)],
-      [OCPP16RequestCommand.STATUS_NOTIFICATION, this.emptyResponseHandler.bind(this)],
-      [OCPP16RequestCommand.METER_VALUES, this.emptyResponseHandler.bind(this)],
-      [OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, this.emptyResponseHandler.bind(this)],
-      [OCPP16RequestCommand.DATA_TRANSFER, this.emptyResponseHandler.bind(this)],
-      [OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, this.emptyResponseHandler.bind(this)],
+      [
+        OCPP16RequestCommand.BOOT_NOTIFICATION,
+        this.handleResponseBootNotification.bind(this) as ResponseHandler,
+      ],
+      [OCPP16RequestCommand.HEARTBEAT, this.emptyResponseHandler.bind(this) as ResponseHandler],
+      [OCPP16RequestCommand.AUTHORIZE, this.handleResponseAuthorize.bind(this) as ResponseHandler],
+      [
+        OCPP16RequestCommand.START_TRANSACTION,
+        this.handleResponseStartTransaction.bind(this) as ResponseHandler,
+      ],
+      [
+        OCPP16RequestCommand.STOP_TRANSACTION,
+        this.handleResponseStopTransaction.bind(this) as ResponseHandler,
+      ],
+      [
+        OCPP16RequestCommand.STATUS_NOTIFICATION,
+        this.emptyResponseHandler.bind(this) as ResponseHandler,
+      ],
+      [OCPP16RequestCommand.METER_VALUES, this.emptyResponseHandler.bind(this) as ResponseHandler],
+      [
+        OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION,
+        this.emptyResponseHandler.bind(this) as ResponseHandler,
+      ],
+      [OCPP16RequestCommand.DATA_TRANSFER, this.emptyResponseHandler.bind(this) as ResponseHandler],
+      [
+        OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION,
+        this.emptyResponseHandler.bind(this) as ResponseHandler,
+      ],
     ]);
     this.jsonSchemas = new Map<OCPP16RequestCommand, JSONSchemaType<JsonObject>>([
       [
@@ -88,7 +114,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16BootNotificationResponse>(
           'assets/json-schemas/ocpp/1.6/BootNotificationResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -96,7 +122,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16HeartbeatResponse>(
           'assets/json-schemas/ocpp/1.6/HeartbeatResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -104,7 +130,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16AuthorizeResponse>(
           'assets/json-schemas/ocpp/1.6/AuthorizeResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -112,7 +138,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StartTransactionResponse>(
           'assets/json-schemas/ocpp/1.6/StartTransactionResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -120,7 +146,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StopTransactionResponse>(
           'assets/json-schemas/ocpp/1.6/StopTransactionResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -128,7 +154,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StatusNotificationResponse>(
           'assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -136,7 +162,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16MeterValuesResponse>(
           'assets/json-schemas/ocpp/1.6/MeterValuesResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -144,7 +170,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DiagnosticsStatusNotificationResponse>(
           'assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -152,7 +178,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferResponse>(
           'assets/json-schemas/ocpp/1.6/DataTransferResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -160,23 +186,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16FirmwareStatusNotificationResponse>(
           'assets/json-schemas/ocpp/1.6/FirmwareStatusNotificationResponse.json',
           moduleName,
-          'constructor'
-        ),
-      ],
-      [
-        OCPP16RequestCommand.RESERVE_NOW,
-        OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ReserveNowResponse>(
-          'assets/json-schemas/ocpp/1.6/ReserveNowResponse.json',
-          moduleName,
-          'constructor'
-        ),
-      ],
-      [
-        OCPP16RequestCommand.CANCEL_RESERVATION,
-        OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16CancelReservationResponse>(
-          'assets/json-schemas/ocpp/1.6/CancelReservationResponse.json',
-          moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
     ]);
@@ -186,7 +196,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
           'assets/json-schemas/ocpp/1.6/ResetResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -194,7 +204,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
           'assets/json-schemas/ocpp/1.6/ClearCacheResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -202,7 +212,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<ChangeAvailabilityResponse>(
           'assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -210,7 +220,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<UnlockConnectorResponse>(
           'assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -218,7 +228,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<GetConfigurationResponse>(
           'assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -226,7 +236,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<ChangeConfigurationResponse>(
           'assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -234,7 +244,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16GetCompositeScheduleResponse>(
           'assets/json-schemas/ocpp/1.6/GetCompositeScheduleResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -242,7 +252,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<SetChargingProfileResponse>(
           'assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -250,7 +260,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<ClearChargingProfileResponse>(
           'assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -258,7 +268,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
           'assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -266,7 +276,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
           'assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -274,7 +284,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<GetDiagnosticsResponse>(
           'assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -282,7 +292,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16TriggerMessageResponse>(
           'assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -290,7 +300,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferResponse>(
           'assets/json-schemas/ocpp/1.6/DataTransferResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
         ),
       ],
       [
@@ -298,22 +308,38 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16UpdateFirmwareResponse>(
           'assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json',
           moduleName,
-          'constructor'
+          'constructor',
+        ),
+      ],
+      [
+        OCPP16IncomingRequestCommand.RESERVE_NOW,
+        OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ReserveNowResponse>(
+          'assets/json-schemas/ocpp/1.6/ReserveNowResponse.json',
+          moduleName,
+          'constructor',
+        ),
+      ],
+      [
+        OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
+        OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
+          'assets/json-schemas/ocpp/1.6/CancelReservationResponse.json',
+          moduleName,
+          'constructor',
         ),
       ],
     ]);
     this.validatePayload = this.validatePayload.bind(this) as (
       chargingStation: ChargingStation,
       commandName: OCPP16RequestCommand,
-      payload: JsonType
+      payload: JsonType,
     ) => boolean;
   }
 
-  public async responseHandler(
+  public async responseHandler<ReqType extends JsonType, ResType extends JsonType>(
     chargingStation: ChargingStation,
     commandName: OCPP16RequestCommand,
-    payload: JsonType,
-    requestPayload: JsonType
+    payload: ResType,
+    requestPayload: ReqType,
   ): Promise<void> {
     if (
       chargingStation.isRegistered() === true ||
@@ -325,11 +351,11 @@ export class OCPP16ResponseService extends OCPPResponseService {
       ) {
         try {
           this.validatePayload(chargingStation, commandName, payload);
-          await this.responseHandlers.get(commandName)(chargingStation, payload, requestPayload);
+          await this.responseHandlers.get(commandName)!(chargingStation, payload, requestPayload);
         } catch (error) {
           logger.error(
             `${chargingStation.logPrefix()} ${moduleName}.responseHandler: Handle response error:`,
-            error
+            error,
           );
           throw error;
         }
@@ -340,10 +366,10 @@ export class OCPP16ResponseService extends OCPPResponseService {
           `${commandName} is not implemented to handle response PDU ${JSON.stringify(
             payload,
             null,
-            2
+            2,
           )}`,
           commandName,
-          payload
+          payload,
         );
       }
     } else {
@@ -352,10 +378,10 @@ export class OCPP16ResponseService extends OCPPResponseService {
         `${commandName} cannot be issued to handle response PDU ${JSON.stringify(
           payload,
           null,
-          2
+          2,
         )} while the charging station is not registered on the central server.`,
         commandName,
-        payload
+        payload,
       );
     }
   }
@@ -363,40 +389,40 @@ export class OCPP16ResponseService extends OCPPResponseService {
   private validatePayload(
     chargingStation: ChargingStation,
     commandName: OCPP16RequestCommand,
-    payload: JsonType
+    payload: JsonType,
   ): boolean {
     if (this.jsonSchemas.has(commandName) === true) {
       return this.validateResponsePayload(
         chargingStation,
         commandName,
-        this.jsonSchemas.get(commandName),
-        payload
+        this.jsonSchemas.get(commandName)!,
+        payload,
       );
     }
     logger.warn(
-      `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command '${commandName}' PDU validation`
+      `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command '${commandName}' PDU validation`,
     );
     return false;
   }
 
   private handleResponseBootNotification(
     chargingStation: ChargingStation,
-    payload: OCPP16BootNotificationResponse
+    payload: OCPP16BootNotificationResponse,
   ): void {
     if (payload.status === RegistrationStatusEnumType.ACCEPTED) {
-      ChargingStationConfigurationUtils.addConfigurationKey(
+      addConfigurationKey(
         chargingStation,
         OCPP16StandardParametersKey.HeartbeatInterval,
         payload.interval.toString(),
         {},
-        { overwrite: true, save: true }
+        { overwrite: true, save: true },
       );
-      ChargingStationConfigurationUtils.addConfigurationKey(
+      addConfigurationKey(
         chargingStation,
         OCPP16StandardParametersKey.HeartBeatInterval,
         payload.interval.toString(),
         { visible: false },
-        { overwrite: true, save: true }
+        { overwrite: true, save: true },
       );
       OCPP16ServiceUtils.startHeartbeatInterval(chargingStation, payload.interval);
     }
@@ -410,7 +436,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
     } else {
       logger.error(
         `${chargingStation.logPrefix()} Charging station boot notification response received: %j with undefined registration status`,
-        payload
+        payload,
       );
     }
   }
@@ -418,9 +444,9 @@ export class OCPP16ResponseService extends OCPPResponseService {
   private handleResponseAuthorize(
     chargingStation: ChargingStation,
     payload: OCPP16AuthorizeResponse,
-    requestPayload: OCPP16AuthorizeRequest
+    requestPayload: OCPP16AuthorizeRequest,
   ): void {
-    let authorizeConnectorId: number;
+    let authorizeConnectorId: number | undefined;
     if (chargingStation.hasEvses) {
       for (const [evseId, evseStatus] of chargingStation.evses) {
         if (evseId > 0) {
@@ -443,24 +469,27 @@ export class OCPP16ResponseService extends OCPPResponseService {
         }
       }
     }
-    const authorizeConnectorIdDefined = !Utils.isNullOrUndefined(authorizeConnectorId);
+    const authorizeConnectorIdDefined = !isNullOrUndefined(authorizeConnectorId);
     if (payload.idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) {
-      authorizeConnectorIdDefined &&
-        (chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = true);
+      if (authorizeConnectorIdDefined) {
+        // chargingStation.getConnectorStatus(authorizeConnectorId!)!.authorizeIdTag =
+        //   requestPayload.idTag;
+        chargingStation.getConnectorStatus(authorizeConnectorId!)!.idTagAuthorized = true;
+      }
       logger.debug(
         `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' accepted${
           authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : ''
-        }`
+        }`,
       );
     } else {
       if (authorizeConnectorIdDefined) {
-        chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = false;
-        delete chargingStation.getConnectorStatus(authorizeConnectorId)?.authorizeIdTag;
+        chargingStation.getConnectorStatus(authorizeConnectorId!)!.idTagAuthorized = false;
+        delete chargingStation.getConnectorStatus(authorizeConnectorId!)?.authorizeIdTag;
       }
       logger.debug(
         `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' rejected with status '${
           payload.idTagInfo.status
-        }'${authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : ''}`
+        }'${authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : ''}`,
       );
     }
   }
@@ -468,7 +497,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
   private async handleResponseStartTransaction(
     chargingStation: ChargingStation,
     payload: OCPP16StartTransactionResponse,
-    requestPayload: OCPP16StartTransactionRequest
+    requestPayload: OCPP16StartTransactionRequest,
   ): Promise<void> {
     const transactionConnectorId = requestPayload.connectorId;
     if (
@@ -476,7 +505,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       chargingStation.hasConnector(transactionConnectorId) === false
     ) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to start a transaction on a non existing connector id ${transactionConnectorId.toString()}`
+        `${chargingStation.logPrefix()} Trying to start a transaction on a non existing connector id ${transactionConnectorId.toString()}`,
       );
       return;
     }
@@ -485,13 +514,13 @@ export class OCPP16ResponseService extends OCPPResponseService {
         true &&
       chargingStation.getAuthorizeRemoteTxRequests() === true &&
       chargingStation.getLocalAuthListEnabled() === true &&
-      chargingStation.hasIdTags() &&
+      chargingStation.hasIdTags() === true &&
       chargingStation.getConnectorStatus(transactionConnectorId)?.idTagLocalAuthorized === false
     ) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to start a transaction with a not local authorized idTag ${
-          chargingStation.getConnectorStatus(transactionConnectorId)?.localAuthorizeIdTag
-        } on connector id ${transactionConnectorId.toString()}`
+        `${chargingStation.logPrefix()} Trying to start a transaction with a not local authorized idTag ${chargingStation.getConnectorStatus(
+          transactionConnectorId,
+        )?.localAuthorizeIdTag} on connector id ${transactionConnectorId.toString()}`,
       );
       await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId);
       return;
@@ -500,14 +529,14 @@ export class OCPP16ResponseService extends OCPPResponseService {
       chargingStation.getConnectorStatus(transactionConnectorId)?.transactionRemoteStarted ===
         true &&
       chargingStation.getAuthorizeRemoteTxRequests() === true &&
-      chargingStation.getMustAuthorizeAtRemoteStart() === true &&
+      chargingStation.getRemoteAuthorization() === true &&
       chargingStation.getConnectorStatus(transactionConnectorId)?.idTagLocalAuthorized === false &&
       chargingStation.getConnectorStatus(transactionConnectorId)?.idTagAuthorized === false
     ) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to start a transaction with a not authorized idTag ${
-          chargingStation.getConnectorStatus(transactionConnectorId)?.authorizeIdTag
-        } on connector id ${transactionConnectorId.toString()}`
+        `${chargingStation.logPrefix()} Trying to start a transaction with a not authorized idTag ${chargingStation.getConnectorStatus(
+          transactionConnectorId,
+        )?.authorizeIdTag} on connector id ${transactionConnectorId.toString()}`,
       );
       await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId);
       return;
@@ -520,9 +549,9 @@ export class OCPP16ResponseService extends OCPPResponseService {
       logger.error(
         `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${
           requestPayload.idTag
-        } different from the authorize request one ${
-          chargingStation.getConnectorStatus(transactionConnectorId)?.authorizeIdTag
-        } on connector id ${transactionConnectorId.toString()}`
+        } different from the authorize request one ${chargingStation.getConnectorStatus(
+          transactionConnectorId,
+        )?.authorizeIdTag} on connector id ${transactionConnectorId.toString()}`,
       );
       await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId);
       return;
@@ -535,9 +564,9 @@ export class OCPP16ResponseService extends OCPPResponseService {
       logger.error(
         `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${
           requestPayload.idTag
-        } different from the local authorized one ${
-          chargingStation.getConnectorStatus(transactionConnectorId)?.localAuthorizeIdTag
-        } on connector id ${transactionConnectorId.toString()}`
+        } different from the local authorized one ${chargingStation.getConnectorStatus(
+          transactionConnectorId,
+        )?.localAuthorizeIdTag} on connector id ${transactionConnectorId.toString()}`,
       );
       await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId);
       return;
@@ -545,7 +574,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
     if (chargingStation.getConnectorStatus(transactionConnectorId)?.transactionStarted === true) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to start a transaction on an already used connector id ${transactionConnectorId.toString()}:`,
-        chargingStation.getConnectorStatus(transactionConnectorId)
+        chargingStation.getConnectorStatus(transactionConnectorId),
       );
       return;
     }
@@ -559,11 +588,11 @@ export class OCPP16ResponseService extends OCPPResponseService {
             ) {
               logger.error(
                 `${chargingStation.logPrefix()} Trying to start a transaction on an already used evse id ${evseId.toString()}:`,
-                evseStatus
+                evseStatus,
               );
               await this.resetConnectorOnStartTransactionError(
                 chargingStation,
-                transactionConnectorId
+                transactionConnectorId,
               );
               return;
             }
@@ -578,36 +607,53 @@ export class OCPP16ResponseService extends OCPPResponseService {
         OCPP16ChargePointStatus.Preparing
     ) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to start a transaction on connector id ${transactionConnectorId.toString()} with status ${
-          chargingStation.getConnectorStatus(transactionConnectorId)?.status
-        }`
+        `${chargingStation.logPrefix()} Trying to start a transaction on connector id ${transactionConnectorId.toString()} with status ${chargingStation.getConnectorStatus(
+          transactionConnectorId,
+        )?.status}`,
       );
       return;
     }
-    if (!Number.isInteger(payload.transactionId)) {
+    if (!Number.isSafeInteger(payload.transactionId)) {
       logger.warn(
         `${chargingStation.logPrefix()} Trying to start a transaction on connector id ${transactionConnectorId.toString()} with a non integer transaction id ${
           payload.transactionId
-        }, converting to integer`
+        }, converting to integer`,
       );
-      payload.transactionId = Utils.convertToInt(payload.transactionId);
+      payload.transactionId = convertToInt(payload.transactionId);
     }
 
     if (payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
-      chargingStation.getConnectorStatus(transactionConnectorId).transactionStarted = true;
-      chargingStation.getConnectorStatus(transactionConnectorId).transactionId =
+      chargingStation.getConnectorStatus(transactionConnectorId)!.transactionStarted = true;
+      chargingStation.getConnectorStatus(transactionConnectorId)!.transactionStart =
+        requestPayload.timestamp;
+      chargingStation.getConnectorStatus(transactionConnectorId)!.transactionId =
         payload.transactionId;
-      chargingStation.getConnectorStatus(transactionConnectorId).transactionIdTag =
+      chargingStation.getConnectorStatus(transactionConnectorId)!.transactionIdTag =
         requestPayload.idTag;
       chargingStation.getConnectorStatus(
-        transactionConnectorId
-      ).transactionEnergyActiveImportRegisterValue = 0;
-      chargingStation.getConnectorStatus(transactionConnectorId).transactionBeginMeterValue =
+        transactionConnectorId,
+      )!.transactionEnergyActiveImportRegisterValue = 0;
+      chargingStation.getConnectorStatus(transactionConnectorId)!.transactionBeginMeterValue =
         OCPP16ServiceUtils.buildTransactionBeginMeterValue(
           chargingStation,
           transactionConnectorId,
-          requestPayload.meterStart
+          requestPayload.meterStart,
+        );
+      const reservedOnConnectorZero =
+        chargingStation.getConnectorStatus(0)?.status === OCPP16ChargePointStatus.Reserved;
+      if (
+        chargingStation.getConnectorStatus(transactionConnectorId)?.status ===
+          OCPP16ChargePointStatus.Reserved ||
+        reservedOnConnectorZero
+      ) {
+        await chargingStation.removeReservation(
+          chargingStation.getReservationBy(
+            'connectorId',
+            reservedOnConnectorZero ? 0 : transactionConnectorId,
+          )!,
+          ReservationTerminationReason.TRANSACTION_STARTED,
         );
+      }
       chargingStation.getBeginEndMeterValues() &&
         (await chargingStation.ocppRequestService.requestHandler<
           OCPP16MeterValuesRequest,
@@ -616,38 +662,36 @@ export class OCPP16ResponseService extends OCPPResponseService {
           connectorId: transactionConnectorId,
           transactionId: payload.transactionId,
           meterValue: [
-            chargingStation.getConnectorStatus(transactionConnectorId).transactionBeginMeterValue,
+            chargingStation.getConnectorStatus(transactionConnectorId)!.transactionBeginMeterValue,
           ],
-        }));
+        } as OCPP16MeterValuesRequest));
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
         transactionConnectorId,
-        OCPP16ChargePointStatus.Charging
+        OCPP16ChargePointStatus.Charging,
       );
       logger.info(
         `${chargingStation.logPrefix()} Transaction with id ${payload.transactionId.toString()} STARTED on ${
           chargingStation.stationInfo.chargingStationId
-        }#${transactionConnectorId.toString()} for idTag '${requestPayload.idTag}'`
+        }#${transactionConnectorId.toString()} for idTag '${requestPayload.idTag}'`,
       );
       if (chargingStation.stationInfo.powerSharedByConnectors) {
         ++chargingStation.powerDivider;
       }
-      const configuredMeterValueSampleInterval =
-        ChargingStationConfigurationUtils.getConfigurationKey(
-          chargingStation,
-          OCPP16StandardParametersKey.MeterValueSampleInterval
-        );
+      const configuredMeterValueSampleInterval = getConfigurationKey(
+        chargingStation,
+        OCPP16StandardParametersKey.MeterValueSampleInterval,
+      );
       chargingStation.startMeterValues(
         transactionConnectorId,
         configuredMeterValueSampleInterval
-          ? Utils.convertToInt(configuredMeterValueSampleInterval.value) * 1000
-          : Constants.DEFAULT_METER_VALUES_INTERVAL
+          ? secondsToMilliseconds(convertToInt(configuredMeterValueSampleInterval.value))
+          : Constants.DEFAULT_METER_VALUES_INTERVAL,
       );
     } else {
       logger.warn(
-        `${chargingStation.logPrefix()} Starting transaction with id ${payload.transactionId.toString()} REJECTED with status '${
-          payload.idTagInfo?.status
-        }', idTag '${requestPayload.idTag}'`
+        `${chargingStation.logPrefix()} Starting transaction with id ${payload.transactionId.toString()} REJECTED with status '${payload
+          .idTagInfo?.status}', idTag '${requestPayload.idTag}'`,
       );
       await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId);
     }
@@ -655,18 +699,18 @@ export class OCPP16ResponseService extends OCPPResponseService {
 
   private async resetConnectorOnStartTransactionError(
     chargingStation: ChargingStation,
-    connectorId: number
+    connectorId: number,
   ): Promise<void> {
-    ChargingStationUtils.resetConnectorStatus(chargingStation.getConnectorStatus(connectorId));
+    resetConnectorStatus(chargingStation.getConnectorStatus(connectorId)!);
     chargingStation.stopMeterValues(connectorId);
-    parentPort?.postMessage(MessageChannelUtils.buildUpdatedMessage(chargingStation));
+    parentPort?.postMessage(buildUpdatedMessage(chargingStation));
     if (
       chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.Available
     ) {
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
         connectorId,
-        OCPP16ChargePointStatus.Available
+        OCPP16ChargePointStatus.Available,
       );
     }
   }
@@ -674,14 +718,14 @@ export class OCPP16ResponseService extends OCPPResponseService {
   private async handleResponseStopTransaction(
     chargingStation: ChargingStation,
     payload: OCPP16StopTransactionResponse,
-    requestPayload: OCPP16StopTransactionRequest
+    requestPayload: OCPP16StopTransactionRequest,
   ): Promise<void> {
     const transactionConnectorId = chargingStation.getConnectorIdByTransactionId(
-      requestPayload.transactionId
+      requestPayload.transactionId,
     );
-    if (Utils.isNullOrUndefined(transactionConnectorId)) {
+    if (isNullOrUndefined(transactionConnectorId)) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to stop a non existing transaction with id ${requestPayload.transactionId.toString()}`
+        `${chargingStation.logPrefix()} Trying to stop a non existing transaction with id ${requestPayload.transactionId.toString()}`,
       );
       return;
     }
@@ -697,42 +741,40 @@ export class OCPP16ResponseService extends OCPPResponseService {
         meterValue: [
           OCPP16ServiceUtils.buildTransactionEndMeterValue(
             chargingStation,
-            transactionConnectorId,
-            requestPayload.meterStop
+            transactionConnectorId!,
+            requestPayload.meterStop,
           ),
         ],
       }));
     if (
       chargingStation.isChargingStationAvailable() === false ||
-      chargingStation.isConnectorAvailable(transactionConnectorId) === false
+      chargingStation.isConnectorAvailable(transactionConnectorId!) === false
     ) {
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
-        transactionConnectorId,
-        OCPP16ChargePointStatus.Unavailable
+        transactionConnectorId!,
+        OCPP16ChargePointStatus.Unavailable,
       );
     } else {
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
-        transactionConnectorId,
-        OCPP16ChargePointStatus.Available
+        transactionConnectorId!,
+        OCPP16ChargePointStatus.Available,
       );
     }
     if (chargingStation.stationInfo.powerSharedByConnectors) {
       chargingStation.powerDivider--;
     }
-    ChargingStationUtils.resetConnectorStatus(
-      chargingStation.getConnectorStatus(transactionConnectorId)
-    );
-    chargingStation.stopMeterValues(transactionConnectorId);
-    parentPort?.postMessage(MessageChannelUtils.buildUpdatedMessage(chargingStation));
+    resetConnectorStatus(chargingStation.getConnectorStatus(transactionConnectorId!)!);
+    chargingStation.stopMeterValues(transactionConnectorId!);
+    parentPort?.postMessage(buildUpdatedMessage(chargingStation));
     const logMsg = `${chargingStation.logPrefix()} Transaction with id ${requestPayload.transactionId.toString()} STOPPED on ${
       chargingStation.stationInfo.chargingStationId
     }#${transactionConnectorId?.toString()} with status '${
       payload.idTagInfo?.status ?? 'undefined'
     }'`;
     if (
-      Utils.isNullOrUndefined(payload.idTagInfo) ||
+      isNullOrUndefined(payload.idTagInfo) ||
       payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED
     ) {
       logger.info(logMsg);