refactor

veilid-cli/src/client_api_connection.rs

@@ -96,6 +96,9 @@ impl veilid_client::Server for VeilidClientImpl {
                 self.comproc.update_route(route);
             }
             VeilidUpdate::Shutdown => self.comproc.update_shutdown(),
+            VeilidUpdate::ValueChange(value_change) => {
+                self.comproc.update_value_change(value_change);
+            }
         }
 
         Promise::ok(())

veilid-cli/src/command_processor.rs

@@ -424,6 +424,10 @@ reply               - reply to an AppCall not handled directly by the server
             self.inner().ui.add_node_event(out);
         }
     }
+    pub fn update_value_change(&mut self, value_change: veilid_core::VeilidValueChange) {
+        let out = format!("Value change: {:?}", value_change);
+        self.inner().ui.add_node_event(out);
+    }
 
     pub fn update_log(&mut self, log: veilid_core::VeilidLog) {
         self.inner().ui.add_node_event(format!(

veilid-cli/src/peers_table_view.rs

@@ -50,7 +50,11 @@ fn format_bps(bps: ByteCount) -> String {
 impl TableViewItem<PeerTableColumn> for PeerTableData {
     fn to_column(&self, column: PeerTableColumn) -> String {
         match column {
-            PeerTableColumn::NodeId => self.node_id.encode(),
+            PeerTableColumn::NodeId => self
+                .node_ids
+                .best()
+                .map(|n| n.value.encode())
+                .unwrap_or_else(|| "???".to_owned()),
             PeerTableColumn::Address => format!(
                 "{:?}:{}",
                 self.peer_address.protocol_type(),
@@ -74,7 +78,21 @@ impl TableViewItem<PeerTableColumn> for PeerTableData {
         Self: Sized,
     {
         match column {
-            PeerTableColumn::NodeId => self.node_id.cmp(&other.node_id),
+            PeerTableColumn::NodeId => {
+                let n1 = self
+                    .node_ids
+                    .best()
+                    .map(|n| n.value.encode())
+                    .unwrap_or_else(|| "???".to_owned());
+
+                let n2 = other
+                    .node_ids
+                    .best()
+                    .map(|n| n.value.encode())
+                    .unwrap_or_else(|| "???".to_owned());
+
+                n1.cmp(&n2)
+            }
             PeerTableColumn::Address => self.to_column(column).cmp(&other.to_column(column)),
             PeerTableColumn::LatencyAvg => self
                 .peer_stats

veilid-cli/src/ui.rs

@@ -881,13 +881,17 @@ impl UI {
     }
     pub fn set_config(&mut self, config: VeilidConfigInner) {
         let mut inner = self.inner.borrow_mut();
-        inner.ui_state.node_id.set(
-            config
-                .network
-                .node_id
-                .map(|x| x.encode())
-                .unwrap_or("<unknown>".to_owned()),
-        );
+
+        let tkv: Vec<TypedKey> = config
+            .network
+            .routing_table
+            .node_ids
+            .iter()
+            .filter_map(|(k, v)| v.node_id.map(|nid| TypedKey::new(*k, nid)))
+            .collect();
+        let tks = TypedKeySet::from(tkv);
+
+        inner.ui_state.node_id.set(tks.to_string());
     }
     pub fn set_connection_state(&mut self, state: ConnectionState) {
         let mut inner = self.inner.borrow_mut();