X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStation.ts;h=1845d35b220186bce42f042d29cf40930fddeb7f;hb=511c18973d15210aabf9cb0789f146bd8c087759;hp=32d48c24c1213c8030ce13eb42b0f3718f2b3c53;hpb=8ecd0802b9a68c9a2b5b482b2f25fa6d2816a3ac;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index 32d48c24..1845d35b 100644
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -1484,7 +1484,7 @@ export default class ChargingStation {
             // Respond
             cachedRequest = this.requests.get(messageId);
             if (Array.isArray(cachedRequest) === true) {
-              [responseCallback, , requestCommandName, requestPayload] = cachedRequest;
+              [responseCallback, errorCallback, requestCommandName, requestPayload] = cachedRequest;
             } else {
               throw new OCPPError(
                 ErrorType.PROTOCOL_ERROR,
@@ -1575,8 +1575,12 @@ export default class ChargingStation {
         [MessageType.CALL_RESULT_MESSAGE, MessageType.CALL_ERROR_MESSAGE].includes(messageType) ===
         true
       ) {
-        // Remove the request from the cache
+        // Always remove the request from the cache in case of error at response handling
         this.requests.delete(messageId);
+        // Always reject the deferred promise in case of error at response handling (rejecting an already fulfilled promise is a no-op)
+        if (errorCallback) {
+          errorCallback(error as OCPPError, false);
+        }
       }
     }
   }