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
Merge pull request #908 from SAP/dependabot/npm_and_yarn/poolifier-3.1.12
[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..8d19078e448f0584b33c357f41e248852c069655 100644
(file)
--- a/
src/types/ocpp/Requests.ts
+++ b/
src/types/ocpp/Requests.ts
@@
-1,11
+1,9
@@
-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 OCPP16DiagnosticsStatusNotificationRequest,
OCPP16FirmwareStatus,
type OCPP16DataTransferRequest,
type OCPP16DiagnosticsStatusNotificationRequest,
OCPP16FirmwareStatus,
@@
-14,14
+12,20
@@
import {
OCPP16IncomingRequestCommand,
OCPP16MessageTrigger,
OCPP16RequestCommand,
OCPP16IncomingRequestCommand,
OCPP16MessageTrigger,
OCPP16RequestCommand,
+ type OCPP16ReserveNowRequest,
type OCPP16StatusNotificationRequest,
} from './1.6/Requests';
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,
@@
-31,10
+35,11
@@
export type RequestCommand = OCPP16RequestCommand | OCPP20RequestCommand;
export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
export type OutgoingRequest = [MessageType.CALL_MESSAGE, string, RequestCommand, JsonType];
-export
type RequestParams =
{
+export
interface RequestParams
{
skipBufferingOnError?: boolean;
triggerMessage?: boolean;
skipBufferingOnError?: boolean;
triggerMessage?: boolean;
-};
+ throwError?: boolean;
+}
export const IncomingRequestCommand = {
...OCPP16IncomingRequestCommand,
export const IncomingRequestCommand = {
...OCPP16IncomingRequestCommand,
@@
-44,15
+49,20
@@
export type IncomingRequestCommand = OCPP16IncomingRequestCommand | OCPP20Incomi
export type IncomingRequest = [MessageType.CALL_MESSAGE, string, IncomingRequestCommand, JsonType];
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 ResponseCallback = (payload: JsonType, requestPayload: JsonType) => void;
-export type ErrorCallback = (
e
rror: OCPPError, requestStatistic?: boolean) => void;
+export type ErrorCallback = (
ocppE
rror: OCPPError, requestStatistic?: boolean) => void;
export type CachedRequest = [
ResponseCallback,
ErrorCallback,
RequestCommand | IncomingRequestCommand,
export type CachedRequest = [
ResponseCallback,
ErrorCallback,
RequestCommand | IncomingRequestCommand,
- JsonType
+ JsonType
,
];
export const MessageTrigger = {
];
export const MessageTrigger = {
@@
-64,7
+74,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;
@@
-74,15
+86,11
@@
export type DiagnosticsStatusNotificationRequest = OCPP16DiagnosticsStatusNotifi
export type FirmwareStatusNotificationRequest = OCPP16FirmwareStatusNotificationRequest;
export type FirmwareStatusNotificationRequest = OCPP16FirmwareStatusNotificationRequest;
-export type IncomingRequestHandler = (
- chargingStation: ChargingStation,
- commandPayload: JsonType
-) => JsonType | Promise<JsonType>;
-
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,
@@
-95,3
+103,7
@@
export const FirmwareStatus = {
export type FirmwareStatus = OCPP16FirmwareStatus;
export type ResponseType = JsonType | OCPPError;
export type FirmwareStatus = OCPP16FirmwareStatus;
export type ResponseType = JsonType | OCPPError;
+
+export type ReserveNowRequest = OCPP16ReserveNowRequest;
+
+export type CancelReservationRequest = OCPP16CancelReservationRequest;