fix(deps): update all dependencies

Signed-off-by: kjuulh <contact@kjuulh.io>

Cargo.lock

@@ -135,9 +135,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.83"
+version = "0.1.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -163,16 +163,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
- "axum-core",
+ "axum-core 0.4.5",
  "bytes",
  "futures-util",
  "http",
  "http-body",
  "http-body-util",
+ "itoa",
+ "matchit 0.7.3",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper",
+ "tower 0.5.2",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8"
+dependencies = [
+ "axum-core 0.5.0",
+ "bytes",
+ "form_urlencoded",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
  "hyper",
  "hyper-util",
  "itoa",
- "matchit",
+ "matchit 0.8.4",
  "memchr",
  "mime",
  "percent-encoding",
@@ -182,9 +209,9 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sync_wrapper 1.0.2",
+ "sync_wrapper",
  "tokio",
- "tower 0.5.1",
+ "tower 0.5.2",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -205,7 +232,26 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper 1.0.2",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "rustversion",
+ "sync_wrapper",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -374,7 +420,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "axum",
+ "axum 0.8.1",
  "bytes",
  "clap",
  "dirs 5.0.1",
@@ -382,6 +428,7 @@ dependencies = [
  "futures",
  "nodrift",
  "notmad",
+ "petname",
  "prost",
  "prost-types",
  "reqwest",
@@ -1557,6 +1604,12 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
+[[package]]
+name = "matchit"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
+
 [[package]]
 name = "maybe-owned"
 version = "0.3.4"
@@ -1781,6 +1834,20 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
+[[package]]
+name = "petname"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cd31dcfdbbd7431a807ef4df6edd6473228e94d5c805e8cf671227a21bad068"
+dependencies = [
+ "anyhow",
+ "clap",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "rand",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.1.7"
@@ -1996,9 +2063,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.9"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -2025,10 +2092,11 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.2",
+ "sync_wrapper",
  "tokio",
  "tokio-native-tls",
  "tokio-util",
+ "tower 0.5.2",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -2395,12 +2463,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -2641,7 +2703,7 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
 dependencies = [
  "async-stream",
  "async-trait",
- "axum",
+ "axum 0.7.9",
  "base64 0.22.1",
  "bytes",
  "h2",
@@ -2688,14 +2750,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
  "pin-project-lite",
- "sync_wrapper 0.1.2",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -3409,7 +3471,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]

Cargo.toml

@@ -11,4 +11,4 @@ tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = { version = "0.3.18" }
 clap = { version = "4", features = ["derive", "env"] }
 dotenv = { version = "0.15" }
-axum = { version = "0.7" }
+axum = { version = "0.8" }

crates/churn/Cargo.toml

@@ -37,3 +37,4 @@ reqwest = { version = "0.12.9", default-features = false, features = [
 serde_json = "1.0.133"
 wasmtime = "28.0.0"
 wasmtime-wasi = "28.0.0"
+petname = "2.0.2"

crates/churn/src/agent/agent_state.rs

@@ -44,7 +44,7 @@ impl State {
         let config = AgentConfig::new().await?;
         let discovery = DiscoveryClient::new(&config.discovery).discover().await?;
         let grpc = GrpcClient::new(&discovery.process_host);
-        let plugin_store = PluginStore::new()?;
+        let plugin_store = PluginStore::new(config.clone())?;
         let scheduled_tasks = ScheduledTasks::new(plugin_store.clone());
         let scheduler = Scheduler::new(scheduled_tasks);
         let queue = AgentQueue::new(scheduler);

crates/churn/src/agent/config.rs

@@ -8,6 +8,8 @@ use uuid::Uuid;
 pub struct AgentConfig {
     pub agent_id: String,
     pub discovery: String,
+
+    pub labels: BTreeMap<String, String>,
 }
 
 impl AgentConfig {
@@ -17,6 +19,7 @@ impl AgentConfig {
         Ok(Self {
             agent_id: config.agent_id,
             discovery: config.discovery,
+            labels: config.labels.unwrap_or_default(),
         })
     }
 }

crates/churn/src/agent/plugins.rs

@@ -8,6 +8,9 @@ use wasmtime::component::*;
 use wasmtime::{Config, Engine, Store};
 use wasmtime_wasi::{DirPerms, FilePerms, WasiCtx, WasiCtxBuilder, WasiView};
 
+use super::agent_state::State;
+use super::config::AgentConfig;
+
 wasmtime::component::bindgen!({
     path: "wit/world.wit",
     //world: "churn",
@@ -17,9 +20,14 @@ wasmtime::component::bindgen!({
     }
 });
 
-#[derive(Default)]
-pub struct CustomProcess {}
+pub struct CustomProcess {
+    agent_config: AgentConfig,
+}
 impl CustomProcess {
+    pub fn new(agent_config: AgentConfig) -> Self {
+        Self { agent_config }
+    }
+
     pub fn run(&self, args: Vec<String>) -> String {
         tracing::info!("calling function");
 
@@ -42,6 +50,10 @@ impl CustomProcess {
             }
         }
     }
+
+    pub fn get_label(&self, label_key: &str) -> Option<String> {
+        self.agent_config.labels.get(label_key).cloned()
+    }
 }
 
 #[derive(Clone)]
@@ -50,9 +62,9 @@ pub struct PluginStore {
 }
 
 impl PluginStore {
-    pub fn new() -> anyhow::Result<Self> {
+    pub fn new(config: AgentConfig) -> anyhow::Result<Self> {
         Ok(Self {
-            inner: Arc::new(Mutex::new(InnerPluginStore::new()?)),
+            inner: Arc::new(Mutex::new(InnerPluginStore::new(config)?)),
         })
     }
 
@@ -74,7 +86,7 @@ pub struct InnerPluginStore {
 }
 
 impl InnerPluginStore {
-    pub fn new() -> anyhow::Result<Self> {
+    pub fn new(agent_config: AgentConfig) -> anyhow::Result<Self> {
         let mut config = Config::default();
         config.wasm_component_model(true);
         config.async_support(true);
@@ -89,7 +101,7 @@ impl InnerPluginStore {
             |state: &mut ServerWasiView| state,
         )?;
 
-        let wasi_view = ServerWasiView::new();
+        let wasi_view = ServerWasiView::new(agent_config);
         let store = Store::new(&engine, wasi_view);
 
         Ok(Self {
@@ -112,11 +124,21 @@ impl InnerPluginStore {
     pub async fn execute(&mut self, plugin: &str) -> anyhow::Result<()> {
         let plugin = self.ensure_plugin(plugin).await?;
 
-        plugin
+        if plugin
+            .interface0
+            .call_should_run(&mut self.store)
+            .await
+            .context("Failed to call should run")?
+        {
+            tracing::info!("job was marked as required to run");
+            return plugin
                 .interface0
                 .call_execute(&mut self.store)
                 .await
-            .context("Failed to call add function")
+                .context("Failed to call add function");
+        }
+
+        Ok(())
     }
 
     async fn ensure_plugin(&mut self, plugin: &str) -> anyhow::Result<Churn> {
@@ -148,6 +170,12 @@ impl InnerPluginStore {
 
             let req = reqwest::get(format!("https://api-minio.front.kjuulh.io/churn-registry/{plugin_name}/{plugin_version}/{plugin_name}.wasm")).await.context("failed to get plugin from registry")?;
             let mut stream = req.bytes_stream();
+
+            tracing::info!(
+                plugin_name = plugin_name,
+                plugin_path = plugin_path.display().to_string(),
+                "writing plugin to file"
+            );
             let mut file = tokio::fs::File::create(&plugin_path).await?;
             while let Some(chunk) = stream.next().await {
                 let chunk = chunk?;
@@ -177,14 +205,17 @@ struct ServerWasiView {
     table: ResourceTable,
     ctx: WasiCtx,
     processes: ResourceTable,
+    agent_config: AgentConfig,
 }
 
 impl ServerWasiView {
-    fn new() -> Self {
+    fn new(agent_config: AgentConfig) -> Self {
         let table = ResourceTable::new();
 
         let ctx = WasiCtxBuilder::new()
             .inherit_stdio()
+            .inherit_stdout()
+            .inherit_stderr()
             .inherit_env()
             .inherit_network()
             .preopened_dir("/", "/", DirPerms::all(), FilePerms::all())
@@ -195,6 +226,7 @@ impl ServerWasiView {
             table,
             ctx,
             processes: ResourceTable::default(),
+            agent_config,
         }
     }
 }
@@ -216,7 +248,9 @@ impl HostProcess for ServerWasiView {
     async fn new(
         &mut self,
     ) -> wasmtime::component::Resource<component::churn_tasks::process::Process> {
-        self.processes.push(CustomProcess::default()).unwrap()
+        self.processes
+            .push(CustomProcess::new(self.agent_config.clone()))
+            .unwrap()
     }
 
     async fn run_process(
@@ -228,6 +262,15 @@ impl HostProcess for ServerWasiView {
         process.run(inputs)
     }
 
+    async fn get_variable(
+        &mut self,
+        self_: wasmtime::component::Resource<component::churn_tasks::process::Process>,
+        key: wasmtime::component::__internal::String,
+    ) -> String {
+        let process = self.processes.get(&self_).unwrap();
+        process.get_label(&key).unwrap()
+    }
+
     async fn drop(
         &mut self,
         rep: wasmtime::component::Resource<component::churn_tasks::process::Process>,

crates/churn/src/cli.rs

@@ -31,6 +31,13 @@ pub async fn execute() -> anyhow::Result<()> {
                     setup_labels.insert(k, v);
                 }
 
+                if !setup_labels.contains_key("node_name") {
+                    setup_labels.insert(
+                        "node_name".into(),
+                        petname::petname(2, "-").expect("to be able to generate a valid petname"),
+                    );
+                }
+
                 agent::setup_config(discovery, force, setup_labels).await?;
                 tracing::info!("wrote default agent config");
             }

crates/churn/wit/world.wit

@@ -4,6 +4,7 @@ interface process {
     resource process {
         constructor();
         run-process: func(inputs: list<string>) -> string;
+        get-variable: func(key: string) -> string;
     }
 }