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
Update src/charging-station/ChargingStation.ts
[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 884da269e5e863c30082c6a04a22bb35653d0778..7eef7b5b14d35f2db1c3aebef13d8f1ad12aaf82 100644
(file)
--- a/
src/types/ocpp/Requests.ts
+++ b/
src/types/ocpp/Requests.ts
@@
-1,6
+1,3
@@
-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 {
import { OCPP16DiagnosticsStatus } from './1.6/DiagnosticsStatus';
import type { OCPP16MeterValuesRequest } from './1.6/MeterValues';
import {
@@
-16,12
+13,17
@@
import {
OCPP16RequestCommand,
type OCPP16StatusNotificationRequest,
} from './1.6/Requests';
OCPP16RequestCommand,
type OCPP16StatusNotificationRequest,
} from './1.6/Requests';
+import { OperationalStatusEnumType } from './2.0/Common';
import {
type OCPP20BootNotificationRequest,
OCPP20IncomingRequestCommand,
OCPP20RequestCommand,
import {
type OCPP20BootNotificationRequest,
OCPP20IncomingRequestCommand,
OCPP20RequestCommand,
+ type OCPP20StatusNotificationRequest,
} from './2.0/Requests';
import type { MessageType } from './MessageType';
} from './2.0/Requests';
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,
@@
-34,6
+36,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 = {
@@
-64,7
+67,9
@@
export type BootNotificationRequest = OCPP16BootNotificationRequest | OCPP20Boot
export type HeartbeatRequest = OCPP16HeartbeatRequest;
export type HeartbeatRequest = OCPP16HeartbeatRequest;
-export type StatusNotificationRequest = OCPP16StatusNotificationRequest;
+export type StatusNotificationRequest =
+ | OCPP16StatusNotificationRequest
+ | OCPP20StatusNotificationRequest;
export type MeterValuesRequest = OCPP16MeterValuesRequest;
export type MeterValuesRequest = OCPP16MeterValuesRequest;
@@
-81,8
+86,9
@@
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,
export const DiagnosticsStatus = {
...OCPP16DiagnosticsStatus,