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

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