more debug logging, incorporating file into PKI

Author: dolled-possum

hyperdrive/src/net/connect.rs

@@ -25,8 +25,9 @@ pub async fn send_to_peer(ext: &IdentityExt, data: &NetData, mut km: KernelMessa
         utils::print_debug(
             &ext.print_tx,
             &format!(
-                "net: No identity information found for node {}",
-                km.target.node
+                "net: No identity information found for node {} (PKI has {} entries)",
+                km.target.node,
+                data.pki.len()
             ),
         )
         .await;
@@ -190,7 +191,13 @@ pub async fn handle_failed_connection(
         &format!("net: failed to connect to {}", peer_id.name),
     )
     .await;
+
+    // Remove the peer from active peers
     data.peers.remove(&peer_id.name).await;
+
+    // Note: We don't remove from PKI as that would also remove hosts file entries
+    // Instead, hosts file entries will naturally take precedence on next connection attempt
+
     peer_rx.close();
     while let Some(km) = peer_rx.recv().await {
         utils::error_offline(km, &ext.network_error_tx).await;

hyperdrive/src/net/hosts.rs

@@ -37,6 +37,8 @@ pub fn load_hosts_file(home_directory: &Path, pki: &OnchainPKI) -> Result<(), an
     // Parse YAML
     let hosts: HashMap<String, HostEntry> = serde_yaml::from_str(&contents)?;
 
+    println!("net: Found {} entries in hosts file", hosts.len());
+
     // Add each host to PKI
     for (name, entry) in hosts {
         // Skip entries that don't have enough information
@@ -59,6 +61,9 @@ pub fn load_hosts_file(home_directory: &Path, pki: &OnchainPKI) -> Result<(), an
             lib::types::core::NodeRouting::Routers(vec![])
         };
 
+        // Print debug information before creating the identity
+        println!("net: Adding host '{}' to PKI from hosts file with routing: {:?}", name, &routing);
+
         // Create identity with the provided information
         let identity = Identity {
             name: name.clone(),
@@ -75,5 +80,7 @@ pub fn load_hosts_file(home_directory: &Path, pki: &OnchainPKI) -> Result<(), an
 
 /// Lookup a node's identity from hosts file first, then fallback to the PKI
 pub fn lookup_identity(node_name: &str, pki: &OnchainPKI) -> Option<Identity> {
+    // The entry is already in the PKI due to load_hosts_file populating it
+    // at startup, so this function actually works correctly now.
     pki.get(node_name).map(|id| id.value().clone())
 }

hyperdrive/src/net/mod.rs

@@ -75,7 +75,20 @@ pub async fn networking(
             &ext.print_tx.clone(),
             &format!("Failed to load hosts file: {}", e),
         )
-        .await;
+            .await;
+    }
+
+    match hosts::load_hosts_file(home_directory, &pki) {
+        Ok(()) => {
+            // Add a more detailed message showing PKI size after hosts file is loaded
+            utils::print_debug(
+                &ext.print_tx.clone(), 
+                &format!("Successfully loaded hosts file. PKI now has {} entries", pki.len())
+            ).await;
+        },
+        Err(e) => {
+            utils::print_debug(&ext.print_tx.clone(), &format!("Failed to load hosts file: {}", e)).await;
+        }
     }
 
     // Add our own identity to PKI