X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16IncomingRequestService.ts;h=73943d4e7f527fa11daf6512a4b7441fdb59081a;hb=d972af76b6d7d1d2a099d254eacf45245b5316ac;hp=46c1201872280760d6972836d4f8c1e80ecf6695;hpb=24578c318295d517762fa075959846f230affbe0;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index 46c12018..73943d4e 100644
--- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@ -1,13 +1,12 @@
-/* eslint-disable max-len */
 // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
 
-import fs from 'node:fs';
-import path from 'node:path';
+import { createWriteStream, readdirSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
 import { URL, fileURLToPath } from 'node:url';
 
 import type { JSONSchemaType } from 'ajv';
 import { Client, type FTPResponse } from 'basic-ftp';
-import tar from 'tar';
+import { create } from 'tar';
 
 import { OCPP16Constants } from './OCPP16Constants';
 import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
@@ -25,7 +24,6 @@ import {
   type ClearChargingProfileRequest,
   type ClearChargingProfileResponse,
   type ConnectorStatus,
-  ConnectorStatusEnum,
   ErrorType,
   type GenericResponse,
   GenericStatus,
@@ -37,11 +35,10 @@ import {
   type JsonObject,
   type JsonType,
   OCPP16AuthorizationStatus,
-  type OCPP16AuthorizeRequest,
-  type OCPP16AuthorizeResponse,
   OCPP16AvailabilityType,
   type OCPP16BootNotificationRequest,
   type OCPP16BootNotificationResponse,
+  type OCPP16CancelReservationRequest,
   OCPP16ChargePointErrorCode,
   OCPP16ChargePointStatus,
   type OCPP16ChargingProfile,
@@ -50,7 +47,6 @@ import {
   type OCPP16ClearCacheRequest,
   type OCPP16DataTransferRequest,
   type OCPP16DataTransferResponse,
-  OCPP16DataTransferStatus,
   OCPP16DataTransferVendorId,
   OCPP16DiagnosticsStatus,
   type OCPP16DiagnosticsStatusNotificationRequest,
@@ -65,6 +61,8 @@ import {
   OCPP16IncomingRequestCommand,
   OCPP16MessageTrigger,
   OCPP16RequestCommand,
+  type OCPP16ReserveNowRequest,
+  type OCPP16ReserveNowResponse,
   OCPP16StandardParametersKey,
   type OCPP16StartTransactionRequest,
   type OCPP16StartTransactionResponse,
@@ -80,22 +78,16 @@ import {
   OCPPVersion,
   type RemoteStartTransactionRequest,
   type RemoteStopTransactionRequest,
+  ReservationFilterKey,
+  ReservationTerminationReason,
   type ResetRequest,
   type SetChargingProfileRequest,
   type SetChargingProfileResponse,
+  type StartTransactionRequest,
   type UnlockConnectorRequest,
   type UnlockConnectorResponse,
 } from '../../../types';
-import type {
-  OCPP16CancelReservationRequest,
-  OCPP16ReserveNowRequest,
-} from '../../../types/ocpp/1.6/Requests';
-import type {
-  OCPP16CancelReservationResponse,
-  OCPP16ReserveNowResponse,
-} from '../../../types/ocpp/1.6/Responses';
 import { Constants, Utils, logger } from '../../../utils';
-import { OCPPConstants } from '../OCPPConstants';
 import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService';
 
 const moduleName = 'OCPP16IncomingRequestService';
@@ -149,6 +141,11 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       [OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, this.handleRequestTriggerMessage.bind(this)],
       [OCPP16IncomingRequestCommand.DATA_TRANSFER, this.handleRequestDataTransfer.bind(this)],
       [OCPP16IncomingRequestCommand.UPDATE_FIRMWARE, this.handleRequestUpdateFirmware.bind(this)],
+      [OCPP16IncomingRequestCommand.RESERVE_NOW, this.handleRequestReserveNow.bind(this)],
+      [
+        OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
+        this.handleRequestCancelReservation.bind(this),
+      ],
     ]);
     this.jsonSchemas = new Map<OCPP16IncomingRequestCommand, JSONSchemaType<JsonObject>>([
       [
@@ -271,6 +268,22 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           'constructor'
         ),
       ],
+      [
+        OCPP16IncomingRequestCommand.RESERVE_NOW,
+        OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ReserveNowRequest>(
+          'assets/json-schemas/ocpp/1.6/ReserveNow.json',
+          moduleName,
+          'constructor'
+        ),
+      ],
+      [
+        OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
+        OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16CancelReservationRequest>(
+          'assets/json-schemas/ocpp/1.6/CancelReservation.json',
+          moduleName,
+          'constructor'
+        ),
+      ],
     ]);
     this.validatePayload = this.validatePayload.bind(this) as (
       chargingStation: ChargingStation,
@@ -322,7 +335,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         } catch (error) {
           // Log
           logger.error(
-            `${chargingStation.logPrefix()} ${moduleName}.incomingRequestHandler: Handle incoming request error:`,
+            `${chargingStation.logPrefix()} ${moduleName}.incomingRequestHandler:
+              Handle incoming request error:`,
             error
           );
           throw error;
@@ -375,7 +389,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       );
     }
     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;
   }
