X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16ResponseService.ts;h=9e8a2d5f7636a33aba59c198a8a7e337cea8f0bf;hb=d58b442097da31f8b974d51aef63c64470d9ab48;hp=a082653d7de498eb31b63d5ec34ef32863afe2fb;hpb=28e78158b290b14a09f64adbff0ddb3daf8c5588;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 a082653d..9e8a2d5f 100644
--- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts
@@ -4,11 +4,11 @@ import { parentPort } from 'node:worker_threads';
 
 import type { JSONSchemaType } from 'ajv';
 
+import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
 import {
   type ChargingStation,
   ChargingStationConfigurationUtils,
   ChargingStationUtils,
-  MessageChannelUtils,
 } from '../../../charging-station';
 import { OCPPError } from '../../../exception';
 import {
@@ -25,6 +25,7 @@ import {
   type OCPP16AuthorizeRequest,
   type OCPP16AuthorizeResponse,
   type OCPP16BootNotificationResponse,
+  type OCPP16CancelReservationResponse,
   OCPP16ChargePointStatus,
   type OCPP16DataTransferResponse,
   type OCPP16DiagnosticsStatusNotificationResponse,
@@ -35,6 +36,7 @@ import {
   type OCPP16MeterValuesRequest,
   type OCPP16MeterValuesResponse,
   OCPP16RequestCommand,
+  type OCPP16ReserveNowResponse,
   OCPP16StandardParametersKey,
   type OCPP16StartTransactionRequest,
   type OCPP16StartTransactionResponse,
@@ -49,8 +51,8 @@ import {
   type SetChargingProfileResponse,
   type UnlockConnectorResponse,
 } from '../../../types';
-import { Constants, Utils, logger } from '../../../utils';
-import { OCPP16ServiceUtils, OCPPResponseService } from '../internal';
+import { Constants, Utils, buildUpdatedMessage, logger } from '../../../utils';
+import { OCPPResponseService } from '../OCPPResponseService';
 
 const moduleName = 'OCPP16ResponseService';
 
@@ -84,7 +86,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.BOOT_NOTIFICATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16BootNotificationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/BootNotificationResponse.json',
+          'assets/json-schemas/ocpp/1.6/BootNotificationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -92,7 +94,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.HEARTBEAT,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16HeartbeatResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/HeartbeatResponse.json',
+          'assets/json-schemas/ocpp/1.6/HeartbeatResponse.json',
           moduleName,
           'constructor'
         ),
@@ -100,7 +102,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.AUTHORIZE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16AuthorizeResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/AuthorizeResponse.json',
+          'assets/json-schemas/ocpp/1.6/AuthorizeResponse.json',
           moduleName,
           'constructor'
         ),
@@ -108,7 +110,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.START_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StartTransactionResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/StartTransactionResponse.json',
+          'assets/json-schemas/ocpp/1.6/StartTransactionResponse.json',
           moduleName,
           'constructor'
         ),
@@ -116,7 +118,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.STOP_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StopTransactionResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/StopTransactionResponse.json',
+          'assets/json-schemas/ocpp/1.6/StopTransactionResponse.json',
           moduleName,
           'constructor'
         ),
@@ -124,7 +126,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.STATUS_NOTIFICATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16StatusNotificationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json',
+          'assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -132,7 +134,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.METER_VALUES,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16MeterValuesResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/MeterValuesResponse.json',
+          'assets/json-schemas/ocpp/1.6/MeterValuesResponse.json',
           moduleName,
           'constructor'
         ),
@@ -140,7 +142,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DiagnosticsStatusNotificationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json',
+          'assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -148,7 +150,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.DATA_TRANSFER,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/DataTransferResponse.json',
+          'assets/json-schemas/ocpp/1.6/DataTransferResponse.json',
           moduleName,
           'constructor'
         ),
@@ -156,7 +158,23 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16FirmwareStatusNotificationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/FirmwareStatusNotificationResponse.json',
+          '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'
         ),
@@ -166,7 +184,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.RESET,
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/ResetResponse.json',
+          'assets/json-schemas/ocpp/1.6/ResetResponse.json',
           moduleName,
           'constructor'
         ),
@@ -174,7 +192,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.CLEAR_CACHE,
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/ClearCacheResponse.json',
+          'assets/json-schemas/ocpp/1.6/ClearCacheResponse.json',
           moduleName,
           'constructor'
         ),
@@ -182,7 +200,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY,
         OCPP16ServiceUtils.parseJsonSchemaFile<ChangeAvailabilityResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json',
+          'assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json',
           moduleName,
           'constructor'
         ),
@@ -190,7 +208,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR,
         OCPP16ServiceUtils.parseJsonSchemaFile<UnlockConnectorResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json',
+          'assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json',
           moduleName,
           'constructor'
         ),
@@ -198,7 +216,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.GET_CONFIGURATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<GetConfigurationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json',
+          'assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -206,7 +224,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION,
         OCPP16ServiceUtils.parseJsonSchemaFile<ChangeConfigurationResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json',
+          'assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json',
           moduleName,
           'constructor'
         ),
@@ -214,7 +232,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16GetCompositeScheduleResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/GetCompositeScheduleResponse.json',
+          'assets/json-schemas/ocpp/1.6/GetCompositeScheduleResponse.json',
           moduleName,
           'constructor'
         ),
@@ -222,7 +240,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
         OCPP16ServiceUtils.parseJsonSchemaFile<SetChargingProfileResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json',
+          'assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json',
           moduleName,
           'constructor'
         ),
@@ -230,7 +248,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
         OCPP16ServiceUtils.parseJsonSchemaFile<ClearChargingProfileResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json',
+          'assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json',
           moduleName,
           'constructor'
         ),
@@ -238,7 +256,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json',
+          'assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json',
           moduleName,
           'constructor'
         ),
@@ -246,7 +264,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION,
         OCPP16ServiceUtils.parseJsonSchemaFile<GenericResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json',
+          'assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json',
           moduleName,
           'constructor'
         ),
@@ -254,7 +272,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
         OCPP16ServiceUtils.parseJsonSchemaFile<GetDiagnosticsResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json',
+          'assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json',
           moduleName,
           'constructor'
         ),
@@ -262,7 +280,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16TriggerMessageResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json',
+          'assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json',
           moduleName,
           'constructor'
         ),
@@ -270,7 +288,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.DATA_TRANSFER,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/DataTransferResponse.json',
+          'assets/json-schemas/ocpp/1.6/DataTransferResponse.json',
           moduleName,
           'constructor'
         ),
@@ -278,7 +296,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       [
         OCPP16IncomingRequestCommand.UPDATE_FIRMWARE,
         OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16UpdateFirmwareResponse>(
-          '../../../assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json',
+          'assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json',
           moduleName,
           'constructor'
         ),
@@ -403,13 +421,26 @@ export class OCPP16ResponseService extends OCPPResponseService {
     requestPayload: OCPP16AuthorizeRequest
   ): void {
     let authorizeConnectorId: number;
-    for (const connectorId of chargingStation.connectors.keys()) {
-      if (
-        connectorId > 0 &&
-        chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag === requestPayload.idTag
-      ) {
-        authorizeConnectorId = connectorId;
-        break;
+    if (chargingStation.hasEvses) {
+      for (const [evseId, evseStatus] of chargingStation.evses) {
+        if (evseId > 0) {
+          for (const [connectorId, connectorStatus] of evseStatus.connectors) {
+            if (connectorStatus?.authorizeIdTag === requestPayload.idTag) {
+              authorizeConnectorId = connectorId;
+              break;
+            }
+          }
+        }
+      }
+    } else {
+      for (const connectorId of chargingStation.connectors.keys()) {
+        if (
+          connectorId > 0 &&
+          chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag === requestPayload.idTag
+        ) {
+          authorizeConnectorId = connectorId;
+          break;
+        }
       }
     }
     const authorizeConnectorIdDefined = !Utils.isNullOrUndefined(authorizeConnectorId);
@@ -418,7 +449,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
         (chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = true);
       logger.debug(
         `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' accepted${
-          authorizeConnectorIdDefined ? ` on connector ${authorizeConnectorId}` : ''
+          authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : ''
         }`
       );
     } else {
@@ -429,7 +460,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
       logger.debug(
         `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' rejected with status '${
           payload.idTagInfo.status
-        }'${authorizeConnectorIdDefined ? ` on connector ${authorizeConnectorId}` : ''}`
+        }'${authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : ''}`
       );
     }
   }
@@ -439,111 +470,142 @@ export class OCPP16ResponseService extends OCPPResponseService {
     payload: OCPP16StartTransactionResponse,
     requestPayload: OCPP16StartTransactionRequest
   ): Promise<void> {
-    const connectorId = requestPayload.connectorId;
-
-    if (connectorId === 0 || !chargingStation.connectors.has(connectorId)) {
+    const transactionConnectorId = requestPayload.connectorId;
+    if (
+      transactionConnectorId === 0 ||
+      chargingStation.hasConnector(transactionConnectorId) === false
+    ) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to start a transaction on a non existing connector id ${connectorId.toString()}`
+        `${chargingStation.logPrefix()} Trying to start a transaction on a non existing connector id ${transactionConnectorId.toString()}`
       );
       return;
     }
     if (
-      chargingStation.getConnectorStatus(connectorId)?.transactionRemoteStarted === true &&
+      chargingStation.getConnectorStatus(transactionConnectorId)?.transactionRemoteStarted ===
+        true &&
       chargingStation.getAuthorizeRemoteTxRequests() === true &&
       chargingStation.getLocalAuthListEnabled() === true &&
       chargingStation.hasIdTags() &&
-      chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized === false
+      chargingStation.getConnectorStatus(transactionConnectorId)?.idTagLocalAuthorized === false
     ) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to start a transaction with a not local authorized idTag ${
-          chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag
-        } on connector id ${connectorId.toString()}`
+          chargingStation.getConnectorStatus(transactionConnectorId)?.localAuthorizeIdTag
+        } on connector id ${transactionConnectorId.toString()}`
       );
-      await this.resetConnectorOnStartTransactionError(chargingStation, connectorId);
+      await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId);
       return;
     }
     if (
-      chargingStation.getConnectorStatus(connectorId)?.transactionRemoteStarted === true &&
+      chargingStation.getConnectorStatus(transactionConnectorId)?.transactionRemoteStarted ===
+        true &&
       chargingStation.getAuthorizeRemoteTxRequests() === true &&
       chargingStation.getMustAuthorizeAtRemoteStart() === true &&
-      chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized === false &&
-      chargingStation.getConnectorStatus(connectorId)?.idTagAuthorized === false
+      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(connectorId)?.authorizeIdTag
-        } on connector id ${connectorId.toString()}`
+          chargingStation.getConnectorStatus(transactionConnectorId)?.authorizeIdTag
+        } on connector id ${transactionConnectorId.toString()}`
       );
-      await this.resetConnectorOnStartTransactionError(chargingStation, connectorId);
+      await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId);
       return;
     }
     if (
-      chargingStation.getConnectorStatus(connectorId)?.idTagAuthorized &&
-      chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag !== requestPayload.idTag
+      chargingStation.getConnectorStatus(transactionConnectorId)?.idTagAuthorized &&
+      chargingStation.getConnectorStatus(transactionConnectorId)?.authorizeIdTag !==
+        requestPayload.idTag
     ) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${
           requestPayload.idTag
         } different from the authorize request one ${
-          chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag
-        } on connector id ${connectorId.toString()}`
+          chargingStation.getConnectorStatus(transactionConnectorId)?.authorizeIdTag
+        } on connector id ${transactionConnectorId.toString()}`
       );
-      await this.resetConnectorOnStartTransactionError(chargingStation, connectorId);
+      await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId);
       return;
     }
     if (
-      chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized &&
-      chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag !== requestPayload.idTag
+      chargingStation.getConnectorStatus(transactionConnectorId)?.idTagLocalAuthorized &&
+      chargingStation.getConnectorStatus(transactionConnectorId)?.localAuthorizeIdTag !==
+        requestPayload.idTag
     ) {
       logger.error(
         `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${
           requestPayload.idTag
         } different from the local authorized one ${
-          chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag
-        } on connector id ${connectorId.toString()}`
+          chargingStation.getConnectorStatus(transactionConnectorId)?.localAuthorizeIdTag
+        } on connector id ${transactionConnectorId.toString()}`
       );
