X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FRequests.ts;h=89f836651c013bc81122326487ac2e4b0070cbc7;hb=14763b466177d8e74d2e1925647e04e2d62ac72a;hp=1a4de0dafd34a558638cb65f5aed8a244b46cf3a;hpb=6a64534b96acd18aa0aa7a73c0a2ee479834d4c0;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 1a4de0da..89f83665 100644
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -1,12 +1,39 @@
-import { IncomingRequestCommand } from './1.6/Requests';
+import { OCPP16AvailabilityType, OCPP16BootNotificationRequest, OCPP16IncomingRequestCommand, OCPP16RequestCommand } from './1.6/Requests';
+
 import { MessageType } from './MessageType';
-import OCPPError from '../../charging-station/OcppError';
+import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
+import OCPPError from '../../charging-station/ocpp/OCPPError';
 
 export default interface Requests {
   [id: string]: Request;
 }
 
-export type Request = [(payload?, requestPayload?) => void, (error?: OCPPError) => void, Record<string, unknown>];
+export type BootNotificationRequest = OCPP16BootNotificationRequest;
+
+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 IncomingRequest = [MessageType, string, IncomingRequestCommand, string, string];
+export type Request = [(payload: Record<string, unknown> | string, requestPayload: Record<string, unknown>) => void, (error: OCPPError) => void, Record<string, unknown>];
 
+export type IncomingRequest = [MessageType, string, IncomingRequestCommand, Record<string, unknown>, Record<string, unknown>];