Use the fixed JsonType definition where appropriate

[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 1a4de0dafd34a558638cb65f5aed8a244b46cf3a..16a79c05d2cf74365cd09f2e102af269cfe08b0a 100644 (file)
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -1,12 +1,66 @@
-import { IncomingRequestCommand } from './1.6/Requests';
+import {
+  OCPP16AvailabilityType,
+  OCPP16BootNotificationRequest,
+  OCPP16HeartbeatRequest,
+  OCPP16IncomingRequestCommand,
+  OCPP16RequestCommand,
+  OCPP16StatusNotificationRequest,
+} from './1.6/Requests';
+
+import { JsonType } from '../JsonType';
 import { MessageType } from './MessageType';
-import OCPPError from '../../charging-station/OcppError';
+import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
+import { OCPP16MeterValuesRequest } from './1.6/MeterValues';
+import OCPPError from '../../exception/OCPPError';
+
+export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
+
+export type IncomingRequest = [MessageType.CALL_MESSAGE, string, IncomingRequestCommand, JsonType];
+
+export type CachedRequest = [
+  (payload: JsonType, requestPayload: JsonType) => void,
+  (error: OCPPError, requestStatistic?: boolean) => void,
+  RequestCommand | IncomingRequestCommand,
+  JsonType
+];
 
-export default interface Requests {
-  [id: string]: Request;
+export type IncomingRequestHandler = (commandPayload: JsonType) => JsonType | Promise<JsonType>;
+
+export type ResponseType = JsonType | OCPPError;
+
+export interface RequestParams {
+  skipBufferingOnError?: boolean;
+  triggerMessage?: boolean;
 }
 
-export type Request = [(payload?, requestPayload?) => void, (error?: OCPPError) => void, Record<string, unknown>];
+export type BootNotificationRequest = OCPP16BootNotificationRequest;
+
+export type HeartbeatRequest = OCPP16HeartbeatRequest;
+
+export type StatusNotificationRequest = OCPP16StatusNotificationRequest;
+
+export type MeterValuesRequest = OCPP16MeterValuesRequest;
+
+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 IncomingRequest = [MessageType, string, IncomingRequestCommand, string, string];
+export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
 
+export const DiagnosticsStatus = {
+  ...OCPP16DiagnosticsStatus,
+};