Refine connector id validation error message

[e-mobility-charging-stations-simulator.git] / src / types / ocpp / Requests.ts

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 60724254c8a61390bcee73787bfc4facdaa8514f..9934f1671292158bb5d4f3d47d03f95f3e7c361a 100644 (file)
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -1,44 +1,52 @@
+import type ChargingStation from '../../charging-station/ChargingStation';
+import type OCPPError from '../../exception/OCPPError';
+import type { JsonType } from '../JsonType';
+import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
+import type { OCPP16MeterValuesRequest } from './1.6/MeterValues';
 import {
   OCPP16AvailabilityType,
   OCPP16BootNotificationRequest,
   OCPP16HeartbeatRequest,
   OCPP16IncomingRequestCommand,
+  OCPP16MessageTrigger,
   OCPP16RequestCommand,
   OCPP16StatusNotificationRequest,
 } from './1.6/Requests';
+import type { MessageType } from './MessageType';
 
-import { JsonObject } from '../JsonType';
-import { MessageType } from './MessageType';
-import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
-import { OCPP16MeterValuesRequest } from './1.6/MeterValues';
-import OCPPError from '../../exception/OCPPError';
+export type RequestCommand = OCPP16RequestCommand;
 
-export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonObject];
+export const RequestCommand = {
+  ...OCPP16RequestCommand,
+};
 
-export type IncomingRequest = [
-  MessageType.CALL_MESSAGE,
-  string,
-  IncomingRequestCommand,
-  JsonObject
-];
+export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
+
+export type RequestParams = {
+  skipBufferingOnError?: boolean;
+  triggerMessage?: boolean;
+};
+
+export type IncomingRequestCommand = OCPP16IncomingRequestCommand;
+
+export const IncomingRequestCommand = {
+  ...OCPP16IncomingRequestCommand,
+};
+
+export type IncomingRequest = [MessageType.CALL_MESSAGE, string, IncomingRequestCommand, JsonType];
 
 export type CachedRequest = [
-  (payload: JsonObject, requestPayload: JsonObject) => void,
+  (payload: JsonType, requestPayload: JsonType) => void,
   (error: OCPPError, requestStatistic?: boolean) => void,
   RequestCommand | IncomingRequestCommand,
-  JsonObject
+  JsonType
 ];
 
-export type IncomingRequestHandler = (
-  commandPayload: JsonObject
-) => JsonObject | Promise<JsonObject>;
-
-export type ResponseType = JsonObject | OCPPError;
+export type MessageTrigger = OCPP16MessageTrigger;
 
-export interface RequestParams {
-  skipBufferingOnError?: boolean;
-  triggerMessage?: boolean;
-}
+export const MessageTrigger = {
+  ...OCPP16MessageTrigger,
+};
 
 export type BootNotificationRequest = OCPP16BootNotificationRequest;
 
@@ -48,26 +56,21 @@ export type StatusNotificationRequest = OCPP16StatusNotificationRequest;
 
 export type MeterValuesRequest = OCPP16MeterValuesRequest;
 
+export type IncomingRequestHandler = (
+  chargingStation: ChargingStation,
+  commandPayload: JsonType
+) => JsonType | Promise<JsonType>;
+
 export type AvailabilityType = OCPP16AvailabilityType;
 
 export const AvailabilityType = {
   ...OCPP16AvailabilityType,
 };
 
-export type RequestCommand = OCPP16RequestCommand;
-
-export const RequestCommand = {
-  ...OCPP16RequestCommand,
-};
-
-export type IncomingRequestCommand = OCPP16IncomingRequestCommand;
-
-export const IncomingRequestCommand = {
-  ...OCPP16IncomingRequestCommand,
-};
-
 export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
 
 export const DiagnosticsStatus = {
   ...OCPP16DiagnosticsStatus,
 };
+
+export type ResponseType = JsonType | OCPPError;