change net api to be response-based instead of prints

Cargo.toml

@@ -21,6 +21,7 @@ members = [
     "kinode/packages/kns_indexer/kns_indexer", "kinode/packages/kns_indexer/get_block",
     "kinode/packages/terminal/terminal",
     "kinode/packages/terminal/alias", "kinode/packages/terminal/cat", "kinode/packages/terminal/echo", "kinode/packages/terminal/hi", "kinode/packages/terminal/m", "kinode/packages/terminal/top",
+    "kinode/packages/terminal/namehash_to_name", "kinode/packages/terminal/net_diagnostics", "kinode/packages/terminal/peer", "kinode/packages/terminal/peers",
     "kinode/packages/tester/tester", "kinode/packages/tester/test_runner",
 ]
 default-members = ["lib"]

README.md

@@ -103,7 +103,8 @@ The `sys` publisher is not a real node ID, but it's also not a special case valu
 - CTRL+R to search history, CTRL+R again to toggle through search results, CTRL+G to cancel search
 
 - `m <address> <json>`: send an inter-process message. <address> is formatted as <node>@<process_id>. <process_id> is formatted as <process_name>:<package_name>:<publisher_node>. JSON containing spaces must be wrapped in single-quotes (`''`).
-    - Example: `m our@net:distro:sys diagnostics`
+    - Example: `m our@eth:distro:sys "SetPublic" -a 5`
+    - the '-a' flag is used to expect a response with a given timeout
     - `our` will always be interpolated by the system as your node's name
 - `hi <name> <string>`: send a text message to another node's command line.
     - Example: `hi ben.os hello world`
@@ -114,6 +115,9 @@ The `sys` publisher is not a real node ID, but it's also not a special case valu
     - Example: `cat /terminal:sys/pkg/scripts.json`
 - `echo <text>`: print `text` to the terminal
     - Example: `echo foo`
+- `net_diagnostics`: print some useful networking diagnostic data
+- `peers`: print the peers the node currently hold connections with
+- `peer <name>`: print the peer's PKI info, if it exists
 
 ### Terminal example usage
 

kinode/packages/kns_indexer/kns_indexer/src/lib.rs

