expose a function for hermit install

expose a function for hermit install

.fluentci/src/jobs.ts

@@ -336,13 +336,14 @@ export async function e2e(
   src: string | Directory | undefined = ".",
   _options: string[] = []
 ): Promise<string> {
-  let plugins = [
+  const plugins = [
     "archive",
     "chmod",
     "devbox",
     "flox",
     "git",
     "hash",
+    "hermit",
     "http",
     "mise",
     "nix",
@@ -532,6 +533,7 @@ export async function e2e(
     "git",
     "directory",
     "envhub",
+    "hermit",
     "mise",
     "pixi",
     "pkgx",

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
           wasm: true
           pipeline: rust
           args: build --release
-          engine-version: 0.4.0
+          engine-version: 0.4.7
       - name: Run Build and e2e tests
         run: |
           export PATH=${HOME}/.cargo/bin:${PATH}

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: fluentci-io/setup-fluentci@v5
         with:
-          engine-version: 0.4.0
+          engine-version: 0.4.7
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Build

crates/cli/Cargo.toml

@@ -18,8 +18,8 @@ clap = "3.2.20"
 extism = "1.2.0"
 fluentci-core = {path = "../core", version = "0.3.6"}
 fluentci-ext = {path = "../ext", version = "0.2.5"}
-fluentci-server = {path = "../server", version = "0.3.6"}
-fluentci-shared = {path = "../shared", version = "0.2.6"}
+fluentci-server = {path = "../server", version = "0.3.7"}
+fluentci-shared = {path = "../shared", version = "0.2.7"}
 get-port = "4.0.0"
 md5 = "0.7.0"
 regex = "1.10.3"

crates/cli/src/cmd/call.rs

@@ -89,6 +89,7 @@ pub fn call(module: &str, command: &str) -> Result<(), Error> {
         .with_function("mise", [], [PTR], user_data.clone(), mise)
         .with_function("trust", [], [], user_data.clone(), trust)
         .with_function("hermit", [], [PTR], user_data.clone(), hermit)
+        .with_function("install", [], [], user_data.clone(), install)
         .with_function("with_exec", [PTR], [], user_data.clone(), with_exec)
         .with_function("with_workdir", [PTR], [], user_data.clone(), with_workdir)
         .with_function("with_cache", [PTR], [], user_data.clone(), with_cache)

crates/common/Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"]
 license = "MPL-2.0"
 name = "fluentci-common"
 repository = "https://github.com/fluentci-io/fluentci-engine"
-version = "0.2.6"
+version = "0.2.7"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

crates/common/src/hermit.rs

@@ -54,3 +54,29 @@ pub fn with_packages(graph: Arc<Mutex<Graph>>, packages: Vec<String>) -> Result<
 
     Ok(())
 }
+
+pub fn install(graph: Arc<Mutex<Graph>>) -> Result<(), Error> {
+    let mut graph = graph.lock().unwrap();
+
+    let id = Uuid::new_v4().to_string();
+    let dep_id = graph.vertices[graph.size() - 1].id.clone();
+    let deps = match graph.size() {
+        1 => vec![],
+        _ => vec![dep_id],
+    };
+    graph.execute(GraphCommand::AddVertex(
+        id.clone(),
+        "install".into(),
+        "hermit install".into(),
+        deps,
+        Arc::new(Box::new(HermitExt::default())),
+    ))?;
+
+    if graph.size() > 2 {
+        let x = graph.size() - 2;
+        let y = graph.size() - 1;
+        graph.execute(GraphCommand::AddEdge(x, y))?;
+    }
+
+    Ok(())
+}

crates/graphql/Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"]
 license = "MPL-2.0"
 name = "fluentci-graphql"
 repository = "https://github.com/fluentci-io/fluentci-engine"
-version = "0.3.6"
+version = "0.3.7"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,7 +16,7 @@ anyhow = "1.0.80"
 async-graphql = "7.0.2"
 async-graphql-actix-web = "7.0.2"
 dirs = "5.0.1"
-fluentci-common = {path = "../common", version = "0.2.6"}
+fluentci-common = {path = "../common", version = "0.2.7"}
 fluentci-core = {path = "../core", version = "0.3.6"}
 fluentci-ext = {path = "../ext", version = "0.2.5"}
 fluentci-secrets = {path = "../secrets", version = "0.1.0"}

crates/graphql/src/schema/objects/hermit.rs

@@ -76,6 +76,12 @@ impl Hermit {
         Ok(self)
     }
 
+    async fn install(&self, ctx: &Context<'_>) -> Result<&Hermit, Error> {
+        let graph = ctx.data::<Arc<Mutex<Graph>>>().unwrap();
+        common_hermit::install(graph.clone())?;
+        Ok(self)
+    }
+
     async fn stdout(&self, ctx: &Context<'_>) -> Result<String, Error> {
         let graph = ctx.data::<Arc<Mutex<Graph>>>().unwrap();
         let rx = ctx.data::<Arc<Mutex<Receiver<(String, usize)>>>>().unwrap();

crates/pdk/Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"]
 license = "MPL-2.0"
 name = "fluentci-pdk"
 repository = "https://github.com/fluentci-io/fluentci-engine"
-version = "0.2.2"
+version = "0.2.3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

crates/pdk/src/hermit.rs

@@ -10,6 +10,7 @@ extern "ExtismHost" {
     fn with_cache(cache: Json<Cache>);
     fn with_file(file: Json<File>);
     fn with_packages(packages: Json<Vec<String>>);
+    fn install();
     fn stdout() -> String;
     fn stderr() -> String;
     fn as_service(name: String) -> Json<Service>;
@@ -91,6 +92,13 @@ impl Hermit {
         })
     }
 
+    pub fn install(&self) -> Result<Hermit, Error> {
+        unsafe { install() }?;
+        Ok(Hermit {
+            id: self.id.clone(),
+        })
+    }
+
     pub fn stdout(&self) -> Result<String, Error> {
         unsafe { stdout() }
     }

crates/server/Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"]
 license = "MPL-2.0"
 name = "fluentci-server"
 repository = "https://github.com/fluentci-io/fluentci-engine"
-version = "0.3.6"
+version = "0.3.7"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -19,7 +19,7 @@ async-graphql = "7.0.2"
 async-graphql-actix-web = "7.0.2"
 fluentci-core = {path = "../core", version = "0.3.6"}
 fluentci-ext = {path = "../ext", version = "0.2.5"}
-fluentci-graphql = {path = "../graphql", version = "0.3.6"}
+fluentci-graphql = {path = "../graphql", version = "0.3.7"}
 mime_guess = "2.0.4"
 owo-colors = "4.0.0"
 tokio = "1.36.0"

crates/shared/Cargo.toml

@@ -7,15 +7,15 @@ keywords = ["nix", "environment", "ci", "wasm", "devops"]
 license = "MPL-2.0"
 name = "fluentci-shared"
 repository = "https://github.com/fluentci-io/fluentci-engine"
-version = "0.2.6"
+version = "0.2.7"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.82"
 extism = "1.2.0"
 extism-pdk = "1.1.0"
-fluentci-common = {path = "../common", version = "0.2.6"}
+fluentci-common = {path = "../common", version = "0.2.7"}
 fluentci-core = {path = "../core", version = "0.3.6"}
 fluentci-ext = {path = "../ext", version = "0.2.5"}
 fluentci-secrets = {path = "../secrets", version = "0.1.0"}

crates/shared/src/hermit.rs

@@ -1,5 +1,5 @@
 use extism::{convert::Json, *};
-use fluentci_common::hermit::hermit as common_hermit;
+use fluentci_common::hermit as common_hermit;
 
 use crate::state::State;
 
@@ -8,6 +8,14 @@ host_fn!(pub hermit(user_data: State;) -> Json<Hermit> {
     let state = state.lock().unwrap();
     let graph = state.graph.clone();
 
-    let hermit = common_hermit(graph, true)?;
+    let hermit = common_hermit::hermit(graph, true)?;
     Ok(Json(hermit))
 });
+
+host_fn!(pub install(user_data: State;) {
+    let state = user_data.get()?;
+    let state = state.lock().unwrap();
+    let graph = state.graph.clone();
+    common_hermit::install(graph)?;
+    Ok(())
+});