diff --git a/crates/radicle-tauri/src/commands/cob/release.rs b/crates/radicle-tauri/src/commands/cob/release.rs index 1c24b19fd..ad4d04f9b 100644 --- a/crates/radicle-tauri/src/commands/cob/release.rs +++ b/crates/radicle-tauri/src/commands/cob/release.rs @@ -196,10 +196,11 @@ pub async fn artifact_node_running(ctx: tauri::State<'_, AppState>) -> Result radicle_types::binaries::ArtifactBinaries { - radicle_types::binaries::artifact_binaries() +pub async fn artifact_binaries() -> Result { + Ok(tauri::async_runtime::spawn_blocking(radicle_types::binaries::artifact_binaries).await?) } #[tauri::command] diff --git a/crates/radicle-types/bindings/artifact/ArtifactBinaries.ts b/crates/radicle-types/bindings/artifact/ArtifactBinaries.ts index ffd538f7b..b75e00c4e 100644 --- a/crates/radicle-types/bindings/artifact/ArtifactBinaries.ts +++ b/crates/radicle-types/bindings/artifact/ArtifactBinaries.ts @@ -16,6 +16,10 @@ export type ArtifactBinaries = { * The `rad-artifact` CLI. */ cli: boolean; + /** + * Version of the `rad-artifact` CLI, when it answers `--version`. + */ + cliVersion?: string; /** * The `rad-artifact-node` seeding daemon. */ diff --git a/crates/radicle-types/src/binaries.rs b/crates/radicle-types/src/binaries.rs index b2677513a..bb22d3b6c 100644 --- a/crates/radicle-types/src/binaries.rs +++ b/crates/radicle-types/src/binaries.rs @@ -139,20 +139,33 @@ const RAD_ARTIFACT_NODE_BIN: &str = "rad-artifact-node"; /// /// Uncached for the same reason as [`rad`]: the UI polls, so an install that /// happens while the app runs takes effect without a restart. -#[derive(Clone, Copy, Debug, Serialize, TS)] +#[derive(Clone, Debug, Serialize, TS)] #[serde(rename_all = "camelCase")] #[ts(export)] #[ts(export_to = "artifact/")] pub struct ArtifactBinaries { /// The `rad-artifact` CLI. pub cli: bool, + /// Version of the `rad-artifact` CLI, when it answers `--version`. + #[serde(skip_serializing_if = "Option::is_none")] + #[ts(optional)] + pub cli_version: Option, /// The `rad-artifact-node` seeding daemon. pub node: bool, } pub fn artifact_binaries() -> ArtifactBinaries { + let cli = candidates(RAD_ARTIFACT_BIN).find(|path| path.is_file()); + // `rad-artifact --version` prints the crate name before the version. + let cli_version = cli.as_deref().and_then(probe).map(|version| { + version + .rsplit_once(' ') + .map_or(version.clone(), |(_, v)| v.to_owned()) + }); + ArtifactBinaries { - cli: candidates(RAD_ARTIFACT_BIN).any(|path| path.is_file()), + cli: cli.is_some(), + cli_version, node: candidates(RAD_ARTIFACT_NODE_BIN).any(|path| path.is_file()), } } @@ -323,7 +336,7 @@ fn probe(path: &Path) -> Option { } if std::time::Instant::now() >= deadline { log::warn!( - "{} did not answer `--version` within {}s, taking it as not being git", + "{} did not answer `--version` within {}s, giving up", path.display(), PROBE_TIMEOUT.as_secs() ); diff --git a/src/components/ArtifactNodeStatusButton.svelte b/src/components/ArtifactNodeStatusButton.svelte index 2cc5f55cb..f45949d63 100644 --- a/src/components/ArtifactNodeStatusButton.svelte +++ b/src/components/ArtifactNodeStatusButton.svelte @@ -173,6 +173,10 @@ Node version {status.version} {/if} + {#if binaries?.cliVersion} + CLI version + {binaries.cliVersion} + {/if} Uptime {uptime} Seeding