@@ -396,9 +411,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     logger.info(
       `${chargingStation.logPrefix()} ${
         commandPayload.type
-      } reset command received, simulating it. The station will be back online in ${Utils.formatDurationMilliSeconds(
-        chargingStation.stationInfo.resetTime
-      )}`
+      } reset command received, simulating it. The station will be
+        back online in ${Utils.formatDurationMilliSeconds(chargingStation.stationInfo.resetTime)}`
     );
     return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
   }
@@ -410,7 +424,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     const connectorId = commandPayload.connectorId;
     if (chargingStation.hasConnector(connectorId) === false) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to unlock a non existing connector id ${connectorId.toString()}`
+        `${chargingStation.logPrefix()} Trying to unlock a non existing
+          connector id ${connectorId.toString()}`
       );
       return OCPP16Constants.OCPP_RESPONSE_UNLOCK_NOT_SUPPORTED;
     }
@@ -557,9 +572,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     }
     if (chargingStation.hasConnector(commandPayload.connectorId) === false) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to set charging profile(s) to a non existing connector id ${
-          commandPayload.connectorId
-        }`
+        `${chargingStation.logPrefix()} Trying to set charging profile(s) to a
+          non existing connector id ${commandPayload.connectorId}`
       );
       return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
     }
@@ -578,9 +592,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           false)
     ) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to set transaction charging profile(s) on connector ${
-          commandPayload.connectorId
-        } without a started transaction`
+        `${chargingStation.logPrefix()} Trying to set transaction charging profile(s)
+          on connector ${commandPayload.connectorId} without a started transaction`
       );
       return OCPP16Constants.OCPP_SET_CHARGING_PROFILE_RESPONSE_REJECTED;
     }
@@ -613,9 +626,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     }
     if (chargingStation.hasConnector(commandPayload.connectorId) === false) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to get composite schedule to a non existing connector id ${
-          commandPayload.connectorId
-        }`
+        `${chargingStation.logPrefix()} Trying to get composite schedule to a
+          non existing connector id ${commandPayload.connectorId}`
       );
       return OCPP16Constants.OCPP_RESPONSE_REJECTED;
     }
@@ -663,9 +675,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     }
     if (chargingStation.hasConnector(commandPayload.connectorId) === false) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to clear a charging profile(s) to a non existing connector id ${
-          commandPayload.connectorId
-        }`
+        `${chargingStation.logPrefix()} Trying to clear a charging profile(s) to
+          a non existing connector id ${commandPayload.connectorId}`
       );
       return OCPP16Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN;
     }
