From 10786d2e598865cd6e763df08f692cfc0f756908 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 19 Nov 2026 22:03:28 +0000 Subject: continuum-party status: this node by its ID, not by being heard 0 s ago `status` took a node heard from 0 seconds ago for the node it asked, as counts give 0 for that one; another node heard from within the second was called `this node` too. GET /events says the node's ID now (`node`), and `status` marks the node of that ID (`here` in --json), and no other, as `this node`; another heard from within the second is `heard 0 s ago`. --- src/api/events.rs | 6 ++++-- src/federation/party/status.rs | 32 +++++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/api/events.rs b/src/api/events.rs index d6c06c4..5a69769 100644 --- a/src/api/events.rs +++ b/src/api/events.rs @@ -84,8 +84,9 @@ fn why(refusal: &Refusal) -> String { /// `GET /events`: the store's ID, its checkpoint's, its heads, as many as an event may /// name, what a new event builds on (`Store::building_on`), how many events it took -/// after its checkpoint, the event it stopped at, if any, the node's party, whether the -/// node votes for it by itself, and the revisions of the federation its continuum knows. +/// after its checkpoint, the event it stopped at, if any, the node's ID and party, whether +/// the node votes for it by itself, and the revisions of the federation its continuum +/// knows. async fn summary(State(state): State) -> Response { let party = state.holding.party().map(str::to_owned); let votes = state.holding.votes_by_itself(); @@ -99,6 +100,7 @@ async fn summary(State(state): State) -> Response { "heads": ids(store.building_on()), "taken": store.taken().len(), "stopped": stopped, + "node": state.local_id(), "party": party, "votesByItself": votes, "revisions": revisions(), diff --git a/src/federation/party/status.rs b/src/federation/party/status.rs index 2428845..4c637fa 100644 --- a/src/federation/party/status.rs +++ b/src/federation/party/status.rs @@ -66,6 +66,7 @@ async fn model(node: &Node, options: &Options, party: Option<&str>) -> Result) -> Result Vec { paint.paint(Style::Id, &text(&node["id"])) )); let heard = match node["heard"].as_u64() { - Some(0) => paint.paint(Style::Good, "this node"), + _ if node["here"].as_bool() == Some(true) => paint.paint(Style::Good, "this node"), Some(seconds) if seconds <= LATELY => { paint.paint(Style::Good, &format!("heard {}", ago(seconds))) } @@ -770,19 +772,29 @@ mod tests { "lass": { "keys": ["ssh-ed25519 AAAAone"], "keySet": ["ssh-ed25519 AAAAone"], - "nodes": [{ - "id": "continuum:9c07", - "name": "beta", - "heard": 0, - "knows": {"wire": [52, 52], "revision": {"named": "the base revision"}}, - }], + "nodes": [ + { + "id": "continuum:9c07", + "name": "beta", + "here": true, + "heard": 0, + "knows": {"wire": [52, 52], "revision": {"named": "the base revision"}}, + }, + { + "id": "continuum:3b1e", + "name": null, + "here": false, + "heard": 0, + "knows": {"wire": [52, 52], "revision": null}, + }, + ], }, "tv": { "keys": ["ssh-ed25519 AAAAtwo"], "keySet": ["ssh-ed25519 AAAAthree"], "nodes": [ - {"id": "continuum:5be1", "name": null, "heard": LATELY + 1, "knows": null}, - {"id": "continuum:77d0", "name": null, "heard": null, "knows": null}, + {"id": "continuum:5be1", "name": null, "here": false, "heard": LATELY + 1, "knows": null}, + {"id": "continuum:77d0", "name": null, "here": false, "heard": null, "knows": null}, ], }, }, @@ -839,6 +851,8 @@ mod tests { has(" tv"); has(" continuum:9c07 (beta)"); has(" this node; wire 52; the base revision"); + // Another node heard from within the second is no less another. + has(" heard 0 s ago; wire 52; no federation"); has(&format!( " heard {}; said nothing of what it runs", ago(LATELY + 1) -- cgit v1.3.1