new: cleanup templates

src/new/templates/rust/no-ui/chat/{package_name}/src/lib.rs

@@ -40,7 +40,7 @@ fn handle_message(our: &Address, message_archive: &mut MessageArchive) -> anyhow
             ref message,
         } => {
             if target == &our.node {
-                println!("{package_name}|{}: {}", source.node, message);
+                println!("{}: {}", source.node, message);
                 message_archive.push((source.node.clone(), message.clone()));
             } else {
                 let _ = Request::new()
@@ -76,15 +76,15 @@ fn handle_message(our: &Address, message_archive: &mut MessageArchive) -> anyhow
 
 call_init!(init);
 fn init(our: Address) {
-    println!("{package_name}: begin");
+    println!("begin");
 
     let mut message_archive: MessageArchive = Vec::new();
 
     loop {
         match handle_message(&our, &mut message_archive) {
             Ok(()) => {}
             Err(e) => {
-                println!("{package_name}: error: {:?}", e);
+                println!("error: {:?}", e);
             }
         };
     }

src/new/templates/rust/no-ui/echo/{package_name}/src/lib.rs

@@ -16,7 +16,7 @@ fn handle_message(_our: &Address) -> anyhow::Result<()> {
     }
 
     let body: serde_json::Value = serde_json::from_slice(message.body())?;
-    println!("{package_name}: got {body:?}");
+    println!("got {body:?}");
     Response::new()
         .body(serde_json::to_vec(&serde_json::json!("Ack")).unwrap())
         .send()
@@ -26,13 +26,13 @@ fn handle_message(_our: &Address) -> anyhow::Result<()> {
 
 call_init!(init);
 fn init(our: Address) {
-    println!("{package_name}: begin");
+    println!("begin");
 
     loop {
         match handle_message(&our) {
             Ok(()) => {}
             Err(e) => {
-                println!("{package_name}: error: {:?}", e);
+                println!("error: {:?}", e);
             }
         };
     }

src/new/templates/rust/no-ui/fibonacci/Cargo.toml_

@@ -2,6 +2,7 @@
 resolver = "2"
 members = [
     "{package_name}",
+    "number",
 ]
 
 [profile.release]

src/new/templates/rust/no-ui/fibonacci/number/Cargo.toml_

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

src/new/templates/rust/no-ui/fibonacci/number/src/lib.rs

@@ -0,0 +1,54 @@
+use serde::{Deserialize, Serialize};
+
+use kinode_process_lib::{
+    await_next_request_body, call_init, println, Address, Message, Request,
+};
+
+wit_bindgen::generate!({
+    path: "wit",
+    world: "process",
+    exports: {
+        world: Component,
+    },
+});
+
+#[derive(Debug, Serialize, Deserialize)]
+enum FibonacciRequest {
+    Number(u32),
+    Numbers((u32, u32)),
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+enum FibonacciResponse {
+    Number(u128),
+    Numbers((u128, u32)),
+}
+
+call_init!(init);
+fn init(our: Address) {
+    let Ok(body) = await_next_request_body() else {
+        println!("failed to get args!");
+        return;
+    };
+
+    let number: u32 = String::from_utf8(body)
+        .unwrap_or_default()
+        .parse()
+        .unwrap_or_default();
+
+    let Ok(Ok(Message::Response { body, .. })) =
+        Request::to((our.node(), ("{package_name}", "{package_name}", "{publisher}")))
+            .body(serde_json::to_vec(&FibonacciRequest::Number(number)).unwrap())
+            .send_and_await_response(5)
+    else {
+        println!("did not receive expected Response from {package_name}:{package_name}:{publisher}");
+        return;
+    };
+
+    let Ok(FibonacciResponse::Number(_number)) = serde_json::from_slice(&body) else {
+        println!("did not receive expected Ack from {package_name}:{package_name}:{publisher}");
+        return;
+    };
+
+    // don't need to print the number here since the main process prints it
+}

src/new/templates/rust/no-ui/fibonacci/pkg/scripts.json

@@ -0,0 +1,13 @@
+{
+    "number.wasm": {
+        "root": false,
+        "public": false,
+        "request_networking": false,
+        "request_capabilities": [
+            "{package_name}:{package_name}:{publisher}"
+        ],
+        "grant_capabilities": [
+            "{package_name}:{package_name}:{publisher}"
+        ]
+    }
+}

src/new/templates/rust/no-ui/fibonacci/{package_name}/src/lib.rs

@@ -52,7 +52,7 @@ fn handle_message() -> anyhow::Result<()> {
             let result = fibonacci(number);
             let duration = start.elapsed();
             println!(
-                "{package_name}: fibonacci({}) = {}; {}ns",
+                "fibonacci({}) = {}; {}ns",
                 number,
                 result,
                 duration.as_nanos(),
@@ -82,7 +82,7 @@ fn handle_message() -> anyhow::Result<()> {
                 }
             }) / number_trials as u128;
             println!(
-                "{package_name}: fibonacci({}) = {}; {}±{}ns averaged over {} trials",
+                "fibonacci({}) = {}; {}±{}ns averaged over {} trials",
                 number, result, mean, absolute_deviation, number_trials,
             );
             Response::new()
@@ -98,15 +98,14 @@ fn handle_message() -> anyhow::Result<()> {
 }
 
 call_init!(init);
-
 fn init(_our: Address) {
-    println!("{package_name}: begin");
+    println!("begin");
 
     loop {
         match handle_message() {
             Ok(()) => {}
             Err(e) => {
-                println!("{package_name}: error: {:?}", e);
+                println!("error: {:?}", e);
             }
         };
     }

src/new/templates/rust/no-ui/file_transfer/Cargo.toml_

@@ -3,6 +3,8 @@ resolver = "2"
 members = [
     "{package_name}",
     "worker",
+    "download",
+    "list_files"
 ]
 
 [profile.release]

src/new/templates/rust/no-ui/file_transfer/download/Cargo.toml_

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

src/new/templates/rust/no-ui/file_transfer/download/src/lib.rs

@@ -0,0 +1,67 @@
+use serde::{Deserialize, Serialize};
+
+use kinode_process_lib::{
+    await_next_request_body, call_init, println, Address, Message, Request,
+};
+
+wit_bindgen::generate!({
+    path: "wit",
+    world: "process",
+    exports: {
+        world: Component,
+    },
+});
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum TransferRequest {
+    ListFiles,
+    Download { name: String, target: Address },
+    Progress { name: String, progress: u64 },
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum TransferResponse {
+    ListFiles(Vec<FileInfo>),
+    Download { name: String, worker: Address },
+    Done,
+    Started,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct FileInfo {
+    pub name: String,
+    pub size: u64,
+}
+
+call_init!(init);
+fn init(our: Address) {
+    let Ok(body) = await_next_request_body() else {
+        println!("failed to get args!");
+        return;
+    };
+
+    let args = String::from_utf8(body).unwrap_or_default();
+    let Some((name, who)) = args.split_once(" ") else {
+        println!("usage: {}@download:{package_name}:{publisher} file_name who", our.node());
+        return
+    };
+    let our: Address = format!("{}@{package_name}:{package_name}:{publisher}", our.node())
+        .parse()
+        .unwrap();
+
+    let target: Address = format!("{}@{package_name}:{package_name}:{publisher}", who)
+        .parse()
+        .unwrap();
+
+    let Ok(Ok(Message::Response { .. })) =
+        Request::to(our)
+            .body(serde_json::to_vec(&TransferRequest::Download {
+                name: name.into(),
+                target: target.clone(),
+            }).unwrap())
+            .send_and_await_response(5)
+    else {
+        println!("did not receive expected Response from {target}");
+        return;
+    };
+}

src/new/templates/rust/no-ui/file_transfer/list_files/Cargo.toml_

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

src/new/templates/rust/no-ui/file_transfer/list_files/src/lib.rs

@@ -0,0 +1,78 @@
+use serde::{Deserialize, Serialize};
+
+use kinode_process_lib::{
+    await_next_request_body, call_init, println, Address, Message, Request,
+};
+
+wit_bindgen::generate!({
+    path: "wit",
+    world: "process",
+    exports: {
+        world: Component,
+    },
+});
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum TransferRequest {
+    ListFiles,
+    Download { name: String, target: Address },
+    Progress { name: String, progress: u64 },
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub enum TransferResponse {
+    ListFiles(Vec<FileInfo>),
+    Download { name: String, worker: Address },
+    Done,
+    Started,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct FileInfo {
+    pub name: String,
+    pub size: u64,
+}
+
+call_init!(init);
+fn init(our: Address) {
+    let Ok(body) = await_next_request_body() else {
+        println!("failed to get args!");
+        return;
+    };
+
+    let who = String::from_utf8(body).unwrap_or_default();
+    if who.is_empty() {
+        println!("usage: {}@list_files:{package_name}:{publisher} who", our);
+        return;
+    }
+
+    let target: Address = format!("{}@{package_name}:{package_name}:{publisher}", who)
+        .parse()
+        .unwrap();
+
+    let Ok(Ok(Message::Response { body, .. })) =
+        Request::to(target)
+            .body(serde_json::to_vec(&TransferRequest::ListFiles).unwrap())
+            .send_and_await_response(5)
+    else {
+        println!("did not receive expected Response from {who}");
+        return;
+    };
+
+    let Ok(TransferResponse::ListFiles(files)) = serde_json::from_slice(&body) else {
+        println!("did not receive expected ListFiles from {who}");
+        return;
+    };
+
+    println!(
+        "{}",
+        files.iter().
+            fold(format!("{who} available files:\nFile\t\tSize (bytes)\n"), |mut msg, file| {
+                msg.push_str(&format!(
+                    "{}\t\t{}", file.name.split('/').last().unwrap(),
+                    file.size,
+                ));
+                msg
+            })
+    );
+}

src/new/templates/rust/no-ui/file_transfer/pkg/scripts.json

@@ -0,0 +1,24 @@
+{
+    "download.wasm": {
+        "root": false,
+        "public": false,
+        "request_networking": false,
+        "request_capabilities": [
+            "{package_name}:{package_name}:{publisher}"
+        ],
+        "grant_capabilities": [
+            "{package_name}:{package_name}:{publisher}"
+        ]
+    },
+    "list_files.wasm": {
+        "root": false,
+        "public": false,
+        "request_networking": true,
+        "request_capabilities": [
+            "{package_name}:{package_name}:{publisher}"
+        ],
+        "grant_capabilities": [
+            "{package_name}:{package_name}:{publisher}"
+        ]
+    }
+}