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

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 1aa015b6..a2194996 100644
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -5,21 +5,27 @@ import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
 import type { OCPP16MeterValuesRequest } from './1.6/MeterValues';
 import {
   OCPP16AvailabilityType,
-  OCPP16BootNotificationRequest,
-  OCPP16DataTransferRequest,
-  OCPP16HeartbeatRequest,
+  type OCPP16BootNotificationRequest,
+  type OCPP16DataTransferRequest,
+  OCPP16FirmwareStatus,
+  type OCPP16HeartbeatRequest,
   OCPP16IncomingRequestCommand,
   OCPP16MessageTrigger,
   OCPP16RequestCommand,
-  OCPP16StatusNotificationRequest,
+  type OCPP16StatusNotificationRequest,
 } from './1.6/Requests';
+import {
+  type OCPP20BootNotificationRequest,
+  OCPP20IncomingRequestCommand,
+  OCPP20RequestCommand,
+} from './2.0/Requests';
 import type { MessageType } from './MessageType';
 
-export type RequestCommand = OCPP16RequestCommand;
-
 export const RequestCommand = {
   ...OCPP16RequestCommand,
-};
+  ...OCPP20RequestCommand,
+} as const;
+export type RequestCommand = OCPP16RequestCommand | OCPP20RequestCommand;
 
 export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
 
@@ -28,11 +34,11 @@ export type RequestParams = {
   triggerMessage?: boolean;
 };
 
-export type IncomingRequestCommand = OCPP16IncomingRequestCommand;
-
 export const IncomingRequestCommand = {
   ...OCPP16IncomingRequestCommand,
-};
+  ...OCPP20IncomingRequestCommand,
+} as const;
+export type IncomingRequestCommand = OCPP16IncomingRequestCommand | OCPP20IncomingRequestCommand;
 
 export type IncomingRequest = [MessageType.CALL_MESSAGE, string, IncomingRequestCommand, JsonType];
 
@@ -47,13 +53,12 @@ export type CachedRequest = [
   JsonType
 ];
 
-export type MessageTrigger = OCPP16MessageTrigger;
-
 export const MessageTrigger = {
   ...OCPP16MessageTrigger,
-};
+} as const;
+export type MessageTrigger = OCPP16MessageTrigger;
 
-export type BootNotificationRequest = OCPP16BootNotificationRequest;
+export type BootNotificationRequest = OCPP16BootNotificationRequest | OCPP20BootNotificationRequest;
 
 export type HeartbeatRequest = OCPP16HeartbeatRequest;
 
@@ -68,16 +73,19 @@ export type IncomingRequestHandler = (
   commandPayload: JsonType
 ) => JsonType | Promise<JsonType>;
 
-export type AvailabilityType = OCPP16AvailabilityType;
-
 export const AvailabilityType = {
   ...OCPP16AvailabilityType,
-};
-
-export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
+} as const;
+export type AvailabilityType = OCPP16AvailabilityType;
 
 export const DiagnosticsStatus = {
   ...OCPP16DiagnosticsStatus,
-};
+} as const;
+export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
+
+export const FirmwareStatus = {
+  ...OCPP16FirmwareStatus,
+} as const;
+export type FirmwareStatus = OCPP16FirmwareStatus;
 
 export type ResponseType = JsonType | OCPPError;