@@ -748,7 +759,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     const connectorId: number = commandPayload.connectorId;
     if (chargingStation.hasConnector(connectorId) === false) {
       logger.error(
-        `${chargingStation.logPrefix()} Trying to change the availability of a non existing connector id ${connectorId.toString()}`
+        `${chargingStation.logPrefix()} Trying to change the availability of a
+          non existing connector id ${connectorId.toString()}`
       );
       return OCPP16Constants.OCPP_AVAILABILITY_RESPONSE_REJECTED;
     }
@@ -809,31 +821,40 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     chargingStation: ChargingStation,
     commandPayload: RemoteStartTransactionRequest
   ): Promise<GenericResponse> {
-    const transactionConnectorId = commandPayload.connectorId;
-    const reserved: boolean =
+    const { connectorId: transactionConnectorId, idTag, chargingProfile } = commandPayload;
+    const reserved =
       chargingStation.getConnectorStatus(transactionConnectorId).status ===
       OCPP16ChargePointStatus.Reserved;
+    const reservedOnConnectorZero =
+      chargingStation.getConnectorStatus(0).status === OCPP16ChargePointStatus.Reserved;
+    if (
+      (reserved &&
+        !chargingStation.validateIncomingRequestWithReservation(transactionConnectorId, idTag)) ||
+      (reservedOnConnectorZero && !chargingStation.validateIncomingRequestWithReservation(0, idTag))
+    ) {
+      return OCPP16Constants.OCPP_RESPONSE_REJECTED;
+    }
     if (chargingStation.hasConnector(transactionConnectorId) === false) {
       return this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        commandPayload.idTag
+        idTag
       );
     }
     if (
-      chargingStation.isChargingStationAvailable() === false ||
-      chargingStation.isConnectorAvailable(transactionConnectorId) === false ||
-      reserved
+      !chargingStation.isChargingStationAvailable() ||
+      !chargingStation.isConnectorAvailable(transactionConnectorId)
     ) {
       return this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        commandPayload.idTag
+        idTag
       );
     }
-    const remoteStartTransactionLogMsg = `${chargingStation.logPrefix()} Transaction remotely STARTED on ${
+    const remoteStartTransactionLogMsg = `
+      ${chargingStation.logPrefix()} Transaction remotely STARTED on ${
       chargingStation.stationInfo.chargingStationId
-    }#${transactionConnectorId.toString()} for idTag '${commandPayload.idTag}'`;
+    }#${transactionConnectorId.toString()} for idTag '${idTag}'`;
     await OCPP16ServiceUtils.sendAndSetConnectorStatus(
       chargingStation,
       transactionConnectorId,
@@ -841,64 +862,55 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     );
     const connectorStatus = chargingStation.getConnectorStatus(transactionConnectorId);
     // Check if authorized
