fix: Add missing type for error payload

shiv3 · Oct 8, 2024 · 304e327 · 304e327
1 parent 74345b0
commit 304e327
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;