From 53e07f9437c9d52d412bdfb399605569bc56a3eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Tue, 13 Sep 2022 20:08:10 +0200 Subject: [PATCH] Ensure the deferred promise use to send OCPP message will not be leaked MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- src/charging-station/ChargingStation.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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); + } } } } -- 2.34.1