repoint post_turn_counts + dedup web_ui stats onto todo_server::dial (#2635 inc 1)
This commit is contained in:
parent
e8d101d663
commit
e11e8294a3
3 changed files with 46 additions and 69 deletions
|
|
@ -30,37 +30,14 @@ pub(super) async fn api_stats(
|
|||
/// moved in-container). Returns `None` on any transport / decode failure or
|
||||
/// when the socket is unset — the stats are decorative, not authoritative.
|
||||
async fn fetch_reminder_stats(window_secs: u64) -> Option<hive_sh4re::ReminderStats> {
|
||||
use tokio::io::{AsyncBufReadExt as _, AsyncWriteExt as _, BufReader};
|
||||
use tokio::net::UnixStream;
|
||||
|
||||
let socket_path = std::env::var_os("HIVE_AGENT_SOCKET").map(std::path::PathBuf::from)?;
|
||||
if !socket_path.exists() {
|
||||
return None;
|
||||
}
|
||||
tokio::time::timeout(std::time::Duration::from_secs(3), async move {
|
||||
let mut stream = UnixStream::connect(&socket_path).await?;
|
||||
let req = hive_agent_sock::Request::ReminderRollup {
|
||||
since_secs: window_secs,
|
||||
};
|
||||
let mut line = serde_json::to_string(&req)?;
|
||||
line.push('\n');
|
||||
stream.write_all(line.as_bytes()).await?;
|
||||
stream.flush().await?;
|
||||
let mut lines = BufReader::new(stream).lines();
|
||||
let resp_line = lines
|
||||
.next_line()
|
||||
.await?
|
||||
.ok_or_else(|| anyhow::anyhow!("agent socket closed without response"))?;
|
||||
let resp: hive_agent_sock::Response = serde_json::from_str(&resp_line)?;
|
||||
anyhow::Ok(match resp {
|
||||
hive_agent_sock::Response::ReminderRollup { stats } => Some(stats),
|
||||
_ => None,
|
||||
})
|
||||
match crate::todo_server::dial(&hive_agent_sock::Request::ReminderRollup {
|
||||
since_secs: window_secs,
|
||||
})
|
||||
.await
|
||||
.ok()?
|
||||
.ok()
|
||||
.flatten()
|
||||
.await?
|
||||
{
|
||||
hive_agent_sock::Response::ReminderRollup { stats } => Some(stats),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// `GET /api/todos` — snapshot of this agent's local todos (loose-ends v2).
|
||||
|
|
@ -70,36 +47,12 @@ async fn fetch_reminder_stats(window_secs: u64) -> Option<hive_sh4re::ReminderSt
|
|||
/// `LooseEnd::Todo` (subsystem, key, summary, source, `age_seconds`). Returns
|
||||
/// an empty array when the socket is unavailable — best-effort, silent failure.
|
||||
pub(super) async fn api_todos() -> Response {
|
||||
use tokio::io::{AsyncBufReadExt as _, AsyncWriteExt as _, BufReader};
|
||||
use tokio::net::UnixStream;
|
||||
|
||||
let socket_path = match std::env::var_os("HIVE_AGENT_SOCKET") {
|
||||
Some(p) => std::path::PathBuf::from(p),
|
||||
None => return axum::Json(serde_json::json!({ "todos": [] })).into_response(),
|
||||
};
|
||||
if !socket_path.exists() {
|
||||
return axum::Json(serde_json::json!({ "todos": [] })).into_response();
|
||||
}
|
||||
let todos = tokio::time::timeout(std::time::Duration::from_secs(3), async move {
|
||||
let mut stream = UnixStream::connect(&socket_path).await?;
|
||||
let req = hive_agent_sock::Request::ListTodos { subsystem: None };
|
||||
let mut line = serde_json::to_string(&req)?;
|
||||
line.push('\n');
|
||||
stream.write_all(line.as_bytes()).await?;
|
||||
stream.flush().await?;
|
||||
let mut lines = BufReader::new(stream).lines();
|
||||
let resp_line = lines
|
||||
.next_line()
|
||||
.await?
|
||||
.ok_or_else(|| anyhow::anyhow!("agent socket closed without response"))?;
|
||||
let resp: hive_agent_sock::Response = serde_json::from_str(&resp_line)?;
|
||||
anyhow::Ok(match resp {
|
||||
hive_agent_sock::Response::LooseEnds { loose_ends } => loose_ends,
|
||||
let todos =
|
||||
match crate::todo_server::dial(&hive_agent_sock::Request::ListTodos { subsystem: None })
|
||||
.await
|
||||
{
|
||||
Some(hive_agent_sock::Response::LooseEnds { loose_ends }) => loose_ends,
|
||||
_ => Vec::new(),
|
||||
})
|
||||
})
|
||||
.await
|
||||
.unwrap_or_else(|_| Err(anyhow::anyhow!("timeout")))
|
||||
.unwrap_or_default();
|
||||
};
|
||||
axum::Json(serde_json::json!({ "todos": todos })).into_response()
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue