X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FRequests.ts;h=a2407476fd90d24eb6d971afd66ff664390c1e50;hb=974efe6c9928aabb0d9356c19342d0fa432f3cc1;hp=a21949962049f95634c73d5fb061a7694748ead0;hpb=d4c84337227e85dfbf20ff23d153e6bd1f685b87;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index a2194996..a2407476 100644
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -1,25 +1,31 @@
-import type ChargingStation from '../../charging-station/ChargingStation';
-import type OCPPError from '../../exception/OCPPError';
-import type { JsonType } from '../JsonType';
 import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
 import type { OCPP16MeterValuesRequest } from './1.6/MeterValues';
 import {
   OCPP16AvailabilityType,
   type OCPP16BootNotificationRequest,
+  type OCPP16CancelReservationRequest,
   type OCPP16DataTransferRequest,
+  type OCPP16DiagnosticsStatusNotificationRequest,
   OCPP16FirmwareStatus,
+  type OCPP16FirmwareStatusNotificationRequest,
   type OCPP16HeartbeatRequest,
   OCPP16IncomingRequestCommand,
   OCPP16MessageTrigger,
   OCPP16RequestCommand,
+  type OCPP16ReserveNowRequest,
   type OCPP16StatusNotificationRequest,
 } from './1.6/Requests';
+import { OperationalStatusEnumType } from './2.0/Common';
 import {
   type OCPP20BootNotificationRequest,
   OCPP20IncomingRequestCommand,
   OCPP20RequestCommand,
+  type OCPP20StatusNotificationRequest,
 } from './2.0/Requests';
 import type { MessageType } from './MessageType';
+import type { ChargingStation } from '../../charging-station';
+import type { OCPPError } from '../../exception';
+import type { JsonType } from '../JsonType';
 
 export const RequestCommand = {
   ...OCPP16RequestCommand,
@@ -29,10 +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,
@@ -50,7 +57,7 @@ export type CachedRequest = [
   ResponseCallback,
   ErrorCallback,
   RequestCommand | IncomingRequestCommand,
-  JsonType
+  JsonType,
 ];
 
 export const MessageTrigger = {
@@ -62,21 +69,28 @@ export type BootNotificationRequest = OCPP16BootNotificationRequest | OCPP20Boot
 
 export type HeartbeatRequest = OCPP16HeartbeatRequest;
 
-export type StatusNotificationRequest = OCPP16StatusNotificationRequest;
+export type StatusNotificationRequest =
+  | OCPP16StatusNotificationRequest
+  | OCPP20StatusNotificationRequest;
 
 export type MeterValuesRequest = OCPP16MeterValuesRequest;
 
 export type DataTransferRequest = OCPP16DataTransferRequest;
 
+export type DiagnosticsStatusNotificationRequest = OCPP16DiagnosticsStatusNotificationRequest;
+
+export type FirmwareStatusNotificationRequest = OCPP16FirmwareStatusNotificationRequest;
+
 export type IncomingRequestHandler = (
   chargingStation: ChargingStation,
-  commandPayload: JsonType
+  commandPayload: JsonType,
 ) => JsonType | Promise<JsonType>;
 
 export const AvailabilityType = {
   ...OCPP16AvailabilityType,
+  ...OperationalStatusEnumType,
 } as const;
-export type AvailabilityType = OCPP16AvailabilityType;
+export type AvailabilityType = OCPP16AvailabilityType | OperationalStatusEnumType;
 
 export const DiagnosticsStatus = {
   ...OCPP16DiagnosticsStatus,
@@ -89,3 +103,7 @@ export const FirmwareStatus = {
 export type FirmwareStatus = OCPP16FirmwareStatus;
 
 export type ResponseType = JsonType | OCPPError;
+
+export type ReserveNowRequest = OCPP16ReserveNowRequest;
+
+export type CancelReservationRequest = OCPP16CancelReservationRequest;