From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Tue, 13 Sep 2022 18:08:10 +0000 (+0200)
Subject: Ensure the deferred promise use to send OCPP message will not be leaked
X-Git-Tag: v1.1.74~40
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=53e07f9437c9d52d412bdfb399605569bc56a3eb;p=e-mobility-charging-stations-simulator.git

Ensure the deferred promise use to send OCPP message will not be leaked

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---

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);
+        }
       }
     }
   }