X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FRequests.ts;h=c718f1e03ab5b61c6fc8b92cdf49dd1154f179fd;hb=55ae7b758f478a2beb4557bbc96363fb913dcc73;hp=b0037ae0bb45099f185b91db61fea82a34cac965;hpb=08f130a055123f5e47c59e1a64875f8cff44d020;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index b0037ae0..c718f1e0 100644
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -1,70 +1,115 @@
+import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus.js'
+import type { OCPP16MeterValuesRequest } from './1.6/MeterValues.js'
 import {
   OCPP16AvailabilityType,
-  OCPP16BootNotificationRequest,
-  OCPP16HeartbeatRequest,
+  type OCPP16BootNotificationRequest,
+  type OCPP16CancelReservationRequest,
+  type OCPP16DataTransferRequest,
+  type OCPP16DiagnosticsStatusNotificationRequest,
+  OCPP16FirmwareStatus,
+  type OCPP16FirmwareStatusNotificationRequest,
+  type OCPP16HeartbeatRequest,
   OCPP16IncomingRequestCommand,
+  OCPP16MessageTrigger,
   OCPP16RequestCommand,
-  OCPP16StatusNotificationRequest,
-} from './1.6/Requests';
+  type OCPP16ReserveNowRequest,
+  type OCPP16StatusNotificationRequest
+} from './1.6/Requests.js'
+import { OperationalStatusEnumType } from './2.0/Common.js'
+import {
+  type OCPP20BootNotificationRequest,
+  OCPP20IncomingRequestCommand,
+  OCPP20RequestCommand,
+  type OCPP20StatusNotificationRequest
+} from './2.0/Requests.js'
+import type { MessageType } from './MessageType.js'
+import type { ChargingStation } from '../../charging-station/index.js'
+import type { OCPPError } from '../../exception/index.js'
+import type { JsonType } from '../JsonType.js'
 
-import ChargingStation from '../../charging-station/ChargingStation';
-import { JsonType } from '../JsonType';
-import { MessageType } from './MessageType';
-import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
-import { OCPP16MeterValuesRequest } from './1.6/MeterValues';
-import OCPPError from '../../exception/OCPPError';
+export const RequestCommand = {
+  ...OCPP16RequestCommand,
+  ...OCPP20RequestCommand
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type RequestCommand = OCPP16RequestCommand | OCPP20RequestCommand
 
-export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
+export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType]
 
-export type IncomingRequest = [MessageType.CALL_MESSAGE, string, IncomingRequestCommand, JsonType];
+export interface RequestParams {
+  skipBufferingOnError?: boolean
+  triggerMessage?: boolean
+  throwError?: boolean
+}
 
-export type CachedRequest = [
-  (payload: JsonType, requestPayload: JsonType) => void,
-  (error: OCPPError, requestStatistic?: boolean) => void,
-  RequestCommand | IncomingRequestCommand,
-  JsonType
-];
+export const IncomingRequestCommand = {
+  ...OCPP16IncomingRequestCommand,
+  ...OCPP20IncomingRequestCommand
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type IncomingRequestCommand = OCPP16IncomingRequestCommand | OCPP20IncomingRequestCommand
+
+export type IncomingRequest = [MessageType.CALL_MESSAGE, string, IncomingRequestCommand, JsonType]
 
 export type IncomingRequestHandler = (
   chargingStation: ChargingStation,
   commandPayload: JsonType
-) => JsonType | Promise<JsonType>;
+) => JsonType | Promise<JsonType>
 
-export type ResponseType = JsonType | OCPPError;
+export type ResponseCallback = (payload: JsonType, requestPayload: JsonType) => void
 
-export interface RequestParams {
-  skipBufferingOnError?: boolean;
-  triggerMessage?: boolean;
-}
+export type ErrorCallback = (ocppError: OCPPError, requestStatistic?: boolean) => void
 
-export type BootNotificationRequest = OCPP16BootNotificationRequest;
+export type CachedRequest = [
+  ResponseCallback,
+  ErrorCallback,
+  RequestCommand | IncomingRequestCommand,
+  JsonType
+]
+
+export const MessageTrigger = {
+  ...OCPP16MessageTrigger
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type MessageTrigger = OCPP16MessageTrigger
+
+export type BootNotificationRequest = OCPP16BootNotificationRequest | OCPP20BootNotificationRequest
 
-export type HeartbeatRequest = OCPP16HeartbeatRequest;
+export type HeartbeatRequest = OCPP16HeartbeatRequest
 
-export type StatusNotificationRequest = OCPP16StatusNotificationRequest;
+export type StatusNotificationRequest =
+  | OCPP16StatusNotificationRequest
+  | OCPP20StatusNotificationRequest
 
-export type MeterValuesRequest = OCPP16MeterValuesRequest;
+export type MeterValuesRequest = OCPP16MeterValuesRequest
 
-export type AvailabilityType = OCPP16AvailabilityType;
+export type DataTransferRequest = OCPP16DataTransferRequest
+
+export type DiagnosticsStatusNotificationRequest = OCPP16DiagnosticsStatusNotificationRequest
+
+export type FirmwareStatusNotificationRequest = OCPP16FirmwareStatusNotificationRequest
 
 export const AvailabilityType = {
   ...OCPP16AvailabilityType,
-};
-
-export type RequestCommand = OCPP16RequestCommand;
+  ...OperationalStatusEnumType
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type AvailabilityType = OCPP16AvailabilityType | OperationalStatusEnumType
 
-export const RequestCommand = {
-  ...OCPP16RequestCommand,
-};
+export const DiagnosticsStatus = {
+  ...OCPP16DiagnosticsStatus
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type DiagnosticsStatus = OCPP16DiagnosticsStatus
 
-export type IncomingRequestCommand = OCPP16IncomingRequestCommand;
+export const FirmwareStatus = {
+  ...OCPP16FirmwareStatus
+} as const
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export type FirmwareStatus = OCPP16FirmwareStatus
 
-export const IncomingRequestCommand = {
-  ...OCPP16IncomingRequestCommand,
-};
+export type ResponseType = JsonType | OCPPError
 
-export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
+export type ReserveNowRequest = OCPP16ReserveNowRequest
 
-export const DiagnosticsStatus = {
-  ...OCPP16DiagnosticsStatus,
-};
+export type CancelReservationRequest = OCPP16CancelReservationRequest