-    if (chargingStation.getAuthorizeRemoteTxRequests() === true) {
-      const authorized = await this.isAuthorized(
-        chargingStation,
-        transactionConnectorId,
-        commandPayload.idTag
-      );
-      if (authorized === true) {
-        // Authorization successful, start transaction
+    if (
+      chargingStation.getAuthorizeRemoteTxRequests() &&
+      (await OCPP16ServiceUtils.isIdTagAuthorized(chargingStation, transactionConnectorId, idTag))
+    ) {
+      // Authorization successful, start transaction
+      if (
+        this.setRemoteStartTransactionChargingProfile(
+          chargingStation,
+          transactionConnectorId,
+          chargingProfile
+        ) === true
+      ) {
+        connectorStatus.transactionRemoteStarted = true;
+        const startTransactionPayload: Partial<StartTransactionRequest> = {
+          connectorId: transactionConnectorId,
+          idTag,
+        };
+        if (reserved || reservedOnConnectorZero) {
+          const reservation = chargingStation.getReservationBy(
+            ReservationFilterKey.CONNECTOR_ID,
+            reservedOnConnectorZero ? 0 : transactionConnectorId
+          );
+          startTransactionPayload.reservationId = reservation.id;
+          await chargingStation.removeReservation(
+            reservation,
+            ReservationTerminationReason.TRANSACTION_STARTED
+          );
+        }
         if (
-          this.setRemoteStartTransactionChargingProfile(
-            chargingStation,
-            transactionConnectorId,
-            commandPayload.chargingProfile
-          ) === true
+          (
+            await chargingStation.ocppRequestService.requestHandler<
+              OCPP16StartTransactionRequest,
+              OCPP16StartTransactionResponse
+            >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, startTransactionPayload)
+          ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
         ) {
-          connectorStatus.transactionRemoteStarted = true;
-          const startTransactionData: JsonType = {
-            connectorId: transactionConnectorId,
-            idTag: commandPayload.idTag,
-          };
-          if (reserved) {
-            startTransactionData['reservationId'] =
-              chargingStation.getReservationByConnectorId(transactionConnectorId).reservationId;
-          }
-          if (
-            (
-              await chargingStation.ocppRequestService.requestHandler<
-                OCPP16StartTransactionRequest,
-                OCPP16StartTransactionResponse
-              >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, startTransactionData)
-            ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
-          ) {
-            logger.debug(remoteStartTransactionLogMsg);
-            return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
-          }
-          return this.notifyRemoteStartTransactionRejected(
-            chargingStation,
-            transactionConnectorId,
-            commandPayload.idTag
-          );
+          logger.debug(remoteStartTransactionLogMsg);
+          return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
         }
         return this.notifyRemoteStartTransactionRejected(
           chargingStation,
           transactionConnectorId,
-          commandPayload.idTag
+          idTag
         );
       }
       return this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        commandPayload.idTag
-      );
-    }
-    if (reserved) {
-      await this.handleReservedRemoteStartTransaction(
-        chargingStation,
-        transactionConnectorId,
-        commandPayload
+        idTag
       );
     }
     // No authorization check required, start transaction
@@ -906,7 +918,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       this.setRemoteStartTransactionChargingProfile(
         chargingStation,
         transactionConnectorId,
-        commandPayload.chargingProfile
+        chargingProfile
       ) === true
     ) {
       connectorStatus.transactionRemoteStarted = true;
@@ -917,7 +929,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
             OCPP16StartTransactionResponse
           >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, {
             connectorId: transactionConnectorId,
-            idTag: commandPayload.idTag,
+            idTag,
           })
         ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
       ) {
@@ -927,13 +939,13 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       return this.notifyRemoteStartTransactionRejected(
         chargingStation,
         transactionConnectorId,
-        commandPayload.idTag
+        idTag
       );
     }
     return this.notifyRemoteStartTransactionRejected(
       chargingStation,
       transactionConnectorId,
-      commandPayload.idTag
+      idTag
     );
   }
 
@@ -952,7 +964,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       );
     }
     logger.warn(
-      `${chargingStation.logPrefix()} Remote starting transaction REJECTED on connector id ${connectorId.toString()}, idTag '${idTag}', availability '${
+      `${chargingStation.logPrefix()} Remote starting transaction REJECTED on connector id
+        ${connectorId.toString()}, idTag '${idTag}', availability '${
         chargingStation.getConnectorStatus(connectorId)?.availability
       }', status '${chargingStation.getConnectorStatus(connectorId)?.status}'`
     );
@@ -967,7 +980,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     if (cp && cp.chargingProfilePurpose === OCPP16ChargingProfilePurposeType.TX_PROFILE) {
       OCPP16ServiceUtils.setChargingProfile(chargingStation, connectorId, cp);
       logger.debug(
-        `${chargingStation.logPrefix()} Charging profile(s) set at remote start transaction on connector id ${connectorId}: %j`,
+        `${chargingStation.logPrefix()} Charging profile(s) set at remote start transaction
+          on connector id ${connectorId}: %j`,
         cp
       );
       return true;
@@ -1024,7 +1038,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       }
     }
     logger.warn(
-      `${chargingStation.logPrefix()} Trying to remote stop a non existing transaction with id: ${transactionId.toString()}`
+      `${chargingStation.logPrefix()} Trying to remote stop a non existing transaction with id:
+        ${transactionId.toString()}`
     );
     return OCPP16Constants.OCPP_RESPONSE_REJECTED;
   }
