Merge pull request #6848 from The-K-R-O-K/AndriiDiachuk/6837-hearbeat-interval-correct-reset

[Access] Heartbeat interval not reset correctly in streaming endpoints.

Author: peterargue

engine/access/rest/websockets/data_providers/account_statuses_provider.go

@@ -109,8 +109,8 @@ func (p *AccountStatusesDataProvider) handleResponse() func(accountStatusesRespo
 			if blocksSinceLastMessage < p.heartbeatInterval {
 				return nil
 			}
-			blocksSinceLastMessage = 0
 		}
+		blocksSinceLastMessage = 0
 
 		index := messageIndex.Value()
 		if ok := messageIndex.Set(messageIndex.Value() + 1); !ok {

engine/access/rest/websockets/data_providers/events_provider.go

@@ -95,8 +95,8 @@ func (p *EventsDataProvider) handleResponse() func(eventsResponse *backend.Event
 			if blocksSinceLastMessage < p.heartbeatInterval {
 				return nil
 			}
-			blocksSinceLastMessage = 0
 		}
+		blocksSinceLastMessage = 0
 
 		index := messageIndex.Value()
 		if ok := messageIndex.Set(messageIndex.Value() + 1); !ok {

engine/access/rest/websockets/legacy/websocket_handler.go

@@ -146,8 +146,8 @@ func (wsController *WebsocketController) writeEvents(sub subscription.Subscripti
 				if blocksSinceLastMessage < wsController.HeartbeatInterval {
 					continue
 				}
-				blocksSinceLastMessage = 0
 			}
+			blocksSinceLastMessage = 0
 
 			// EventsResponse contains CCF encoded events, and this API returns JSON-CDC events.
 			// convert event payload formats.

engine/access/state_stream/backend/handler.go

@@ -370,8 +370,8 @@ func (h *Handler) handleEventsResponse(send sendSubscribeEventsResponseFunc, hea
 			if blocksSinceLastMessage < heartbeatInterval {
 				return nil
 			}
-			blocksSinceLastMessage = 0
 		}
+		blocksSinceLastMessage = 0
 
 		// BlockExecutionData contains CCF encoded events, and the Access API returns JSON-CDC events.
 		// convert event payload formats.
@@ -490,8 +490,8 @@ func (h *Handler) handleAccountStatusesResponse(
 			if blocksSinceLastMessage < heartbeatInterval {
 				return nil
 			}
-			blocksSinceLastMessage = 0
 		}
+		blocksSinceLastMessage = 0
 
 		results, err := convertAccountsStatusesResultsToMessage(evenVersion, resp)
 		if err != nil {