X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2FRequests.ts;h=0d60daf5872044d5a365da2ce75ef01c179a70c3;hb=f5a1ff8ce8f87a149791c2c98fe7c5e8a20b5392;hp=871015b6078855c30132ee27ac01f19dffaf5635;hpb=953d6b028e82d6997897802afefbb4ce0d225dee;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/Requests.ts b/src/types/ocpp/Requests.ts
index 871015b6..0d60daf5 100644
--- a/src/types/ocpp/Requests.ts
+++ b/src/types/ocpp/Requests.ts
@@ -1,86 +1,109 @@
-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 type { OCPP16MeterValuesRequest } from './1.6/MeterValues';
+import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus.js';
+import type { OCPP16MeterValuesRequest } from './1.6/MeterValues.js';
 import {
   OCPP16AvailabilityType,
   type OCPP16BootNotificationRequest,
+  type OCPP16CancelReservationRequest,
   type OCPP16DataTransferRequest,
+  type OCPP16DiagnosticsStatusNotificationRequest,
+  OCPP16FirmwareStatus,
+  type OCPP16FirmwareStatusNotificationRequest,
   type OCPP16HeartbeatRequest,
   OCPP16IncomingRequestCommand,
   OCPP16MessageTrigger,
   OCPP16RequestCommand,
+  type OCPP16ReserveNowRequest,
   type OCPP16StatusNotificationRequest,
-} from './1.6/Requests';
-import { OCPP20IncomingRequestCommand, OCPP20RequestCommand } from './2.0/Requests';
-import type { MessageType } from './MessageType';
-
-export type RequestCommand = OCPP16RequestCommand;
+} from './1.6/Requests.js';
+import { OperationalStatusEnumType } from './2.0/Common.js';
+import {
+  type OCPP20BootNotificationRequest,
+  OCPP20IncomingRequestCommand,
+  OCPP20RequestCommand,
+  type OCPP20StatusNotificationRequest,
+} from './2.0/Requests.js';
+import type { MessageType } from './MessageType.js';
+import type { ChargingStation } from '../../charging-station/index.js';
+import type { OCPPError } from '../../exception/index.js';
+import type { JsonType } from '../JsonType.js';
 
 export const RequestCommand = {
   ...OCPP16RequestCommand,
   ...OCPP20RequestCommand,
-};
+} as const;
+export type RequestCommand = OCPP16RequestCommand | OCPP20RequestCommand;
 
 export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
 
-export type RequestParams = {
+export interface RequestParams {
   skipBufferingOnError?: boolean;
   triggerMessage?: boolean;
-};
-
-export type IncomingRequestCommand = OCPP16IncomingRequestCommand;
+  throwError?: boolean;
+}
 
 export const IncomingRequestCommand = {
   ...OCPP16IncomingRequestCommand,
   ...OCPP20IncomingRequestCommand,
-};
+} as const;
+export type IncomingRequestCommand = OCPP16IncomingRequestCommand | OCPP20IncomingRequestCommand;
 
 export type IncomingRequest = [MessageType.CALL_MESSAGE, string, IncomingRequestCommand, JsonType];
 
+export type IncomingRequestHandler = (
+  chargingStation: ChargingStation,
+  commandPayload: JsonType,
+) => JsonType | Promise<JsonType>;
+
 export type ResponseCallback = (payload: JsonType, requestPayload: JsonType) => void;
 
-export type ErrorCallback = (error: OCPPError, requestStatistic?: boolean) => void;
+export type ErrorCallback = (ocppError: OCPPError, requestStatistic?: boolean) => void;
 
 export type CachedRequest = [
   ResponseCallback,
   ErrorCallback,
   RequestCommand | IncomingRequestCommand,
-  JsonType
+  JsonType,
 ];
 
-export type MessageTrigger = OCPP16MessageTrigger;
-
 export const MessageTrigger = {
   ...OCPP16MessageTrigger,
-};
+} as const;
+export type MessageTrigger = OCPP16MessageTrigger;
 
-export type BootNotificationRequest = OCPP16BootNotificationRequest;
+export type BootNotificationRequest = OCPP16BootNotificationRequest | OCPP20BootNotificationRequest;
 
 export type HeartbeatRequest = OCPP16HeartbeatRequest;
 
-export type StatusNotificationRequest = OCPP16StatusNotificationRequest;
+export type StatusNotificationRequest =
+  | OCPP16StatusNotificationRequest
+  | OCPP20StatusNotificationRequest;
 
 export type MeterValuesRequest = OCPP16MeterValuesRequest;
 
 export type DataTransferRequest = OCPP16DataTransferRequest;
 
-export type IncomingRequestHandler = (
-  chargingStation: ChargingStation,
-  commandPayload: JsonType
-) => JsonType | Promise<JsonType>;
+export type DiagnosticsStatusNotificationRequest = OCPP16DiagnosticsStatusNotificationRequest;
 
-export type AvailabilityType = OCPP16AvailabilityType;
+export type FirmwareStatusNotificationRequest = OCPP16FirmwareStatusNotificationRequest;
 
 export const AvailabilityType = {
   ...OCPP16AvailabilityType,
-};
-
-export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
+  ...OperationalStatusEnumType,
+} as const;
+export type AvailabilityType = OCPP16AvailabilityType | OperationalStatusEnumType;
 
 export const DiagnosticsStatus = {
   ...OCPP16DiagnosticsStatus,
-};
+} as const;
+export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
+
+export const FirmwareStatus = {
+  ...OCPP16FirmwareStatus,
+} as const;
+export type FirmwareStatus = OCPP16FirmwareStatus;
 
 export type ResponseType = JsonType | OCPPError;
+
+export type ReserveNowRequest = OCPP16ReserveNowRequest;
+
+export type CancelReservationRequest = OCPP16CancelReservationRequest;