X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Ftypes%2Focpp%2F1.6%2FRequests.ts;h=32d9757f4cea58be69ca349976cbc760709933c2;hb=66a7748ddeda8c94d7562a1ce58d440319654a4c;hp=8af407c0ac3789fceb6ca52fb54c3cbec133398f;hpb=1af50fac1ab71fed19f11864d1644261046698a3;p=e-mobility-charging-stations-simulator.git

diff --git a/src/types/ocpp/1.6/Requests.ts b/src/types/ocpp/1.6/Requests.ts
index 8af407c0..32d9757f 100644
--- a/src/types/ocpp/1.6/Requests.ts
+++ b/src/types/ocpp/1.6/Requests.ts
@@ -1,18 +1,26 @@
-import { ChargingProfilePurposeType, OCPP16ChargingProfile } from './ChargingProfile';
-
-import { OCPP16ChargePointErrorCode } from './ChargePointErrorCode';
-import { OCPP16ChargePointStatus } from './ChargePointStatus';
-import { OCPP16StandardParametersKey } from './Configuration';
+import type { OCPP16ChargePointErrorCode } from './ChargePointErrorCode.js'
+import type { OCPP16ChargePointStatus } from './ChargePointStatus.js'
+import type {
+  OCPP16ChargingProfile,
+  OCPP16ChargingProfilePurposeType,
+  OCPP16ChargingRateUnitType
+} from './ChargingProfile.js'
+import type { OCPP16StandardParametersKey, OCPP16VendorParametersKey } from './Configuration.js'
+import type { OCPP16DiagnosticsStatus } from './DiagnosticsStatus.js'
+import type { EmptyObject } from '../../EmptyObject.js'
+import type { JsonObject } from '../../JsonType.js'
 
 export enum OCPP16RequestCommand {
   BOOT_NOTIFICATION = 'BootNotification',
   HEARTBEAT = 'Heartbeat',
   STATUS_NOTIFICATION = 'StatusNotification',
-  CHANGE_CONFIGURATION = 'ChangeConfiguration',
   AUTHORIZE = 'Authorize',
   START_TRANSACTION = 'StartTransaction',
   STOP_TRANSACTION = 'StopTransaction',
-  METERVALUES = 'MeterValues'
+  METER_VALUES = 'MeterValues',
+  DIAGNOSTICS_STATUS_NOTIFICATION = 'DiagnosticsStatusNotification',
+  FIRMWARE_STATUS_NOTIFICATION = 'FirmwareStatusNotification',
+  DATA_TRANSFER = 'DataTransfer'
 }
 
 export enum OCPP16IncomingRequestCommand {
@@ -22,87 +30,170 @@ export enum OCPP16IncomingRequestCommand {
   UNLOCK_CONNECTOR = 'UnlockConnector',
   GET_CONFIGURATION = 'GetConfiguration',
   CHANGE_CONFIGURATION = 'ChangeConfiguration',
+  GET_COMPOSITE_SCHEDULE = 'GetCompositeSchedule',
   SET_CHARGING_PROFILE = 'SetChargingProfile',
   CLEAR_CHARGING_PROFILE = 'ClearChargingProfile',
   REMOTE_START_TRANSACTION = 'RemoteStartTransaction',
-  REMOTE_STOP_TRANSACTION = 'RemoteStopTransaction'
+  REMOTE_STOP_TRANSACTION = 'RemoteStopTransaction',
+  GET_DIAGNOSTICS = 'GetDiagnostics',
+  TRIGGER_MESSAGE = 'TriggerMessage',
+  DATA_TRANSFER = 'DataTransfer',
+  UPDATE_FIRMWARE = 'UpdateFirmware',
+  RESERVE_NOW = 'ReserveNow',
+  CANCEL_RESERVATION = 'CancelReservation'
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface HeartbeatRequest { }
-
-export interface OCPP16BootNotificationRequest {
-  chargeBoxSerialNumber?: string;
-  chargePointModel: string;
-  chargePointSerialNumber?: string;
-  chargePointVendor: string;
-  firmwareVersion?: string;
-  iccid?: string;
-  imsi?: string;
-  meterSerialNumber?: string;
-  meterType?: string;
+export type OCPP16HeartbeatRequest = EmptyObject
+
+export interface OCPP16BootNotificationRequest extends JsonObject {
+  chargePointVendor: string
+  chargePointModel: string
+  chargePointSerialNumber?: string
+  chargeBoxSerialNumber?: string
+  firmwareVersion?: string
+  iccid?: string
+  imsi?: string
+  meterType?: string
+  meterSerialNumber?: string
 }
 
-export interface StatusNotificationRequest {
-  connectorId: number;
-  errorCode: OCPP16ChargePointErrorCode;
-  info?: string;
-  status: OCPP16ChargePointStatus;
-  timestamp?: string;
-  vendorId?: string;
-  vendorErrorCode?: string;
+export interface OCPP16StatusNotificationRequest extends JsonObject {
+  connectorId: number
+  errorCode: OCPP16ChargePointErrorCode
+  status: OCPP16ChargePointStatus
+  info?: string
+  timestamp?: Date
+  vendorId?: string
+  vendorErrorCode?: string
 }
 
-export interface ChangeConfigurationRequest {
-  key: string | OCPP16StandardParametersKey;
-  value: string;
+export type OCPP16ClearCacheRequest = EmptyObject
+
+type OCPP16ConfigurationKey = string | OCPP16StandardParametersKey | OCPP16VendorParametersKey
+
+export interface ChangeConfigurationRequest extends JsonObject {
+  key: OCPP16ConfigurationKey
+  value: string
 }
 
-export interface RemoteStartTransactionRequest {
-  connectorId: number;
-  idTag: string;
-  chargingProfile?: OCPP16ChargingProfile;
+export interface RemoteStartTransactionRequest extends JsonObject {
+  connectorId: number
+  idTag: string
+  chargingProfile?: OCPP16ChargingProfile
 }
 
-export interface RemoteStopTransactionRequest {
-  transactionId: number;
+export interface RemoteStopTransactionRequest extends JsonObject {
+  transactionId: number
 }
 
-export interface UnlockConnectorRequest {
-  connectorId: number;
+export interface UnlockConnectorRequest extends JsonObject {
+  connectorId: number
 }
 
-export interface GetConfigurationRequest {
-  key?: string | OCPP16StandardParametersKey[];
+export interface GetConfigurationRequest extends JsonObject {
+  key?: OCPP16ConfigurationKey[]
 }
 
-export enum ResetType {
+enum ResetType {
   HARD = 'Hard',
   SOFT = 'Soft'
 }
 
-export interface ResetRequest {
-  type: ResetType;
+export interface ResetRequest extends JsonObject {
+  type: ResetType
+}
+
+export interface OCPP16GetCompositeScheduleRequest extends JsonObject {
+  connectorId: number
+  duration: number
+  chargingRateUnit?: OCPP16ChargingRateUnitType
 }
 
-export interface SetChargingProfileRequest {
-  connectorId: number;
-  csChargingProfiles: OCPP16ChargingProfile;
+export interface SetChargingProfileRequest extends JsonObject {
+  connectorId: number
+  csChargingProfiles: OCPP16ChargingProfile
 }
 
 export enum OCPP16AvailabilityType {
-  INOPERATIVE = 'Inoperative',
-  OPERATIVE = 'Operative'
+  Inoperative = 'Inoperative',
+  Operative = 'Operative'
+}
+
+export interface OCPP16ChangeAvailabilityRequest extends JsonObject {
+  connectorId: number
+  type: OCPP16AvailabilityType
+}
+
+export interface OCPP16ClearChargingProfileRequest extends JsonObject {
+  id?: number
+  connectorId?: number
+  chargingProfilePurpose?: OCPP16ChargingProfilePurposeType
+  stackLevel?: number
+}
+
+export interface OCPP16UpdateFirmwareRequest extends JsonObject {
+  location: string
+  retrieveDate: Date
+  retries?: number
+  retryInterval?: number
+}
+
+export enum OCPP16FirmwareStatus {
+  Downloaded = 'Downloaded',
+  DownloadFailed = 'DownloadFailed',
+  Downloading = 'Downloading',
+  Idle = 'Idle',
+  InstallationFailed = 'InstallationFailed',
+  Installing = 'Installing',
+  Installed = 'Installed'
+}
+
+export type OCPP16FirmwareStatusNotificationRequest = {
+  status: OCPP16FirmwareStatus
+} & JsonObject
+
+export interface GetDiagnosticsRequest extends JsonObject {
+  location: string
+  retries?: number
+  retryInterval?: number
+  startTime?: Date
+  stopTime?: Date
+}
+
+export interface OCPP16DiagnosticsStatusNotificationRequest extends JsonObject {
+  status: OCPP16DiagnosticsStatus
+}
+
+export enum OCPP16MessageTrigger {
+  BootNotification = 'BootNotification',
+  DiagnosticsStatusNotification = 'DiagnosticsStatusNotification',
+  FirmwareStatusNotification = 'FirmwareStatusNotification',
+  Heartbeat = 'Heartbeat',
+  MeterValues = 'MeterValues',
+  StatusNotification = 'StatusNotification'
+}
+
+export interface OCPP16TriggerMessageRequest extends JsonObject {
+  requestedMessage: OCPP16MessageTrigger
+  connectorId?: number
+}
+
+export enum OCPP16DataTransferVendorId {}
+
+export interface OCPP16DataTransferRequest extends JsonObject {
+  vendorId: string
+  messageId?: string
+  data?: string
 }
 
-export interface ChangeAvailabilityRequest {
-  connectorId: number;
-  type: OCPP16AvailabilityType;
+export interface OCPP16ReserveNowRequest extends JsonObject {
+  connectorId: number
+  expiryDate: Date
+  idTag: string
+  parentIdTag?: string
+  reservationId: number
 }
 
-export interface ClearChargingProfileRequest {
-  id?: number;
-  connectorId?: number;
-  chargingProfilePurpose?: ChargingProfilePurposeType;
-  stackLevel?: number;
+export interface OCPP16CancelReservationRequest extends JsonObject {
+  reservationId: number
 }