X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FRequests.ts;h=1a0d0ffbde9cfb2bd76e36cb8c9afcf565f3ec85;hb=b0a67e55b5f2dc2128c6b1d63cc525b0bb98a690;hp=26d8bd7efbdb4b8469e592b5c08916d4ca7a960f;hpb=7170127d905a1af7a64c0c01ae81c1f892cfc278;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 26d8bd7e..1a0d0ffb 100644
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -1,13 +1,19 @@
 import { OCPP16AvailabilityType, OCPP16BootNotificationRequest, OCPP16IncomingRequestCommand, OCPP16RequestCommand } from './1.6/Requests';
 
+import { JsonType } from '../JsonType';
 import { MessageType } from './MessageType';
 import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
-import OCPPError from '../../charging-station/OCPPError';
+import OCPPError from '../../exception/OCPPError';
 
-export default interface Requests {
-  [id: string]: Request;
+export interface SendParams {
+  skipBufferingOnError?: boolean,
+  triggerMessage?: boolean
 }
 
+export type IncomingRequestHandler = (commandPayload: JsonType) => JsonType | Promise<JsonType>;
+
+export type ResponseType = JsonType | OCPPError | string;
+
 export type BootNotificationRequest = OCPP16BootNotificationRequest;
 
 export type AvailabilityType = OCPP16AvailabilityType;
@@ -34,6 +40,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, JsonType, JsonType];
+
+export type IncomingRequest = [MessageType, string, IncomingRequestCommand, JsonType, JsonType];
 
-export type IncomingRequest = [MessageType, string, IncomingRequestCommand, Record<string, unknown>, Record<string, unknown>];
+export type CachedRequest = [(payload: JsonType, requestPayload: JsonType) => void, (error: OCPPError, requestStatistic?: boolean) => void, RequestCommand | IncomingRequestCommand, JsonType | OCPPError];