X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FResponses.ts;h=f14ef426871c107b8533d8744fde282f6930a857;hb=6b635033ddf255392ded26fd03fe1f128b15ad69;hp=77497074221dd2a496e9e2b93ad26bc7f0d5dc5c;hpb=802cfa135dad14f8b15401685c3429395cb3e6e1;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Responses.ts b/src/types/ocpp/Responses.ts
index 77497074..f14ef426 100644
--- a/src/types/ocpp/Responses.ts
+++ b/src/types/ocpp/Responses.ts
@@ -1,54 +1,103 @@
-import { OCPP16AvailabilityStatus, OCPP16BootNotificationResponse, OCPP16ChargingProfileStatus, OCPP16ClearChargingProfileStatus, OCPP16ConfigurationStatus, OCPP16RegistrationStatus, OCPP16TriggerMessageStatus, OCPP16UnlockStatus } from './1.6/Responses';
-
-export type BootNotificationResponse = OCPP16BootNotificationResponse;
-
-export enum DefaultStatus {
-  ACCEPTED = 'Accepted',
-  REJECTED = 'Rejected'
-}
-
-export interface DefaultResponse {
-  status: DefaultStatus;
+import type { ChargingStation } from '../../charging-station';
+import {
+  type ErrorType,
+  type JsonType,
+  type MessageType,
+  OCPP16AvailabilityStatus,
+  type OCPP16BootNotificationResponse,
+  OCPP16ChargingProfileStatus,
+  OCPP16ClearChargingProfileStatus,
+  OCPP16ConfigurationStatus,
+  type OCPP16DataTransferResponse,
+  OCPP16DataTransferStatus,
+  type OCPP16DiagnosticsStatusNotificationResponse,
+  type OCPP16FirmwareStatusNotificationResponse,
+  type OCPP16HeartbeatResponse,
+  type OCPP16MeterValuesResponse,
+  type OCPP16StatusNotificationResponse,
+  OCPP16TriggerMessageStatus,
+  OCPP16UnlockStatus,
+  type OCPP20BootNotificationResponse,
+  type OCPP20ClearCacheResponse,
+  type OCPP20StatusNotificationResponse,
+} from '../internal';
+
+export type Response = [MessageType.CALL_RESULT_MESSAGE, string, JsonType];
+
+export type ErrorResponse = [MessageType.CALL_ERROR_MESSAGE, string, ErrorType, string, JsonType];
+
+export type ResponseHandler = (
+  chargingStation: ChargingStation,
+  payload: JsonType,
+  requestPayload?: JsonType
+) => void | Promise<void>;
+
+export type BootNotificationResponse =
+  | OCPP16BootNotificationResponse
+  | OCPP20BootNotificationResponse;
+
+export type HeartbeatResponse = OCPP16HeartbeatResponse;
+
+export type ClearCacheResponse = GenericResponse | OCPP20ClearCacheResponse;
+
+export type StatusNotificationResponse =
+  | OCPP16StatusNotificationResponse
+  | OCPP20StatusNotificationResponse;
+
+export type MeterValuesResponse = OCPP16MeterValuesResponse;
+
+export type DataTransferResponse = OCPP16DataTransferResponse;
+
+export type DiagnosticsStatusNotificationResponse = OCPP16DiagnosticsStatusNotificationResponse;
+
+export type FirmwareStatusNotificationResponse = OCPP16FirmwareStatusNotificationResponse;
+
+export enum GenericStatus {
+  Accepted = 'Accepted',
+  Rejected = 'Rejected',
 }
 
-export type RegistrationStatus = OCPP16RegistrationStatus;
-
-export const RegistrationStatus = {
-  ...OCPP16RegistrationStatus
+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;
+  ...OCPP16AvailabilityStatus,
+} as const;
+export type AvailabilityStatus = OCPP16AvailabilityStatus;
 
 export const ChargingProfileStatus = {
-  ...OCPP16ChargingProfileStatus
-};
-
-export type ClearChargingProfileStatus = OCPP16ClearChargingProfileStatus;
+  ...OCPP16ChargingProfileStatus,
+} as const;
+export type ChargingProfileStatus = OCPP16ChargingProfileStatus;
 
 export const ClearChargingProfileStatus = {
-  ...OCPP16ClearChargingProfileStatus
-};
-
-export type ConfigurationStatus = OCPP16ConfigurationStatus;
+  ...OCPP16ClearChargingProfileStatus,
+} as const;
+export type ClearChargingProfileStatus = OCPP16ClearChargingProfileStatus;
 
 export const ConfigurationStatus = {
-  ...OCPP16ConfigurationStatus
-};
-
-export type UnlockStatus = OCPP16UnlockStatus;
+  ...OCPP16ConfigurationStatus,
+} as const;
+export type ConfigurationStatus = OCPP16ConfigurationStatus;
 
 export const UnlockStatus = {
-  ...OCPP16UnlockStatus
-};
+  ...OCPP16UnlockStatus,
+} as const;
+export type UnlockStatus = OCPP16UnlockStatus;
 
+export const TriggerMessageStatus = {
+  ...OCPP16TriggerMessageStatus,
+} as const;
 export type TriggerMessageStatus = OCPP16TriggerMessageStatus;
 
-export const TriggerMessageStatus = {
-  ...OCPP16TriggerMessageStatus
-};
+export const DataTransferStatus = {
+  ...OCPP16DataTransferStatus,
+} as const;
+export type DataTransferStatus = OCPP16DataTransferStatus;