From 52ce5f50b645f9e609388b1f838429a52c247b12 Mon Sep 17 00:00:00 2001
From: Kushal Baral <136962554+kushal1o1@users.noreply.github.com>
Date: Sat, 13 Jun 2026 20:35:22 +0545
Subject: [PATCH] fix(ocpp): update lastHeartbeat on CALLRESULT/CALLERROR, stop
 orphaned timer

- Update lastHeartbeat on CALLRESULT/CALLERROR so responsive stations
  aren't falsely disconnected
- Clear ipMessageCleanupTimer on server shutdown to prevent orphaned
  interval
---
 packages/ocpp/src/server/ocpp-server.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/ocpp/src/server/ocpp-server.ts b/packages/ocpp/src/server/ocpp-server.ts
index 665ea54..963a043 100644
--- a/packages/ocpp/src/server/ocpp-server.ts
+++ b/packages/ocpp/src/server/ocpp-server.ts
@@ -408,6 +408,10 @@ export class OcppServer {
 
     // Handle responses to our outgoing calls
     if (messageType === MESSAGE_TYPE_CALLRESULT || messageType === MESSAGE_TYPE_CALLERROR) {
+      // Station is alive — it responded. Update liveness clock so
+      // PingMonitor.checkHeartbeats() doesn't disconnect stations that
+      // are actively responding to CSMS-initiated commands.
+      session.lastHeartbeat = new Date();
       if (isCallResult(parsed)) {
         // Log the inbound CALLRESULT so operators can see what the station
         // returned for CSMS-initiated commands. Without this the OCPP log
@@ -615,6 +619,10 @@ export class OcppServer {
   }
 
   async stop(): Promise<void> {
+    if (ipMessageCleanupTimer != null) {
+      clearInterval(ipMessageCleanupTimer);
+      ipMessageCleanupTimer = null;
+    }
     await this.pingMonitor.stop();
     if (this.wssSecure != null) {
       const secure = this.wssSecure;