@@ -1041,7 +1056,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       ) === false
     ) {
       logger.warn(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware: Cannot simulate firmware update: feature profile not supported`
+        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware:
+          Cannot simulate firmware update: feature profile not supported`
       );
       return OCPP16Constants.OCPP_RESPONSE_EMPTY;
     }
@@ -1050,7 +1066,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       chargingStation.stationInfo.firmwareStatus !== OCPP16FirmwareStatus.Installed
     ) {
       logger.warn(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware: Cannot simulate firmware update: firmware update is already in progress`
+        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUpdateFirmware:
+          Cannot simulate firmware update: firmware update is already in progress`
       );
       return OCPP16Constants.OCPP_RESPONSE_EMPTY;
     }
@@ -1067,7 +1084,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       ).catch(Constants.EMPTY_FUNCTION);
     } else {
       setTimeout(() => {
-        this.updateFirmwareSimulation(chargingStation).catch(Constants.EMPTY_FUNCTION);
+        this.runInAsyncScope(
+          this.updateFirmwareSimulation.bind(this) as (
+            this: OCPP16IncomingRequestService,
+            ...args: any[]
+          ) => Promise<void>,
+          this,
+          chargingStation
+        ).catch(Constants.EMPTY_FUNCTION);
       }, retrieveDate?.getTime() - now);
     }
     return OCPP16Constants.OCPP_RESPONSE_EMPTY;
@@ -1149,7 +1173,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       if (runningTransactions > 0) {
         const waitTime = 15 * 1000;
         logger.debug(
-          `${chargingStation.logPrefix()} ${moduleName}.updateFirmwareSimulation: ${runningTransactions} transaction(s) in progress, waiting ${
+          `${chargingStation.logPrefix()} ${moduleName}.updateFirmwareSimulation:
+            ${runningTransactions} transaction(s) in progress, waiting ${
             waitTime / 1000
           } seconds before continuing firmware update simulation`
         );
@@ -1237,7 +1262,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       ) === false
     ) {
       logger.warn(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: Cannot get diagnostics: feature profile not supported`
+        `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics:
+          Cannot get diagnostics: feature profile not supported`
       );
       return OCPP16Constants.OCPP_RESPONSE_EMPTY;
     }
