From 2b94ad12b41578109dd303bf77c49ff93ed2f7e5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Mon, 20 Nov 2023 22:27:55 +0100
Subject: [PATCH] fix(simulator): buffer OCPP payload at sending error
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Closes #156

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 .../ocpp/OCPPRequestService.ts                | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/charging-station/ocpp/OCPPRequestService.ts b/src/charging-station/ocpp/OCPPRequestService.ts
index bb9a75fe..794f3e25 100644
--- a/src/charging-station/ocpp/OCPPRequestService.ts
+++ b/src/charging-station/ocpp/OCPPRequestService.ts
@@ -22,7 +22,13 @@ import {
   type ResponseCallback,
   type ResponseType,
 } from '../../types';
-import { cloneObject, handleSendMessageError, isNullOrUndefined, logger } from '../../utils';
+import {
+  cloneObject,
+  formatDurationMilliSeconds,
+  handleSendMessageError,
+  isNullOrUndefined,
+  logger,
+} from '../../utils';
 
 const moduleName = 'OCPPRequestService';
 
@@ -367,14 +373,6 @@ export abstract class OCPPRequestService {
           reject(ocppError);
         };
 
-        const rejectAndCleanRequestsCache = (ocppError: OCPPError): void => {
-          // Remove request from the cache
-          if (messageType === MessageType.CALL_MESSAGE) {
-            chargingStation.requests.delete(messageId);
-          }
-          return reject(ocppError);
-        };
-
         const handleSendError = (ocppError: OCPPError): void => {
           if (params?.skipBufferingOnError === false) {
             // Buffer
@@ -389,10 +387,11 @@ export abstract class OCPPRequestService {
                 errorCallback,
               );
             }
-            // Reject and keep request in the cache
-            return reject(ocppError);
+          } else if (messageType === MessageType.CALL_MESSAGE) {
+            // Remove request from the cache
+            chargingStation.requests.delete(messageId);
           }
-          return rejectAndCleanRequestsCache(ocppError);
+          return reject(ocppError);
         };
 
         if (chargingStation.stationInfo?.enableStatistics === true) {
@@ -409,10 +408,14 @@ export abstract class OCPPRequestService {
         if (chargingStation.isWebSocketConnectionOpened() === true) {
           const beginId = PerformanceStatistics.beginMeasure(commandName);
           const sendTimeout = setTimeout(() => {
-            return rejectAndCleanRequestsCache(
+            return handleSendError(
               new OCPPError(
                 ErrorType.GENERIC_ERROR,
-                `Timeout for message id '${messageId}'`,
+                `Timeout ${formatDurationMilliSeconds(
+                  OCPPConstants.OCPP_WEBSOCKET_TIMEOUT,
+                )} reached for ${
+                  params?.skipBufferingOnError === false ? '' : 'non '
+                }buffered message id '${messageId}' with content '${messageToSend}`,
                 commandName,
                 (messagePayload as OCPPError).details,
               ),
-- 
2.34.1