diff --git a/core/archipelago/src/api/rpc/content.rs b/core/archipelago/src/api/rpc/content.rs index 18d11a3b..0b0d0762 100644 --- a/core/archipelago/src/api/rpc/content.rs +++ b/core/archipelago/src/api/rpc/content.rs @@ -1261,16 +1261,31 @@ impl RpcHandler { let mut reached = 0usize; let mut unreachable = 0usize; + // OVERALL budget, not just per-peer. With a dozen federated peers an + // 8s per-peer timeout still adds up past any usable answer — measured + // on the node: this call returned nothing after 45 seconds, which the + // assistant reports to the user as "having trouble accessing the peer + // content list". Partial results beat a timeout: whatever answered + // inside the budget is returned, and the counts say what was missed. + let deadline = tokio::time::Instant::now() + std::time::Duration::from_secs(20); + // Sequential with a per-peer timeout rather than an unbounded fan-out: // 02-08 traced a real UI stall to content.browse-peer starving the // connection pool, and the assistant is not latency-critical. for onion in &onions { + if tokio::time::Instant::now() >= deadline { + // Everything not yet tried counts as unreachable for this call + // rather than being silently omitted. + unreachable += onions.len() - reached - unreachable; + break; + } let params = Some(serde_json::json!({ "onion": onion })); - match tokio::time::timeout( + // Never wait past the overall deadline for a single peer. + let per_peer = std::cmp::min( std::time::Duration::from_secs(8), - self.handle_content_browse_peer(params), - ) - .await + deadline.saturating_duration_since(tokio::time::Instant::now()), + ); + match tokio::time::timeout(per_peer, self.handle_content_browse_peer(params)).await { Ok(Ok(v)) => { reached += 1; @@ -1292,6 +1307,10 @@ impl RpcHandler { "items": items, "peers_reached": reached, "peers_unreachable": unreachable, + "peers_total": onions.len(), + // Explicit so the assistant can say "3 of 12 peers answered" + // instead of implying the empty ones have nothing to share. + "partial": unreachable > 0, })) } diff --git a/neode-ui/src/views/settings/NodeCertificateSection.vue b/neode-ui/src/views/settings/NodeCertificateSection.vue index 71554dd0..87a18359 100644 --- a/neode-ui/src/views/settings/NodeCertificateSection.vue +++ b/neode-ui/src/views/settings/NodeCertificateSection.vue @@ -52,9 +52,12 @@ onMounted(async () => {