Fixes to OCPP commands PDU validation code:
[e-mobility-charging-stations-simulator.git] / src / charging-station / ocpp / 1.6 / OCPP16ResponseService.ts
index 93465c620fb9ff04584a1adecead5781ead24935..061466e8df4b8e4ce5df5440e793836021f18f71 100644 (file)
-// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+import type { JSONSchemaType } from 'ajv';
+
+import OCPPError from '../../../exception/OCPPError';
+import type { JsonObject, JsonType } from '../../../types/JsonType';
+import { OCPP16ChargePointErrorCode } from '../../../types/ocpp/1.6/ChargePointErrorCode';
+import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus';
+import { OCPP16StandardParametersKey } from '../../../types/ocpp/1.6/Configuration';
+import type {
+  OCPP16MeterValuesRequest,
+  OCPP16MeterValuesResponse,
+} from '../../../types/ocpp/1.6/MeterValues';
 import {
-  AuthorizeRequest,
-  OCPP16AuthorizationStatus,
-  OCPP16AuthorizeResponse,
-  OCPP16StartTransactionResponse,
-  OCPP16StopTransactionResponse,
-  StartTransactionRequest,
-  StopTransactionRequest,
-} from '../../../types/ocpp/1.6/Transaction';
-import {
-  HeartbeatRequest,
+  type OCPP16BootNotificationRequest,
+  OCPP16IncomingRequestCommand,
   OCPP16RequestCommand,
-  StatusNotificationRequest,
+  type OCPP16StatusNotificationRequest,
 } from '../../../types/ocpp/1.6/Requests';
-import {
-  HeartbeatResponse,
+import type {
+  DiagnosticsStatusNotificationResponse,
   OCPP16BootNotificationResponse,
-  OCPP16RegistrationStatus,
-  StatusNotificationResponse,
+  OCPP16DataTransferResponse,
+  OCPP16HeartbeatResponse,
+  OCPP16StatusNotificationResponse,
 } from '../../../types/ocpp/1.6/Responses';
-import { MeterValuesRequest, MeterValuesResponse } from '../../../types/ocpp/1.6/MeterValues';
-
-import type ChargingStation from '../../ChargingStation';
+import {
+  OCPP16AuthorizationStatus,
+  type OCPP16AuthorizeRequest,
+  type OCPP16AuthorizeResponse,
+  type OCPP16StartTransactionRequest,
+  type OCPP16StartTransactionResponse,
+  type OCPP16StopTransactionRequest,
+  type OCPP16StopTransactionResponse,
+} from '../../../types/ocpp/1.6/Transaction';
 import { ErrorType } from '../../../types/ocpp/ErrorType';
-import { JsonType } from '../../../types/JsonType';
-import { OCPP16ChargePointErrorCode } from '../../../types/ocpp/1.6/ChargePointErrorCode';
-import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus';
-import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
-import { OCPP16StandardParametersKey } from '../../../types/ocpp/1.6/Configuration';
-import OCPPError from '../../../exception/OCPPError';
-import OCPPResponseService from '../OCPPResponseService';
-import { ResponseHandler } from '../../../types/ocpp/Responses';
-import Utils from '../../../utils/Utils';
+import { OCPPVersion } from '../../../types/ocpp/OCPPVersion';
+import { RegistrationStatusEnumType, type ResponseHandler } from '../../../types/ocpp/Responses';
+import Constants from '../../../utils/Constants';
 import logger from '../../../utils/Logger';
+import Utils from '../../../utils/Utils';
+import type ChargingStation from '../../ChargingStation';
+import { ChargingStationConfigurationUtils } from '../../ChargingStationConfigurationUtils';
+import OCPPResponseService from '../OCPPResponseService';
+import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
 
 const moduleName = 'OCPP16ResponseService';
 
 export default class OCPP16ResponseService extends OCPPResponseService {
+  public jsonIncomingRequestResponseSchemas: Map<
+    OCPP16IncomingRequestCommand,
+    JSONSchemaType<JsonObject>
+  >;
+
   private responseHandlers: Map<OCPP16RequestCommand, ResponseHandler>;
+  private jsonSchemas: Map<OCPP16RequestCommand, JSONSchemaType<JsonObject>>;
 
-  public constructor(chargingStation: ChargingStation) {
+  public constructor() {
     if (new.target?.name === moduleName) {
       throw new TypeError(`Cannot construct ${new.target?.name} instances directly`);
     }
-    super(chargingStation);
+    super(OCPPVersion.VERSION_16);
     this.responseHandlers = new Map<OCPP16RequestCommand, ResponseHandler>([
       [OCPP16RequestCommand.BOOT_NOTIFICATION, this.handleResponseBootNotification.bind(this)],
-      [OCPP16RequestCommand.HEARTBEAT, this.handleResponseHeartbeat.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.handleResponseStatusNotification.bind(this)],
-      [OCPP16RequestCommand.METER_VALUES, this.handleResponseMeterValues.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)],
     ]);
+    this.jsonSchemas = new Map<OCPP16RequestCommand, JSONSchemaType<JsonObject>>([
+      [
+        OCPP16RequestCommand.BOOT_NOTIFICATION,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/1.6/BootNotificationResponse.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP16BootNotificationResponse>,
+      ],
+      [
+        OCPP16RequestCommand.HEARTBEAT,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/1.6/HeartbeatResponse.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP16HeartbeatResponse>,
+      ],
+      [
+        OCPP16RequestCommand.AUTHORIZE,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/1.6/AuthorizeResponse.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP16AuthorizeResponse>,
+      ],
+      [
+        OCPP16RequestCommand.START_TRANSACTION,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/1.6/StartTransactionResponse.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP16StartTransactionResponse>,
+      ],
+      [
+        OCPP16RequestCommand.STOP_TRANSACTION,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/1.6/StopTransactionResponse.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP16StopTransactionResponse>,
+      ],
+      [
+        OCPP16RequestCommand.STATUS_NOTIFICATION,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP16StatusNotificationResponse>,
+      ],
+      [
+        OCPP16RequestCommand.METER_VALUES,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/1.6/MeterValuesResponse.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP16MeterValuesResponse>,
+      ],
+      [
+        OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<DiagnosticsStatusNotificationResponse>,
+      ],
+      [
+        OCPP16RequestCommand.DATA_TRANSFER,
+        JSON.parse(
+          fs.readFileSync(
+            path.resolve(
+              path.dirname(fileURLToPath(import.meta.url)),
+              '../../../assets/json-schemas/ocpp/1.6/DataTransferResponse.json'
+            ),
+            'utf8'
+          )
+        ) as JSONSchemaType<OCPP16DataTransferResponse>,
+      ],
+    ]);
+    this.jsonIncomingRequestResponseSchemas = new Map();
+    this.validatePayload.bind(this);
   }
 
-  public async handleResponse(
+  public async responseHandler(
+    chargingStation: ChargingStation,
     commandName: OCPP16RequestCommand,
-    payload: JsonType | string,
+    payload: JsonType,
     requestPayload: JsonType
   ): Promise<void> {
     if (
-      this.chargingStation.isRegistered() ||
+      chargingStation.isRegistered() === true ||
       commandName === OCPP16RequestCommand.BOOT_NOTIFICATION
     ) {
-      if (this.responseHandlers.has(commandName)) {
+      if (
+        this.responseHandlers.has(commandName) === true &&
+        OCPP16ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true
+      ) {
         try {
-          await this.responseHandlers.get(commandName)(payload, requestPayload);
+          this.validatePayload(chargingStation, commandName, payload);
+          await this.responseHandlers.get(commandName)(chargingStation, payload, requestPayload);
         } catch (error) {
           logger.error(
-            this.chargingStation.logPrefix() + ' Handle request response error: %j',
+            `${chargingStation.logPrefix()} ${moduleName}.responseHandler: Handle response error:`,
             error
           );
           throw error;
@@ -79,114 +217,133 @@ export default class OCPP16ResponseService extends OCPPResponseService {
         // Throw exception
         throw new OCPPError(
           ErrorType.NOT_IMPLEMENTED,
-          `${commandName} is not implemented to handle request response payload ${JSON.stringify(
+          `${commandName} is not implemented to handle response PDU ${JSON.stringify(
             payload,
             null,
             2
           )}`,
-          commandName
+          commandName,
+          payload
         );
       }
     } else {
       throw new OCPPError(
         ErrorType.SECURITY_ERROR,
-        `${commandName} cannot be issued to handle request response payload ${JSON.stringify(
+        `${commandName} cannot be issued to handle response PDU ${JSON.stringify(
           payload,
           null,
           2
-        )} while the charging station is not registered on the central server. `,
-        commandName
+        )} while the charging station is not registered on the central server.`,
+        commandName,
+        payload
       );
     }
   }
 
-  private handleResponseBootNotification(payload: OCPP16BootNotificationResponse): void {
-    if (payload.status === OCPP16RegistrationStatus.ACCEPTED) {
-      this.chargingStation.addConfigurationKey(
-        OCPP16StandardParametersKey.HeartBeatInterval,
+  private validatePayload(
+    chargingStation: ChargingStation,
+    commandName: OCPP16RequestCommand,
+    payload: JsonType
+  ): boolean {
+    if (this.jsonSchemas.has(commandName) === true) {
+      return this.validateResponsePayload(
+        chargingStation,
+        commandName,
+        this.jsonSchemas.get(commandName),
+        payload
+      );
+    }
+    logger.warn(
+      `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command '${commandName}' PDU validation`
+    );
+    return false;
+  }
+
+  private handleResponseBootNotification(
+    chargingStation: ChargingStation,
+    payload: OCPP16BootNotificationResponse
+  ): void {
+    if (payload.status === RegistrationStatusEnumType.ACCEPTED) {
+      ChargingStationConfigurationUtils.addConfigurationKey(
+        chargingStation,
+        OCPP16StandardParametersKey.HeartbeatInterval,
         payload.interval.toString(),
         {},
         { overwrite: true, save: true }
       );
-      this.chargingStation.addConfigurationKey(
-        OCPP16StandardParametersKey.HeartbeatInterval,
+      ChargingStationConfigurationUtils.addConfigurationKey(
+        chargingStation,
+        OCPP16StandardParametersKey.HeartBeatInterval,
         payload.interval.toString(),
         { visible: false },
         { overwrite: true, save: true }
       );
-      this.chargingStation.heartbeatSetInterval
-        ? this.chargingStation.restartHeartbeat()
-        : this.chargingStation.startHeartbeat();
+      chargingStation.heartbeatSetInterval
+        ? chargingStation.restartHeartbeat()
+        : chargingStation.startHeartbeat();
     }
-    if (Object.values(OCPP16RegistrationStatus).includes(payload.status)) {
-      const logMsg = `${this.chargingStation.logPrefix()} Charging station in '${
+    if (Object.values(RegistrationStatusEnumType).includes(payload.status)) {
+      const logMsg = `${chargingStation.logPrefix()} Charging station in '${
         payload.status
       }' state on the central server`;
-      payload.status === OCPP16RegistrationStatus.REJECTED
+      payload.status === RegistrationStatusEnumType.REJECTED
         ? logger.warn(logMsg)
         : logger.info(logMsg);
     } else {
       logger.error(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Charging station boot notification response received: %j with undefined registration status',
         payload
       );
     }
   }
 
-  private handleResponseHeartbeat(
-    payload: HeartbeatResponse,
-    requestPayload: HeartbeatRequest
-  ): void {
-    logger.debug(
-      this.chargingStation.logPrefix() +
-        ' Heartbeat response received: %j to Heartbeat request: %j',
-      payload,
-      requestPayload
-    );
-  }
-
   private handleResponseAuthorize(
+    chargingStation: ChargingStation,
     payload: OCPP16AuthorizeResponse,
-    requestPayload: AuthorizeRequest
+    requestPayload: OCPP16AuthorizeRequest
   ): void {
     let authorizeConnectorId: number;
-    for (const connectorId of this.chargingStation.connectors.keys()) {
+    for (const connectorId of chargingStation.connectors.keys()) {
       if (
         connectorId > 0 &&
-        this.chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag ===
-          requestPayload.idTag
+        chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag === requestPayload.idTag
       ) {
         authorizeConnectorId = connectorId;
         break;
       }
     }
+    const isAuthorizeConnectorIdDefined = authorizeConnectorId !== undefined;
     if (payload.idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) {
-      this.chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = true;
+      isAuthorizeConnectorIdDefined &&
+        (chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = true);
       logger.debug(
-        `${this.chargingStation.logPrefix()} IdTag ${
-          requestPayload.idTag
-        } authorized on connector ${authorizeConnectorId}`
+        `${chargingStation.logPrefix()} IdTag '${requestPayload.idTag}' accepted${
+          isAuthorizeConnectorIdDefined ? ` on connector ${authorizeConnectorId}` : ''
+        }`
       );
     } else {
-      this.chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = false;
-      delete this.chargingStation.getConnectorStatus(authorizeConnectorId).authorizeIdTag;
+      if (isAuthorizeConnectorIdDefined) {
+        chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = false;
+        delete chargingStation.getConnectorStatus(authorizeConnectorId).authorizeIdTag;
+      }
       logger.debug(
-        `${this.chargingStation.logPrefix()} IdTag ${requestPayload.idTag} refused with status '${
+        `${chargingStation.logPrefix()} IdTag '${requestPayload.idTag}' rejected with status '${
           payload.idTagInfo.status
-        }' on connector ${authorizeConnectorId}`
+        }'${isAuthorizeConnectorIdDefined ? ` on connector ${authorizeConnectorId}` : ''}`
       );
     }
   }
 
   private async handleResponseStartTransaction(
+    chargingStation: ChargingStation,
     payload: OCPP16StartTransactionResponse,
-    requestPayload: StartTransactionRequest
+    requestPayload: OCPP16StartTransactionRequest
   ): Promise<void> {
     const connectorId = requestPayload.connectorId;
 
     let transactionConnectorId: number;
-    for (const id of this.chargingStation.connectors.keys()) {
+    for (const id of chargingStation.connectors.keys()) {
       if (id > 0 && id === connectorId) {
         transactionConnectorId = id;
         break;
@@ -194,273 +351,277 @@ export default class OCPP16ResponseService extends OCPPResponseService {
     }
     if (!transactionConnectorId) {
       logger.error(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Trying to start a transaction on a non existing connector Id ' +
           connectorId.toString()
       );
       return;
     }
     if (
-      this.chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted &&
-      this.chargingStation.getAuthorizeRemoteTxRequests() &&
-      this.chargingStation.getLocalAuthListEnabled() &&
-      this.chargingStation.hasAuthorizedTags() &&
-      !this.chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized
+      chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted === true &&
+      chargingStation.getAuthorizeRemoteTxRequests() === true &&
+      chargingStation.getLocalAuthListEnabled() === true &&
+      chargingStation.hasAuthorizedTags() &&
+      chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized === false
     ) {
       logger.error(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Trying to start a transaction with a not local authorized idTag ' +
-          this.chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag +
+          chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag +
           ' on connector Id ' +
           connectorId.toString()
       );
-      await this.resetConnectorOnStartTransactionError(connectorId);
+      await this.resetConnectorOnStartTransactionError(chargingStation, connectorId);
       return;
     }
     if (
-      this.chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted &&
-      this.chargingStation.getAuthorizeRemoteTxRequests() &&
-      this.chargingStation.getMayAuthorizeAtRemoteStart() &&
-      !this.chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized &&
-      !this.chargingStation.getConnectorStatus(connectorId).idTagAuthorized
+      chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted === true &&
+      chargingStation.getAuthorizeRemoteTxRequests() === true &&
+      chargingStation.getMustAuthorizeAtRemoteStart() === true &&
+      chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized === false &&
+      chargingStation.getConnectorStatus(connectorId).idTagAuthorized === false
     ) {
       logger.error(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Trying to start a transaction with a not authorized idTag ' +
-          this.chargingStation.getConnectorStatus(connectorId).authorizeIdTag +
+          chargingStation.getConnectorStatus(connectorId).authorizeIdTag +
           ' on connector Id ' +
           connectorId.toString()
       );
-      await this.resetConnectorOnStartTransactionError(connectorId);
+      await this.resetConnectorOnStartTransactionError(chargingStation, connectorId);
       return;
     }
     if (
-      this.chargingStation.getConnectorStatus(connectorId).idTagAuthorized &&
-      this.chargingStation.getConnectorStatus(connectorId).authorizeIdTag !== requestPayload.idTag
+      chargingStation.getConnectorStatus(connectorId).idTagAuthorized &&
+      chargingStation.getConnectorStatus(connectorId).authorizeIdTag !== requestPayload.idTag
     ) {
       logger.error(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Trying to start a transaction with an idTag ' +
           requestPayload.idTag +
           ' different from the authorize request one ' +
-          this.chargingStation.getConnectorStatus(connectorId).authorizeIdTag +
+          chargingStation.getConnectorStatus(connectorId).authorizeIdTag +
           ' on connector Id ' +
           connectorId.toString()
       );
-      await this.resetConnectorOnStartTransactionError(connectorId);
+      await this.resetConnectorOnStartTransactionError(chargingStation, connectorId);
       return;
     }
     if (
-      this.chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized &&
-      this.chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag !==
-        requestPayload.idTag
+      chargingStation.getConnectorStatus(connectorId).idTagLocalAuthorized &&
+      chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag !== requestPayload.idTag
     ) {
       logger.error(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Trying to start a transaction with an idTag ' +
           requestPayload.idTag +
           ' different from the local authorized one ' +
-          this.chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag +
+          chargingStation.getConnectorStatus(connectorId).localAuthorizeIdTag +
           ' on connector Id ' +
           connectorId.toString()
       );
-      await this.resetConnectorOnStartTransactionError(connectorId);
+      await this.resetConnectorOnStartTransactionError(chargingStation, connectorId);
       return;
     }
-    if (this.chargingStation.getConnectorStatus(connectorId)?.transactionStarted) {
+    if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) {
       logger.debug(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Trying to start a transaction on an already used connector ' +
           connectorId.toString() +
           ': %j',
-        this.chargingStation.getConnectorStatus(connectorId)
+        chargingStation.getConnectorStatus(connectorId)
       );
       return;
     }
     if (
-      this.chargingStation.getConnectorStatus(connectorId)?.status !==
+      chargingStation.getConnectorStatus(connectorId)?.status !==
         OCPP16ChargePointStatus.AVAILABLE &&
-      this.chargingStation.getConnectorStatus(connectorId)?.status !==
-        OCPP16ChargePointStatus.PREPARING
+      chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.PREPARING
     ) {
       logger.error(
-        `${this.chargingStation.logPrefix()} Trying to start a transaction on connector ${connectorId.toString()} with status ${
-          this.chargingStation.getConnectorStatus(connectorId)?.status
+        `${chargingStation.logPrefix()} Trying to start a transaction on connector ${connectorId.toString()} with status ${
+          chargingStation.getConnectorStatus(connectorId)?.status
         }`
       );
       return;
     }
-    if (!Number.isInteger(payload.transactionId)) {
-      logger.warn(
-        `${this.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 ${connectorId.toString()} with a non integer transaction Id ${
+    //       payload.transactionId
+    //     }, converting to integer`
+    //   );
+    //   payload.transactionId = Utils.convertToInt(payload.transactionId);
+    // }
 
     if (payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
-      this.chargingStation.getConnectorStatus(connectorId).transactionStarted = true;
-      this.chargingStation.getConnectorStatus(connectorId).transactionId = payload.transactionId;
-      this.chargingStation.getConnectorStatus(connectorId).transactionIdTag = requestPayload.idTag;
-      this.chargingStation.getConnectorStatus(
+      chargingStation.getConnectorStatus(connectorId).transactionStarted = true;
+      chargingStation.getConnectorStatus(connectorId).transactionId = payload.transactionId;
+      chargingStation.getConnectorStatus(connectorId).transactionIdTag = requestPayload.idTag;
+      chargingStation.getConnectorStatus(
         connectorId
       ).transactionEnergyActiveImportRegisterValue = 0;
-      this.chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue =
+      chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue =
         OCPP16ServiceUtils.buildTransactionBeginMeterValue(
-          this.chargingStation,
+          chargingStation,
           connectorId,
           requestPayload.meterStart
         );
-      this.chargingStation.getBeginEndMeterValues() &&
-        (await this.chargingStation.ocppRequestService.sendMessageHandler(
-          OCPP16RequestCommand.METER_VALUES,
-          {
-            connectorId,
-            transactionId: payload.transactionId,
-            meterValue:
-              this.chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue,
-          }
-        ));
-      await this.chargingStation.ocppRequestService.sendMessageHandler(
-        OCPP16RequestCommand.STATUS_NOTIFICATION,
-        {
+      chargingStation.getBeginEndMeterValues() &&
+        (await chargingStation.ocppRequestService.requestHandler<
+          OCPP16MeterValuesRequest,
+          OCPP16MeterValuesResponse
+        >(chargingStation, OCPP16RequestCommand.METER_VALUES, {
           connectorId,
-          status: OCPP16ChargePointStatus.CHARGING,
-          errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-        }
-      );
-      this.chargingStation.getConnectorStatus(connectorId).status =
-        OCPP16ChargePointStatus.CHARGING;
+          transactionId: payload.transactionId,
+          meterValue: [chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue],
+        }));
+      await chargingStation.ocppRequestService.requestHandler<
+        OCPP16StatusNotificationRequest,
+        OCPP16StatusNotificationResponse
+      >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, {
+        connectorId,
+        status: OCPP16ChargePointStatus.CHARGING,
+        errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+      });
+      chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.CHARGING;
       logger.info(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Transaction ' +
           payload.transactionId.toString() +
           ' STARTED on ' +
-          this.chargingStation.stationInfo.chargingStationId +
+          chargingStation.stationInfo.chargingStationId +
           '#' +
           connectorId.toString() +
-          ' for idTag ' +
-          requestPayload.idTag
+          " for idTag '" +
+          requestPayload.idTag +
+          "'"
       );
-      if (this.chargingStation.stationInfo.powerSharedByConnectors) {
-        this.chargingStation.stationInfo.powerDivider++;
+      if (chargingStation.stationInfo.powerSharedByConnectors) {
+        chargingStation.powerDivider++;
       }
-      const configuredMeterValueSampleInterval = this.chargingStation.getConfigurationKey(
-        OCPP16StandardParametersKey.MeterValueSampleInterval
-      );
-      this.chargingStation.startMeterValues(
+      const configuredMeterValueSampleInterval =
+        ChargingStationConfigurationUtils.getConfigurationKey(
+          chargingStation,
+          OCPP16StandardParametersKey.MeterValueSampleInterval
+        );
+      chargingStation.startMeterValues(
         connectorId,
         configuredMeterValueSampleInterval
           ? Utils.convertToInt(configuredMeterValueSampleInterval.value) * 1000
-          : 60000
+          : Constants.DEFAULT_METER_VALUES_INTERVAL
       );
     } else {
       logger.warn(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Starting transaction id ' +
           payload.transactionId.toString() +
           " REJECTED with status '" +
           payload?.idTagInfo?.status +
-          "', idTag " +
-          requestPayload.idTag
+          "', idTag '" +
+          requestPayload.idTag +
+          "'"
       );
-      await this.resetConnectorOnStartTransactionError(connectorId);
+      await this.resetConnectorOnStartTransactionError(chargingStation, connectorId);
     }
   }
 
-  private async resetConnectorOnStartTransactionError(connectorId: number): Promise<void> {
-    this.chargingStation.resetConnectorStatus(connectorId);
+  private async resetConnectorOnStartTransactionError(
+    chargingStation: ChargingStation,
+    connectorId: number
+  ): Promise<void> {
+    chargingStation.resetConnectorStatus(connectorId);
     if (
-      this.chargingStation.getConnectorStatus(connectorId).status !==
-      OCPP16ChargePointStatus.AVAILABLE
+      chargingStation.getConnectorStatus(connectorId).status !== OCPP16ChargePointStatus.AVAILABLE
     ) {
-      await this.chargingStation.ocppRequestService.sendMessageHandler(
-        OCPP16RequestCommand.STATUS_NOTIFICATION,
-        {
-          connectorId,
-          status: OCPP16ChargePointStatus.AVAILABLE,
-          errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-        }
-      );
-      this.chargingStation.getConnectorStatus(connectorId).status =
-        OCPP16ChargePointStatus.AVAILABLE;
+      await chargingStation.ocppRequestService.requestHandler<
+        OCPP16StatusNotificationRequest,
+        OCPP16StatusNotificationResponse
+      >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, {
+        connectorId,
+        status: OCPP16ChargePointStatus.AVAILABLE,
+        errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+      });
+      chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.AVAILABLE;
     }
   }
 
   private async handleResponseStopTransaction(
+    chargingStation: ChargingStation,
     payload: OCPP16StopTransactionResponse,
-    requestPayload: StopTransactionRequest
+    requestPayload: OCPP16StopTransactionRequest
   ): Promise<void> {
-    const transactionConnectorId = this.chargingStation.getConnectorIdByTransactionId(
+    const transactionConnectorId = chargingStation.getConnectorIdByTransactionId(
       requestPayload.transactionId
     );
     if (!transactionConnectorId) {
       logger.error(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Trying to stop a non existing transaction ' +
           requestPayload.transactionId.toString()
       );
       return;
     }
     if (payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
-      this.chargingStation.getBeginEndMeterValues() &&
-        !this.chargingStation.getOcppStrictCompliance() &&
-        this.chargingStation.getOutOfOrderEndMeterValues() &&
-        (await this.chargingStation.ocppRequestService.sendMessageHandler(
-          OCPP16RequestCommand.METER_VALUES,
-          {
-            connectorId: transactionConnectorId,
-            transactionId: requestPayload.transactionId,
-            meterValue: OCPP16ServiceUtils.buildTransactionEndMeterValue(
-              this.chargingStation,
+      chargingStation.getBeginEndMeterValues() === true &&
+        chargingStation.getOcppStrictCompliance() === false &&
+        chargingStation.getOutOfOrderEndMeterValues() === true &&
+        (await chargingStation.ocppRequestService.requestHandler<
+          OCPP16MeterValuesRequest,
+          OCPP16MeterValuesResponse
+        >(chargingStation, OCPP16RequestCommand.METER_VALUES, {
+          connectorId: transactionConnectorId,
+          transactionId: requestPayload.transactionId,
+          meterValue: [
+            OCPP16ServiceUtils.buildTransactionEndMeterValue(
+              chargingStation,
               transactionConnectorId,
               requestPayload.meterStop
             ),
-          }
-        ));
+          ],
+        }));
       if (
-        !this.chargingStation.isChargingStationAvailable() ||
-        !this.chargingStation.isConnectorAvailable(transactionConnectorId)
+        chargingStation.isChargingStationAvailable() === false ||
+        chargingStation.isConnectorAvailable(transactionConnectorId) === false
       ) {
-        await this.chargingStation.ocppRequestService.sendMessageHandler(
-          OCPP16RequestCommand.STATUS_NOTIFICATION,
-          {
-            connectorId: transactionConnectorId,
-            status: OCPP16ChargePointStatus.UNAVAILABLE,
-            errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-          }
-        );
-        this.chargingStation.getConnectorStatus(transactionConnectorId).status =
+        await chargingStation.ocppRequestService.requestHandler<
+          OCPP16StatusNotificationRequest,
+          OCPP16StatusNotificationResponse
+        >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, {
+          connectorId: transactionConnectorId,
+          status: OCPP16ChargePointStatus.UNAVAILABLE,
+          errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+        });
+        chargingStation.getConnectorStatus(transactionConnectorId).status =
           OCPP16ChargePointStatus.UNAVAILABLE;
       } else {
-        await this.chargingStation.ocppRequestService.sendMessageHandler(
-          OCPP16RequestCommand.STATUS_NOTIFICATION,
-          {
-            connectorId: transactionConnectorId,
-            status: OCPP16ChargePointStatus.AVAILABLE,
-            errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-          }
-        );
-        this.chargingStation.getConnectorStatus(transactionConnectorId).status =
+        await chargingStation.ocppRequestService.requestHandler<
+          OCPP16BootNotificationRequest,
+          OCPP16BootNotificationResponse
+        >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, {
+          connectorId: transactionConnectorId,
+          status: OCPP16ChargePointStatus.AVAILABLE,
+          errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
+        });
+        chargingStation.getConnectorStatus(transactionConnectorId).status =
           OCPP16ChargePointStatus.AVAILABLE;
       }
-      if (this.chargingStation.stationInfo.powerSharedByConnectors) {
-        this.chargingStation.stationInfo.powerDivider--;
+      if (chargingStation.stationInfo.powerSharedByConnectors) {
+        chargingStation.powerDivider--;
       }
+      chargingStation.resetConnectorStatus(transactionConnectorId);
       logger.info(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Transaction ' +
           requestPayload.transactionId.toString() +
           ' STOPPED on ' +
-          this.chargingStation.stationInfo.chargingStationId +
+          chargingStation.stationInfo.chargingStationId +
           '#' +
           transactionConnectorId.toString()
       );
-      this.chargingStation.resetConnectorStatus(transactionConnectorId);
     } else {
       logger.warn(
-        this.chargingStation.logPrefix() +
+        chargingStation.logPrefix() +
           ' Stopping transaction id ' +
           requestPayload.transactionId.toString() +
           " REJECTED with status '" +
@@ -469,28 +630,4 @@ export default class OCPP16ResponseService extends OCPPResponseService {
       );
     }
   }
-
-  private handleResponseStatusNotification(
-    payload: StatusNotificationRequest,
-    requestPayload: StatusNotificationResponse
-  ): void {
-    logger.debug(
-      this.chargingStation.logPrefix() +
-        ' Status notification response received: %j to StatusNotification request: %j',
-      payload,
-      requestPayload
-    );
-  }
-
-  private handleResponseMeterValues(
-    payload: MeterValuesRequest,
-    requestPayload: MeterValuesResponse
-  ): void {
-    logger.debug(
-      this.chargingStation.logPrefix() +
-        ' MeterValues response received: %j to MeterValues request: %j',
-      payload,
-      requestPayload
-    );
-  }
 }