X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FRequests.ts;h=bf3bd76dcaabf2d7b99b2c7cc556caa5825373e7;hb=cd8dd45729bcb9838f1f3c7b82596b8b30f8ce4d;hp=82c7d2135aee7432a93390f4e0a24b52983dad42;hpb=47e224777669f935f45d443b6da948e7977fd9b7;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 82c7d213..bf3bd76d 100644
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -2,11 +2,9 @@ import { OCPP16AvailabilityType, OCPP16BootNotificationRequest, OCPP16IncomingRe
 
 import { MessageType } from './MessageType';
 import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
-import OCPPError from '../../charging-station/OcppError';
+import OCPPError from '../../charging-station/ocpp/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;
 
@@ -34,6 +32,8 @@ export const DiagnosticsStatus = {
   ...OCPP16DiagnosticsStatus
 };
 
-export type Request = [(payload: Record<string, unknown> | string, requestPayload: Record<string, unknown>) => void, (error: OCPPError) => void, Record<string, unknown>];
+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>];