X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FRequests.ts;h=8d19078e448f0584b33c357f41e248852c069655;hb=041365be4e6cfcec381c895a203815dd933afff5;hp=7eef7b5b14d35f2db1c3aebef13d8f1ad12aaf82;hpb=69074173770c04bc5e5aa744b655edf9491daa46;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 7eef7b5b..8d19078e 100644
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -3,6 +3,7 @@ import type { OCPP16MeterValuesRequest } from './1.6/MeterValues';
 import {
   OCPP16AvailabilityType,
   type OCPP16BootNotificationRequest,
+  type OCPP16CancelReservationRequest,
   type OCPP16DataTransferRequest,
   type OCPP16DiagnosticsStatusNotificationRequest,
   OCPP16FirmwareStatus,
@@ -11,6 +12,7 @@ import {
   OCPP16IncomingRequestCommand,
   OCPP16MessageTrigger,
   OCPP16RequestCommand,
+  type OCPP16ReserveNowRequest,
   type OCPP16StatusNotificationRequest,
 } from './1.6/Requests';
 import { OperationalStatusEnumType } from './2.0/Common';
@@ -33,11 +35,11 @@ export type RequestCommand = OCPP16RequestCommand | OCPP20RequestCommand;
 
 export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
 
-export type RequestParams = {
+export interface RequestParams {
   skipBufferingOnError?: boolean;
   triggerMessage?: boolean;
   throwError?: boolean;
-};
+}
 
 export const IncomingRequestCommand = {
   ...OCPP16IncomingRequestCommand,
@@ -47,15 +49,20 @@ export type IncomingRequestCommand = OCPP16IncomingRequestCommand | OCPP20Incomi
 
 export type IncomingRequest = [MessageType.CALL_MESSAGE, string, IncomingRequestCommand, JsonType];
 
+export type IncomingRequestHandler = (
+  chargingStation: ChargingStation,
+  commandPayload: JsonType,
+) => JsonType | Promise<JsonType>;
+
 export type ResponseCallback = (payload: JsonType, requestPayload: JsonType) => void;
 
-export type ErrorCallback = (error: OCPPError, requestStatistic?: boolean) => void;
+export type ErrorCallback = (ocppError: OCPPError, requestStatistic?: boolean) => void;
 
 export type CachedRequest = [
   ResponseCallback,
   ErrorCallback,
   RequestCommand | IncomingRequestCommand,
-  JsonType
+  JsonType,
 ];
 
 export const MessageTrigger = {
@@ -79,11 +86,6 @@ export type DiagnosticsStatusNotificationRequest = OCPP16DiagnosticsStatusNotifi
 
 export type FirmwareStatusNotificationRequest = OCPP16FirmwareStatusNotificationRequest;
 
-export type IncomingRequestHandler = (
-  chargingStation: ChargingStation,
-  commandPayload: JsonType
-) => JsonType | Promise<JsonType>;
-
 export const AvailabilityType = {
   ...OCPP16AvailabilityType,
   ...OperationalStatusEnumType,
@@ -101,3 +103,7 @@ export const FirmwareStatus = {
 export type FirmwareStatus = OCPP16FirmwareStatus;
 
 export type ResponseType = JsonType | OCPPError;
+
+export type ReserveNowRequest = OCPP16ReserveNowRequest;
+
+export type CancelReservationRequest = OCPP16CancelReservationRequest;