feat(ws): adopt WS ping method for heartbeat and latency tracking (#1036)

This commit is contained in:
M57 authored and GitHub committed 2026-09-01 19:44:39 +03:00
1 parent 21db9bfdab
commit d8385a2b02
3 files changed
+99

No files matched your search

@@ -152,6 +152,12 @@ object HermesWsClient {
val isHealthy: Boolean
get() = isConnected && (System.currentTimeMillis() - lastPongTimestamp < 60_000L)
// ── Observable latency tracking (issue #1017) ─────────────────────────
private val _lastLatencyMs = MutableStateFlow<Long?>(null)
/** Last measured round-trip latency in milliseconds via [ping], or null when disconnected / unmeasured. */
val lastLatencyMs: StateFlow<Long?> = _lastLatencyMs.asStateFlow()
private var healthJob: Job? = null
private fun startHealthTracking() {
@@ -161,11 +167,37 @@ object HermesWsClient {
wsScope.launch {
while (connected.get()) {
delay(30_000L)
if (connected.get()) {
try {
ping(timeoutMs = 10_000L)
} catch (e: Exception) {
Log.w(TAG, "Health check ping failed: ${e.message}")
}
}
if (!runHealthCheckPass()) break
}
}
}
/**
* Ultra-lightweight JSON-RPC liveness check and RTT measurement (issue #1017).
* Bypasses agent queues on the backend; measures round-trip time in milliseconds.
* Updates [lastLatencyMs] and [lastPongTimestamp].
*/
suspend fun ping(timeoutMs: Long = 5_000L): Long {
val start = System.currentTimeMillis()
request(WsMethods.PING, emptyMap(), timeoutMs = timeoutMs).await()
val latency = (System.currentTimeMillis() - start).coerceAtLeast(0L)
lastPongTimestamp = System.currentTimeMillis()
_lastLatencyMs.value = latency
return latency
}
@VisibleForTesting
internal fun setLastLatencyForTest(latency: Long?) {
_lastLatencyMs.value = latency
}
/**
* One liveness pass. Returns false when the tracking loop should stop:
* either the connection is already gone or the watchdog fired a cancel.
@@ -199,6 +231,7 @@ object HermesWsClient {
private fun stopHealthTracking() {
healthJob?.cancel()
healthJob = null
_lastLatencyMs.value = null
}
// ── Public observable stream ─────────────────────────────────────────
@@ -37,6 +37,11 @@ object WsMethods {
const val SUDO_RESPOND = "sudo.respond"
const val SECRET_RESPOND = "secret.respond"
// ── Heartbeat & Latency (issue #1017) ──────────────────────────────────
/** Ultra-lightweight liveness check and round-trip latency measurement. */
const val PING = "ping"
// ── Commands catalog ──────────────────────────────────────────────────
const val COMMANDS_CATALOG = "commands.catalog"
const val COMMAND_DISPATCH = "command.dispatch"