From 2e07c0ffc47a6ef185500aafd5b4d025acf9fc9a Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Tue, 12 Nov 2024 15:43:57 -0800 Subject: [PATCH 01/18] update chat-with-file-transfer and file-transfer --- .../.gitignore | 0 .../Cargo.lock | 2 +- .../Cargo.toml | 2 +- ...hat-with-file-transfer:template.os-v0.wit} | 0 .../chat-with-file-transfer}/Cargo.toml | 2 +- .../chat-with-file-transfer}/src/lib.rs | 2 +- .../download/Cargo.toml | 0 .../download/src/lib.rs | 0 .../metadata.json | 6 +- .../pkg/manifest.json | 4 +- .../pkg/scripts.json | 0 .../send/Cargo.toml | 0 .../send/src/lib.rs | 0 .../chat-with-file-transfer-test}/Cargo.lock | 2 +- .../chat-with-file-transfer-test}/Cargo.toml | 2 +- ...ith-file-transfer_test:template.os-v0.wit} | 0 .../chat-with-file-transfer-test}/Cargo.toml | 2 +- .../chat-with-file-transfer-test}/src/lib.rs | 32 +- .../src/tester_lib.rs | 0 .../metadata.json | 10 +- .../pkg/manifest.json | 15 + .../test/tests.toml | 4 +- .../pkg/manifest.json | 15 - .../.gitignore | 3 +- .../Cargo.lock | 1177 ++++++++++++----- .../Cargo.toml | 8 +- .../api/file-transfer:template.os-v0.wit} | 0 .../download/Cargo.toml | 3 +- .../download/src/lib.rs | 0 .../file-transfer-worker-api}/Cargo.toml | 5 +- .../file-transfer-worker-api}/src/lib.rs | 2 +- .../file-transfer-worker}/Cargo.toml | 5 +- .../file-transfer-worker}/src/lib.rs | 12 +- .../file-transfer}/Cargo.toml | 5 +- .../file-transfer}/src/lib.rs | 10 +- .../list-files}/Cargo.toml | 3 +- .../list-files}/src/lib.rs | 26 +- .../metadata.json | 9 +- .../pkg/manifest.json | 4 +- .../pkg/scripts.json | 10 +- 40 files changed, 918 insertions(+), 464 deletions(-) rename code/{chat_with_file_transfer => chat-with-file-transfer}/.gitignore (100%) rename code/{chat_with_file_transfer => chat-with-file-transfer}/Cargo.lock (99%) rename code/{chat_with_file_transfer => chat-with-file-transfer}/Cargo.toml (80%) rename code/{chat_with_file_transfer/api/chat_with_file_transfer:template.os-v0.wit => chat-with-file-transfer/api/chat-with-file-transfer:template.os-v0.wit} (100%) rename code/{chat_with_file_transfer/chat_with_file_transfer => chat-with-file-transfer/chat-with-file-transfer}/Cargo.toml (93%) rename code/{chat_with_file_transfer/chat_with_file_transfer => chat-with-file-transfer/chat-with-file-transfer}/src/lib.rs (98%) rename code/{chat_with_file_transfer => chat-with-file-transfer}/download/Cargo.toml (100%) rename code/{chat_with_file_transfer => chat-with-file-transfer}/download/src/lib.rs (100%) rename code/{chat_with_file_transfer => chat-with-file-transfer}/metadata.json (72%) rename code/{chat_with_file_transfer => chat-with-file-transfer}/pkg/manifest.json (68%) rename code/{chat_with_file_transfer => chat-with-file-transfer}/pkg/scripts.json (100%) rename code/{chat_with_file_transfer => chat-with-file-transfer}/send/Cargo.toml (100%) rename code/{chat_with_file_transfer => chat-with-file-transfer}/send/src/lib.rs (100%) rename code/{chat_with_file_transfer/test/chat_with_file_transfer_test => chat-with-file-transfer/test/chat-with-file-transfer-test}/Cargo.lock (99%) rename code/{chat_with_file_transfer/test/chat_with_file_transfer_test => chat-with-file-transfer/test/chat-with-file-transfer-test}/Cargo.toml (74%) rename code/{chat_with_file_transfer/test/chat_with_file_transfer_test/api/chat_with_file_transfer_test:template.os-v0.wit => chat-with-file-transfer/test/chat-with-file-transfer-test/api/chat-with-file-transfer_test:template.os-v0.wit} (100%) rename code/{chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test => chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test}/Cargo.toml (92%) rename code/{chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test => chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test}/src/lib.rs (86%) rename code/{chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test => chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test}/src/tester_lib.rs (100%) rename code/{chat_with_file_transfer/test/chat_with_file_transfer_test => chat-with-file-transfer/test/chat-with-file-transfer-test}/metadata.json (57%) create mode 100644 code/chat-with-file-transfer/test/chat-with-file-transfer-test/pkg/manifest.json rename code/{chat_with_file_transfer => chat-with-file-transfer}/test/tests.toml (81%) delete mode 100644 code/chat_with_file_transfer/test/chat_with_file_transfer_test/pkg/manifest.json rename code/{file_transfer => file-transfer}/.gitignore (84%) rename code/{file_transfer => file-transfer}/Cargo.lock (74%) rename code/{file_transfer => file-transfer}/Cargo.toml (54%) rename code/{file_transfer/api/file_transfer:template.os-v0.wit => file-transfer/api/file-transfer:template.os-v0.wit} (100%) rename code/{file_transfer => file-transfer}/download/Cargo.toml (80%) rename code/{file_transfer => file-transfer}/download/src/lib.rs (100%) rename code/{file_transfer/file_transfer => file-transfer/file-transfer-worker-api}/Cargo.toml (75%) rename code/{file_transfer/file_transfer_worker_api => file-transfer/file-transfer-worker-api}/src/lib.rs (97%) rename code/{file_transfer/file_transfer_worker => file-transfer/file-transfer-worker}/Cargo.toml (75%) rename code/{file_transfer/file_transfer_worker => file-transfer/file-transfer-worker}/src/lib.rs (94%) rename code/{file_transfer/file_transfer_worker_api => file-transfer/file-transfer}/Cargo.toml (73%) rename code/{file_transfer/file_transfer => file-transfer/file-transfer}/src/lib.rs (93%) rename code/{file_transfer/list_files => file-transfer/list-files}/Cargo.toml (80%) rename code/{file_transfer/list_files => file-transfer/list-files}/src/lib.rs (61%) rename code/{file_transfer => file-transfer}/metadata.json (63%) rename code/{file_transfer => file-transfer}/pkg/manifest.json (72%) rename code/{file_transfer => file-transfer}/pkg/scripts.json (67%) diff --git a/code/chat_with_file_transfer/.gitignore b/code/chat-with-file-transfer/.gitignore similarity index 100% rename from code/chat_with_file_transfer/.gitignore rename to code/chat-with-file-transfer/.gitignore diff --git a/code/chat_with_file_transfer/Cargo.lock b/code/chat-with-file-transfer/Cargo.lock similarity index 99% rename from code/chat_with_file_transfer/Cargo.lock rename to code/chat-with-file-transfer/Cargo.lock index 36d6bd5..b57dc77 100644 --- a/code/chat_with_file_transfer/Cargo.lock +++ b/code/chat-with-file-transfer/Cargo.lock @@ -766,7 +766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chat_with_file_transfer" +name = "chat-with-file-transfer" version = "0.1.0" dependencies = [ "anyhow", diff --git a/code/chat_with_file_transfer/Cargo.toml b/code/chat-with-file-transfer/Cargo.toml similarity index 80% rename from code/chat_with_file_transfer/Cargo.toml rename to code/chat-with-file-transfer/Cargo.toml index 375b96f..c8f94e3 100644 --- a/code/chat_with_file_transfer/Cargo.toml +++ b/code/chat-with-file-transfer/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - "chat_with_file_transfer", + "chat-with-file-transfer", "download", "send", ] diff --git a/code/chat_with_file_transfer/api/chat_with_file_transfer:template.os-v0.wit b/code/chat-with-file-transfer/api/chat-with-file-transfer:template.os-v0.wit similarity index 100% rename from code/chat_with_file_transfer/api/chat_with_file_transfer:template.os-v0.wit rename to code/chat-with-file-transfer/api/chat-with-file-transfer:template.os-v0.wit diff --git a/code/chat_with_file_transfer/chat_with_file_transfer/Cargo.toml b/code/chat-with-file-transfer/chat-with-file-transfer/Cargo.toml similarity index 93% rename from code/chat_with_file_transfer/chat_with_file_transfer/Cargo.toml rename to code/chat-with-file-transfer/chat-with-file-transfer/Cargo.toml index 3be64b5..df0f1d0 100644 --- a/code/chat_with_file_transfer/chat_with_file_transfer/Cargo.toml +++ b/code/chat-with-file-transfer/chat-with-file-transfer/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "chat_with_file_transfer" +name = "chat-with-file-transfer" version = "0.1.0" edition = "2021" diff --git a/code/chat_with_file_transfer/chat_with_file_transfer/src/lib.rs b/code/chat-with-file-transfer/chat-with-file-transfer/src/lib.rs similarity index 98% rename from code/chat_with_file_transfer/chat_with_file_transfer/src/lib.rs rename to code/chat-with-file-transfer/chat-with-file-transfer/src/lib.rs index cfa3405..ccf5633 100644 --- a/code/chat_with_file_transfer/chat_with_file_transfer/src/lib.rs +++ b/code/chat-with-file-transfer/chat-with-file-transfer/src/lib.rs @@ -78,7 +78,7 @@ fn handle_chat_request( let _ = Request::new() .target(Address { node: target.clone(), - process: "chat_with_file_transfer:chat_with_file_transfer:template.os" + process: "chat-with-file-transfer:chat-with-file-transfer:template.os" .parse()?, }) .body(request) diff --git a/code/chat_with_file_transfer/download/Cargo.toml b/code/chat-with-file-transfer/download/Cargo.toml similarity index 100% rename from code/chat_with_file_transfer/download/Cargo.toml rename to code/chat-with-file-transfer/download/Cargo.toml diff --git a/code/chat_with_file_transfer/download/src/lib.rs b/code/chat-with-file-transfer/download/src/lib.rs similarity index 100% rename from code/chat_with_file_transfer/download/src/lib.rs rename to code/chat-with-file-transfer/download/src/lib.rs diff --git a/code/chat_with_file_transfer/metadata.json b/code/chat-with-file-transfer/metadata.json similarity index 72% rename from code/chat_with_file_transfer/metadata.json rename to code/chat-with-file-transfer/metadata.json index 84add97..cde3b40 100644 --- a/code/chat_with_file_transfer/metadata.json +++ b/code/chat-with-file-transfer/metadata.json @@ -1,9 +1,9 @@ { - "name": "chat_with_file_transfer", + "name": "chat-with-file-transfer", "description": "", "image": "", "properties": { - "package_name": "chat_with_file_transfer", + "package_name": "chat-with-file-transfer", "current_version": "0.1.0", "publisher": "template.os", "mirrors": [], @@ -12,7 +12,7 @@ }, "wit_version": 0, "dependencies": [ - "file_transfer:template.os" + "file-transfer:template.os" ] }, "external_url": "", diff --git a/code/chat_with_file_transfer/pkg/manifest.json b/code/chat-with-file-transfer/pkg/manifest.json similarity index 68% rename from code/chat_with_file_transfer/pkg/manifest.json rename to code/chat-with-file-transfer/pkg/manifest.json index ba70d5b..be2fc34 100644 --- a/code/chat_with_file_transfer/pkg/manifest.json +++ b/code/chat-with-file-transfer/pkg/manifest.json @@ -1,7 +1,7 @@ [ { - "process_name": "chat_with_file_transfer", - "process_wasm_path": "/chat_with_file_transfer.wasm", + "process_name": "chat-with-file-transfer", + "process_wasm_path": "/chat-with-file-transfer.wasm", "on_exit": "Restart", "request_networking": true, "request_capabilities": [ diff --git a/code/chat_with_file_transfer/pkg/scripts.json b/code/chat-with-file-transfer/pkg/scripts.json similarity index 100% rename from code/chat_with_file_transfer/pkg/scripts.json rename to code/chat-with-file-transfer/pkg/scripts.json diff --git a/code/chat_with_file_transfer/send/Cargo.toml b/code/chat-with-file-transfer/send/Cargo.toml similarity index 100% rename from code/chat_with_file_transfer/send/Cargo.toml rename to code/chat-with-file-transfer/send/Cargo.toml diff --git a/code/chat_with_file_transfer/send/src/lib.rs b/code/chat-with-file-transfer/send/src/lib.rs similarity index 100% rename from code/chat_with_file_transfer/send/src/lib.rs rename to code/chat-with-file-transfer/send/src/lib.rs diff --git a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/Cargo.lock b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/Cargo.lock similarity index 99% rename from code/chat_with_file_transfer/test/chat_with_file_transfer_test/Cargo.lock rename to code/chat-with-file-transfer/test/chat-with-file-transfer-test/Cargo.lock index f044a58..03ff7a4 100644 --- a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/Cargo.lock +++ b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/Cargo.lock @@ -766,7 +766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chat_with_file_transfer_test" +name = "chat-with-file-transfer-test" version = "0.1.0" dependencies = [ "anyhow", diff --git a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/Cargo.toml b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/Cargo.toml similarity index 74% rename from code/chat_with_file_transfer/test/chat_with_file_transfer_test/Cargo.toml rename to code/chat-with-file-transfer/test/chat-with-file-transfer-test/Cargo.toml index 1b7e51a..66db294 100644 --- a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/Cargo.toml +++ b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - "chat_with_file_transfer_test", + "chat-with-file-transfer-test", ] [profile.release] diff --git a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/api/chat_with_file_transfer_test:template.os-v0.wit b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/api/chat-with-file-transfer_test:template.os-v0.wit similarity index 100% rename from code/chat_with_file_transfer/test/chat_with_file_transfer_test/api/chat_with_file_transfer_test:template.os-v0.wit rename to code/chat-with-file-transfer/test/chat-with-file-transfer-test/api/chat-with-file-transfer_test:template.os-v0.wit diff --git a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test/Cargo.toml b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test/Cargo.toml similarity index 92% rename from code/chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test/Cargo.toml rename to code/chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test/Cargo.toml index 9c04374..0de92e1 100644 --- a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test/Cargo.toml +++ b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "chat_with_file_transfer_test" +name = "chat-with-file-transfer-test" version = "0.1.0" edition = "2021" diff --git a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test/src/lib.rs b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test/src/lib.rs similarity index 86% rename from code/chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test/src/lib.rs rename to code/chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test/src/lib.rs index 99a918a..88a0c8e 100644 --- a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test/src/lib.rs +++ b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test/src/lib.rs @@ -23,7 +23,7 @@ wit_bindgen::generate!({ const FILE_NAME: &str = "my_file.txt"; const FILE_CONTENTS: &str = "hi"; -const DRIVE_PATH: &str = "chat_with_file_transfer:template.os"; +const DRIVE_PATH: &str = "chat-with-file-transfer:template.os"; impl From
for WitAddress { fn from(address: Address) -> Self { @@ -54,8 +54,8 @@ fn make_chat_address(node: &str) -> Address { Address { node: node.to_string(), process: ProcessId::new( - Some("chat_with_file_transfer"), - "chat_with_file_transfer", + Some("chat-with-file-transfer"), + "chat-with-file-transfer", "template.os", ), } @@ -75,7 +75,7 @@ fn setup(our: &Address, their: &str) -> anyhow::Result<()> { .send()?; // caps on our - println!("chat_with_file_transfer_test: started caps handshake..."); + println!("chat-with-file-transfer-test: started caps handshake..."); let response = Request::new() .target(our_chat_address.clone()) @@ -84,7 +84,7 @@ fn setup(our: &Address, their: &str) -> anyhow::Result<()> { save_capabilities(response.capabilities()); println!( - "chat_with_file_transfer_test: got caps {:#?}", + "chat-with-file-transfer-test: got caps {:#?}", our_capabilities() ); @@ -108,20 +108,20 @@ fn handle_message(our: &Address) -> anyhow::Result<()> { input_node_names: node_names, .. }) = message.body().try_into()?; - println!("chat_with_file_transfer_test: a"); + println!("chat-with-file-transfer-test: a"); assert!(node_names.len() >= 2); // we are master node assert!(our.node == node_names[0]); if setup(&our, &node_names[1]).is_err() { - fail!("chat_with_file_transfer_test"); + fail!("chat-with-file-transfer-test"); } let our_chat_address = make_chat_address(&our.node); let their_chat_address = make_chat_address(&node_names[1]); // Send - println!("chat_with_file_transfer_test: b"); + println!("chat-with-file-transfer-test: b"); let message: String = "hello".into(); let _ = Request::new() .target(our_chat_address.clone()) @@ -133,17 +133,17 @@ fn handle_message(our: &Address) -> anyhow::Result<()> { .unwrap(); // Get history from receiver & test - println!("chat_with_file_transfer_test: c"); + println!("chat-with-file-transfer-test: c"); let response = Request::new() .target(their_chat_address.clone()) .body(ChatRequest::History(our.node.clone())) .send_and_await_response(15)? .unwrap(); if response.is_request() { - fail!("chat_with_file_transfer_test"); + fail!("chat-with-file-transfer-test"); }; let ChatResponse::History(messages) = response.body().try_into()? else { - fail!("chat_with_file_transfer_test"); + fail!("chat-with-file-transfer-test"); }; let expected_messages = vec![ChatMessage { author: our.node.clone(), @@ -152,7 +152,7 @@ fn handle_message(our: &Address) -> anyhow::Result<()> { if messages != expected_messages { println!("{messages:?} != {expected_messages:?}"); - fail!("chat_with_file_transfer_test"); + fail!("chat-with-file-transfer-test"); } // Test file_transfer_worker @@ -166,7 +166,7 @@ fn handle_message(our: &Address) -> anyhow::Result<()> { .send_and_await_response(15)? .unwrap(); if response.is_request() { - fail!("chat_with_file_transfer_test"); + fail!("chat-with-file-transfer-test"); }; std::thread::sleep(std::time::Duration::from_secs(3)); @@ -176,7 +176,7 @@ fn handle_message(our: &Address) -> anyhow::Result<()> { }; let file_contents = file.read()?; if file_contents != FILE_CONTENTS.as_bytes() { - fail!("chat_with_file_transfer_test"); + fail!("chat-with-file-transfer-test"); } Response::new() @@ -195,9 +195,9 @@ fn init(our: Address) { match handle_message(&our) { Ok(()) => {} Err(e) => { - println!("chat_with_file_transfer_test: error: {e:?}"); + println!("chat-with-file-transfer-test: error: {e:?}"); - fail!("chat_with_file_transfer_test"); + fail!("chat-with-file-transfer-test"); } }; } diff --git a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test/src/tester_lib.rs b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test/src/tester_lib.rs similarity index 100% rename from code/chat_with_file_transfer/test/chat_with_file_transfer_test/chat_with_file_transfer_test/src/tester_lib.rs rename to code/chat-with-file-transfer/test/chat-with-file-transfer-test/chat-with-file-transfer-test/src/tester_lib.rs diff --git a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/metadata.json b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/metadata.json similarity index 57% rename from code/chat_with_file_transfer/test/chat_with_file_transfer_test/metadata.json rename to code/chat-with-file-transfer/test/chat-with-file-transfer-test/metadata.json index 5f6edea..68e89dd 100644 --- a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/metadata.json +++ b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/metadata.json @@ -1,9 +1,9 @@ { - "name": "chat_with_file_transfer Test", - "description": "A test for chat_with_file_transfer.", + "name": "chat-with-file-transfer Test", + "description": "A test for chat-with-file-transfer.", "image": "", "properties": { - "package_name": "chat_with_file_transfer_test", + "package_name": "chat-with-file-transfer-test", "current_version": "0.1.0", "publisher": "template.os", "mirrors": [], @@ -12,8 +12,8 @@ }, "wit_version": 0, "dependencies": [ - "chat_with_file_transfer:template.os", - "file_transfer:template.os", + "chat-with-file-transfer:template.os", + "file-transfer:template.os", "tester:sys" ] }, diff --git a/code/chat-with-file-transfer/test/chat-with-file-transfer-test/pkg/manifest.json b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/pkg/manifest.json new file mode 100644 index 0000000..f065783 --- /dev/null +++ b/code/chat-with-file-transfer/test/chat-with-file-transfer-test/pkg/manifest.json @@ -0,0 +1,15 @@ +[ + { + "process_name": "chat-with-file-transfer-test", + "process_wasm_path": "/chat-with-file-transfer-test.wasm", + "on_exit": "Restart", + "request_networking": false, + "request_capabilities": [ + "chat-with-file-transfer:chat-with-file-transfer:template.os" + ], + "grant_capabilities": [ + "chat-with-file-transfer:chat-with-file-transfer:template.os" + ], + "public": true + } +] diff --git a/code/chat_with_file_transfer/test/tests.toml b/code/chat-with-file-transfer/test/tests.toml similarity index 81% rename from code/chat_with_file_transfer/test/tests.toml rename to code/chat-with-file-transfer/test/tests.toml index 075b6d5..8ef6ccc 100644 --- a/code/chat_with_file_transfer/test/tests.toml +++ b/code/chat-with-file-transfer/test/tests.toml @@ -5,12 +5,12 @@ runtime_build_release = false [[tests]] -dependency_package_paths = ["..", "../../file_transfer"] +dependency_package_paths = ["..", "../../file-transfer"] setup_packages = [ { path = "..", run = true } ] setup_scripts = [] -test_package_paths = ["chat_with_file_transfer_test"] +test_package_paths = ["chat-with-file-transfer-test"] test_scripts = [] timeout_secs = 5 fakechain_router = 8545 diff --git a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/pkg/manifest.json b/code/chat_with_file_transfer/test/chat_with_file_transfer_test/pkg/manifest.json deleted file mode 100644 index 6d2eea6..0000000 --- a/code/chat_with_file_transfer/test/chat_with_file_transfer_test/pkg/manifest.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "process_name": "chat_with_file_transfer_test", - "process_wasm_path": "/chat_with_file_transfer_test.wasm", - "on_exit": "Restart", - "request_networking": false, - "request_capabilities": [ - "chat_with_file_transfer:chat_with_file_transfer:template.os" - ], - "grant_capabilities": [ - "chat_with_file_transfer:chat_with_file_transfer:template.os" - ], - "public": true - } -] diff --git a/code/file_transfer/.gitignore b/code/file-transfer/.gitignore similarity index 84% rename from code/file_transfer/.gitignore rename to code/file-transfer/.gitignore index 2f9a673..b29ccdc 100644 --- a/code/file_transfer/.gitignore +++ b/code/file-transfer/.gitignore @@ -1,6 +1,7 @@ target */target/ pkg/*.wasm +pkg/*.zip pkg/ui *.swp *.swo @@ -9,4 +10,4 @@ pkg/ui */process_env ui/dist ui/node_modules -node_modules \ No newline at end of file +node_modules diff --git a/code/file_transfer/Cargo.lock b/code/file-transfer/Cargo.lock similarity index 74% rename from code/file_transfer/Cargo.lock rename to code/file-transfer/Cargo.lock index cf632d7..332e78a 100644 --- a/code/file_transfer/Cargo.lock +++ b/code/file-transfer/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -18,15 +18,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "ahash" -version = "0.8.11" +name = "aho-corasick" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", + "memchr", ] [[package]] @@ -55,10 +52,11 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.27" +version = "0.1.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b515e82c8468ddb6ff8db21c78a5997442f113fd8471fd5b2261b2602dd0c67" +checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470" dependencies = [ + "alloy-primitives 0.8.11", "num_enum", "strum", ] @@ -70,7 +68,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da374e868f54c7f4ad2ad56829827badca388efd645f8cf5fccc61c2b5343504" dependencies = [ "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde", "c-kzg", @@ -85,7 +83,7 @@ checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-sol-types", ] @@ -96,14 +94,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df" dependencies = [ "alloy-json-abi", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-sol-type-parser", "alloy-sol-types", "const-hex", "itoa", "serde", "serde_json", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -112,7 +110,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76ecab54890cdea1e4808fc0891c7e6cfcf71fe1a9fe26810c7280ef768f4ed" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde", "c-kzg", @@ -127,7 +125,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bca15afde1b6d15e3fc1c97421262b1bbb37aee45752e3c8b6d6f13f776554ff" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-serde", "serde", ] @@ -138,7 +136,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-sol-type-parser", "serde", "serde_json", @@ -150,7 +148,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d6f34930b7e3e2744bcc79056c217f00cb2abb33bc5d4ff88da7623c5bb078b" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "serde", "serde_json", "thiserror", @@ -166,7 +164,7 @@ dependencies = [ "alloy-consensus", "alloy-eips", "alloy-json-rpc", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rpc-types-eth", "alloy-serde", "alloy-signer", @@ -187,7 +185,7 @@ dependencies = [ "bytes", "cfg-if", "const-hex", - "derive_more", + "derive_more 0.99.18", "hex-literal", "itoa", "k256", @@ -199,6 +197,23 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "alloy-primitives" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd58d377699e6cfeab52c4a9d28bdc4ef37e2bd235ff2db525071fe37a2e9af5" +dependencies = [ + "bytes", + "cfg-if", + "const-hex", + "derive_more 1.0.0", + "hex-literal", + "itoa", + "paste", + "ruint", + "tiny-keccak", +] + [[package]] name = "alloy-provider" version = "0.1.4" @@ -210,7 +225,7 @@ dependencies = [ "alloy-eips", "alloy-json-rpc", "alloy-network", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rpc-client", "alloy-rpc-types-eth", "alloy-transport", @@ -233,9 +248,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" +checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -244,13 +259,13 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" +checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] @@ -292,7 +307,7 @@ checksum = "ab4123ee21f99ba4bd31bfa36ba89112a18a500f8b452f02b35708b1b951e2b9" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde", "alloy-sol-types", @@ -308,7 +323,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9416c52959e66ead795a11f4a86c248410e9e368a0765710e57055b8a1774dd6" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "serde", "serde_json", ] @@ -319,7 +334,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b33753c09fa1ad85e5b092b8dc2372f1e337a42e84b9b4cff9fede75ba4adb32" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "async-trait", "auto_impl", "elliptic-curve", @@ -338,7 +353,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] @@ -354,7 +369,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", "syn-solidity", "tiny-keccak", ] @@ -370,7 +385,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", "syn-solidity", ] @@ -381,7 +396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98" dependencies = [ "serde", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -390,7 +405,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-sol-macro", "const-hex", "serde", @@ -432,9 +447,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "ark-ff" @@ -470,7 +485,7 @@ dependencies = [ "num-bigint", "num-traits", "paste", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "zeroize", ] @@ -562,15 +577,15 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -579,24 +594,24 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] @@ -607,20 +622,20 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -732,32 +747,36 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" dependencies = [ "serde", ] [[package]] name = "c-kzg" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf100c4cea8f207e883ff91ca886d621d8a166cb04971dfaa9bb8fd99ed95df" +checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928" dependencies = [ "blst", "cc", "glob", "hex", "libc", + "once_cell", "serde", ] [[package]] name = "cc" -version = "1.1.10" +version = "1.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" +checksum = "baee610e9452a8f6f0a1b6194ec09ff9e2d85dea54432acdae41aa0761c95d70" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -765,11 +784,38 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "color-eyre" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + [[package]] name = "const-hex" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6" +checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" dependencies = [ "cfg-if", "cpufeatures", @@ -808,9 +854,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -850,7 +896,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -886,8 +932,29 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.4.0", - "syn 2.0.74", + "rustc_version 0.4.1", + "syn 2.0.87", +] + +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "unicode-xid", ] [[package]] @@ -911,6 +978,17 @@ dependencies = [ "subtle", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "download" version = "0.1.0" @@ -984,11 +1062,21 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fastrlp" @@ -1012,7 +1100,7 @@ dependencies = [ ] [[package]] -name = "file_transfer" +name = "file-transfer" version = "0.1.0" dependencies = [ "anyhow", @@ -1024,7 +1112,7 @@ dependencies = [ ] [[package]] -name = "file_transfer_worker" +name = "file-transfer-worker" version = "0.1.0" dependencies = [ "anyhow", @@ -1037,7 +1125,7 @@ dependencies = [ ] [[package]] -name = "file_transfer_worker_api" +name = "file-transfer-worker-api" version = "0.1.0" dependencies = [ "anyhow", @@ -1066,6 +1154,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -1098,9 +1192,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1113,9 +1207,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1123,15 +1217,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1140,38 +1234,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1215,9 +1309,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -1241,9 +1335,16 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" dependencies = [ - "ahash", "allocator-api2", + "equivalent", + "foldhash", ] [[package]] @@ -1327,15 +1428,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -1368,9 +1469,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -1381,11 +1482,128 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "id-arena" version = "2.2.1" @@ -1394,12 +1612,23 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", ] [[package]] @@ -1422,22 +1651,28 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "indexmap" -version = "2.3.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.1", "serde", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "itertools" @@ -1465,18 +1700,18 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] [[package]] name = "k256" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", "ecdsa", @@ -1487,9 +1722,9 @@ dependencies = [ [[package]] name = "keccak-asm" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422fbc7ff2f2f5bdffeb07718e5a5324dca72b0c9293d50df4026652385e3314" +checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" dependencies = [ "digest 0.10.7", "sha3-asm", @@ -1497,13 +1732,17 @@ dependencies = [ [[package]] name = "kinode_process_lib" -version = "0.8.3" -source = "git+https://github.com/kinode-dao/process_lib?tag=v0.8.3#f9fc2460b22e7d63bb74385d3adbaefebc71b333" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29b2cb309fa374e2ec3f7c00c3285d75c2c6cccec33f937f699251680372dcd6" dependencies = [ "alloy", - "alloy-primitives", + "alloy-primitives 0.7.7", + "alloy-sol-macro", + "alloy-sol-types", "anyhow", "bincode", + "color-eyre", "http", "mime_guess", "rand", @@ -1511,6 +1750,9 @@ dependencies = [ "serde", "serde_json", "thiserror", + "tracing", + "tracing-error", + "tracing-subscriber", "url", "wit-bindgen", ] @@ -1529,15 +1771,15 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "linux-raw-sys" @@ -1557,6 +1799,12 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "lock_api" version = "0.4.12" @@ -1575,11 +1823,20 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown 0.15.1", +] + +[[package]] +name = "matchers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "hashbrown", + "regex-automata 0.1.10", ] [[package]] @@ -1642,6 +1899,16 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -1698,29 +1965,29 @@ checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] name = "object" -version = "0.36.3" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags", "cfg-if", @@ -1739,7 +2006,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] @@ -1750,9 +2017,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -1760,6 +2027,18 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + [[package]] name = "parity-scale-codec" version = "3.6.12" @@ -1796,7 +2075,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -1813,9 +2092,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -1824,29 +2103,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -1866,9 +2145,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "ppv-lite86" @@ -1892,9 +2171,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ "toml_edit", ] @@ -1925,9 +2204,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -1938,7 +2217,7 @@ version = "0.1.0" source = "git+https://github.com/kinode-dao/process_macros?rev=626e501#626e501d351e3365480ec6f770d474ed4ae339bf" dependencies = [ "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] @@ -1955,7 +2234,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax", + "regex-syntax 0.8.5", "rusty-fork", "tempfile", "unarray", @@ -1969,9 +2248,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2023,24 +2302,62 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags", ] +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64", "bytes", @@ -2072,7 +2389,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "windows-registry", ] [[package]] @@ -2170,18 +2487,18 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "375116bee2be9ed569afe2154ea6a99dfdffd257f533f187498c2a8f5feaf4ee" dependencies = [ "bitflags", "errno", @@ -2192,25 +2509,24 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rusty-fork" @@ -2232,11 +2548,11 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2274,9 +2590,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -2308,29 +2624,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.207" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.207" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.124" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -2363,14 +2679,29 @@ dependencies = [ [[package]] name = "sha3-asm" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d79b758b7cb2085612b11a235055e485605a5103faccdd633f35bd7aee69dd" +checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" dependencies = [ "cc", "cfg-if", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signature" version = "2.2.0" @@ -2425,6 +2756,12 @@ dependencies = [ "der", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -2450,7 +2787,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] @@ -2472,9 +2809,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.74" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -2490,7 +2827,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] @@ -2498,6 +2835,20 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] [[package]] name = "tap" @@ -2507,9 +2858,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -2520,22 +2871,32 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", ] [[package]] @@ -2557,25 +2918,20 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.8.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" -version = "1.39.2" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -2595,7 +2951,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] @@ -2610,9 +2966,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -2622,9 +2978,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -2641,13 +2997,13 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "toml_datetime", - "winnow 0.5.40", + "winnow", ] [[package]] @@ -2660,7 +3016,6 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite", - "tokio", "tower-layer", "tower-service", "tracing", @@ -2668,15 +3023,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -2698,7 +3053,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", ] [[package]] @@ -2708,6 +3063,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", ] [[package]] @@ -2724,9 +3132,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "uint" @@ -2748,57 +3156,51 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "url" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "valuable" version = "0.1.0" @@ -2843,34 +3245,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -2880,9 +3283,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2890,22 +3293,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-encoder" @@ -2945,54 +3348,82 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "windows-sys" -version = "0.48.0" +name = "winapi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ - "windows-targets 0.48.5", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] -name = "windows-sys" -version = "0.52.0" +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] -name = "windows-targets" -version = "0.48.5" +name = "windows-sys" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows-targets", ] [[package]] @@ -3001,46 +3432,28 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -3053,48 +3466,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -3103,32 +3492,13 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "wit-bindgen" version = "0.24.0" @@ -3181,7 +3551,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -3223,6 +3593,18 @@ dependencies = [ "wasmparser", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.5.1" @@ -3232,6 +3614,30 @@ dependencies = [ "tap", ] +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -3250,7 +3656,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", ] [[package]] @@ -3270,5 +3697,27 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.74", + "syn 2.0.87", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] diff --git a/code/file_transfer/Cargo.toml b/code/file-transfer/Cargo.toml similarity index 54% rename from code/file_transfer/Cargo.toml rename to code/file-transfer/Cargo.toml index 918afe1..8b4dbc7 100644 --- a/code/file_transfer/Cargo.toml +++ b/code/file-transfer/Cargo.toml @@ -1,11 +1,11 @@ [workspace] resolver = "2" members = [ - "file_transfer", - "file_transfer_worker_api", - "file_transfer_worker", + "file-transfer", + "file-transfer-worker-api", + "file-transfer-worker", "download", - "list_files" + "list-files" ] [profile.release] diff --git a/code/file_transfer/api/file_transfer:template.os-v0.wit b/code/file-transfer/api/file-transfer:template.os-v0.wit similarity index 100% rename from code/file_transfer/api/file_transfer:template.os-v0.wit rename to code/file-transfer/api/file-transfer:template.os-v0.wit diff --git a/code/file_transfer/download/Cargo.toml b/code/file-transfer/download/Cargo.toml similarity index 80% rename from code/file_transfer/download/Cargo.toml rename to code/file-transfer/download/Cargo.toml index 3256729..5c6e012 100644 --- a/code/file_transfer/download/Cargo.toml +++ b/code/file-transfer/download/Cargo.toml @@ -2,10 +2,11 @@ name = "download" version = "0.1.0" edition = "2021" +publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = "0.9.2" process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/code/file_transfer/download/src/lib.rs b/code/file-transfer/download/src/lib.rs similarity index 100% rename from code/file_transfer/download/src/lib.rs rename to code/file-transfer/download/src/lib.rs diff --git a/code/file_transfer/file_transfer/Cargo.toml b/code/file-transfer/file-transfer-worker-api/Cargo.toml similarity index 75% rename from code/file_transfer/file_transfer/Cargo.toml rename to code/file-transfer/file-transfer-worker-api/Cargo.toml index a511ca8..aeff93b 100644 --- a/code/file_transfer/file_transfer/Cargo.toml +++ b/code/file-transfer/file-transfer-worker-api/Cargo.toml @@ -1,11 +1,12 @@ [package] -name = "file_transfer" +name = "file-transfer-worker-api" version = "0.1.0" edition = "2021" +publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = "0.9.2" process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/code/file_transfer/file_transfer_worker_api/src/lib.rs b/code/file-transfer/file-transfer-worker-api/src/lib.rs similarity index 97% rename from code/file_transfer/file_transfer_worker_api/src/lib.rs rename to code/file-transfer/file-transfer-worker-api/src/lib.rs index a2ed498..4cf40fb 100644 --- a/code/file_transfer/file_transfer_worker_api/src/lib.rs +++ b/code/file-transfer/file-transfer-worker-api/src/lib.rs @@ -22,7 +22,7 @@ fn start_download( let our_worker = spawn( None, &format!( - "{}:{}/pkg/file_transfer_worker.wasm", + "{}:{}/pkg/file-transfer-worker.wasm", our.process.package_name, our.process.publisher_node, ), OnExit::None, diff --git a/code/file_transfer/file_transfer_worker/Cargo.toml b/code/file-transfer/file-transfer-worker/Cargo.toml similarity index 75% rename from code/file_transfer/file_transfer_worker/Cargo.toml rename to code/file-transfer/file-transfer-worker/Cargo.toml index ec9836f..e749d17 100644 --- a/code/file_transfer/file_transfer_worker/Cargo.toml +++ b/code/file-transfer/file-transfer-worker/Cargo.toml @@ -1,12 +1,13 @@ [package] -name = "file_transfer_worker" +name = "file-transfer-worker" version = "0.1.0" edition = "2021" +publish = false [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = { version = "0.9.2", features = ["logging"] } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/code/file_transfer/file_transfer_worker/src/lib.rs b/code/file-transfer/file-transfer-worker/src/lib.rs similarity index 94% rename from code/file_transfer/file_transfer_worker/src/lib.rs rename to code/file-transfer/file-transfer-worker/src/lib.rs index 9a91863..6dae285 100644 --- a/code/file_transfer/file_transfer_worker/src/lib.rs +++ b/code/file-transfer/file-transfer-worker/src/lib.rs @@ -3,8 +3,9 @@ use crate::kinode::process::file_transfer_worker::{ Response as WorkerResponse, }; use crate::kinode::process::standard::{Address as WitAddress, ProcessId as WitProcessId}; +use kinode_process_lib::logging::{error, info, init_logging, Level}; use kinode_process_lib::{ - await_message, call_init, get_blob, println, + await_message, call_init, get_blob, vfs::{open_dir, open_file, Directory, File, SeekFrom}, Address, Message, ProcessId, Request, Response, }; @@ -212,7 +213,8 @@ fn handle_message( call_init!(init); fn init(our: Address) { - println!("worker: begin"); + init_logging(&our, Level::DEBUG, Level::INFO, None, None).unwrap(); + info!("worker: begin"); let start = std::time::Instant::now(); let drive_path = format!("{}/files", our.package_id()); @@ -224,16 +226,16 @@ fn init(our: Address) { loop { match await_message() { - Err(send_error) => println!("worker: got SendError: {send_error}"), + Err(send_error) => error!("worker: got SendError: {send_error}"), Ok(ref message) => { match handle_message(message, &mut file, &files_dir, &mut size, &mut parent) { Ok(exit) => { if exit { - println!("worker: done: exiting, took {:?}", start.elapsed()); + info!("worker: done: exiting, took {:?}", start.elapsed()); break; } } - Err(e) => println!("worker: got error while handling message: {e:?}"), + Err(e) => error!("worker: got error while handling message: {e:?}"), } } } diff --git a/code/file_transfer/file_transfer_worker_api/Cargo.toml b/code/file-transfer/file-transfer/Cargo.toml similarity index 73% rename from code/file_transfer/file_transfer_worker_api/Cargo.toml rename to code/file-transfer/file-transfer/Cargo.toml index 2e75c86..c04468d 100644 --- a/code/file_transfer/file_transfer_worker_api/Cargo.toml +++ b/code/file-transfer/file-transfer/Cargo.toml @@ -1,11 +1,12 @@ [package] -name = "file_transfer_worker_api" +name = "file-transfer" version = "0.1.0" edition = "2021" +publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = { version = "0.9.2", features = ["logging"] } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/code/file_transfer/file_transfer/src/lib.rs b/code/file-transfer/file-transfer/src/lib.rs similarity index 93% rename from code/file_transfer/file_transfer/src/lib.rs rename to code/file-transfer/file-transfer/src/lib.rs index 528ee66..775ecbe 100644 --- a/code/file_transfer/file_transfer/src/lib.rs +++ b/code/file-transfer/file-transfer/src/lib.rs @@ -6,6 +6,7 @@ use crate::kinode::process::file_transfer_worker::{ Response as WorkerResponse, }; use crate::kinode::process::standard::{Address as WitAddress, ProcessId as WitProcessId}; +use kinode_process_lib::logging::{error, info, init_logging, Level}; use kinode_process_lib::{ await_message, call_init, println, vfs::{create_drive, metadata, open_dir, Directory, FileType}, @@ -103,7 +104,7 @@ fn handle_worker_request( } } WorkerRequest::Progress(ProgressRequest { name, progress }) => { - println!("{} progress: {}%", name, progress); + info!("{} progress: {}%", name, progress); Response::new().body(WorkerResponse::Progress).send()?; } } @@ -158,17 +159,18 @@ fn handle_message(our: &Address, message: &Message, files_dir: &Directory) -> an call_init!(init); fn init(our: Address) { - println!("begin"); + init_logging(&our, Level::DEBUG, Level::INFO, None, None).unwrap(); + info!("begin"); let drive_path = create_drive(our.package_id(), "files", None).unwrap(); let files_dir = open_dir(&drive_path, false, None).unwrap(); loop { match await_message() { - Err(send_error) => println!("got SendError: {send_error}"), + Err(send_error) => error!("got SendError: {send_error}"), Ok(ref message) => match handle_message(&our, message, &files_dir) { Ok(_) => {} - Err(e) => println!("got error while handling message: {e:?}"), + Err(e) => error!("got error while handling message: {e:?}"), }, } } diff --git a/code/file_transfer/list_files/Cargo.toml b/code/file-transfer/list-files/Cargo.toml similarity index 80% rename from code/file_transfer/list_files/Cargo.toml rename to code/file-transfer/list-files/Cargo.toml index 6c6ca8f..5de95b3 100644 --- a/code/file_transfer/list_files/Cargo.toml +++ b/code/file-transfer/list-files/Cargo.toml @@ -2,10 +2,11 @@ name = "list_files" version = "0.1.0" edition = "2021" +publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.3" } +kinode_process_lib = "0.9.2" process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/code/file_transfer/list_files/src/lib.rs b/code/file-transfer/list-files/src/lib.rs similarity index 61% rename from code/file_transfer/list_files/src/lib.rs rename to code/file-transfer/list-files/src/lib.rs index 6f14cbc..69774f4 100644 --- a/code/file_transfer/list_files/src/lib.rs +++ b/code/file-transfer/list-files/src/lib.rs @@ -1,7 +1,7 @@ -use crate::kinode::process::file_transfer::{Request as TransferRequest, Response as TransferResponse}; -use kinode_process_lib::{ - await_next_message_body, call_init, println, Address, Message, Request, +use crate::kinode::process::file_transfer::{ + Request as TransferRequest, Response as TransferResponse, }; +use kinode_process_lib::{await_next_message_body, call_init, println, Address, Message, Request}; wit_bindgen::generate!({ path: "target/wit", @@ -19,7 +19,7 @@ fn init(_our: Address) { let who = String::from_utf8(body).unwrap_or_default(); if who.is_empty() { - println!("usage: list_files:file_transfer:template.os who"); + println!("usage: list-files:file_transfer:template.os who"); return; } @@ -27,10 +27,9 @@ fn init(_our: Address) { .parse() .unwrap(); - let Ok(Ok(Message::Response { body, .. })) = - Request::to(target) - .body(TransferRequest::ListFiles) - .send_and_await_response(5) + let Ok(Ok(Message::Response { body, .. })) = Request::to(target) + .body(TransferRequest::ListFiles) + .send_and_await_response(5) else { println!("did not receive expected Response from {who}"); return; @@ -43,13 +42,16 @@ fn init(_our: Address) { println!( "{}", - files.iter(). - fold(format!("{who} available files:\nFile\t\tSize (bytes)\n"), |mut msg, file| { + 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(), + "{}\t\t{}", + file.name.split('/').last().unwrap(), file.size, )); msg - }) + } + ) ); } diff --git a/code/file_transfer/metadata.json b/code/file-transfer/metadata.json similarity index 63% rename from code/file_transfer/metadata.json rename to code/file-transfer/metadata.json index e1449d3..359b738 100644 --- a/code/file_transfer/metadata.json +++ b/code/file-transfer/metadata.json @@ -1,9 +1,9 @@ { - "name": "file_transfer", + "name": "file-transfer", "description": "", "image": "", "properties": { - "package_name": "file_transfer", + "package_name": "file-transfer", "current_version": "0.1.0", "publisher": "template.os", "mirrors": [], @@ -12,10 +12,7 @@ }, "wit_version": 0, "dependencies": [ - "file_transfer:template.os" - ], - "api_includes": [ - "pkg/file_transfer_worker.wasm" + "file-transfer:template.os" ] }, "external_url": "", diff --git a/code/file_transfer/pkg/manifest.json b/code/file-transfer/pkg/manifest.json similarity index 72% rename from code/file_transfer/pkg/manifest.json rename to code/file-transfer/pkg/manifest.json index c6a3c81..f5385b2 100644 --- a/code/file_transfer/pkg/manifest.json +++ b/code/file-transfer/pkg/manifest.json @@ -1,7 +1,7 @@ [ { - "process_name": "file_transfer", - "process_wasm_path": "/file_transfer.wasm", + "process_name": "file-transfer", + "process_wasm_path": "/file-transfer.wasm", "on_exit": "Restart", "request_networking": true, "request_capabilities": [ diff --git a/code/file_transfer/pkg/scripts.json b/code/file-transfer/pkg/scripts.json similarity index 67% rename from code/file_transfer/pkg/scripts.json rename to code/file-transfer/pkg/scripts.json index 381b699..37fb6ba 100644 --- a/code/file_transfer/pkg/scripts.json +++ b/code/file-transfer/pkg/scripts.json @@ -3,21 +3,17 @@ "root": false, "public": false, "request_networking": false, - "request_capabilities": [ - "file_transfer:file_transfer:template.os" - ], + "request_capabilities": [], "grant_capabilities": [ "file_transfer:file_transfer:template.os" ], "wit_version": 0 }, - "list_files.wasm": { + "list-files.wasm": { "root": false, "public": false, "request_networking": true, - "request_capabilities": [ - "file_transfer:file_transfer:template.os" - ], + "request_capabilities": [], "grant_capabilities": [ "file_transfer:file_transfer:template.os" ], From db4bb129cecf164154762b6f1ee58d000c799752 Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Tue, 12 Nov 2024 16:03:29 -0800 Subject: [PATCH 02/18] code: update http-client --- code/{http_client => http-client}/.gitignore | 0 code/{http_client => http-client}/Cargo.lock | 957 +++++++++++++++++- code/{http_client => http-client}/Cargo.toml | 2 +- .../http-client}/Cargo.toml | 4 +- .../http-client}/src/lib.rs | 5 +- .../metadata.json | 4 +- .../pkg/manifest.json | 8 +- 7 files changed, 931 insertions(+), 49 deletions(-) rename code/{http_client => http-client}/.gitignore (100%) rename code/{http_client => http-client}/Cargo.lock (71%) rename code/{http_client => http-client}/Cargo.toml (85%) rename code/{http_client/http_client => http-client/http-client}/Cargo.toml (86%) rename code/{http_client/http_client => http-client/http-client}/src/lib.rs (84%) rename code/{http_client => http-client}/metadata.json (83%) rename code/{http_client => http-client}/pkg/manifest.json (54%) diff --git a/code/http_client/.gitignore b/code/http-client/.gitignore similarity index 100% rename from code/http_client/.gitignore rename to code/http-client/.gitignore diff --git a/code/http_client/Cargo.lock b/code/http-client/Cargo.lock similarity index 71% rename from code/http_client/Cargo.lock rename to code/http-client/Cargo.lock index bf338b5..052b25d 100644 --- a/code/http_client/Cargo.lock +++ b/code/http-client/Cargo.lock @@ -17,55 +17,155 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "allocator-api2" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" + +[[package]] +name = "alloy" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba1c79677c9ce51c8d45e20845b05e6fb070ea2c863fba03ad6af2c778474bd" +dependencies = [ + "alloy-consensus", + "alloy-core", + "alloy-eips", + "alloy-genesis", + "alloy-json-rpc", + "alloy-provider", + "alloy-rpc-client", + "alloy-rpc-types", + "alloy-serde", + "alloy-transport-http", +] + +[[package]] +name = "alloy-chains" +version = "0.1.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470" +dependencies = [ + "alloy-primitives 0.8.12", + "num_enum", + "strum", +] + [[package]] name = "alloy-consensus" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da374e868f54c7f4ad2ad56829827badca388efd645f8cf5fccc61c2b5343504" dependencies = [ "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde", "c-kzg", "serde", - "sha2", +] + +[[package]] +name = "alloy-core" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4" +dependencies = [ + "alloy-dyn-abi", + "alloy-json-abi", + "alloy-primitives 0.7.7", + "alloy-sol-types", +] + +[[package]] +name = "alloy-dyn-abi" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df" +dependencies = [ + "alloy-json-abi", + "alloy-primitives 0.7.7", + "alloy-sol-type-parser", + "alloy-sol-types", + "const-hex", + "itoa", + "serde", + "serde_json", + "winnow 0.6.20", ] [[package]] name = "alloy-eips" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f76ecab54890cdea1e4808fc0891c7e6cfcf71fe1a9fe26810c7280ef768f4ed" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde", "c-kzg", "once_cell", "serde", + "sha2", ] [[package]] name = "alloy-genesis" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca15afde1b6d15e3fc1c97421262b1bbb37aee45752e3c8b6d6f13f776554ff" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-serde", "serde", ] +[[package]] +name = "alloy-json-abi" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372" +dependencies = [ + "alloy-primitives 0.7.7", + "alloy-sol-type-parser", + "serde", + "serde_json", +] + [[package]] name = "alloy-json-rpc" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d6f34930b7e3e2744bcc79056c217f00cb2abb33bc5d4ff88da7623c5bb078b" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "serde", "serde_json", "thiserror", "tracing", ] +[[package]] +name = "alloy-network" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25f6895fc31b48fa12306ef9b4f78b7764f8bd6d7d91cdb0a40e233704a0f23f" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-primitives 0.7.7", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "thiserror", +] + [[package]] name = "alloy-primitives" version = "0.7.7" @@ -76,7 +176,7 @@ dependencies = [ "bytes", "cfg-if", "const-hex", - "derive_more", + "derive_more 0.99.18", "hex-literal", "itoa", "k256", @@ -88,6 +188,55 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "alloy-primitives" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fce5dbd6a4f118eecc4719eaa9c7ffc31c315e6c5ccde3642db927802312425" +dependencies = [ + "bytes", + "cfg-if", + "const-hex", + "derive_more 1.0.0", + "hex-literal", + "itoa", + "paste", + "ruint", + "tiny-keccak", +] + +[[package]] +name = "alloy-provider" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c538bfa893d07e27cb4f3c1ab5f451592b7c526d511d62b576a2ce59e146e4a" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network", + "alloy-primitives 0.7.7", + "alloy-rpc-client", + "alloy-rpc-types-eth", + "alloy-transport", + "alloy-transport-http", + "async-stream", + "async-trait", + "auto_impl", + "dashmap", + "futures", + "futures-utils-wasm", + "lru", + "pin-project", + "reqwest", + "serde", + "serde_json", + "tokio", + "tracing", + "url", +] + [[package]] name = "alloy-rlp" version = "0.3.8" @@ -110,19 +259,50 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "alloy-rpc-client" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ba31bae67773fd5a60020bea900231f8396202b7feca4d0c70c6b59308ab4a8" +dependencies = [ + "alloy-json-rpc", + "alloy-transport", + "alloy-transport-http", + "futures", + "pin-project", + "reqwest", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower", + "tracing", + "url", +] + [[package]] name = "alloy-rpc-types" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "184a7a42c7ba9141cc9e76368356168c282c3bc3d9e5d78f3556bdfe39343447" +dependencies = [ + "alloy-rpc-types-eth", + "alloy-serde", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab4123ee21f99ba4bd31bfa36ba89112a18a500f8b452f02b35708b1b951e2b9" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-genesis", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde", "alloy-sol-types", - "itertools 0.12.1", + "itertools 0.13.0", "serde", "serde_json", "thiserror", @@ -130,14 +310,29 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9416c52959e66ead795a11f4a86c248410e9e368a0765710e57055b8a1774dd6" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "serde", "serde_json", ] +[[package]] +name = "alloy-signer" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b33753c09fa1ad85e5b092b8dc2372f1e337a42e84b9b4cff9fede75ba4adb32" +dependencies = [ + "alloy-primitives 0.7.7", + "async-trait", + "auto_impl", + "elliptic-curve", + "k256", + "thiserror", +] + [[package]] name = "alloy-sol-macro" version = "0.7.7" @@ -185,21 +380,33 @@ dependencies = [ "syn-solidity", ] +[[package]] +name = "alloy-sol-type-parser" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98" +dependencies = [ + "serde", + "winnow 0.6.20", +] + [[package]] name = "alloy-sol-types" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-sol-macro", "const-hex", + "serde", ] [[package]] name = "alloy-transport" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b51a291f949f755e6165c3ed562883175c97423703703355f4faa4b7d0a57c" dependencies = [ "alloy-json-rpc", "base64", @@ -210,8 +417,23 @@ dependencies = [ "thiserror", "tokio", "tower", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport-http" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d65871f9f1cafe1ed25cde2f1303be83e6473e995a2d56c275ae4fcce6119c" +dependencies = [ + "alloy-json-rpc", + "alloy-transport", + "reqwest", + "serde_json", + "tower", + "tracing", "url", - "wasm-bindgen-futures", ] [[package]] @@ -350,6 +572,39 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "auto_impl" version = "1.2.0" @@ -541,6 +796,22 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + [[package]] name = "cpufeatures" version = "0.2.13" @@ -578,6 +849,19 @@ dependencies = [ "typenum", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "der" version = "0.7.9" @@ -612,6 +896,27 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", + "unicode-xid", +] + [[package]] name = "digest" version = "0.9.0" @@ -739,6 +1044,27 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -754,12 +1080,54 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + [[package]] name = "futures-core" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + [[package]] name = "futures-macro" version = "0.3.30" @@ -771,6 +1139,12 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + [[package]] name = "futures-task" version = "0.3.30" @@ -783,9 +1157,13 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ + "futures-channel", "futures-core", + "futures-io", "futures-macro", + "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", @@ -848,6 +1226,17 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "heck" version = "0.4.1" @@ -905,7 +1294,30 @@ dependencies = [ ] [[package]] -name = "http_client" +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "http-client" version = "0.1.0" dependencies = [ "kinode_process_lib", @@ -915,6 +1327,66 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "hyper" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "id-arena" version = "2.2.1" @@ -958,10 +1430,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.5", "serde", ] +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + [[package]] name = "itertools" version = "0.10.5" @@ -973,9 +1451,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1020,13 +1498,13 @@ dependencies = [ [[package]] name = "kinode_process_lib" -version = "0.8.0" -source = "git+https://github.com/kinode-dao/process_lib?tag=v0.8.0#95a4b042939b760d58c4c4c4eb92f43e813fc1d2" +version = "0.9.4" +source = "git+https://github.com/kinode-dao/process_lib?rev=778457a#778457ae52c934fd17e0e846127a9472a8e03170" dependencies = [ - "alloy-json-rpc", - "alloy-primitives", - "alloy-rpc-types", - "alloy-transport", + "alloy", + "alloy-primitives 0.7.7", + "alloy-sol-macro", + "alloy-sol-types", "anyhow", "bincode", "http", @@ -1070,11 +1548,30 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown 0.15.1", +] [[package]] name = "memchr" @@ -1107,6 +1604,35 @@ dependencies = [ "adler", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -1146,6 +1672,26 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "object" version = "0.36.3" @@ -1161,6 +1707,50 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "openssl" +version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "parity-scale-codec" version = "3.6.12" @@ -1187,6 +1777,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + [[package]] name = "paste" version = "1.0.15" @@ -1252,6 +1855,12 @@ dependencies = [ "spki", ] +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + [[package]] name = "ppv-lite86" version = "0.2.20" @@ -1394,12 +2003,60 @@ dependencies = [ "rand_core", ] +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags", +] + [[package]] name = "regex-syntax" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +[[package]] +name = "reqwest" +version = "0.12.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +dependencies = [ + "base64", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-registry", +] + [[package]] name = "rfc6979" version = "0.4.0" @@ -1515,6 +2172,27 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + [[package]] name = "rusty-fork" version = "0.3.0" @@ -1533,6 +2211,21 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "schannel" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "sec1" version = "0.7.3" @@ -1547,6 +2240,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "0.11.0" @@ -1603,6 +2319,18 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "sha2" version = "0.10.8" @@ -1649,6 +2377,16 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "spdx" version = "0.10.6" @@ -1674,6 +2412,28 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.74", +] + [[package]] name = "subtle" version = "2.6.1" @@ -1714,6 +2474,15 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + [[package]] name = "tap" version = "1.0.1" @@ -1793,7 +2562,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", "pin-project-lite", + "tokio", ] [[package]] @@ -1810,7 +2631,7 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] @@ -1872,6 +2693,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "typenum" version = "1.17.0" @@ -1961,6 +2788,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.5" @@ -1976,6 +2809,15 @@ dependencies = [ "libc", ] +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2094,6 +2936,36 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -2185,6 +3057,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + [[package]] name = "wit-bindgen" version = "0.24.0" diff --git a/code/http_client/Cargo.toml b/code/http-client/Cargo.toml similarity index 85% rename from code/http_client/Cargo.toml rename to code/http-client/Cargo.toml index d6a6464..1278fad 100644 --- a/code/http_client/Cargo.toml +++ b/code/http-client/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - "http_client" + "http-client" ] [profile.release] diff --git a/code/http_client/http_client/Cargo.toml b/code/http-client/http-client/Cargo.toml similarity index 86% rename from code/http_client/http_client/Cargo.toml rename to code/http-client/http-client/Cargo.toml index 29aa751..6c1489b 100644 --- a/code/http_client/http_client/Cargo.toml +++ b/code/http-client/http-client/Cargo.toml @@ -1,10 +1,10 @@ [package] -name = "http_client" +name = "http-client" version = "0.1.0" edition = "2021" [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.0" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "778457a" } url = "2" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/code/http_client/http_client/src/lib.rs b/code/http-client/http-client/src/lib.rs similarity index 84% rename from code/http_client/http_client/src/lib.rs rename to code/http-client/http-client/src/lib.rs index 087c414..07318de 100644 --- a/code/http_client/http_client/src/lib.rs +++ b/code/http-client/http-client/src/lib.rs @@ -5,7 +5,7 @@ /// kit f /// /// # Start package from a new terminal. -/// kit bs http_client +/// kit bs http-client /// ``` use kinode_process_lib::{call_init, http, println, Address}; @@ -21,7 +21,8 @@ fn init(_our: Address) { println!("begin"); let url = url::Url::parse(URL).expect("failed to parse url"); - let response = http::send_request_await_response(http::Method::GET, url, None, 5, vec![]); + let response = + http::client::send_request_await_response(http::Method::GET, url, None, 5, vec![]); match response { Err(e) => panic!("request failed: {e:?}"), diff --git a/code/http_client/metadata.json b/code/http-client/metadata.json similarity index 83% rename from code/http_client/metadata.json rename to code/http-client/metadata.json index 7c6303b..237ba9c 100644 --- a/code/http_client/metadata.json +++ b/code/http-client/metadata.json @@ -1,9 +1,9 @@ { - "name": "http_client", + "name": "http-client", "description": "", "image": "", "properties": { - "package_name": "http_client", + "package_name": "http-client", "current_version": "0.1.0", "publisher": "template.os", "mirrors": [], diff --git a/code/http_client/pkg/manifest.json b/code/http-client/pkg/manifest.json similarity index 54% rename from code/http_client/pkg/manifest.json rename to code/http-client/pkg/manifest.json index 0cf7369..6cb8618 100644 --- a/code/http_client/pkg/manifest.json +++ b/code/http-client/pkg/manifest.json @@ -1,14 +1,14 @@ [ { - "process_name": "http_client", - "process_wasm_path": "/http_client.wasm", + "process_name": "http-client", + "process_wasm_path": "/http-client.wasm", "on_exit": "None", "request_networking": false, "request_capabilities": [ - "http_client:distro:sys" + "http-client:distro:sys" ], "grant_capabilities": [ - "http_client:distro:sys" + "http-client:distro:sys" ], "public": false } From 5d983e622779a5dab00b8953f6f918d61d79f75d Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Tue, 12 Nov 2024 19:07:07 -0800 Subject: [PATCH 03/18] code: update http-server --- code/{http_server => http-server}/.gitignore | 0 code/{http_server => http-server}/Cargo.lock | 957 +++++++++++++++++- code/{http_server => http-server}/Cargo.toml | 2 +- .../http-server}/Cargo.toml | 4 +- .../http-server}/src/lib.rs | 18 +- .../metadata.json | 4 +- .../pkg/manifest.json | 8 +- 7 files changed, 940 insertions(+), 53 deletions(-) rename code/{http_server => http-server}/.gitignore (100%) rename code/{http_server => http-server}/Cargo.lock (71%) rename code/{http_server => http-server}/Cargo.toml (85%) rename code/{http_server/http_server => http-server/http-server}/Cargo.toml (86%) rename code/{http_server/http_server => http-server/http-server}/src/lib.rs (75%) rename code/{http_server => http-server}/metadata.json (83%) rename code/{http_server => http-server}/pkg/manifest.json (54%) diff --git a/code/http_server/.gitignore b/code/http-server/.gitignore similarity index 100% rename from code/http_server/.gitignore rename to code/http-server/.gitignore diff --git a/code/http_server/Cargo.lock b/code/http-server/Cargo.lock similarity index 71% rename from code/http_server/Cargo.lock rename to code/http-server/Cargo.lock index b114dc4..d106217 100644 --- a/code/http_server/Cargo.lock +++ b/code/http-server/Cargo.lock @@ -17,55 +17,155 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "allocator-api2" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" + +[[package]] +name = "alloy" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba1c79677c9ce51c8d45e20845b05e6fb070ea2c863fba03ad6af2c778474bd" +dependencies = [ + "alloy-consensus", + "alloy-core", + "alloy-eips", + "alloy-genesis", + "alloy-json-rpc", + "alloy-provider", + "alloy-rpc-client", + "alloy-rpc-types", + "alloy-serde", + "alloy-transport-http", +] + +[[package]] +name = "alloy-chains" +version = "0.1.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18c5c520273946ecf715c0010b4e3503d7eba9893cd9ce6b7fff5654c4a3c470" +dependencies = [ + "alloy-primitives 0.8.12", + "num_enum", + "strum", +] + [[package]] name = "alloy-consensus" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da374e868f54c7f4ad2ad56829827badca388efd645f8cf5fccc61c2b5343504" dependencies = [ "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde", "c-kzg", "serde", - "sha2", +] + +[[package]] +name = "alloy-core" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4" +dependencies = [ + "alloy-dyn-abi", + "alloy-json-abi", + "alloy-primitives 0.7.7", + "alloy-sol-types", +] + +[[package]] +name = "alloy-dyn-abi" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df" +dependencies = [ + "alloy-json-abi", + "alloy-primitives 0.7.7", + "alloy-sol-type-parser", + "alloy-sol-types", + "const-hex", + "itoa", + "serde", + "serde_json", + "winnow 0.6.20", ] [[package]] name = "alloy-eips" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f76ecab54890cdea1e4808fc0891c7e6cfcf71fe1a9fe26810c7280ef768f4ed" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde", "c-kzg", "once_cell", "serde", + "sha2", ] [[package]] name = "alloy-genesis" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca15afde1b6d15e3fc1c97421262b1bbb37aee45752e3c8b6d6f13f776554ff" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-serde", "serde", ] +[[package]] +name = "alloy-json-abi" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372" +dependencies = [ + "alloy-primitives 0.7.7", + "alloy-sol-type-parser", + "serde", + "serde_json", +] + [[package]] name = "alloy-json-rpc" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d6f34930b7e3e2744bcc79056c217f00cb2abb33bc5d4ff88da7623c5bb078b" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "serde", "serde_json", "thiserror", "tracing", ] +[[package]] +name = "alloy-network" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25f6895fc31b48fa12306ef9b4f78b7764f8bd6d7d91cdb0a40e233704a0f23f" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-primitives 0.7.7", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "thiserror", +] + [[package]] name = "alloy-primitives" version = "0.7.7" @@ -76,7 +176,7 @@ dependencies = [ "bytes", "cfg-if", "const-hex", - "derive_more", + "derive_more 0.99.18", "hex-literal", "itoa", "k256", @@ -88,6 +188,55 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "alloy-primitives" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fce5dbd6a4f118eecc4719eaa9c7ffc31c315e6c5ccde3642db927802312425" +dependencies = [ + "bytes", + "cfg-if", + "const-hex", + "derive_more 1.0.0", + "hex-literal", + "itoa", + "paste", + "ruint", + "tiny-keccak", +] + +[[package]] +name = "alloy-provider" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c538bfa893d07e27cb4f3c1ab5f451592b7c526d511d62b576a2ce59e146e4a" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network", + "alloy-primitives 0.7.7", + "alloy-rpc-client", + "alloy-rpc-types-eth", + "alloy-transport", + "alloy-transport-http", + "async-stream", + "async-trait", + "auto_impl", + "dashmap", + "futures", + "futures-utils-wasm", + "lru", + "pin-project", + "reqwest", + "serde", + "serde_json", + "tokio", + "tracing", + "url", +] + [[package]] name = "alloy-rlp" version = "0.3.8" @@ -110,19 +259,50 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "alloy-rpc-client" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ba31bae67773fd5a60020bea900231f8396202b7feca4d0c70c6b59308ab4a8" +dependencies = [ + "alloy-json-rpc", + "alloy-transport", + "alloy-transport-http", + "futures", + "pin-project", + "reqwest", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower", + "tracing", + "url", +] + [[package]] name = "alloy-rpc-types" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "184a7a42c7ba9141cc9e76368356168c282c3bc3d9e5d78f3556bdfe39343447" +dependencies = [ + "alloy-rpc-types-eth", + "alloy-serde", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab4123ee21f99ba4bd31bfa36ba89112a18a500f8b452f02b35708b1b951e2b9" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-genesis", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde", "alloy-sol-types", - "itertools 0.12.1", + "itertools 0.13.0", "serde", "serde_json", "thiserror", @@ -130,14 +310,29 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9416c52959e66ead795a11f4a86c248410e9e368a0765710e57055b8a1774dd6" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "serde", "serde_json", ] +[[package]] +name = "alloy-signer" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b33753c09fa1ad85e5b092b8dc2372f1e337a42e84b9b4cff9fede75ba4adb32" +dependencies = [ + "alloy-primitives 0.7.7", + "async-trait", + "auto_impl", + "elliptic-curve", + "k256", + "thiserror", +] + [[package]] name = "alloy-sol-macro" version = "0.7.7" @@ -185,21 +380,33 @@ dependencies = [ "syn-solidity", ] +[[package]] +name = "alloy-sol-type-parser" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98" +dependencies = [ + "serde", + "winnow 0.6.20", +] + [[package]] name = "alloy-sol-types" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-sol-macro", "const-hex", + "serde", ] [[package]] name = "alloy-transport" -version = "0.1.0" -source = "git+https://github.com/alloy-rs/alloy.git?rev=cad7935#cad7935d69f433e45d190902e58b1c996b35adfa" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b51a291f949f755e6165c3ed562883175c97423703703355f4faa4b7d0a57c" dependencies = [ "alloy-json-rpc", "base64", @@ -210,8 +417,23 @@ dependencies = [ "thiserror", "tokio", "tower", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport-http" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d65871f9f1cafe1ed25cde2f1303be83e6473e995a2d56c275ae4fcce6119c" +dependencies = [ + "alloy-json-rpc", + "alloy-transport", + "reqwest", + "serde_json", + "tower", + "tracing", "url", - "wasm-bindgen-futures", ] [[package]] @@ -350,6 +572,39 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "async-trait" +version = "0.1.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "auto_impl" version = "1.2.0" @@ -541,6 +796,22 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + [[package]] name = "cpufeatures" version = "0.2.13" @@ -578,6 +849,19 @@ dependencies = [ "typenum", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "der" version = "0.7.9" @@ -612,6 +896,27 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", + "unicode-xid", +] + [[package]] name = "digest" version = "0.9.0" @@ -739,6 +1044,27 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -754,12 +1080,54 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + [[package]] name = "futures-core" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + [[package]] name = "futures-macro" version = "0.3.30" @@ -771,6 +1139,12 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + [[package]] name = "futures-task" version = "0.3.30" @@ -783,9 +1157,13 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ + "futures-channel", "futures-core", + "futures-io", "futures-macro", + "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", @@ -848,6 +1226,17 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "heck" version = "0.4.1" @@ -905,7 +1294,30 @@ dependencies = [ ] [[package]] -name = "http_server" +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "http-server" version = "0.1.0" dependencies = [ "anyhow", @@ -915,6 +1327,66 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "httparse" +version = "1.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "hyper" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "id-arena" version = "2.2.1" @@ -958,10 +1430,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.5", "serde", ] +[[package]] +name = "ipnet" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + [[package]] name = "itertools" version = "0.10.5" @@ -973,9 +1451,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1020,13 +1498,13 @@ dependencies = [ [[package]] name = "kinode_process_lib" -version = "0.8.0" -source = "git+https://github.com/kinode-dao/process_lib?tag=v0.8.0#95a4b042939b760d58c4c4c4eb92f43e813fc1d2" +version = "0.9.4" +source = "git+https://github.com/kinode-dao/process_lib?rev=778457a#778457ae52c934fd17e0e846127a9472a8e03170" dependencies = [ - "alloy-json-rpc", - "alloy-primitives", - "alloy-rpc-types", - "alloy-transport", + "alloy", + "alloy-primitives 0.7.7", + "alloy-sol-macro", + "alloy-sol-types", "anyhow", "bincode", "http", @@ -1070,11 +1548,30 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "lru" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown 0.15.1", +] [[package]] name = "memchr" @@ -1107,6 +1604,35 @@ dependencies = [ "adler", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -1146,6 +1672,26 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "object" version = "0.36.3" @@ -1161,6 +1707,50 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "openssl" +version = "0.10.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "parity-scale-codec" version = "3.6.12" @@ -1187,6 +1777,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + [[package]] name = "paste" version = "1.0.15" @@ -1252,6 +1855,12 @@ dependencies = [ "spki", ] +[[package]] +name = "pkg-config" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" + [[package]] name = "ppv-lite86" version = "0.2.20" @@ -1394,12 +2003,60 @@ dependencies = [ "rand_core", ] +[[package]] +name = "redox_syscall" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +dependencies = [ + "bitflags", +] + [[package]] name = "regex-syntax" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +[[package]] +name = "reqwest" +version = "0.12.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" +dependencies = [ + "base64", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows-registry", +] + [[package]] name = "rfc6979" version = "0.4.0" @@ -1515,6 +2172,27 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + +[[package]] +name = "rustversion" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" + [[package]] name = "rusty-fork" version = "0.3.0" @@ -1533,6 +2211,21 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "schannel" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "sec1" version = "0.7.3" @@ -1547,6 +2240,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "0.11.0" @@ -1603,6 +2319,18 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "sha2" version = "0.10.8" @@ -1649,6 +2377,16 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "spdx" version = "0.10.6" @@ -1674,6 +2412,28 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.74", +] + [[package]] name = "subtle" version = "2.6.1" @@ -1714,6 +2474,15 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + [[package]] name = "tap" version = "1.0.1" @@ -1793,7 +2562,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", "pin-project-lite", + "tokio", ] [[package]] @@ -1810,7 +2631,7 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] @@ -1872,6 +2693,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "typenum" version = "1.17.0" @@ -1961,6 +2788,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.5" @@ -1976,6 +2809,15 @@ dependencies = [ "libc", ] +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2094,6 +2936,36 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -2185,6 +3057,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + [[package]] name = "wit-bindgen" version = "0.24.0" diff --git a/code/http_server/Cargo.toml b/code/http-server/Cargo.toml similarity index 85% rename from code/http_server/Cargo.toml rename to code/http-server/Cargo.toml index 29f0e0d..ba5a33d 100644 --- a/code/http_server/Cargo.toml +++ b/code/http-server/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - "http_server" + "http-server" ] [profile.release] diff --git a/code/http_server/http_server/Cargo.toml b/code/http-server/http-server/Cargo.toml similarity index 86% rename from code/http_server/http_server/Cargo.toml rename to code/http-server/http-server/Cargo.toml index 1bc437d..2ee34d4 100644 --- a/code/http_server/http_server/Cargo.toml +++ b/code/http-server/http-server/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "http_server" +name = "http-server" version = "0.1.0" edition = "2021" [dependencies] anyhow = "1" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.0" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "778457a" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.24.0" diff --git a/code/http_server/http_server/src/lib.rs b/code/http-server/http-server/src/lib.rs similarity index 75% rename from code/http_server/http_server/src/lib.rs rename to code/http-server/http-server/src/lib.rs index 944d08d..a76938b 100644 --- a/code/http_server/http_server/src/lib.rs +++ b/code/http-server/http-server/src/lib.rs @@ -5,10 +5,10 @@ /// kit f /// /// # Start package from a new terminal. -/// kit bs http_server +/// kit bs http-server /// /// # Send an HTTP request. -/// curl -X PUT -d '{"Hello": "greetings"}' http://localhost:8080/http_server:http_server:template.os +/// curl -X PUT -d '{"Hello": "greetings"}' http://localhost:8080/http-server:http-server:template.os /// ``` use anyhow::{anyhow, Result}; @@ -21,7 +21,7 @@ wit_bindgen::generate!({ /// Handle a message from the HTTP server. fn handle_http_message(message: &Message) -> Result<()> { - let Ok(server_request) = http::HttpServerRequest::from_bytes(message.body()) else { + let Ok(server_request) = http::server::HttpServerRequest::from_bytes(message.body()) else { return Err(anyhow!("received a message with weird `body`!")); }; let Some(http_request) = server_request.request() else { @@ -35,7 +35,7 @@ fn handle_http_message(message: &Message) -> Result<()> { "received a PUT HTTP request with no body, skipping" )); }; - http::send_response(http::StatusCode::OK, None, vec![]); + http::server::send_response(http::StatusCode::OK, None, vec![]); println!( "{:?}", serde_json::from_slice::(&body.bytes) @@ -47,12 +47,18 @@ call_init!(init); fn init(_our: Address) { println!("begin"); - http::bind_http_path("/", false, false).unwrap(); + let mut server = http::server::HttpServer::new(5); + server + .bind_http_path( + "/", + http::server::HttpBindingConfig::new(false, false, false, None), + ) + .unwrap(); loop { match await_message() { Ok(message) => { - if message.source().process == "http_server:distro:sys" { + if message.source().process == "http-server:distro:sys" { if let Err(e) = handle_http_message(&message) { println!("{e}"); } diff --git a/code/http_server/metadata.json b/code/http-server/metadata.json similarity index 83% rename from code/http_server/metadata.json rename to code/http-server/metadata.json index 8143359..8080a94 100644 --- a/code/http_server/metadata.json +++ b/code/http-server/metadata.json @@ -1,9 +1,9 @@ { - "name": "http_server", + "name": "http-server", "description": "", "image": "", "properties": { - "package_name": "http_server", + "package_name": "http-server", "current_version": "0.1.0", "publisher": "template.os", "mirrors": [], diff --git a/code/http_server/pkg/manifest.json b/code/http-server/pkg/manifest.json similarity index 54% rename from code/http_server/pkg/manifest.json rename to code/http-server/pkg/manifest.json index 404903e..5a743d8 100644 --- a/code/http_server/pkg/manifest.json +++ b/code/http-server/pkg/manifest.json @@ -1,14 +1,14 @@ [ { - "process_name": "http_server", - "process_wasm_path": "/http_server.wasm", + "process_name": "http-server", + "process_wasm_path": "/http-server.wasm", "on_exit": "Restart", "request_networking": false, "request_capabilities": [ - "http_server:distro:sys" + "http-server:distro:sys" ], "grant_capabilities": [ - "http_server:distro:sys" + "http-server:distro:sys" ], "public": false } From 8c599514b225d1e65986db58b2fd916e3447a59a Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Tue, 12 Nov 2024 19:49:02 -0800 Subject: [PATCH 04/18] code: update mfa-data-demo --- .../.gitignore | 0 .../Cargo.lock | 2 +- .../Cargo.toml | 2 +- .../api/mfa-data-demo:template.os-v0.wit} | 0 .../metadata.json | 4 ++-- .../mfa-data-demo}/Cargo.toml | 2 +- .../mfa-data-demo}/src/lib.rs | 0 .../pkg/manifest.json | 6 +++--- .../test/mfa-data-demo-test}/Cargo.lock | 0 .../test/mfa-data-demo-test}/Cargo.toml | 2 +- .../api/mfa_data_demo_test:template.os-v0.wit | 0 .../test/mfa-data-demo-test}/metadata.json | 8 ++++---- .../mfa-data-demo-test}/Cargo.toml | 0 .../mfa-data-demo-test}/src/lib.rs | 20 +++++++++---------- .../mfa-data-demo-test}/src/tester_lib.rs | 0 .../test/mfa-data-demo-test/pkg/manifest.json | 15 ++++++++++++++ .../test/tests.toml | 2 +- .../test/mfa_data_demo_test/pkg/manifest.json | 15 -------------- 18 files changed, 39 insertions(+), 39 deletions(-) rename code/{mfa_data_demo => mfa-data-demo}/.gitignore (100%) rename code/{mfa_data_demo => mfa-data-demo}/Cargo.lock (99%) rename code/{mfa_data_demo => mfa-data-demo}/Cargo.toml (83%) rename code/{mfa_data_demo/api/mfa_data_demo:template.os-v0.wit => mfa-data-demo/api/mfa-data-demo:template.os-v0.wit} (100%) rename code/{mfa_data_demo => mfa-data-demo}/metadata.json (82%) rename code/{mfa_data_demo/mfa_data_demo => mfa-data-demo/mfa-data-demo}/Cargo.toml (95%) rename code/{mfa_data_demo/mfa_data_demo => mfa-data-demo/mfa-data-demo}/src/lib.rs (100%) rename code/{mfa_data_demo => mfa-data-demo}/pkg/manifest.json (66%) rename code/{mfa_data_demo/test/mfa_data_demo_test => mfa-data-demo/test/mfa-data-demo-test}/Cargo.lock (100%) rename code/{mfa_data_demo/test/mfa_data_demo_test => mfa-data-demo/test/mfa-data-demo-test}/Cargo.toml (79%) rename code/{mfa_data_demo/test/mfa_data_demo_test => mfa-data-demo/test/mfa-data-demo-test}/api/mfa_data_demo_test:template.os-v0.wit (100%) rename code/{mfa_data_demo/test/mfa_data_demo_test => mfa-data-demo/test/mfa-data-demo-test}/metadata.json (66%) rename code/{mfa_data_demo/test/mfa_data_demo_test/mfa_data_demo_test => mfa-data-demo/test/mfa-data-demo-test/mfa-data-demo-test}/Cargo.toml (100%) rename code/{mfa_data_demo/test/mfa_data_demo_test/mfa_data_demo_test => mfa-data-demo/test/mfa-data-demo-test/mfa-data-demo-test}/src/lib.rs (81%) rename code/{mfa_data_demo/test/mfa_data_demo_test/mfa_data_demo_test => mfa-data-demo/test/mfa-data-demo-test/mfa-data-demo-test}/src/tester_lib.rs (100%) create mode 100644 code/mfa-data-demo/test/mfa-data-demo-test/pkg/manifest.json rename code/{mfa_data_demo => mfa-data-demo}/test/tests.toml (90%) delete mode 100644 code/mfa_data_demo/test/mfa_data_demo_test/pkg/manifest.json diff --git a/code/mfa_data_demo/.gitignore b/code/mfa-data-demo/.gitignore similarity index 100% rename from code/mfa_data_demo/.gitignore rename to code/mfa-data-demo/.gitignore diff --git a/code/mfa_data_demo/Cargo.lock b/code/mfa-data-demo/Cargo.lock similarity index 99% rename from code/mfa_data_demo/Cargo.lock rename to code/mfa-data-demo/Cargo.lock index 12cf0c4..9e82548 100644 --- a/code/mfa_data_demo/Cargo.lock +++ b/code/mfa-data-demo/Cargo.lock @@ -1530,7 +1530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] -name = "mfa_data_demo" +name = "mfa-data-demo" version = "0.1.0" dependencies = [ "anyhow", diff --git a/code/mfa_data_demo/Cargo.toml b/code/mfa-data-demo/Cargo.toml similarity index 83% rename from code/mfa_data_demo/Cargo.toml rename to code/mfa-data-demo/Cargo.toml index 7e5acad..bc929b8 100644 --- a/code/mfa_data_demo/Cargo.toml +++ b/code/mfa-data-demo/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - "mfa_data_demo", + "mfa-data-demo", ] [profile.release] diff --git a/code/mfa_data_demo/api/mfa_data_demo:template.os-v0.wit b/code/mfa-data-demo/api/mfa-data-demo:template.os-v0.wit similarity index 100% rename from code/mfa_data_demo/api/mfa_data_demo:template.os-v0.wit rename to code/mfa-data-demo/api/mfa-data-demo:template.os-v0.wit diff --git a/code/mfa_data_demo/metadata.json b/code/mfa-data-demo/metadata.json similarity index 82% rename from code/mfa_data_demo/metadata.json rename to code/mfa-data-demo/metadata.json index 89abc56..9d31682 100644 --- a/code/mfa_data_demo/metadata.json +++ b/code/mfa-data-demo/metadata.json @@ -1,9 +1,9 @@ { - "name": "mfa_data_demo", + "name": "mfa-data-demo", "description": "", "image": "", "properties": { - "package_name": "mfa_data_demo", + "package_name": "mfa-data-demo", "current_version": "0.1.0", "publisher": "template.os", "mirrors": [], diff --git a/code/mfa_data_demo/mfa_data_demo/Cargo.toml b/code/mfa-data-demo/mfa-data-demo/Cargo.toml similarity index 95% rename from code/mfa_data_demo/mfa_data_demo/Cargo.toml rename to code/mfa-data-demo/mfa-data-demo/Cargo.toml index 72ffdba..8aece6f 100644 --- a/code/mfa_data_demo/mfa_data_demo/Cargo.toml +++ b/code/mfa-data-demo/mfa-data-demo/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mfa_data_demo" +name = "mfa-data-demo" version = "0.1.0" edition = "2021" diff --git a/code/mfa_data_demo/mfa_data_demo/src/lib.rs b/code/mfa-data-demo/mfa-data-demo/src/lib.rs similarity index 100% rename from code/mfa_data_demo/mfa_data_demo/src/lib.rs rename to code/mfa-data-demo/mfa-data-demo/src/lib.rs diff --git a/code/mfa_data_demo/pkg/manifest.json b/code/mfa-data-demo/pkg/manifest.json similarity index 66% rename from code/mfa_data_demo/pkg/manifest.json rename to code/mfa-data-demo/pkg/manifest.json index b90ec46..634d433 100644 --- a/code/mfa_data_demo/pkg/manifest.json +++ b/code/mfa-data-demo/pkg/manifest.json @@ -1,11 +1,11 @@ [ { - "process_name": "mfa_data_demo", - "process_wasm_path": "/mfa_data_demo.wasm", + "process_name": "mfa-data-demo", + "process_wasm_path": "/mfa-data-demo.wasm", "on_exit": "None", "request_networking": false, "request_capabilities": [ - "http_server:distro:sys" + "http-server:distro:sys" ], "grant_capabilities": [ "terminal:terminal:sys", diff --git a/code/mfa_data_demo/test/mfa_data_demo_test/Cargo.lock b/code/mfa-data-demo/test/mfa-data-demo-test/Cargo.lock similarity index 100% rename from code/mfa_data_demo/test/mfa_data_demo_test/Cargo.lock rename to code/mfa-data-demo/test/mfa-data-demo-test/Cargo.lock diff --git a/code/mfa_data_demo/test/mfa_data_demo_test/Cargo.toml b/code/mfa-data-demo/test/mfa-data-demo-test/Cargo.toml similarity index 79% rename from code/mfa_data_demo/test/mfa_data_demo_test/Cargo.toml rename to code/mfa-data-demo/test/mfa-data-demo-test/Cargo.toml index 6e94fad..a243215 100644 --- a/code/mfa_data_demo/test/mfa_data_demo_test/Cargo.toml +++ b/code/mfa-data-demo/test/mfa-data-demo-test/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - "mfa_data_demo_test", + "mfa-data-demo-test", ] [profile.release] diff --git a/code/mfa_data_demo/test/mfa_data_demo_test/api/mfa_data_demo_test:template.os-v0.wit b/code/mfa-data-demo/test/mfa-data-demo-test/api/mfa_data_demo_test:template.os-v0.wit similarity index 100% rename from code/mfa_data_demo/test/mfa_data_demo_test/api/mfa_data_demo_test:template.os-v0.wit rename to code/mfa-data-demo/test/mfa-data-demo-test/api/mfa_data_demo_test:template.os-v0.wit diff --git a/code/mfa_data_demo/test/mfa_data_demo_test/metadata.json b/code/mfa-data-demo/test/mfa-data-demo-test/metadata.json similarity index 66% rename from code/mfa_data_demo/test/mfa_data_demo_test/metadata.json rename to code/mfa-data-demo/test/mfa-data-demo-test/metadata.json index 80b053a..59c78fa 100644 --- a/code/mfa_data_demo/test/mfa_data_demo_test/metadata.json +++ b/code/mfa-data-demo/test/mfa-data-demo-test/metadata.json @@ -1,9 +1,9 @@ { - "name": "mfa_data_demo Test", - "description": "A test for mfa_data_demo.", + "name": "mfa-data-demo Test", + "description": "A test for mfa-data-demo.", "image": "", "properties": { - "package_name": "mfa_data_demo_test", + "package_name": "mfa-data-demo-test", "current_version": "0.1.0", "publisher": "template.os", "mirrors": [], @@ -12,7 +12,7 @@ }, "wit_version": 0, "dependencies": [ - "mfa_data_demo:template.os", + "mfa-data-demo:template.os", "tester:sys" ] }, diff --git a/code/mfa_data_demo/test/mfa_data_demo_test/mfa_data_demo_test/Cargo.toml b/code/mfa-data-demo/test/mfa-data-demo-test/mfa-data-demo-test/Cargo.toml similarity index 100% rename from code/mfa_data_demo/test/mfa_data_demo_test/mfa_data_demo_test/Cargo.toml rename to code/mfa-data-demo/test/mfa-data-demo-test/mfa-data-demo-test/Cargo.toml diff --git a/code/mfa_data_demo/test/mfa_data_demo_test/mfa_data_demo_test/src/lib.rs b/code/mfa-data-demo/test/mfa-data-demo-test/mfa-data-demo-test/src/lib.rs similarity index 81% rename from code/mfa_data_demo/test/mfa_data_demo_test/mfa_data_demo_test/src/lib.rs rename to code/mfa-data-demo/test/mfa-data-demo-test/mfa-data-demo-test/src/lib.rs index 731f0ac..9d1b667 100644 --- a/code/mfa_data_demo/test/mfa_data_demo_test/mfa_data_demo_test/src/lib.rs +++ b/code/mfa-data-demo/test/mfa-data-demo-test/mfa-data-demo-test/src/lib.rs @@ -17,7 +17,7 @@ fn handle_message(our: &Address) -> anyhow::Result<()> { let message = await_message()?; if !message.is_request() { - fail!("mfa_data_demo_test"); + fail!("mfa-data-demo-test"); } let source = message.source(); if our.node != source.node { @@ -31,24 +31,24 @@ fn handle_message(our: &Address) -> anyhow::Result<()> { .. }) = message.body().try_into()?; if node_names.len() != 1 { - fail!("mfa_data_demo_test"); + fail!("mfa-data-demo-test"); } let our_demo_address = - format!("{}@mfa_data_demo:mfa_data_demo:template.os", our.node).parse()?; + format!("{}@mfa-data-demo:mfa-data-demo:template.os", our.node).parse()?; let response = Request::new() .target(&our_demo_address) .body(MfaRequest::Hello("hello from test".to_string())) .send_and_await_response(5)??; if response.is_request() { - fail!("mfa_data_demo_test"); + fail!("mfa-data-demo-test"); }; let MfaResponse::Hello(ref text) = response.body().try_into()? else { - fail!("mfa_data_demo_test"); + fail!("mfa-data-demo-test"); }; if text != "hello to you too!" { - fail!("mfa_data_demo_test"); + fail!("mfa-data-demo-test"); } let response = Request::new() @@ -56,10 +56,10 @@ fn handle_message(our: &Address) -> anyhow::Result<()> { .body(MfaRequest::Goodbye) .send_and_await_response(5)??; if response.is_request() { - fail!("mfa_data_demo_test"); + fail!("mfa-data-demo-test"); }; let MfaResponse::Goodbye = response.body().try_into()? else { - fail!("mfa_data_demo_test"); + fail!("mfa-data-demo-test"); }; Response::new().body(TesterResponse::Run(Ok(()))).send()?; @@ -75,8 +75,8 @@ fn init(our: Address) { match handle_message(&our) { Ok(()) => {} Err(e) => { - println!("mfa_data_demo_test: error: {e:?}"); - fail!("mfa_data_demo_test"); + println!("mfa-data-demo-test: error: {e:?}"); + fail!("mfa-data-demo-test"); } }; } diff --git a/code/mfa_data_demo/test/mfa_data_demo_test/mfa_data_demo_test/src/tester_lib.rs b/code/mfa-data-demo/test/mfa-data-demo-test/mfa-data-demo-test/src/tester_lib.rs similarity index 100% rename from code/mfa_data_demo/test/mfa_data_demo_test/mfa_data_demo_test/src/tester_lib.rs rename to code/mfa-data-demo/test/mfa-data-demo-test/mfa-data-demo-test/src/tester_lib.rs diff --git a/code/mfa-data-demo/test/mfa-data-demo-test/pkg/manifest.json b/code/mfa-data-demo/test/mfa-data-demo-test/pkg/manifest.json new file mode 100644 index 0000000..3d38860 --- /dev/null +++ b/code/mfa-data-demo/test/mfa-data-demo-test/pkg/manifest.json @@ -0,0 +1,15 @@ +[ + { + "process_name": "mfa-data-demo-test", + "process_wasm_path": "/mfa-data-demo-test.wasm", + "on_exit": "Restart", + "request_networking": false, + "request_capabilities": [ + "mfa-data-demo:mfa-data-demo:template.os" + ], + "grant_capabilities": [ + "mfa-data-demo:mfa-data-demo:template.os" + ], + "public": true + } +] diff --git a/code/mfa_data_demo/test/tests.toml b/code/mfa-data-demo/test/tests.toml similarity index 90% rename from code/mfa_data_demo/test/tests.toml rename to code/mfa-data-demo/test/tests.toml index b33b7e9..d24cd52 100644 --- a/code/mfa_data_demo/test/tests.toml +++ b/code/mfa-data-demo/test/tests.toml @@ -10,7 +10,7 @@ setup_packages = [ { path = "..", run = true } ] setup_scripts = [] -test_package_paths = ["mfa_data_demo_test"] +test_package_paths = ["mfa-data-demo-test"] test_scripts = [] timeout_secs = 5 fakechain_router = 8545 diff --git a/code/mfa_data_demo/test/mfa_data_demo_test/pkg/manifest.json b/code/mfa_data_demo/test/mfa_data_demo_test/pkg/manifest.json deleted file mode 100644 index be478ae..0000000 --- a/code/mfa_data_demo/test/mfa_data_demo_test/pkg/manifest.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "process_name": "mfa_data_demo_test", - "process_wasm_path": "/mfa_data_demo_test.wasm", - "on_exit": "Restart", - "request_networking": false, - "request_capabilities": [ - "mfa_data_demo:mfa_data_demo:template.os" - ], - "grant_capabilities": [ - "mfa_data_demo:mfa_data_demo:template.os" - ], - "public": true - } -] From 517d905404052ab968b2cc604636815a41ae579a Mon Sep 17 00:00:00 2001 From: hosted-fornet Date: Tue, 12 Nov 2024 20:01:38 -0800 Subject: [PATCH 05/18] code: update mfa-fe-demo --- code/{mfa_fe_demo => mfa-fe-demo}/.gitignore | 0 .../mfa_fe_demo_test => mfa-fe-demo}/Cargo.lock | 6 +++--- code/{mfa_fe_demo => mfa-fe-demo}/Cargo.toml | 2 +- .../api/mfa-data-demo:template.os-v0.wit} | 0 .../curl-endpoint.sh | 0 code/{mfa_fe_demo => mfa-fe-demo}/metadata.json | 4 ++-- .../mfa-fe-demo}/Cargo.toml | 4 ++-- .../mfa-fe-demo}/src/icon | 0 .../mfa-fe-demo}/src/lib.rs | 0 .../pkg/manifest.json | 8 ++++---- .../pkg/ui/index.html | 2 +- .../test/mfa-fe-demo-test}/Cargo.lock | 2 +- .../test/mfa-fe-demo-test}/Cargo.toml | 2 +- .../api/mfa-data-demo-test:template.os-v0.wit} | 0 .../test/mfa-fe-demo-test}/metadata.json | 8 ++++---- .../mfa-fe-demo-test}/Cargo.toml | 2 +- .../mfa-fe-demo-test}/src/lib.rs | 16 ++++++++-------- .../mfa-fe-demo-test}/src/tester_lib.rs | 0 .../test/mfa-fe-demo-test/pkg/manifest.json | 15 +++++++++++++++ .../{mfa_fe_demo => mfa-fe-demo}/test/tests.toml | 2 +- .../test/mfa_fe_demo_test/pkg/manifest.json | 15 --------------- 21 files changed, 44 insertions(+), 44 deletions(-) rename code/{mfa_fe_demo => mfa-fe-demo}/.gitignore (100%) rename code/{mfa_fe_demo/test/mfa_fe_demo_test => mfa-fe-demo}/Cargo.lock (99%) rename code/{mfa_fe_demo => mfa-fe-demo}/Cargo.toml (84%) rename code/{mfa_fe_demo/api/mfa_data_demo:template.os-v0.wit => mfa-fe-demo/api/mfa-data-demo:template.os-v0.wit} (100%) rename code/{mfa_fe_demo => mfa-fe-demo}/curl-endpoint.sh (100%) rename code/{mfa_fe_demo => mfa-fe-demo}/metadata.json (83%) rename code/{mfa_fe_demo/mfa_fe_demo => mfa-fe-demo/mfa-fe-demo}/Cargo.toml (89%) rename code/{mfa_fe_demo/mfa_fe_demo => mfa-fe-demo/mfa-fe-demo}/src/icon (100%) rename code/{mfa_fe_demo/mfa_fe_demo => mfa-fe-demo/mfa-fe-demo}/src/lib.rs (100%) rename code/{mfa_fe_demo => mfa-fe-demo}/pkg/manifest.json (68%) rename code/{mfa_fe_demo => mfa-fe-demo}/pkg/ui/index.html (94%) rename code/{mfa_fe_demo => mfa-fe-demo/test/mfa-fe-demo-test}/Cargo.lock (99%) rename code/{mfa_fe_demo/test/mfa_fe_demo_test => mfa-fe-demo/test/mfa-fe-demo-test}/Cargo.toml (81%) rename code/{mfa_fe_demo/test/mfa_fe_demo_test/api/mfa_data_demo_test:template.os-v0.wit => mfa-fe-demo/test/mfa-fe-demo-test/api/mfa-data-demo-test:template.os-v0.wit} (100%) rename code/{mfa_fe_demo/test/mfa_fe_demo_test => mfa-fe-demo/test/mfa-fe-demo-test}/metadata.json (67%) rename code/{mfa_fe_demo/test/mfa_fe_demo_test/mfa_fe_demo_test => mfa-fe-demo/test/mfa-fe-demo-test/mfa-fe-demo-test}/Cargo.toml (94%) rename code/{mfa_fe_demo/test/mfa_fe_demo_test/mfa_fe_demo_test => mfa-fe-demo/test/mfa-fe-demo-test/mfa-fe-demo-test}/src/lib.rs (83%) rename code/{mfa_fe_demo/test/mfa_fe_demo_test/mfa_fe_demo_test => mfa-fe-demo/test/mfa-fe-demo-test/mfa-fe-demo-test}/src/tester_lib.rs (100%) create mode 100644 code/mfa-fe-demo/test/mfa-fe-demo-test/pkg/manifest.json rename code/{mfa_fe_demo => mfa-fe-demo}/test/tests.toml (91%) delete mode 100644 code/mfa_fe_demo/test/mfa_fe_demo_test/pkg/manifest.json diff --git a/code/mfa_fe_demo/.gitignore b/code/mfa-fe-demo/.gitignore similarity index 100% rename from code/mfa_fe_demo/.gitignore rename to code/mfa-fe-demo/.gitignore diff --git a/code/mfa_fe_demo/test/mfa_fe_demo_test/Cargo.lock b/code/mfa-fe-demo/Cargo.lock similarity index 99% rename from code/mfa_fe_demo/test/mfa_fe_demo_test/Cargo.lock rename to code/mfa-fe-demo/Cargo.lock index 18afd20..f8435ec 100644 --- a/code/mfa_fe_demo/test/mfa_fe_demo_test/Cargo.lock +++ b/code/mfa-fe-demo/Cargo.lock @@ -1448,8 +1448,8 @@ dependencies = [ [[package]] name = "kinode_process_lib" -version = "0.9.0" -source = "git+https://github.com/kinode-dao/process_lib?tag=v0.9.0#284f202376b3cd3ce0c03aa660a006fc6187f236" +version = "0.9.4" +source = "git+https://github.com/kinode-dao/process_lib?rev=778457a#778457ae52c934fd17e0e846127a9472a8e03170" dependencies = [ "alloy", "alloy-primitives", @@ -1530,7 +1530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] -name = "mfa_fe_demo_test" +name = "mfa-fe-demo" version = "0.1.0" dependencies = [ "anyhow", diff --git a/code/mfa_fe_demo/Cargo.toml b/code/mfa-fe-demo/Cargo.toml similarity index 84% rename from code/mfa_fe_demo/Cargo.toml rename to code/mfa-fe-demo/Cargo.toml index 7d4645d..37b6e5c 100644 --- a/code/mfa_fe_demo/Cargo.toml +++ b/code/mfa-fe-demo/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - "mfa_fe_demo", + "mfa-fe-demo", ] [profile.release] diff --git a/code/mfa_fe_demo/api/mfa_data_demo:template.os-v0.wit b/code/mfa-fe-demo/api/mfa-data-demo:template.os-v0.wit similarity index 100% rename from code/mfa_fe_demo/api/mfa_data_demo:template.os-v0.wit rename to code/mfa-fe-demo/api/mfa-data-demo:template.os-v0.wit diff --git a/code/mfa_fe_demo/curl-endpoint.sh b/code/mfa-fe-demo/curl-endpoint.sh similarity index 100% rename from code/mfa_fe_demo/curl-endpoint.sh rename to code/mfa-fe-demo/curl-endpoint.sh diff --git a/code/mfa_fe_demo/metadata.json b/code/mfa-fe-demo/metadata.json similarity index 83% rename from code/mfa_fe_demo/metadata.json rename to code/mfa-fe-demo/metadata.json index 9396446..762b7bc 100644 --- a/code/mfa_fe_demo/metadata.json +++ b/code/mfa-fe-demo/metadata.json @@ -1,9 +1,9 @@ { - "name": "mfa_fe_demo", + "name": "mfa-fe-demo", "description": "", "image": "", "properties": { - "package_name": "mfa_fe_demo", + "package_name": "mfa-fe-demo", "current_version": "0.1.0", "publisher": "template.os", "mirrors": [], diff --git a/code/mfa_fe_demo/mfa_fe_demo/Cargo.toml b/code/mfa-fe-demo/mfa-fe-demo/Cargo.toml similarity index 89% rename from code/mfa_fe_demo/mfa_fe_demo/Cargo.toml rename to code/mfa-fe-demo/mfa-fe-demo/Cargo.toml index ae215d1..f3eb5c1 100644 --- a/code/mfa_fe_demo/mfa_fe_demo/Cargo.toml +++ b/code/mfa-fe-demo/mfa-fe-demo/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "mfa_fe_demo" +name = "mfa-fe-demo" version = "0.1.0" edition = "2021" [dependencies] anyhow = "1" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.9.0" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "778457a" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/code/mfa_fe_demo/mfa_fe_demo/src/icon b/code/mfa-fe-demo/mfa-fe-demo/src/icon similarity index 100% rename from code/mfa_fe_demo/mfa_fe_demo/src/icon rename to code/mfa-fe-demo/mfa-fe-demo/src/icon diff --git a/code/mfa_fe_demo/mfa_fe_demo/src/lib.rs b/code/mfa-fe-demo/mfa-fe-demo/src/lib.rs similarity index 100% rename from code/mfa_fe_demo/mfa_fe_demo/src/lib.rs rename to code/mfa-fe-demo/mfa-fe-demo/src/lib.rs diff --git a/code/mfa_fe_demo/pkg/manifest.json b/code/mfa-fe-demo/pkg/manifest.json similarity index 68% rename from code/mfa_fe_demo/pkg/manifest.json rename to code/mfa-fe-demo/pkg/manifest.json index 119f2cc..deddcea 100644 --- a/code/mfa_fe_demo/pkg/manifest.json +++ b/code/mfa-fe-demo/pkg/manifest.json @@ -1,16 +1,16 @@ [ { - "process_name": "mfa_fe_demo", - "process_wasm_path": "/mfa_fe_demo.wasm", + "process_name": "mfa-fe-demo", + "process_wasm_path": "/mfa-fe-demo.wasm", "on_exit": "None", "request_networking": false, "request_capabilities": [ "homepage:homepage:sys", - "http_server:distro:sys", + "http-server:distro:sys", "vfs:distro:sys" ], "grant_capabilities": [ - "http_server:distro:sys", + "http-server:distro:sys", "terminal:terminal:sys", "tester:tester:sys", "vfs:distro:sys" diff --git a/code/mfa_fe_demo/pkg/ui/index.html b/code/mfa-fe-demo/pkg/ui/index.html similarity index 94% rename from code/mfa_fe_demo/pkg/ui/index.html rename to code/mfa-fe-demo/pkg/ui/index.html index d6025cd..cea1ded 100644 --- a/code/mfa_fe_demo/pkg/ui/index.html +++ b/code/mfa-fe-demo/pkg/ui/index.html @@ -15,7 +15,7 @@

This is a website!