X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FRequests.ts;h=9934f1671292158bb5d4f3d47d03f95f3e7c361a;hb=8eb3b688c4b6fb3e946f38d474a5125caf1d056a;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..9934f167 100644
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -1,39 +1,76 @@
-import { OCPP16AvailabilityType, OCPP16BootNotificationRequest, OCPP16IncomingRequestCommand, OCPP16RequestCommand } from './1.6/Requests';
-
-import { MessageType } from './MessageType';
+import type ChargingStation from '../../charging-station/ChargingStation';
+import type OCPPError from '../../exception/OCPPError';
+import type { JsonType } from '../JsonType';
 import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
-import OCPPError from '../../charging-station/OcppError';
-
-export default interface Requests {
-  [id: string]: Request;
-}
-
-export type BootNotificationRequest = OCPP16BootNotificationRequest;
+import type { OCPP16MeterValuesRequest } from './1.6/MeterValues';
+import {
+  OCPP16AvailabilityType,
+  OCPP16BootNotificationRequest,
+  OCPP16HeartbeatRequest,
+  OCPP16IncomingRequestCommand,
+  OCPP16MessageTrigger,
+  OCPP16RequestCommand,
+  OCPP16StatusNotificationRequest,
+} from './1.6/Requests';
+import type { MessageType } from './MessageType';
 
-export type AvailabilityType = OCPP16AvailabilityType;
+export type RequestCommand = OCPP16RequestCommand;
 
-export const AvailabilityType = {
-  ...OCPP16AvailabilityType
+export const RequestCommand = {
+  ...OCPP16RequestCommand,
 };
 
-export type RequestCommand = OCPP16RequestCommand;
+export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
 
-export const RequestCommand = {
-  ...OCPP16RequestCommand
+export type RequestParams = {
+  skipBufferingOnError?: boolean;
+  triggerMessage?: boolean;
 };
 
 export type IncomingRequestCommand = OCPP16IncomingRequestCommand;
 
 export const IncomingRequestCommand = {
-  ...OCPP16IncomingRequestCommand
+  ...OCPP16IncomingRequestCommand,
+};
+
+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 type MessageTrigger = OCPP16MessageTrigger;
+
+export const MessageTrigger = {
+  ...OCPP16MessageTrigger,
+};
+
+export type BootNotificationRequest = OCPP16BootNotificationRequest;
+
+export type HeartbeatRequest = OCPP16HeartbeatRequest;
+
+export type StatusNotificationRequest = OCPP16StatusNotificationRequest;
+
+export type MeterValuesRequest = OCPP16MeterValuesRequest;
+
+export type IncomingRequestHandler = (
+  chargingStation: ChargingStation,
+  commandPayload: JsonType
+) => JsonType | Promise<JsonType>;
+
+export type AvailabilityType = OCPP16AvailabilityType;
+
+export const AvailabilityType = {
+  ...OCPP16AvailabilityType,
 };
 
 export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
 
 export const DiagnosticsStatus = {
-  ...OCPP16DiagnosticsStatus
+  ...OCPP16DiagnosticsStatus,
 };
 
-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>];
+export type ResponseType = JsonType | OCPPError;