X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FRequests.ts;h=c718f1e03ab5b61c6fc8b92cdf49dd1154f179fd;hb=8f801a9337304c521bf1ae125debe87405865fbf;hp=7f2955840c8d0a28c3ef996b4d68db47469c9a82;hpb=caad9d6b03dbfc507da6d8e79ccbbaf74593e981;p=e-mobility-charging-stations-simulator.git

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