-      await this.resetConnectorOnStartTransactionError(chargingStation, connectorId);
+      await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId);
       return;
     }
-    if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) {
-      logger.debug(
-        `${chargingStation.logPrefix()} Trying to start a transaction on an already used connector ${connectorId.toString()}: %j`,
-        chargingStation.getConnectorStatus(connectorId)
+    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)
       );
       return;
     }
+    if (chargingStation.hasEvses) {
+      for (const [evseId, evseStatus] of chargingStation.evses) {
+        if (evseStatus.connectors.size > 1) {
+          for (const [connectorId, connectorStatus] of evseStatus.connectors) {
+            if (
+              transactionConnectorId !== connectorId &&
+              connectorStatus?.transactionStarted === true
+            ) {
+              logger.error(
+                `${chargingStation.logPrefix()} Trying to start a transaction on an already used evse id ${evseId.toString()}:`,
+                evseStatus
+              );
+              await this.resetConnectorOnStartTransactionError(
+                chargingStation,
+                transactionConnectorId
+              );
+              return;
+            }
+          }
+        }
+      }
+    }
     if (
-      chargingStation.getConnectorStatus(connectorId)?.status !==
+      chargingStation.getConnectorStatus(transactionConnectorId)?.status !==
         OCPP16ChargePointStatus.Available &&
-      chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.Preparing
+      chargingStation.getConnectorStatus(transactionConnectorId)?.status !==
+        OCPP16ChargePointStatus.Preparing
     ) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to start a transaction on connector ${connectorId.toString()} with status ${
-          chargingStation.getConnectorStatus(connectorId)?.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)) {
-    //   logger.warn(
-    //     `${chargingStation.logPrefix()} Trying to start a transaction on connector ${connectorId.toString()} with a non integer transaction Id ${
-    //       payload.transactionId
-    //     }, converting to integer`
-    //   );
-    //   payload.transactionId = Utils.convertToInt(payload.transactionId);
-    // }
+    if (!Number.isInteger(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`
+      );
+      payload.transactionId = Utils.convertToInt(payload.transactionId);
+    }
 
     if (payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
-      chargingStation.getConnectorStatus(connectorId).transactionStarted = true;
-      chargingStation.getConnectorStatus(connectorId).transactionId = payload.transactionId;
-      chargingStation.getConnectorStatus(connectorId).transactionIdTag = requestPayload.idTag;
+      chargingStation.getConnectorStatus(transactionConnectorId).transactionStarted = true;
+      chargingStation.getConnectorStatus(transactionConnectorId).transactionId =
+        payload.transactionId;
+      chargingStation.getConnectorStatus(transactionConnectorId).transactionIdTag =
+        requestPayload.idTag;
       chargingStation.getConnectorStatus(
-        connectorId
+        transactionConnectorId
       ).transactionEnergyActiveImportRegisterValue = 0;
-      chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue =
+      chargingStation.getConnectorStatus(transactionConnectorId).transactionBeginMeterValue =
         OCPP16ServiceUtils.buildTransactionBeginMeterValue(
           chargingStation,
-          connectorId,
+          transactionConnectorId,
           requestPayload.meterStart
         );
       chargingStation.getBeginEndMeterValues() &&
@@ -551,22 +613,24 @@ export class OCPP16ResponseService extends OCPPResponseService {
           OCPP16MeterValuesRequest,
           OCPP16MeterValuesResponse
         >(chargingStation, OCPP16RequestCommand.METER_VALUES, {
-          connectorId,
+          connectorId: transactionConnectorId,
           transactionId: payload.transactionId,
-          meterValue: [chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue],
+          meterValue: [
+            chargingStation.getConnectorStatus(transactionConnectorId).transactionBeginMeterValue,
+          ],
         }));
       await OCPP16ServiceUtils.sendAndSetConnectorStatus(
         chargingStation,
-        connectorId,
+        transactionConnectorId,
         OCPP16ChargePointStatus.Charging
       );
       logger.info(
-        `${chargingStation.logPrefix()} Transaction ${payload.transactionId.toString()} STARTED on ${
+        `${chargingStation.logPrefix()} Transaction with id ${payload.transactionId.toString()} STARTED on ${
           chargingStation.stationInfo.chargingStationId
-        }#${connectorId.toString()} for idTag '${requestPayload.idTag}'`
+        }#${transactionConnectorId.toString()} for idTag '${requestPayload.idTag}'`
       );
       if (chargingStation.stationInfo.powerSharedByConnectors) {
-        chargingStation.powerDivider++;
+        ++chargingStation.powerDivider;
       }
       const configuredMeterValueSampleInterval =
         ChargingStationConfigurationUtils.getConfigurationKey(
@@ -574,18 +638,18 @@ export class OCPP16ResponseService extends OCPPResponseService {
           OCPP16StandardParametersKey.MeterValueSampleInterval
         );
       chargingStation.startMeterValues(
-        connectorId,
+        transactionConnectorId,
         configuredMeterValueSampleInterval
           ? Utils.convertToInt(configuredMeterValueSampleInterval.value) * 1000
           : Constants.DEFAULT_METER_VALUES_INTERVAL
       );
     } else {
       logger.warn(
-        `${chargingStation.logPrefix()} Starting transaction id ${payload.transactionId.toString()} REJECTED with status '${
+        `${chargingStation.logPrefix()} Starting transaction with id ${payload.transactionId.toString()} REJECTED with status '${
           payload.idTagInfo?.status
         }', idTag '${requestPayload.idTag}'`
       );
-      await this.resetConnectorOnStartTransactionError(chargingStation, connectorId);
+      await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId);
     }
   }
 
