refactor neovide, mobdap and bridge download handler into single releases manager and improve error handling (in case of e.g. no internet)

Author: atomicptr

.github/workflows/release.yml

@@ -17,6 +17,7 @@ jobs:
         config:
           - name: Linux x86
             os: ubuntu-latest
+            cargo-tools: cargo-edit,cargo-cross
             artifact:
               sidecar: target/x86_64-unknown-linux-gnu/release/libdefold_nvim_sidecar.so
               bridge: target/x86_64-unknown-linux-gnu/release/defold-nvim-bridge
@@ -25,6 +26,7 @@ jobs:
               bridge: target/release/linux-x86-defold-nvim-bridge
           - name: MacOS x86
             os: macos-15-intel
+            cargo-tools: cargo-edit
             artifact:
               sidecar: target/release/libdefold_nvim_sidecar.dylib
               bridge: target/release/defold-nvim-bridge
@@ -33,6 +35,7 @@ jobs:
               bridge: target/release/macos-x86-defold-nvim-bridge
           - name: MacOS ARM
             os: macos-latest
+            cargo-tools: cargo-edit
             artifact:
               sidecar: target/release/libdefold_nvim_sidecar.dylib
               bridge: target/release/defold-nvim-bridge
@@ -41,6 +44,7 @@ jobs:
               bridge: target/release/macos-arm-defold-nvim-bridge
           - name: Windows x86
             os: windows-latest
+            cargo-tools: cargo-edit
             artifact:
               sidecar: target/release/defold_nvim_sidecar.dll
               bridge: target/release/defold-nvim-bridge.exe
