1 files changed, 31 insertions, 11 deletions

diff --git a/src/api/dashboard/mod.rs b/src/api/dashboard/mod.rs
index 2557906..8d954c0 100644
--- a/src/api/dashboard/mod.rs
+++ b/src/api/dashboard/mod.rs
@@ -302,14 +302,13 @@ impl Graph {
             let replica = state.doc.read().await;
             members::members(&replica.doc)
         };
-        for member in members
+        let members: Vec<String> = members
             .into_iter()
             .filter(|member| member != state.local_id())
             .take(MAX_ASKED)
-        {
-            let state = state.clone();
-            tokio::spawn(async move { links::ask(&state, &member, lease).await });
-        }
+            .collect();
+        // Those we can't reach, through peers that can (`links::ask_all`).
+        links::ask_all(state, members, lease).await;
     }
 }
 
@@ -320,9 +319,13 @@ async fn build(state: &AppState, graph: &Graph, live: bool) -> JsonValue {
     let list = super::peers::peer_list(state).await;
     let stats = serde_json::to_value(super::stats::collect(state, &list).await).unwrap_or_default();
     let peers = serde_json::to_value(&list).unwrap_or_default();
-    let aliases = {
+    let (aliases, dashboards) = {
         let replica = state.doc.read().await;
-        members::aliases(&replica.doc)
+        let dashboards: std::collections::HashMap<String, String> = members::members(&replica.doc)
+            .into_iter()
+            .filter_map(|pk| members::dashboard(&replica.doc, &pk).map(|url| (pk, url)))
+            .collect();
+        (members::aliases(&replica.doc), dashboards)
     };
     let local = state.local_id();
     let intended: Map<String, JsonValue> = graph
@@ -357,12 +360,25 @@ async fn build(state: &AppState, graph: &Graph, live: bool) -> JsonValue {
         ),
         u64::try_from(state.clock_skew_warn.as_millis()).unwrap_or(u64::MAX),
     );
-    // Everyone on the map: in the member list's graph, or measured.
+    // Everyone on the map: in the member list's graph, measured, or at the other end of
+    // a link measured. A node that joined through others is linked to them before its
+    // registration reaches this node, and before the graph is computed again
+    // (`LINKS_EVERY`); it shows then, hollow (no links of its own reported).
+    let linked: BTreeSet<&String> = own
+        .iter()
+        .chain(
+            replies
+                .iter()
+                .flat_map(|(_, _, member_links)| member_links.iter()),
+        )
+        .map(|link| &link.peer)
+        .collect();
     let mut members_json = Map::new();
-    for member in graph.intended.keys().chain(measured.keys()) {
+    for member in graph.intended.keys().chain(measured.keys()).chain(linked) {
         members_json.insert(
             member.clone(),
-            json!({ "alias": aliases.get(member), "self": member == local }),
+            json!({ "alias": aliases.get(member), "self": member == local,
+                "dashboard": dashboards.get(member) }),
         );
     }
     json!({
@@ -619,7 +635,11 @@ async fn events(Extension(hub): Extension<Arc<Hub>>) -> impl IntoResponse {
             }
         }
     };
-    Sse::new(stream).keep_alive(KeepAlive::default())
+    (
+        // Through nginx too as it comes, not buffered (`operations.md`).
+        [(super::UNBUFFERED.0, super::UNBUFFERED.1)],
+        Sse::new(stream).keep_alive(KeepAlive::default()),
+    )
 }
 
 /// The node stops: the client may reconnect once it is back.