X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FResponses.ts;h=aac5a5fc3774b39d008b454d5e85faad021e2016;hb=16c46962f43a692c996b1c89a94dc572fea52d63;hp=50f1d2b134f9b71867ac7eb02b92ae4b11fac827;hpb=e7aeea18e189dd087c8f951cf77a253e2818ae90;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index 50f1d2b1..aac5a5fc 100644
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -1,70 +1,107 @@
+import type { ChargingStation } from '../../charging-station/index.js'
+import type { JsonType } from '../JsonType.js'
+import type { OCPP16MeterValuesResponse } from './1.6/MeterValues.js'
 import {
   OCPP16AvailabilityStatus,
-  OCPP16BootNotificationResponse,
+  type OCPP16BootNotificationResponse,
   OCPP16ChargingProfileStatus,
   OCPP16ClearChargingProfileStatus,
   OCPP16ConfigurationStatus,
-  OCPP16RegistrationStatus,
+  type OCPP16DataTransferResponse,
+  OCPP16DataTransferStatus,
+  type OCPP16DiagnosticsStatusNotificationResponse,
+  type OCPP16FirmwareStatusNotificationResponse,
+  type OCPP16HeartbeatResponse,
+  OCPP16ReservationStatus,
+  type OCPP16StatusNotificationResponse,
   OCPP16TriggerMessageStatus,
-  OCPP16UnlockStatus,
-} from './1.6/Responses';
+  OCPP16UnlockStatus
+} from './1.6/Responses.js'
+import type { OCPP20BootNotificationResponse, OCPP20ClearCacheResponse } from './2.0/Responses.js'
+import { type GenericResponse, GenericStatus } from './Common.js'
+import type { ErrorType } from './ErrorType.js'
+import type { MessageType } from './MessageType.js'
 
-import { JsonType } from '../JsonType';
+export type Response = [MessageType.CALL_RESULT_MESSAGE, string, JsonType]
+
+export type ErrorResponse = [MessageType.CALL_ERROR_MESSAGE, string, ErrorType, string, JsonType]
 
 export type ResponseHandler = (
-  payload: JsonType | string,
+  chargingStation: ChargingStation,
+  payload: JsonType,
   requestPayload?: JsonType
-) => void | Promise<void>;
+) => void | Promise<void>
 
-export type BootNotificationResponse = OCPP16BootNotificationResponse;
+export type BootNotificationResponse =
+  | OCPP16BootNotificationResponse
+  | OCPP20BootNotificationResponse
 
-export enum DefaultStatus {
-  ACCEPTED = 'Accepted',
-  REJECTED = 'Rejected',
-}
+export type HeartbeatResponse = OCPP16HeartbeatResponse
 
-export interface DefaultResponse {
-  status: DefaultStatus;
-}
+export type ClearCacheResponse = GenericResponse | OCPP20ClearCacheResponse
 
-export type RegistrationStatus = OCPP16RegistrationStatus;
+export type StatusNotificationResponse = OCPP16StatusNotificationResponse
 
-export const RegistrationStatus = {
-  ...OCPP16RegistrationStatus,
-};
+export type MeterValuesResponse = OCPP16MeterValuesResponse
 
-export type AvailabilityStatus = OCPP16AvailabilityStatus;
+export type DataTransferResponse = OCPP16DataTransferResponse
 
-export const AvailabilityStatus = {
-  ...OCPP16AvailabilityStatus,
-};
+export type DiagnosticsStatusNotificationResponse = OCPP16DiagnosticsStatusNotificationResponse
 
-export type ChargingProfileStatus = OCPP16ChargingProfileStatus;
+export type FirmwareStatusNotificationResponse = OCPP16FirmwareStatusNotificationResponse
 
-export const ChargingProfileStatus = {
-  ...OCPP16ChargingProfileStatus,
-};
+export const AvailabilityStatus = {
+  ...OCPP16AvailabilityStatus
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type AvailabilityStatus = OCPP16AvailabilityStatus
 
-export type ClearChargingProfileStatus = OCPP16ClearChargingProfileStatus;
+export const ChargingProfileStatus = {
+  ...OCPP16ChargingProfileStatus
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type ChargingProfileStatus = OCPP16ChargingProfileStatus
 
 export const ClearChargingProfileStatus = {
-  ...OCPP16ClearChargingProfileStatus,
-};
-
-export type ConfigurationStatus = OCPP16ConfigurationStatus;
+  ...OCPP16ClearChargingProfileStatus
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type ClearChargingProfileStatus = OCPP16ClearChargingProfileStatus
 
 export const ConfigurationStatus = {
-  ...OCPP16ConfigurationStatus,
-};
-
-export type UnlockStatus = OCPP16UnlockStatus;
+  ...OCPP16ConfigurationStatus
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type ConfigurationStatus = OCPP16ConfigurationStatus
 
 export const UnlockStatus = {
-  ...OCPP16UnlockStatus,
-};
-
-export type TriggerMessageStatus = OCPP16TriggerMessageStatus;
+  ...OCPP16UnlockStatus
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type UnlockStatus = OCPP16UnlockStatus
 
 export const TriggerMessageStatus = {
-  ...OCPP16TriggerMessageStatus,
-};
+  ...OCPP16TriggerMessageStatus
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type TriggerMessageStatus = OCPP16TriggerMessageStatus
+
+export const DataTransferStatus = {
+  ...OCPP16DataTransferStatus
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type DataTransferStatus = OCPP16DataTransferStatus
+
+export type ReservationStatus = OCPP16ReservationStatus
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const ReservationStatus = {
+  ...OCPP16ReservationStatus
+} as const
+
+export type CancelReservationStatus = GenericStatus
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const CancelReservationStatus = {
+  ...GenericStatus
+} as const
+
+export type CancelReservationResponse = GenericResponse