Fix incoming message error handling

[e-mobility-charging-stations-simulator.git] / src / charging-station / ocpp / OCPPIncomingRequestService.ts

diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
index a56437f951e7a9999683584a0c4eaed6df7a230b..5fadfb95d5ee5227327fe8fc0304a1aee2998f9b 100644 (file)
--- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts
+++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
@@ -19,14 +19,17 @@ export default abstract class OCPPIncomingRequestService {
     return OCPPIncomingRequestService.instances.get(chargingStation.id) as T;
   }
 
-  protected handleIncomingRequestError<T>(commandName: IncomingRequestCommand, error: Error, errorOcppResponse?: T, params: HandleErrorParams = { throwError: true }): T {
+  protected handleIncomingRequestError<T>(commandName: IncomingRequestCommand, error: Error, params: HandleErrorParams<T> = { throwError: true }): T {
     logger.error(this.chargingStation.logPrefix() + ' Incoming request command %s error: %j', commandName, error);
-    if (errorOcppResponse) {
-      return errorOcppResponse;
+    if (!params?.throwError && params?.errorResponse) {
+      return params?.errorResponse;
     }
-    if (params?.throwError) {
+    if (params?.throwError && !params?.errorResponse) {
       throw error;
     }
+    if (params?.throwError && params?.errorResponse) {
+      return params?.errorResponse;
+    }
   }
 
   public abstract handleRequest(messageId: string, commandName: IncomingRequestCommand, commandPayload: JsonType): Promise<void>;