@@ -53,11 +57,19 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           rustflags: ""
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: ${{ matrix.config.cargo-tools }}
+
+      - name: set version ${{ matrix.config.name }}
+        run: |
+          TAG_NAME=${GITHUB_REF#refs/tags/}
+          VERSION=${TAG_NAME#v}
+          cargo set-version $VERSION
 
       - name: build ${{ matrix.config.name }}
         if: contains(matrix.config.os, 'ubuntu')
         run: |
-          cargo install cargo-cross
           cargo cross build --release --target x86_64-unknown-linux-gnu
 
       - name: build ${{ matrix.config.name }}

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "defold-nvim-bridge"
-version = "0.1.0"
+version = "0.1.4"
 edition = "2024"
 
 [dependencies]

crates/bridge/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "defold-nvim-core"
-version = "0.1.0"
+version = "0.1.4"
 edition = "2024"
 
 [dependencies]

crates/core/Cargo.toml

@@ -1,42 +1,37 @@
-use anyhow::{Context, Result, bail};
+use anyhow::{Context, Result};
 use std::{
     fs::{self},
     path::{Path, PathBuf},
-    time::Duration,
 };
 use version_compare::Version;
 
-use crate::{github, utils};
-
-const MIN_VERSION: &str = "0.0.0";
-
-#[cfg(target_os = "windows")]
-const EXE_SUFFIX: &'static str = ".exe";
+use crate::{release_downloader, utils};
 
+const EXECUTABLE_NAME: &str = "defold-nvim-bridge";
+const OWNER: &str = "atomicptr";
+const REPOSITORY: &str = "defold.nvim";
 #[cfg(not(target_os = "windows"))]
 const EXE_SUFFIX: &str = "";
 
 #[cfg(target_os = "linux")]
-const NAME: &str = "linux-x86-defold-nvim-bridge";
+const ASSET_NAME: &str = "linux-x86-defold-nvim-bridge";
 
 #[cfg(all(target_os = "macos", target_arch = "x86_64"))]
-const NAME: &str = "macos-x86-defold-nvim-bridge";
+const ASSET_NAME: &str = "macos-x86-defold-nvim-bridge";
 
 #[cfg(all(target_os = "macos", target_arch = "aarch64"))]
-const NAME: &str = "macos-arm-defold-nvim-bridge";
+const ASSET_NAME: &str = "macos-arm-defold-nvim-bridge";
 
 #[cfg(target_os = "windows")]
-const NAME: &str = "windows-x86-defold-nvim-bridge";
+const ASSET_NAME: &str = "windows-x86-defold-nvim-bridge";
 
-const OWNER: &str = "atomicptr";
-const REPOSITORY: &str = "defold.nvim";
-
-pub fn path(plugin_root: &Path) -> Result<PathBuf> {
+pub fn path(plugin_root: Option<&Path>) -> Result<PathBuf> {
     let exe = exe_name();
 
-    if plugin_root.exists() {
+    if let Some(plugin_root) = plugin_root
+        && plugin_root.exists()
+    {
         let candidates = [
-            plugin_root.join(&exe),
             plugin_root.join("target").join("debug").join(&exe),
             plugin_root.join("target").join("release").join(&exe),
         ];
@@ -64,96 +59,40 @@ fn local_path() -> Result<PathBuf> {
     Ok(dir.join(exe_name()))
 }
 
-fn version_path() -> Result<PathBuf> {
-    let dir = dirs::data_dir()
-        .context("could not get data dir")?
-        .join("defold.nvim")
-        .join("meta");
-
-    fs::create_dir_all(&dir)?;
-
-    Ok(dir.join("bridge_version"))
-}
-
-fn version() -> Result<String> {
-    let file = version_path()?;
-
-    if !file.exists() {
-        bail!("Version not found");
-    }
-
-    Ok(fs::read_to_string(file)?)
-}
-
-fn is_update_available() -> Result<bool> {
-    if !local_path()?.exists() {
-        return Ok(true);
-    }
-
-    if !version_path()?.exists() {
-        return Ok(true);
-    }
-
-    let Ok(v) = version() else {
-        return Ok(true);
-    };
-
-    tracing::debug!("Bridge Version {v} installed");
-
-    let Some(installed) = Version::from(&v) else {
-        tracing::debug!("Couldnt parse version");
-        return Ok(true);
-    };
-
-    // if min version is higher, force update
-    let min_version = Version::from(MIN_VERSION).expect("cant parse min version");
-    if installed < min_version {
-        tracing::debug!("Bridge Min Version {MIN_VERSION} exceeded (current {v})");
-        return Ok(true);
-    }
-
-    // if the version file is younger than a week dont bother
-    let last_modified = version_path()?.metadata()?.modified()?;
-    if last_modified.elapsed()? < Duration::from_hours(24 * 7) {
-        return Ok(false);
-    }
-
-    // re-write the file again so that we only check once a week
-    fs::write(version_path()?, &v)?;
-
-    let release = github::fetch_release(OWNER, REPOSITORY)?;
-
-    tracing::debug!("Bridge Version {} is newest", release.tag_name);
-
-    let Some(current) = Version::from(&release.tag_name) else {
-        return Ok(false);
-    };
-
-    Ok(current > installed)
-}
-
 fn install() -> Result<PathBuf> {
-    let path = local_path()?;
-
-    if path.exists() && !is_update_available()? {
-        tracing::debug!("No update available for {}", path.display());
-        return Ok(path);
-    }
-
-    let (downloaded_file, release) = github::download_release(OWNER, REPOSITORY, NAME)?;
-
-    tracing::debug!("New Bridge version found {}", release.tag_name);
-
-    utils::move_file(&downloaded_file, &path)?;
-    fs::write(version_path()?, release.tag_name)?;
-
-    #[cfg(any(target_os = "linux", target_os = "macos"))]
-    {
-        use std::{fs::Permissions, os::unix::fs::PermissionsExt};
-        fs::set_permissions(&path, Permissions::from_mode(0o700))?;
-    }
-
-    github::clear_downloads(OWNER, REPOSITORY)?;
-
-    Ok(path)
+    let min_version = utils::version();
+    let min_version = Version::from(&min_version);
+    let curr_version = release_downloader::version(EXECUTABLE_NAME);
+    let curr_version = curr_version
+        .as_ref()
+        .map(|v| Version::from(v))
+        .ok()
+        .flatten();
+
+    release_downloader::install_with(
+        OWNER,
+        REPOSITORY,
+        ASSET_NAME,
+        EXECUTABLE_NAME,
+        |downloaded_file| {
+            let path = local_path()?;
+
+            utils::move_file(downloaded_file, &path)?;
+
+            #[cfg(any(target_os = "linux", target_os = "macos"))]
+            {
+                use std::{fs::Permissions, os::unix::fs::PermissionsExt};
+                fs::set_permissions(&path, Permissions::from_mode(0o700))?;
+            }
+
+            Ok(())
+        },
+        local_path,
+        match (min_version, curr_version) {
+            (Some(mv), Some(cv)) => mv > cv,
+            _ => false,
+        },
+    )?;
+
+    local_path()
 }

crates/core/src/bridge.rs

@@ -105,7 +105,7 @@ fn create_runner_script(
     fs::create_dir_all(&dir)?;
 
     let script_path = dir.join(format!("run.{SCRIPT_EXT}"));
-    let bridge_path = bridge::path(plugin_root)?;
+    let bridge_path = bridge::path(Some(plugin_root))?;
     let launch_pre_args = launcher_settings.bridge_pre_cli_args().join(" ");
     let launch_post_args = launcher_settings.bridge_post_cli_args().join(" ");
 

crates/core/src/editor_config.rs

@@ -9,5 +9,6 @@ pub mod github;
 pub mod mobdap;
 pub mod neovide;
 pub mod project;
+mod release_downloader;
 pub mod script_api;
 pub mod utils;