repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: cleanup reservation handling code
[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 38596bfd4c611203d2999de8ad08c81aeb5ffb27..9ca43da713e29ad1112b074ab1dd78dc49e6f123 100644
(file)
--- a/
src/types/ocpp/Requests.ts
+++ b/
src/types/ocpp/Requests.ts
@@
-1,20
+1,31
@@
-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 {
OCPP16AvailabilityType,
type OCPP16BootNotificationRequest,
import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
import type { OCPP16MeterValuesRequest } from './1.6/MeterValues';
import {
OCPP16AvailabilityType,
type OCPP16BootNotificationRequest,
+ type OCPP16CancelReservationRequest,
type OCPP16DataTransferRequest,
type OCPP16DataTransferRequest,
+ type OCPP16DiagnosticsStatusNotificationRequest,
+ OCPP16FirmwareStatus,
+ type OCPP16FirmwareStatusNotificationRequest,
type OCPP16HeartbeatRequest,
OCPP16IncomingRequestCommand,
OCPP16MessageTrigger,
OCPP16RequestCommand,
type OCPP16HeartbeatRequest,
OCPP16IncomingRequestCommand,
OCPP16MessageTrigger,
OCPP16RequestCommand,
+ type OCPP16ReserveNowRequest,
type OCPP16StatusNotificationRequest,
} from './1.6/Requests';
type OCPP16StatusNotificationRequest,
} from './1.6/Requests';
-import { OCPP20IncomingRequestCommand, OCPP20RequestCommand } from './2.0/Requests';
+import { OperationalStatusEnumType } from './2.0/Common';
+import {
+ type OCPP20BootNotificationRequest,
+ OCPP20IncomingRequestCommand,
+ OCPP20RequestCommand,
+ type OCPP20StatusNotificationRequest,
+} from './2.0/Requests';
import type { MessageType } from './MessageType';
import type { MessageType } from './MessageType';
+import type { ChargingStation } from '../../charging-station';
+import type { OCPPError } from '../../exception';
+import type { JsonType } from '../JsonType';
export const RequestCommand = {
...OCPP16RequestCommand,
export const RequestCommand = {
...OCPP16RequestCommand,
@@
-27,6
+38,7
@@
export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand,
export type RequestParams = {
skipBufferingOnError?: boolean;
triggerMessage?: boolean;
export type RequestParams = {
skipBufferingOnError?: boolean;
triggerMessage?: boolean;
+ throwError?: boolean;
};
export const IncomingRequestCommand = {
};
export const IncomingRequestCommand = {
@@
-53,16
+65,22
@@
export const MessageTrigger = {
} as const;
export type MessageTrigger = OCPP16MessageTrigger;
} as const;
export type MessageTrigger = OCPP16MessageTrigger;
-export type BootNotificationRequest = OCPP16BootNotificationRequest;
+export type BootNotificationRequest = OCPP16BootNotificationRequest
| OCPP20BootNotificationRequest
;
export type HeartbeatRequest = OCPP16HeartbeatRequest;
export type HeartbeatRequest = OCPP16HeartbeatRequest;
-export type StatusNotificationRequest = OCPP16StatusNotificationRequest;
+export type StatusNotificationRequest =
+ | OCPP16StatusNotificationRequest
+ | OCPP20StatusNotificationRequest;
export type MeterValuesRequest = OCPP16MeterValuesRequest;
export type DataTransferRequest = OCPP16DataTransferRequest;
export type MeterValuesRequest = OCPP16MeterValuesRequest;
export type DataTransferRequest = OCPP16DataTransferRequest;
+export type DiagnosticsStatusNotificationRequest = OCPP16DiagnosticsStatusNotificationRequest;
+
+export type FirmwareStatusNotificationRequest = OCPP16FirmwareStatusNotificationRequest;
+
export type IncomingRequestHandler = (
chargingStation: ChargingStation,
commandPayload: JsonType
export type IncomingRequestHandler = (
chargingStation: ChargingStation,
commandPayload: JsonType
@@
-70,12
+88,22
@@
export type IncomingRequestHandler = (
export const AvailabilityType = {
...OCPP16AvailabilityType,
export const AvailabilityType = {
...OCPP16AvailabilityType,
+ ...OperationalStatusEnumType,
} as const;
} as const;
-export type AvailabilityType = OCPP16AvailabilityType;
+export type AvailabilityType = OCPP16AvailabilityType
| OperationalStatusEnumType
;
export const DiagnosticsStatus = {
...OCPP16DiagnosticsStatus,
} as const;
export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
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 ResponseType = JsonType | OCPPError;
+
+export type ReserveNowRequest = OCPP16ReserveNowRequest;
+
+export type CancelReservationRequest = OCPP16CancelReservationRequest;