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
Add BootNotification and ClearCache OCPP 2.0.1 commands support
[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 ed9dac1a71fe2d8de071adb90093a945de149eff..09e2b0cc5a7df446239c90839607c57f64262aab 100644
(file)
--- a/
src/types/ocpp/Requests.ts
+++ b/
src/types/ocpp/Requests.ts
@@
-1,47
+1,63
@@
import type ChargingStation from '../../charging-station/ChargingStation';
import type ChargingStation from '../../charging-station/ChargingStation';
-import OCPPError from '../../exception/OCPPError';
-import { JsonType } from '../JsonType';
+import
type
OCPPError from '../../exception/OCPPError';
+import
type
{ JsonType } from '../JsonType';
import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
-import { OCPP16MeterValuesRequest } from './1.6/MeterValues';
+import
type
{ OCPP16MeterValuesRequest } from './1.6/MeterValues';
import {
OCPP16AvailabilityType,
import {
OCPP16AvailabilityType,
- OCPP16BootNotificationRequest,
- OCPP16HeartbeatRequest,
+ type OCPP16BootNotificationRequest,
+ type OCPP16DataTransferRequest,
+ type OCPP16HeartbeatRequest,
OCPP16IncomingRequestCommand,
OCPP16IncomingRequestCommand,
+ OCPP16MessageTrigger,
OCPP16RequestCommand,
OCPP16RequestCommand,
- OCPP16StatusNotificationRequest,
+
type
OCPP16StatusNotificationRequest,
} from './1.6/Requests';
} from './1.6/Requests';
-import { MessageType } from './MessageType';
-
-export type RequestCommand = OCPP16RequestCommand;
+import {
+ type OCPP20BootNotificationRequest,
+ OCPP20IncomingRequestCommand,
+ OCPP20RequestCommand,
+} from './2.0/Requests';
+import type { MessageType } from './MessageType';
export const RequestCommand = {
...OCPP16RequestCommand,
export const RequestCommand = {
...OCPP16RequestCommand,
-};
+ ...OCPP20RequestCommand,
+} as const;
+export type RequestCommand = OCPP16RequestCommand | OCPP20RequestCommand;
export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
-export
interface RequestParams
{
+export
type RequestParams =
{
skipBufferingOnError?: boolean;
triggerMessage?: boolean;
skipBufferingOnError?: boolean;
triggerMessage?: boolean;
-}
-
-export type IncomingRequestCommand = OCPP16IncomingRequestCommand;
+};
export const IncomingRequestCommand = {
...OCPP16IncomingRequestCommand,
export const IncomingRequestCommand = {
...OCPP16IncomingRequestCommand,
-};
+ ...OCPP20IncomingRequestCommand,
+} as const;
+export type IncomingRequestCommand = OCPP16IncomingRequestCommand | OCPP20IncomingRequestCommand;
export type IncomingRequest = [MessageType.CALL_MESSAGE, string, IncomingRequestCommand, JsonType];
export type IncomingRequest = [MessageType.CALL_MESSAGE, string, IncomingRequestCommand, JsonType];
+export type ResponseCallback = (payload: JsonType, requestPayload: JsonType) => void;
+
+export type ErrorCallback = (error: OCPPError, requestStatistic?: boolean) => void;
+
export type CachedRequest = [
export type CachedRequest = [
-
(payload: JsonType, requestPayload: JsonType) => void
,
-
(error: OCPPError, requestStatistic?: boolean) => void
,
+
ResponseCallback
,
+
ErrorCallback
,
RequestCommand | IncomingRequestCommand,
JsonType
];
RequestCommand | IncomingRequestCommand,
JsonType
];
-export type BootNotificationRequest = OCPP16BootNotificationRequest;
+export const MessageTrigger = {
+ ...OCPP16MessageTrigger,
+} as const;
+export type MessageTrigger = OCPP16MessageTrigger;
+
+export type BootNotificationRequest = OCPP16BootNotificationRequest | OCPP20BootNotificationRequest;
export type HeartbeatRequest = OCPP16HeartbeatRequest;
export type HeartbeatRequest = OCPP16HeartbeatRequest;
@@
-49,21
+65,21
@@
export type StatusNotificationRequest = OCPP16StatusNotificationRequest;
export type MeterValuesRequest = OCPP16MeterValuesRequest;
export type MeterValuesRequest = OCPP16MeterValuesRequest;
+export type DataTransferRequest = OCPP16DataTransferRequest;
+
export type IncomingRequestHandler = (
chargingStation: ChargingStation,
commandPayload: JsonType
) => JsonType | Promise<JsonType>;
export type IncomingRequestHandler = (
chargingStation: ChargingStation,
commandPayload: JsonType
) => JsonType | Promise<JsonType>;
-export type AvailabilityType = OCPP16AvailabilityType;
-
export const AvailabilityType = {
...OCPP16AvailabilityType,
export const AvailabilityType = {
...OCPP16AvailabilityType,
-};
-
-export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
+} as const;
+export type AvailabilityType = OCPP16AvailabilityType;
export const DiagnosticsStatus = {
...OCPP16DiagnosticsStatus,
export const DiagnosticsStatus = {
...OCPP16DiagnosticsStatus,
-};
+} as const;
+export type DiagnosticsStatus = OCPP16DiagnosticsStatus;
export type ResponseType = JsonType | OCPPError;
export type ResponseType = JsonType | OCPPError;