@@ -1245,12 +1271,11 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     if (uri.protocol.startsWith('ftp:')) {
       let ftpClient: Client;
       try {
-        const logFiles = fs
-          .readdirSync(path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'))
+        const logFiles = readdirSync(resolve(dirname(fileURLToPath(import.meta.url)), '../'))
           .filter((file) => file.endsWith('.log'))
-          .map((file) => path.join('./', file));
+          .map((file) => join('./', file));
         const diagnosticsArchive = `${chargingStation.stationInfo.chargingStationId}_logs.tar.gz`;
-        tar.create({ gzip: true }, logFiles).pipe(fs.createWriteStream(diagnosticsArchive));
+        create({ gzip: true }, logFiles).pipe(createWriteStream(diagnosticsArchive));
         ftpClient = new Client();
         const accessResponse = await ftpClient.access({
           host: uri.host,
@@ -1275,18 +1300,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
               })
               .catch((error) => {
                 logger.error(
-                  `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics: Error while sending '${
-                    OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION
-                  }'`,
+                  `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetDiagnostics:
+                    Error while sending '${OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION}'`,
                   error
                 );
               });
           });
           uploadResponse = await ftpClient.uploadFrom(
-            path.join(
-              path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'),
-              diagnosticsArchive
-            ),
+            join(resolve(dirname(fileURLToPath(import.meta.url)), '../'), diagnosticsArchive),
             `${uri.pathname}${diagnosticsArchive}`
           );
           if (uploadResponse.code === 226) {
@@ -1490,13 +1511,9 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
   ): OCPP16DataTransferResponse {
     try {
       if (Object.values(OCPP16DataTransferVendorId).includes(commandPayload.vendorId)) {
-        return {
-          status: OCPP16DataTransferStatus.ACCEPTED,
-        };
+        return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_ACCEPTED;
       }
-      return {
-        status: OCPP16DataTransferStatus.UNKNOWN_VENDOR_ID,
-      };
+      return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_UNKNOWN_VENDOR_ID;
     } catch (error) {
       return this.handleIncomingRequestError(
         chargingStation,
@@ -1511,65 +1528,62 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     chargingStation: ChargingStation,
     commandPayload: OCPP16ReserveNowRequest
   ): Promise<OCPP16ReserveNowResponse> {
+    if (
+      !OCPP16ServiceUtils.checkFeatureProfile(
+        chargingStation,
+        OCPP16SupportedFeatureProfiles.Reservation,
+        OCPP16IncomingRequestCommand.RESERVE_NOW
+      )
+    ) {
+      return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
+    }
     const { reservationId, idTag, connectorId } = commandPayload;
-    let connector: Map<number, ConnectorStatus>;
     let response: OCPP16ReserveNowResponse;
     try {
-      if (
-        !chargingStation.supportsReservations() &&
-        chargingStation.isConnectorAvailable(connectorId)
-      ) {
-        return OCPPConstants.OCPP_RESERVATION_RESPONSE_REJECTED;
+      if (!chargingStation.isConnectorAvailable(connectorId) && connectorId > 0) {
+        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
       }
-      if (connectorId === 0 && !chargingStation.supportsReservationsOnConnectorId0()) {
-        return OCPPConstants.OCPP_RESERVATION_RESPONSE_REJECTED;
+      if (connectorId === 0 && !chargingStation.getReservationOnConnectorId0Enabled()) {
+        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
       }
-      if (!(await this.isAuthorized(chargingStation, connectorId, commandPayload.idTag))) {
-        return OCPPConstants.OCPP_RESERVATION_RESPONSE_REJECTED;
+      if (!(await OCPP16ServiceUtils.isIdTagAuthorized(chargingStation, connectorId, idTag))) {
+        return OCPP16Constants.OCPP_RESERVATION_RESPONSE_REJECTED;
       }
       switch (chargingStation.getConnectorStatus(connectorId).status) {
-        case ConnectorStatusEnum.Faulted:
-          response = OCPPConstants.OCPP_RESERVATION_RESPONSE_FAULTED;
+        case OCPP16ChargePointStatus.Faulted:
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED;
           break;
-        case ConnectorStatusEnum.Occupied:
-          response = OCPPConstants.OCPP_RESERVATION_RESPONSE_OCCUPIED;
+        case OCPP16ChargePointStatus.Preparing:
+        case OCPP16ChargePointStatus.Charging:
+        case OCPP16ChargePointStatus.SuspendedEV:
+        case OCPP16ChargePointStatus.SuspendedEVSE:
+        case OCPP16ChargePointStatus.Finishing:
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_OCCUPIED;
           break;
-        case ConnectorStatusEnum.Unavailable:
-          response = OCPPConstants.OCPP_RESERVATION_RESPONSE_UNAVAILABLE;
+        case OCPP16ChargePointStatus.Unavailable:
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_UNAVAILABLE;
           break;
-        case ConnectorStatusEnum.Reserved:
-          if (Utils.isUndefined(chargingStation.getReservation(commandPayload.reservationId))) {
-            response = OCPPConstants.OCPP_RESERVATION_RESPONSE_OCCUPIED;
+        case OCPP16ChargePointStatus.Reserved:
+          if (!chargingStation.isConnectorReservable(reservationId, idTag, connectorId)) {
+            response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_OCCUPIED;
             break;
           }
         // eslint-disable-next-line no-fallthrough
         default:
-          logger.info(
-            `${chargingStation.logPrefix()} on connector ${connectorId} is now reserved for ${
-              commandPayload.idTag
-            }`
-          );
-          chargingStation.getConnectorStatus(connectorId).status = ConnectorStatusEnum.Reserved;
-          chargingStation.addReservation({ ...commandPayload });
-          await chargingStation.ocppRequestService
-            .requestHandler<OCPP16StatusNotificationRequest, OCPP16StatusNotificationResponse>(
-              chargingStation,
-              OCPP16RequestCommand.STATUS_NOTIFICATION,
-              {
-                connectorId,
-                errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-                status: chargingStation.getConnectorStatus(connectorId).status,
-              },
-              {
-                triggerMessage: true,
-              }
-            )
-            .catch(Constants.EMPTY_FUNCTION);
-          response = OCPPConstants.OCPP_RESERVATION_RESPONSE_ACCEPTED;
+          if (!chargingStation.isConnectorReservable(reservationId, idTag)) {
+            response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_OCCUPIED;
+            break;
+          }
+          await chargingStation.addReservation({
+            id: commandPayload.reservationId,
+            ...commandPayload,
+          });
+          response = OCPP16Constants.OCPP_RESERVATION_RESPONSE_ACCEPTED;
           break;
       }
       return response;
     } catch (error) {
+      chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.Available;
       return this.handleIncomingRequestError(
         chargingStation,
         OCPP16IncomingRequestCommand.RESERVE_NOW,
@@ -1582,33 +1596,30 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
   private async handleRequestCancelReservation(
     chargingStation: ChargingStation,
     commandPayload: OCPP16CancelReservationRequest
-  ): Promise<OCPP16CancelReservationResponse> {
+  ): Promise<GenericResponse> {
+    if (
+      !OCPP16ServiceUtils.checkFeatureProfile(
+        chargingStation,
+        OCPP16SupportedFeatureProfiles.Reservation,
+        OCPP16IncomingRequestCommand.CANCEL_RESERVATION
+      )
+    ) {
+      return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED;
+    }
     try {
-      const reservationId = commandPayload.reservationId;
-      const [exists, reservation] = chargingStation.doesReservationExist(reservationId);
+      const { reservationId } = commandPayload;
+      const [exists, reservation] = chargingStation.doesReservationExists({ id: reservationId });
       if (!exists) {
         logger.error(
-          `${chargingStation.logPrefix()} Reservation with ID ${reservationId} does not exist on charging station`
+          `${chargingStation.logPrefix()} Reservation with ID ${reservationId}
+            does not exist on charging station`
         );
         return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED;
       }
-      chargingStation.getConnectorStatus(reservation.connectorId).status =
-        ConnectorStatusEnum.Available;
-      chargingStation.removeReservation(reservation.reservationId);
-      await chargingStation.ocppRequestService
-        .requestHandler<OCPP16StatusNotificationRequest, OCPP16StatusNotificationResponse>(
-          chargingStation,
-          OCPP16RequestCommand.STATUS_NOTIFICATION,
-          {
-            connectorId: reservation.connectorId,
-            errorCode: OCPP16ChargePointErrorCode.NO_ERROR,
-            status: chargingStation.getConnectorStatus(reservation.connectorId).status,
-          },
-          {
-            triggerMessage: true,
-          }
-        )
-        .catch(Constants.EMPTY_FUNCTION);
+      await chargingStation.removeReservation(
+        reservation,
+        ReservationTerminationReason.RESERVATION_CANCELED
+      );
       return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_ACCEPTED;
     } catch (error) {
       return this.handleIncomingRequestError(
@@ -1619,98 +1630,4 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       );
     }
   }
-
-  /**
-   * Check for authorized access on a connector with given ConnectorId and idTag for the user
-   * @param {ChargingStation} chargingStation - Charging Station working on incoming request
-   * @param {number} ConnectorId - Identifier of the connector at the charging station
-   * @param {string} idTag - Identifier of the user
-   * @param {string} parentIdTag - Identifier for a group of idTags, which is optional
-   * @returns {Promise<boolean>} - 'true' if user is authorized, 'false' otherwise
-   */
-  private async isAuthorized(
-    chargingStation: ChargingStation,
-    connectorId: number,
-    idTag: string,
-    parentIdTag?: string
-  ): Promise<boolean> {
-    let authorized = false;
-    const connectorStatus = chargingStation.getConnectorStatus(connectorId);
-    if (
-      chargingStation.getLocalAuthListEnabled() === true &&
-      chargingStation.hasIdTags() === true &&
-      Utils.isNotEmptyString(
-        chargingStation.idTagsCache
-          .getIdTags(ChargingStationUtils.getIdTagsFile(chargingStation.stationInfo))
-          ?.find((tag) => tag === idTag)
-      )
-    ) {
-      connectorStatus.localAuthorizeIdTag = idTag;
-      connectorStatus.idTagLocalAuthorized = true;
-      authorized = true;
-    } else if (chargingStation.getMustAuthorizeAtRemoteStart() === true) {
-      connectorStatus.authorizeIdTag = idTag;
-      const authorizeResponse: OCPP16AuthorizeResponse =
-        await chargingStation.ocppRequestService.requestHandler<
-          OCPP16AuthorizeRequest,
-          OCPP16AuthorizeResponse
-        >(chargingStation, OCPP16RequestCommand.AUTHORIZE, {
-          idTag: idTag,
-        });
-      if (authorizeResponse?.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) {
-        authorized = true;
-      }
-    } else {
-      logger.warn(
-        `${chargingStation.logPrefix()} The charging station configuration expects authorize at remote start transaction but local authorization or authorize isn't enabled`
-      );
-    }
-    return authorized;
-  }
-
-  private async handleReservedRemoteStartTransaction(
-    chargingStation: ChargingStation,
-    connectorId: number,
-    commandPayload: RemoteStartTransactionRequest
-  ): Promise<GenericResponse> {
-    const reservation = chargingStation.getReservationByConnectorId(connectorId);
-    if (
-      !Utils.isUndefined(reservation) &&
-      (await this.isAuthorized(chargingStation, connectorId, commandPayload.idTag)) &&
-      reservation.idTag === commandPayload.idTag
-    ) {
-      const remoteStartTransactionLogMsg = `${chargingStation.logPrefix()} Transaction remotely STARTED on ${
-        chargingStation.stationInfo.chargingStationId
-      }#${connectorId.toString()} for idTag '${commandPayload.idTag}'`;
-      await OCPP16ServiceUtils.sendAndSetConnectorStatus(
-        chargingStation,
-        connectorId,
-        OCPP16ChargePointStatus.Preparing
-      );
-      if (
-        this.setRemoteStartTransactionChargingProfile(
-          chargingStation,
-          connectorId,
-          commandPayload.chargingProfile
-        ) === true
-      ) {
-        chargingStation.getConnectorStatus(connectorId).transactionRemoteStarted = true;
-        if (
-          (
-            await chargingStation.ocppRequestService.requestHandler<
-              OCPP16StartTransactionRequest,
-              OCPP16StartTransactionResponse
-            >(chargingStation, OCPP16RequestCommand.START_TRANSACTION, {
-              connectorId: connectorId,
-              idTag: commandPayload.idTag,
-              reservationId: reservation.reservationId,
-            })
-          ).idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED
-        ) {
-          logger.debug(remoteStartTransactionLogMsg);
-          return OCPP16Constants.OCPP_RESPONSE_ACCEPTED;
-        }
-      }
-    }
-  }
 }