@@ -595,7 +659,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
   ): Promise<void> {
     ChargingStationUtils.resetConnectorStatus(chargingStation.getConnectorStatus(connectorId));
     chargingStation.stopMeterValues(connectorId);
-    parentPort?.postMessage(MessageChannelUtils.buildUpdatedMessage(chargingStation));
+    parentPort?.postMessage(buildUpdatedMessage(chargingStation));
     if (
       chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.Available
     ) {
@@ -617,7 +681,7 @@ export class OCPP16ResponseService extends OCPPResponseService {
     );
     if (Utils.isNullOrUndefined(transactionConnectorId)) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to stop a non existing transaction ${requestPayload.transactionId.toString()}`
+        `${chargingStation.logPrefix()} Trying to stop a non existing transaction with id ${requestPayload.transactionId.toString()}`
       );
       return;
     }
@@ -661,8 +725,8 @@ export class OCPP16ResponseService extends OCPPResponseService {
       chargingStation.getConnectorStatus(transactionConnectorId)
     );
     chargingStation.stopMeterValues(transactionConnectorId);
-    parentPort?.postMessage(MessageChannelUtils.buildUpdatedMessage(chargingStation));
-    const logMsg = `${chargingStation.logPrefix()} Transaction ${requestPayload.transactionId.toString()} STOPPED on ${
+    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'