diff --git a/src/cp/OCPPMessageHandler.ts b/src/cp/OCPPMessageHandler.ts index 0ddd4cb..c4b43a1 100644 --- a/src/cp/OCPPMessageHandler.ts +++ b/src/cp/OCPPMessageHandler.ts @@ -2,7 +2,7 @@ import {OcppMessageRequestPayload, OcppMessageResponsePayload, OCPPWebSocket} fr import {ChargePoint} from "./ChargePoint"; import {Transaction} from "./Transaction"; import {Logger} from "./Logger"; -import {OCPPMessageType, OCPPAction, OCPPStatus, BootNotification} from "./OcppTypes"; +import {OCPPMessageType, OCPPAction, OCPPStatus, BootNotification, OCPPErrorCode} from "./OcppTypes"; import * as request from "@voltbras/ts-ocpp/dist/messages/json/request"; import * as response from "@voltbras/ts-ocpp/dist/messages/json/response"; @@ -464,7 +464,7 @@ export class OCPPMessageHandler { private sendCallError( messageId: string, - errorCode: string, + errorCode: OCPPErrorCode, errorDescription: string ): void { const errorDetails = { diff --git a/src/cp/OCPPWebSocket.ts b/src/cp/OCPPWebSocket.ts index a718b6e..dc36913 100644 --- a/src/cp/OCPPWebSocket.ts +++ b/src/cp/OCPPWebSocket.ts @@ -1,9 +1,9 @@ import {Logger} from "./Logger"; -import {OCPPAction, OCPPMessageType} from "./OcppTypes"; +import {OCPPAction, OCPPErrorCode, OCPPMessageType} from "./OcppTypes"; import * as request from "@voltbras/ts-ocpp/dist/messages/json/request"; import * as response from "@voltbras/ts-ocpp/dist/messages/json/response"; -export type OcppMessagePayload = OcppMessageRequestPayload | OcppMessageResponsePayload; +export type OcppMessagePayload = OcppMessageRequestPayload | OcppMessageResponsePayload | OcppMessageErrorPayload; export type OcppMessageRequestPayload = | request.AuthorizeRequest @@ -21,6 +21,12 @@ export type OcppMessageResponsePayload = | response.ResetResponse | response.TriggerMessageResponse; +export type OcppMessageErrorPayload = { + readonly errorCode: OCPPErrorCode; + readonly errorDescription: string; + readonly errorDetails?: object; +}; + type MessageHandler = ( messageType: OCPPMessageType, messageId: string, diff --git a/src/cp/OcppTypes.ts b/src/cp/OcppTypes.ts index 2e08940..adb584c 100644 --- a/src/cp/OcppTypes.ts +++ b/src/cp/OcppTypes.ts @@ -1,3 +1,5 @@ +import {ErrorCode} from "@voltbras/ts-ocpp/dist/ws"; + export enum OCPPStatus { Available = "Available", Preparing = "Preparing", @@ -39,6 +41,8 @@ export enum OCPPAction { Reset = "Reset", } +export type OCPPErrorCode = ErrorCode; + export interface BootNotification { ChargeBoxSerialNumber: string; ChargePointModel: string;