Enhance log message on supervision url distribution

[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 aeb6828c7c97cd1e9e1bcff8ebcf3c480a45f5de..2808e2f56a31dc3cb0d7b60176a81d9fd6dc7a3b 100644 (file)
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -1,11 +1,10 @@
 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 '../../exception/OCPPError';
 
-export default interface Requests {
-  [id: string]: Request;
-}
+export type IncomingRequestHandler = (commandPayload: Record<string, unknown>) => Record<string, unknown> | Promise<Record<string, unknown>>;
 
 export type BootNotificationRequest = OCPP16BootNotificationRequest;
 
@@ -27,6 +26,14 @@ export const IncomingRequestCommand = {
   ...OCPP16IncomingRequestCommand
 };
 
-export type Request = [(payload: Record<string, unknown> | string, requestPayload: Record<string, unknown>) => void, (error: OCPPError) => void, Record<string, unknown>];
+export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
+
+export const DiagnosticsStatus = {
+  ...OCPP16DiagnosticsStatus
+};
+
+export type Request = [MessageType, string, RequestCommand, Record<string, unknown>, Record<string, unknown>];
 
 export type IncomingRequest = [MessageType, string, IncomingRequestCommand, Record<string, unknown>, Record<string, unknown>];
+
+export type CachedRequest = [(payload: Record<string, unknown> | string, requestPayload: Record<string, unknown>) => void, (error: OCPPError, requestStatistic?: boolean) => void, RequestCommand | IncomingRequestCommand, Record<string, unknown>];