@@ -49,12 +49,12 @@ pub enum IndexerRequests {
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum NetActions {
+pub enum NetAction {
     KnsUpdate(KnsUpdate),
     KnsBatchUpdate(Vec<KnsUpdate>),
 }
 
-impl TryInto<Vec<u8>> for NetActions {
+impl TryInto<Vec<u8>> for NetAction {
     type Error = anyhow::Error;
     fn try_into(self) -> Result<Vec<u8>, Self::Error> {
         Ok(rmp_serde::to_vec(&self)?)
@@ -172,7 +172,7 @@ fn main(our: Address, mut state: State) -> anyhow::Result<()> {
     // shove all state into net::net
     Request::new()
         .target((&our.node, "net", "distro", "sys"))
-        .try_body(NetActions::KnsBatchUpdate(
+        .try_body(NetAction::KnsBatchUpdate(
             state.nodes.values().cloned().collect::<Vec<_>>(),
         ))?
         .send()?;
@@ -214,7 +214,7 @@ fn main(our: Address, mut state: State) -> anyhow::Result<()> {
     // shove all state into net::net
     Request::new()
         .target((&our.node, "net", "distro", "sys"))
-        .try_body(NetActions::KnsBatchUpdate(
+        .try_body(NetAction::KnsBatchUpdate(
             state.nodes.values().cloned().collect::<Vec<_>>(),
         ))?
         .send()?;
@@ -403,7 +403,7 @@ fn handle_log(our: &Address, state: &mut State, log: &eth::Log) -> anyhow::Resul
     {
         Request::new()
             .target((&our.node, "net", "distro", "sys"))
-            .try_body(NetActions::KnsUpdate(node.clone()))?
+            .try_body(NetAction::KnsUpdate(node.clone()))?
             .send()?;
     }
 

kinode/packages/terminal/namehash_to_name/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "namehash_to_name"
+version = "0.1.0"
+edition = "2021"
+
+
+[dependencies]
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.6.0-alpha.2" }
+rmp-serde = "1.1.2"
+serde = { version = "1.0", features = ["derive"] }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" }
+
+[lib]
+crate-type = ["cdylib"]
+
+[package.metadata.component]
+package = "kinode:process"

kinode/packages/terminal/namehash_to_name/src/lib.rs

@@ -0,0 +1,80 @@
+use kinode_process_lib::{
+    await_next_request_body, call_init, println, Address, Message, NodeId, Request,
+};
+use serde::{Deserialize, Serialize};
+
+wit_bindgen::generate!({
+    path: "wit",
+    world: "process",
+    exports: {
+        world: Component,
+    },
+});
+
+// types copied from runtime networking core
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct Identity {
+    pub name: NodeId,
+    pub networking_key: String,
+    pub ws_routing: Option<(String, u16)>,
+    pub allowed_routers: Vec<NodeId>,
+}
+
+/// Must be parsed from message pack vector.
+/// all Get actions must be sent from local process. used for debugging
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum NetAction {
+    /// get a list of peers we are connected to
+    GetPeers,
+    /// get the [`Identity`] struct for a single peer
+    GetPeer(String),
+    /// get the [`NodeId`] associated with a given namehash, if any
+    GetName(String),
+    /// get a user-readable diagnostics string containing networking inforamtion
+    GetDiagnostics,
+}
+
+/// For now, only sent in response to a ConnectionRequest.
+/// Must be parsed from message pack vector
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum NetResponse {
+    Accepted(NodeId),
+    Rejected(NodeId),
+    /// response to [`NetAction::GetPeers`]
+    Peers(Vec<Identity>),
+    /// response to [`NetAction::GetPeer`]
+    Peer(Option<Identity>),
+    /// response to [`NetAction::GetName`]
+    Name(Option<String>),
+    /// response to [`NetAction::GetDiagnostics`]. A user-readable string.
+    Diagnostics(String),
+}
+
+call_init!(init);
+
+fn init(_our: Address) {
+    let Ok(args) = await_next_request_body() else {
+        println!("failed to get args, aborting");
+        return;
+    };
+    let Ok(namehash) = String::from_utf8(args) else {
+        println!("argument must be a string");
+        return;
+    };
+    let Ok(Ok(Message::Response { body, .. })) = Request::to(("our", "net", "distro", "sys"))
+        .body(rmp_serde::to_vec(&NetAction::GetName(namehash.clone())).unwrap())
+        .send_and_await_response(5)
+    else {
+        println!("failed to get name from networking module");
+        return;
+    };
+    let Ok(NetResponse::Name(maybe_name)) = rmp_serde::from_slice(&body) else {
+        println!("got malformed response from networking module");
+        return;
+    };
+    match maybe_name {
+        Some(name) => println!("{namehash}: {name}"),
+        None => println!("no name found for {namehash}"),
+    }
+}

kinode/packages/terminal/net_diagnostics/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "net_diagnostics"
+version = "0.1.0"
+edition = "2021"
+
+
+[dependencies]
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.6.0-alpha.2" }
+rmp-serde = "1.1.2"
+serde = { version = "1.0", features = ["derive"] }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" }
+
+[lib]
+crate-type = ["cdylib"]
+
+[package.metadata.component]
+package = "kinode:process"

kinode/packages/terminal/net_diagnostics/src/lib.rs

@@ -0,0 +1,67 @@
+use kinode_process_lib::{call_init, println, Address, Message, NodeId, Request};
+use serde::{Deserialize, Serialize};
+
+wit_bindgen::generate!({
+    path: "wit",
+    world: "process",
+    exports: {
+        world: Component,
+    },
+});
+
+// types copied from runtime networking core
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct Identity {
+    pub name: NodeId,
+    pub networking_key: String,
+    pub ws_routing: Option<(String, u16)>,
+    pub allowed_routers: Vec<NodeId>,
+}
+
+/// Must be parsed from message pack vector.
+/// all Get actions must be sent from local process. used for debugging
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum NetAction {
+    /// get a list of peers we are connected to
+    GetPeers,
+    /// get the [`Identity`] struct for a single peer
+    GetPeer(String),
+    /// get the [`NodeId`] associated with a given namehash, if any
+    GetName(String),
+    /// get a user-readable diagnostics string containing networking inforamtion
+    GetDiagnostics,
+}
+
+/// For now, only sent in response to a ConnectionRequest.
+/// Must be parsed from message pack vector
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum NetResponse {
+    Accepted(NodeId),
+    Rejected(NodeId),
+    /// response to [`NetAction::GetPeers`]
+    Peers(Vec<Identity>),
+    /// response to [`NetAction::GetPeer`]
+    Peer(Option<Identity>),
+    /// response to [`NetAction::GetName`]
+    Name(Option<String>),
+    /// response to [`NetAction::GetDiagnostics`]. A user-readable string.
+    Diagnostics(String),
+}
+
+call_init!(init);
+
+fn init(_our: Address) {
+    let Ok(Ok(Message::Response { body, .. })) = Request::to(("our", "net", "distro", "sys"))
+        .body(rmp_serde::to_vec(&NetAction::GetDiagnostics).unwrap())
+        .send_and_await_response(5)
+    else {
+        println!("failed to get diagnostics from networking module");
+        return;
+    };
+    let Ok(NetResponse::Diagnostics(printout)) = rmp_serde::from_slice(&body) else {
+        println!("got malformed response from networking module");
+        return;
+    };
+    println!("{printout}");
+}

kinode/packages/terminal/peer/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "peer"
+version = "0.1.0"
+edition = "2021"
+
+
+[dependencies]
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.6.0-alpha.2" }
+rmp-serde = "1.1.2"
+serde = { version = "1.0", features = ["derive"] }
+wit-bindgen = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "21a46c7" }
+
+[lib]
+crate-type = ["cdylib"]
+
+[package.metadata.component]
+package = "kinode:process"