From 9fa9fa23039f079ee69a0ec394a2564c88d7cc59 Mon Sep 17 00:00:00 2001 From: dr-frmr Date: Tue, 10 Dec 2024 17:15:02 -0500 Subject: [PATCH] update process_lib version for all, fix printout issues in standard_host_v1 --- Cargo.lock | 2 +- kinode/packages/app-store/Cargo.lock | 2 +- .../packages/app-store/app-store/Cargo.toml | 2 +- kinode/packages/app-store/chain/Cargo.toml | 2 +- kinode/packages/app-store/download/Cargo.toml | 2 +- .../packages/app-store/downloads/Cargo.toml | 2 +- .../packages/app-store/ft-worker/Cargo.toml | 2 +- kinode/packages/app-store/install/Cargo.toml | 2 +- .../packages/app-store/uninstall/Cargo.toml | 2 +- kinode/packages/chess/Cargo.lock | 2 +- kinode/packages/chess/chess/Cargo.toml | 2 +- kinode/packages/contacts/Cargo.lock | 2 +- kinode/packages/contacts/contacts/Cargo.toml | 2 +- kinode/packages/contacts/get-names/Cargo.toml | 2 +- kinode/packages/homepage/Cargo.lock | 2 +- kinode/packages/homepage/homepage/Cargo.toml | 2 +- kinode/packages/kino-updates/Cargo.lock | 2 +- kinode/packages/kino-updates/blog/Cargo.toml | 2 +- kinode/packages/kino-updates/globe/Cargo.toml | 2 +- kinode/packages/kns-indexer/Cargo.lock | 2 +- .../packages/kns-indexer/get-block/Cargo.toml | 2 +- .../kns-indexer/kns-indexer/Cargo.toml | 2 +- kinode/packages/kns-indexer/state/Cargo.toml | 2 +- kinode/packages/settings/Cargo.lock | 2 +- kinode/packages/settings/settings/Cargo.toml | 2 +- kinode/packages/terminal/Cargo.lock | 50 ++++++------------- kinode/packages/terminal/alias/Cargo.toml | 2 +- kinode/packages/terminal/cat/Cargo.toml | 2 +- kinode/packages/terminal/echo/Cargo.toml | 2 +- kinode/packages/terminal/help/Cargo.toml | 2 +- kinode/packages/terminal/hi/Cargo.toml | 2 +- kinode/packages/terminal/kfetch/Cargo.toml | 2 +- kinode/packages/terminal/kill/Cargo.toml | 2 +- kinode/packages/terminal/m/Cargo.toml | 2 +- .../terminal/net-diagnostics/Cargo.toml | 2 +- kinode/packages/terminal/peer/Cargo.toml | 2 +- kinode/packages/terminal/peers/Cargo.toml | 2 +- kinode/packages/terminal/terminal/Cargo.toml | 2 +- kinode/packages/terminal/top/Cargo.toml | 2 +- kinode/packages/tester/Cargo.lock | 2 +- kinode/packages/tester/tester/Cargo.toml | 2 +- kinode/src/kernel/process.rs | 12 +++-- kinode/src/kernel/standard_host_v1.rs | 27 ++++++---- 43 files changed, 80 insertions(+), 89 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 67ec637e..2b60779e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3944,7 +3944,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=6ed0cda#6ed0cda955de018f49bd38251810c68415b20e54" +source = "git+https://github.com/kinode-dao/process_lib?rev=0666d2c#0666d2c1883583370122c118e1a9ddecba1dbbbe" dependencies = [ "alloy 0.1.4", "alloy-primitives 0.7.7", diff --git a/kinode/packages/app-store/Cargo.lock b/kinode/packages/app-store/Cargo.lock index eecbae25..e7a3a5ad 100644 --- a/kinode/packages/app-store/Cargo.lock +++ b/kinode/packages/app-store/Cargo.lock @@ -1657,7 +1657,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=6ed0cda#6ed0cda955de018f49bd38251810c68415b20e54" +source = "git+https://github.com/kinode-dao/process_lib?rev=0666d2c#0666d2c1883583370122c118e1a9ddecba1dbbbe" dependencies = [ "alloy", "alloy-primitives 0.7.7", diff --git a/kinode/packages/app-store/app-store/Cargo.toml b/kinode/packages/app-store/app-store/Cargo.toml index 3b1ae7a9..045b3f6e 100644 --- a/kinode/packages/app-store/app-store/Cargo.toml +++ b/kinode/packages/app-store/app-store/Cargo.toml @@ -11,7 +11,7 @@ alloy-primitives = "0.7.6" alloy-sol-types = "0.7.6" anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rand = "0.8" serde = { version = "1.0", features = ["derive"] } diff --git a/kinode/packages/app-store/chain/Cargo.toml b/kinode/packages/app-store/chain/Cargo.toml index b2b2a8f4..bd168d48 100644 --- a/kinode/packages/app-store/chain/Cargo.toml +++ b/kinode/packages/app-store/chain/Cargo.toml @@ -11,7 +11,7 @@ alloy-primitives = "0.7.6" alloy-sol-types = "0.7.6" anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rand = "0.8" serde = { version = "1.0", features = ["derive"] } diff --git a/kinode/packages/app-store/download/Cargo.toml b/kinode/packages/app-store/download/Cargo.toml index 9422c731..39d9d1c9 100644 --- a/kinode/packages/app-store/download/Cargo.toml +++ b/kinode/packages/app-store/download/Cargo.toml @@ -8,7 +8,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } 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/kinode/packages/app-store/downloads/Cargo.toml b/kinode/packages/app-store/downloads/Cargo.toml index 5ac587d9..f3ec2489 100644 --- a/kinode/packages/app-store/downloads/Cargo.toml +++ b/kinode/packages/app-store/downloads/Cargo.toml @@ -8,7 +8,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rand = "0.8" serde = { version = "1.0", features = ["derive"] } diff --git a/kinode/packages/app-store/ft-worker/Cargo.toml b/kinode/packages/app-store/ft-worker/Cargo.toml index 235a7270..43ce299e 100644 --- a/kinode/packages/app-store/ft-worker/Cargo.toml +++ b/kinode/packages/app-store/ft-worker/Cargo.toml @@ -9,7 +9,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } process_macros = { git = "https://github.com/kinode-dao/process_macros", rev = "626e501" } rand = "0.8" serde = { version = "1.0", features = ["derive"] } diff --git a/kinode/packages/app-store/install/Cargo.toml b/kinode/packages/app-store/install/Cargo.toml index 981eb8ed..c08725f6 100644 --- a/kinode/packages/app-store/install/Cargo.toml +++ b/kinode/packages/app-store/install/Cargo.toml @@ -8,7 +8,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } 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/kinode/packages/app-store/uninstall/Cargo.toml b/kinode/packages/app-store/uninstall/Cargo.toml index bb848034..1b285d50 100644 --- a/kinode/packages/app-store/uninstall/Cargo.toml +++ b/kinode/packages/app-store/uninstall/Cargo.toml @@ -8,7 +8,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } 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/kinode/packages/chess/Cargo.lock b/kinode/packages/chess/Cargo.lock index 243fa0bd..0e07de90 100644 --- a/kinode/packages/chess/Cargo.lock +++ b/kinode/packages/chess/Cargo.lock @@ -1560,7 +1560,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=6ed0cda#6ed0cda955de018f49bd38251810c68415b20e54" +source = "git+https://github.com/kinode-dao/process_lib?rev=0666d2c#0666d2c1883583370122c118e1a9ddecba1dbbbe" dependencies = [ "alloy", "alloy-primitives 0.7.7", diff --git a/kinode/packages/chess/chess/Cargo.toml b/kinode/packages/chess/chess/Cargo.toml index cb10abfd..9987234f 100644 --- a/kinode/packages/chess/chess/Cargo.toml +++ b/kinode/packages/chess/chess/Cargo.toml @@ -9,7 +9,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } pleco = "0.5" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/packages/contacts/Cargo.lock b/kinode/packages/contacts/Cargo.lock index 26d5939f..142dd43b 100644 --- a/kinode/packages/contacts/Cargo.lock +++ b/kinode/packages/contacts/Cargo.lock @@ -1515,7 +1515,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=6ed0cda#6ed0cda955de018f49bd38251810c68415b20e54" +source = "git+https://github.com/kinode-dao/process_lib?rev=0666d2c#0666d2c1883583370122c118e1a9ddecba1dbbbe" dependencies = [ "alloy", "alloy-primitives 0.7.7", diff --git a/kinode/packages/contacts/contacts/Cargo.toml b/kinode/packages/contacts/contacts/Cargo.toml index 22d8be71..51476a96 100644 --- a/kinode/packages/contacts/contacts/Cargo.toml +++ b/kinode/packages/contacts/contacts/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" simulation-mode = [] [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } 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/kinode/packages/contacts/get-names/Cargo.toml b/kinode/packages/contacts/get-names/Cargo.toml index 7b24e5d2..bf7650b1 100644 --- a/kinode/packages/contacts/get-names/Cargo.toml +++ b/kinode/packages/contacts/get-names/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } 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/kinode/packages/homepage/Cargo.lock b/kinode/packages/homepage/Cargo.lock index ffc370ca..3098a91b 100644 --- a/kinode/packages/homepage/Cargo.lock +++ b/kinode/packages/homepage/Cargo.lock @@ -1504,7 +1504,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=6ed0cda#6ed0cda955de018f49bd38251810c68415b20e54" +source = "git+https://github.com/kinode-dao/process_lib?rev=0666d2c#0666d2c1883583370122c118e1a9ddecba1dbbbe" dependencies = [ "alloy", "alloy-primitives 0.7.7", diff --git a/kinode/packages/homepage/homepage/Cargo.toml b/kinode/packages/homepage/homepage/Cargo.toml index b547bba0..e368c223 100644 --- a/kinode/packages/homepage/homepage/Cargo.toml +++ b/kinode/packages/homepage/homepage/Cargo.toml @@ -9,7 +9,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.24.0" diff --git a/kinode/packages/kino-updates/Cargo.lock b/kinode/packages/kino-updates/Cargo.lock index 5f335c62..49d5812a 100644 --- a/kinode/packages/kino-updates/Cargo.lock +++ b/kinode/packages/kino-updates/Cargo.lock @@ -1516,7 +1516,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=6ed0cda#6ed0cda955de018f49bd38251810c68415b20e54" +source = "git+https://github.com/kinode-dao/process_lib?rev=0666d2c#0666d2c1883583370122c118e1a9ddecba1dbbbe" dependencies = [ "alloy", "alloy-primitives 0.7.7", diff --git a/kinode/packages/kino-updates/blog/Cargo.toml b/kinode/packages/kino-updates/blog/Cargo.toml index de7f49ee..611b1627 100644 --- a/kinode/packages/kino-updates/blog/Cargo.toml +++ b/kinode/packages/kino-updates/blog/Cargo.toml @@ -9,7 +9,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" url = "2.5.0" diff --git a/kinode/packages/kino-updates/globe/Cargo.toml b/kinode/packages/kino-updates/globe/Cargo.toml index 3f4c296a..49507cd7 100644 --- a/kinode/packages/kino-updates/globe/Cargo.toml +++ b/kinode/packages/kino-updates/globe/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" simulation-mode = [] [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" url = "2.5.0" diff --git a/kinode/packages/kns-indexer/Cargo.lock b/kinode/packages/kns-indexer/Cargo.lock index 2dccb0b6..b32962fc 100644 --- a/kinode/packages/kns-indexer/Cargo.lock +++ b/kinode/packages/kns-indexer/Cargo.lock @@ -1502,7 +1502,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=6ed0cda#6ed0cda955de018f49bd38251810c68415b20e54" +source = "git+https://github.com/kinode-dao/process_lib?rev=0666d2c#0666d2c1883583370122c118e1a9ddecba1dbbbe" dependencies = [ "alloy", "alloy-primitives 0.7.7", diff --git a/kinode/packages/kns-indexer/get-block/Cargo.toml b/kinode/packages/kns-indexer/get-block/Cargo.toml index 8661a70a..375cdf06 100644 --- a/kinode/packages/kns-indexer/get-block/Cargo.toml +++ b/kinode/packages/kns-indexer/get-block/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" simulation-mode = [] [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.24.0" diff --git a/kinode/packages/kns-indexer/kns-indexer/Cargo.toml b/kinode/packages/kns-indexer/kns-indexer/Cargo.toml index 78d25be9..c52a936a 100644 --- a/kinode/packages/kns-indexer/kns-indexer/Cargo.toml +++ b/kinode/packages/kns-indexer/kns-indexer/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0" alloy-primitives = "0.7.0" alloy-sol-types = "0.7.0" hex = "0.4.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } rmp-serde = "1.1.2" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/packages/kns-indexer/state/Cargo.toml b/kinode/packages/kns-indexer/state/Cargo.toml index 35e98be7..96185d0f 100644 --- a/kinode/packages/kns-indexer/state/Cargo.toml +++ b/kinode/packages/kns-indexer/state/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" simulation-mode = [] [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.24.0" diff --git a/kinode/packages/settings/Cargo.lock b/kinode/packages/settings/Cargo.lock index 9a24385c..c8a7b0bb 100644 --- a/kinode/packages/settings/Cargo.lock +++ b/kinode/packages/settings/Cargo.lock @@ -1492,7 +1492,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=6ed0cda#6ed0cda955de018f49bd38251810c68415b20e54" +source = "git+https://github.com/kinode-dao/process_lib?rev=0666d2c#0666d2c1883583370122c118e1a9ddecba1dbbbe" dependencies = [ "alloy", "alloy-primitives 0.7.7", diff --git a/kinode/packages/settings/settings/Cargo.toml b/kinode/packages/settings/settings/Cargo.toml index 195bd310..5c88d850 100644 --- a/kinode/packages/settings/settings/Cargo.toml +++ b/kinode/packages/settings/settings/Cargo.toml @@ -10,7 +10,7 @@ simulation-mode = [] anyhow = "1.0" base64 = "0.22.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } rmp-serde = "1.2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/packages/terminal/Cargo.lock b/kinode/packages/terminal/Cargo.lock index 42f581e0..bc081eec 100644 --- a/kinode/packages/terminal/Cargo.lock +++ b/kinode/packages/terminal/Cargo.lock @@ -31,7 +31,7 @@ name = "alias" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "serde", "serde_json", "wit-bindgen", @@ -834,7 +834,7 @@ name = "cat" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "serde", "serde_json", "wit-bindgen", @@ -1079,7 +1079,7 @@ dependencies = [ name = "echo" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "wit-bindgen", ] @@ -1381,7 +1381,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" name = "help" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "wit-bindgen", ] @@ -1410,7 +1410,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" name = "hi" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "serde", "serde_json", "wit-bindgen", @@ -1639,7 +1639,7 @@ name = "kfetch" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "rmp-serde", "serde", "serde_json", @@ -1651,7 +1651,7 @@ name = "kill" version = "0.1.0" dependencies = [ "anyhow", - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "serde", "serde_json", "wit-bindgen", @@ -1660,29 +1660,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=6ed0cda#6ed0cda955de018f49bd38251810c68415b20e54" -dependencies = [ - "alloy", - "alloy-primitives 0.7.7", - "alloy-sol-macro", - "alloy-sol-types", - "anyhow", - "bincode", - "http", - "mime_guess", - "rand", - "rmp-serde", - "serde", - "serde_json", - "thiserror", - "url", - "wit-bindgen", -] - -[[package]] -name = "kinode_process_lib" -version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=8a5b040#8a5b040dd699ae69d5bc1826fdd6e0bd5d84e766" +source = "git+https://github.com/kinode-dao/process_lib?rev=0666d2c#0666d2c1883583370122c118e1a9ddecba1dbbbe" dependencies = [ "alloy", "alloy-primitives 0.7.7", @@ -1762,7 +1740,7 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=8a5b040)", + "kinode_process_lib", "regex", "serde", "serde_json", @@ -1833,7 +1811,7 @@ dependencies = [ name = "net-diagnostics" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "rmp-serde", "serde", "wit-bindgen", @@ -2006,7 +1984,7 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" name = "peer" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "rmp-serde", "serde", "wit-bindgen", @@ -2016,7 +1994,7 @@ dependencies = [ name = "peers" version = "0.1.0" dependencies = [ - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "rmp-serde", "serde", "wit-bindgen", @@ -2769,7 +2747,7 @@ version = "0.1.1" dependencies = [ "anyhow", "bincode", - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "rand", "regex", "serde", @@ -2915,7 +2893,7 @@ version = "0.2.0" dependencies = [ "anyhow", "clap", - "kinode_process_lib 0.10.0 (git+https://github.com/kinode-dao/process_lib?rev=1fe8612)", + "kinode_process_lib", "serde", "serde_json", "wit-bindgen", diff --git a/kinode/packages/terminal/alias/Cargo.toml b/kinode/packages/terminal/alias/Cargo.toml index 35cf72b8..a8e2dfb0 100644 --- a/kinode/packages/terminal/alias/Cargo.toml +++ b/kinode/packages/terminal/alias/Cargo.toml @@ -8,7 +8,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.24.0" diff --git a/kinode/packages/terminal/cat/Cargo.toml b/kinode/packages/terminal/cat/Cargo.toml index ba43bc47..85871c1d 100644 --- a/kinode/packages/terminal/cat/Cargo.toml +++ b/kinode/packages/terminal/cat/Cargo.toml @@ -8,7 +8,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.24.0" diff --git a/kinode/packages/terminal/echo/Cargo.toml b/kinode/packages/terminal/echo/Cargo.toml index 3202b5dd..c1bbed12 100644 --- a/kinode/packages/terminal/echo/Cargo.toml +++ b/kinode/packages/terminal/echo/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" simulation-mode = [] [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } wit-bindgen = "0.24.0" [lib] diff --git a/kinode/packages/terminal/help/Cargo.toml b/kinode/packages/terminal/help/Cargo.toml index f0ddeee0..b3fbdeb8 100644 --- a/kinode/packages/terminal/help/Cargo.toml +++ b/kinode/packages/terminal/help/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" simulation-mode = [] [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } wit-bindgen = "0.24.0" [lib] diff --git a/kinode/packages/terminal/hi/Cargo.toml b/kinode/packages/terminal/hi/Cargo.toml index 2e09014c..b819ecd5 100644 --- a/kinode/packages/terminal/hi/Cargo.toml +++ b/kinode/packages/terminal/hi/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" simulation-mode = [] [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.24.0" diff --git a/kinode/packages/terminal/kfetch/Cargo.toml b/kinode/packages/terminal/kfetch/Cargo.toml index 50170cea..7d19aac1 100644 --- a/kinode/packages/terminal/kfetch/Cargo.toml +++ b/kinode/packages/terminal/kfetch/Cargo.toml @@ -8,7 +8,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } rmp-serde = "1.1.2" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/packages/terminal/kill/Cargo.toml b/kinode/packages/terminal/kill/Cargo.toml index 7fe76bb7..ab383fd7 100644 --- a/kinode/packages/terminal/kill/Cargo.toml +++ b/kinode/packages/terminal/kill/Cargo.toml @@ -8,7 +8,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.24.0" diff --git a/kinode/packages/terminal/m/Cargo.toml b/kinode/packages/terminal/m/Cargo.toml index 0f2da38c..454956f3 100644 --- a/kinode/packages/terminal/m/Cargo.toml +++ b/kinode/packages/terminal/m/Cargo.toml @@ -9,7 +9,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" clap = "4.4" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } regex = "1.10.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/kinode/packages/terminal/net-diagnostics/Cargo.toml b/kinode/packages/terminal/net-diagnostics/Cargo.toml index ac414457..b1ce94b0 100644 --- a/kinode/packages/terminal/net-diagnostics/Cargo.toml +++ b/kinode/packages/terminal/net-diagnostics/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" simulation-mode = [] [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } rmp-serde = "1.1.2" serde = { version = "1.0", features = ["derive"] } wit-bindgen = "0.24.0" diff --git a/kinode/packages/terminal/peer/Cargo.toml b/kinode/packages/terminal/peer/Cargo.toml index 314f8b80..3080b9eb 100644 --- a/kinode/packages/terminal/peer/Cargo.toml +++ b/kinode/packages/terminal/peer/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" simulation-mode = [] [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } rmp-serde = "1.1.2" serde = { version = "1.0", features = ["derive"] } wit-bindgen = "0.24.0" diff --git a/kinode/packages/terminal/peers/Cargo.toml b/kinode/packages/terminal/peers/Cargo.toml index 1bb52582..2bacd8a8 100644 --- a/kinode/packages/terminal/peers/Cargo.toml +++ b/kinode/packages/terminal/peers/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" simulation-mode = [] [dependencies] -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } rmp-serde = "1.1.2" serde = { version = "1.0", features = ["derive"] } wit-bindgen = "0.24.0" diff --git a/kinode/packages/terminal/terminal/Cargo.toml b/kinode/packages/terminal/terminal/Cargo.toml index cf505e43..062f79a6 100644 --- a/kinode/packages/terminal/terminal/Cargo.toml +++ b/kinode/packages/terminal/terminal/Cargo.toml @@ -9,7 +9,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } rand = "0.8" regex = "1.10.3" serde = { version = "1.0", features = ["derive"] } diff --git a/kinode/packages/terminal/top/Cargo.toml b/kinode/packages/terminal/top/Cargo.toml index 650c3b24..9f842e95 100644 --- a/kinode/packages/terminal/top/Cargo.toml +++ b/kinode/packages/terminal/top/Cargo.toml @@ -9,7 +9,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" clap = "4.4" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" wit-bindgen = "0.24.0" diff --git a/kinode/packages/tester/Cargo.lock b/kinode/packages/tester/Cargo.lock index bf1df465..a5ac50f1 100644 --- a/kinode/packages/tester/Cargo.lock +++ b/kinode/packages/tester/Cargo.lock @@ -1492,7 +1492,7 @@ dependencies = [ [[package]] name = "kinode_process_lib" version = "0.10.0" -source = "git+https://github.com/kinode-dao/process_lib?rev=6ed0cda#6ed0cda955de018f49bd38251810c68415b20e54" +source = "git+https://github.com/kinode-dao/process_lib?rev=0666d2c#0666d2c1883583370122c118e1a9ddecba1dbbbe" dependencies = [ "alloy", "alloy-primitives 0.7.7", diff --git a/kinode/packages/tester/tester/Cargo.toml b/kinode/packages/tester/tester/Cargo.toml index 4ad5b68a..74da02f8 100644 --- a/kinode/packages/tester/tester/Cargo.toml +++ b/kinode/packages/tester/tester/Cargo.toml @@ -9,7 +9,7 @@ simulation-mode = [] [dependencies] anyhow = "1.0" bincode = "1.3.3" -kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "6ed0cda" } +kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "0666d2c" } 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/kinode/src/kernel/process.rs b/kinode/src/kernel/process.rs index 0450cd78..c5eee981 100644 --- a/kinode/src/kernel/process.rs +++ b/kinode/src/kernel/process.rs @@ -272,6 +272,7 @@ async fn make_component_v1( Err(e) => { t::Printout::new( 0, + t::KERNEL_PROCESS_ID.clone(), format!("kernel: process {our_process_id} failed to instantiate: {e:?}"), ) .send(&send_to_terminal) @@ -432,9 +433,13 @@ pub async fn make_process_loop( // the process will run until it returns from init() or crashes match bindings.call_init(&mut store, &our.to_string()).await { Ok(()) => { - t::Printout::new(1, format!("process {our} returned without error")) - .send(&send_to_terminal) - .await; + t::Printout::new( + 1, + t::KERNEL_PROCESS_ID.clone(), + format!("process {our} returned without error"), + ) + .send(&send_to_terminal) + .await; } Err(e) => { let stderr = wasi_stderr.contents().into(); @@ -446,6 +451,7 @@ pub async fn make_process_loop( }; t::Printout::new( 0, + t::KERNEL_PROCESS_ID.clone(), format!("\x1b[38;5;196mprocess {our} ended with error:\x1b[0m\n{output}"), ) .send(&send_to_terminal) diff --git a/kinode/src/kernel/standard_host_v1.rs b/kinode/src/kernel/standard_host_v1.rs index 3b9f05ac..9d91d2ba 100644 --- a/kinode/src/kernel/standard_host_v1.rs +++ b/kinode/src/kernel/standard_host_v1.rs @@ -6,13 +6,18 @@ use lib::v1::wit::Host as StandardHost; use ring::signature::{self, KeyPair}; async fn print_debug(proc: &process::ProcessState, content: &str) { - let _ = proc - .send_to_terminal - .send(t::Printout { - verbosity: 2, - content: format!("{}: {}", proc.metadata.our.process, content), - }) - .await; + t::Printout::new( + 2, + &proc.metadata.our.process, + format!( + "{}:{}: {}", + proc.metadata.our.process.package(), + proc.metadata.our.process.publisher(), + content + ), + ) + .send(&proc.send_to_terminal) + .await; } impl process::ProcessState { @@ -342,6 +347,7 @@ impl process::ProcessState { let Some(ref prompting_message) = self.prompting_message else { t::Printout::new( 0, + KERNEL_PROCESS_ID.clone(), format!("kernel: need non-None prompting_message to handle Response {response:?}"), ) .send(&self.send_to_terminal) @@ -457,15 +463,16 @@ impl StandardHost for process::ProcessWasiV1 { async fn print_to_terminal(&mut self, verbosity: u8, content: String) -> Result<()> { self.process .send_to_terminal - .send(t::Printout { + .send(t::Printout::new( verbosity, - content: format!( + &self.process.metadata.our.process, + format!( "{}:{}: {}", self.process.metadata.our.process.package(), self.process.metadata.our.process.publisher(), content ), - }) + )) .await .map_err(|e| anyhow::anyhow!("fatal: couldn't send to terminal: {e:?}")) }