vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor(web_ui): share one broker_request helper; /send timeout now 409 not 500

Browse source
This commit is contained in:
müde 2026-07-05 21:55:28 +02:00
commit 785a36b907
4 changed files with 86 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

36
hive-ag3nt/src/web_ui/state.rs
View file

@ -3,11 +3,10 @@
use axum::extract::State;
use serde::Serialize;
use crate::client;
use crate::login::LoginState;
use crate::login_session::drop_if_finished;
use super::{AppState, SOCKET_FETCH_TIMEOUT};
use super::AppState;
pub(super) async fn api_state(State(state): State<AppState>) -> axum::Json<StateSnapshot> {
// Capture seq *before* any reads so the dedupe contract is
@ -371,18 +370,10 @@ struct ExtraLink {
/// failure — the inbox section is decorative, not authoritative.
async fn recent_inbox(socket: &std::path::Path) -> Vec<hive_sh4re::InboxRow> {
const LIMIT: u64 = 30;
// Deadline-bounded: `/api/state` must render even when hive-c0re is
// busy — an empty inbox section beats a hung snapshot.
match tokio::time::timeout(
SOCKET_FETCH_TIMEOUT,
client::request::<_, hive_sh4re::Response>(
socket,
&hive_sh4re::Request::Recent { limit: LIMIT },
),
)
.await
{
Ok(Ok(hive_sh4re::Response::Recent { rows })) => rows,
// Deadline-bounded (via `broker_request`): `/api/state` must render even
// when hive-c0re is busy — an empty inbox section beats a hung snapshot.
match super::broker_request(socket, &hive_sh4re::Request::Recent { limit: LIMIT }).await {
Ok(hive_sh4re::Response::Recent { rows }) => rows,
_ => Vec::new(),
}
}
@ -394,19 +385,16 @@ pub(super) async fn fetch_reminder_stats(
socket: &std::path::Path,
window_secs: u64,
) -> Option<hive_sh4re::ReminderStats> {
match tokio::time::timeout(
SOCKET_FETCH_TIMEOUT,
client::request::<_, hive_sh4re::Response>(
socket,
&hive_sh4re::Request::ReminderRollup {
since_secs: window_secs,
agent: None,
},
),
match super::broker_request(
socket,
&hive_sh4re::Request::ReminderRollup {
since_secs: window_secs,
agent: None,
},
)
.await
{
Ok(Ok(hive_sh4re::Response::ReminderRollup(stats))) => Some(stats),
Ok(hive_sh4re::Response::ReminderRollup(stats)) => Some(stats),
_ => None,
}
}