X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FResponses.ts;h=da5948a92fe7fca90ab0d4b3f5144cd1a5a0432b;hb=db652e1ea3fbb7ae3902c4b91b857bca44c87ac1;hp=d5b4b7c578ad31a188a295ce8bc3e9e55af85088;hpb=8114d10e3893e96bb725ce2fca9744429ee4b75b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index d5b4b7c5..da5948a9 100644
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -1,20 +1,30 @@
-import type ChargingStation from '../../charging-station/ChargingStation';
-import { JsonType } from '../JsonType';
-import { OCPP16MeterValuesResponse } from './1.6/MeterValues';
+import type { OCPP16MeterValuesResponse } from './1.6/MeterValues';
 import {
   OCPP16AvailabilityStatus,
-  OCPP16BootNotificationResponse,
+  type OCPP16BootNotificationResponse,
+  OCPP16CancelReservationStatus,
   OCPP16ChargingProfileStatus,
   OCPP16ClearChargingProfileStatus,
   OCPP16ConfigurationStatus,
-  OCPP16HeartbeatResponse,
-  OCPP16RegistrationStatus,
-  OCPP16StatusNotificationResponse,
+  type OCPP16DataTransferResponse,
+  OCPP16DataTransferStatus,
+  type OCPP16DiagnosticsStatusNotificationResponse,
+  type OCPP16FirmwareStatusNotificationResponse,
+  type OCPP16HeartbeatResponse,
+  OCPP16ReservationStatus,
+  type OCPP16StatusNotificationResponse,
   OCPP16TriggerMessageStatus,
   OCPP16UnlockStatus,
 } from './1.6/Responses';
-import { ErrorType } from './ErrorType';
-import { MessageType } from './MessageType';
+import type {
+  OCPP20BootNotificationResponse,
+  OCPP20ClearCacheResponse,
+  OCPP20StatusNotificationResponse,
+} from './2.0/Responses';
+import type { ErrorType } from './ErrorType';
+import type { MessageType } from './MessageType';
+import type { ChargingStation } from '../../charging-station';
+import type { JsonType } from '../JsonType';
 
 export type Response = [MessageType.CALL_RESULT_MESSAGE, string, JsonType];
 
@@ -26,61 +36,84 @@ export type ResponseHandler = (
   requestPayload?: JsonType
 ) => void | Promise<void>;
 
-export type BootNotificationResponse = OCPP16BootNotificationResponse;
+export type BootNotificationResponse =
+  | OCPP16BootNotificationResponse
+  | OCPP20BootNotificationResponse;
 
 export type HeartbeatResponse = OCPP16HeartbeatResponse;
 
-export type StatusNotificationResponse = OCPP16StatusNotificationResponse;
+export type ClearCacheResponse = GenericResponse | OCPP20ClearCacheResponse;
+
+export type StatusNotificationResponse =
+  | OCPP16StatusNotificationResponse
+  | OCPP20StatusNotificationResponse;
 
 export type MeterValuesResponse = OCPP16MeterValuesResponse;
 
-export enum DefaultStatus {
-  ACCEPTED = 'Accepted',
-  REJECTED = 'Rejected',
-}
+export type DataTransferResponse = OCPP16DataTransferResponse;
 
-export interface DefaultResponse {
-  status: DefaultStatus;
-}
+export type DiagnosticsStatusNotificationResponse = OCPP16DiagnosticsStatusNotificationResponse;
 
-export type RegistrationStatus = OCPP16RegistrationStatus;
+export type FirmwareStatusNotificationResponse = OCPP16FirmwareStatusNotificationResponse;
 
-export const RegistrationStatus = {
-  ...OCPP16RegistrationStatus,
+export enum GenericStatus {
+  Accepted = 'Accepted',
+  Rejected = 'Rejected',
+}
+
+export type GenericResponse = {
+  status: GenericStatus;
 };
 
-export type AvailabilityStatus = OCPP16AvailabilityStatus;
+export enum RegistrationStatusEnumType {
+  ACCEPTED = 'Accepted',
+  PENDING = 'Pending',
+  REJECTED = 'Rejected',
+}
 
 export const AvailabilityStatus = {
   ...OCPP16AvailabilityStatus,
-};
-
-export type ChargingProfileStatus = OCPP16ChargingProfileStatus;
+} as const;
+export type AvailabilityStatus = OCPP16AvailabilityStatus;
 
 export const ChargingProfileStatus = {
   ...OCPP16ChargingProfileStatus,
-};
-
-export type ClearChargingProfileStatus = OCPP16ClearChargingProfileStatus;
+} as const;
+export type ChargingProfileStatus = OCPP16ChargingProfileStatus;
 
 export const ClearChargingProfileStatus = {
   ...OCPP16ClearChargingProfileStatus,
-};
-
-export type ConfigurationStatus = OCPP16ConfigurationStatus;
+} as const;
+export type ClearChargingProfileStatus = OCPP16ClearChargingProfileStatus;
 
 export const ConfigurationStatus = {
   ...OCPP16ConfigurationStatus,
-};
-
-export type UnlockStatus = OCPP16UnlockStatus;
+} as const;
+export type ConfigurationStatus = OCPP16ConfigurationStatus;
 
 export const UnlockStatus = {
   ...OCPP16UnlockStatus,
-};
-
-export type TriggerMessageStatus = OCPP16TriggerMessageStatus;
+} as const;
+export type UnlockStatus = OCPP16UnlockStatus;
 
 export const TriggerMessageStatus = {
   ...OCPP16TriggerMessageStatus,
+} as const;
+export type TriggerMessageStatus = OCPP16TriggerMessageStatus;
+
+export const DataTransferStatus = {
+  ...OCPP16DataTransferStatus,
+} as const;
+export type DataTransferStatus = OCPP16DataTransferStatus;
+
+export type ReservationStatus = OCPP16ReservationStatus;
+
+export const ReservationStatus = {
+  ...OCPP16ReservationStatus,
+};
+
+export type CancelReservationStatus = OCPP16CancelReservationStatus;
+
+export const CancelReservationStatus = {
+  ...OCPP16CancelReservationStatus,
 };