From a4ffb303854510e01c0377469e9f004f7dc60218 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Tue, 7 Oct 2025 18:33:28 +0200 Subject: [PATCH] refactor: cleanup status notification sending code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- e-mobility-charging-stations-simulator.code-workspace | 2 +- src/charging-station/ocpp/OCPPServiceUtils.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/e-mobility-charging-stations-simulator.code-workspace b/e-mobility-charging-stations-simulator.code-workspace index 65d1c8ef..e8a70ddd 100644 --- a/e-mobility-charging-stations-simulator.code-workspace +++ b/e-mobility-charging-stations-simulator.code-workspace @@ -9,5 +9,5 @@ { "path": "tests/ocpp-server", }, - ] + ], } diff --git a/src/charging-station/ocpp/OCPPServiceUtils.ts b/src/charging-station/ocpp/OCPPServiceUtils.ts index 69a3e5d6..c7ccb905 100644 --- a/src/charging-station/ocpp/OCPPServiceUtils.ts +++ b/src/charging-station/ocpp/OCPPServiceUtils.ts @@ -176,6 +176,10 @@ export const sendAndSetConnectorStatus = async ( options?: { send: boolean } ): Promise => { options = { send: true, ...options } + const connectorStatus = chargingStation.getConnectorStatus(connectorId) + if (connectorStatus == null) { + return + } if (options.send) { checkConnectorStatusTransition(chargingStation, connectorId, status) await chargingStation.ocppRequestService.requestHandler< @@ -187,11 +191,10 @@ export const sendAndSetConnectorStatus = async ( buildStatusNotificationRequest(chargingStation, connectorId, status, evseId) ) } - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - chargingStation.getConnectorStatus(connectorId)!.status = status + connectorStatus.status = status chargingStation.emit(ChargingStationEvents.connectorStatusChanged, { connectorId, - ...chargingStation.getConnectorStatus(connectorId), + ...connectorStatus, }) } -- 2.43.0