add ability to use a different neovim configuration (fix #49), update dependencies

Author: atomicptr

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "defold-nvim-bridge"
-version = "0.3.3"
+version = "0.4.0"
 edition = "2024"
 
 [dependencies]
@@ -9,7 +9,7 @@ clap = { version = "4.6.0", features = ["derive"] }
 defold-nvim-core = { path = "../core" }
 dirs = "6.0.0"
 netstat2 = "0.11.2"
-termlauncher = "0.2.1"
+termlauncher = "0.3.0"
 tracing = "0.1.44"
 tracing-appender = "0.2.4"
 tracing-subscriber = "0.3.23"

crates/bridge/Cargo.toml

@@ -23,15 +23,24 @@ const VAR_ADDRESS: &str = "{ADDR}";
 const VAR_LINE: &str = "{LINE}";
 const VAR_FILE: &str = "{FILE}";
 
-fn report_process_errors(child: Child) -> Result<()> {
-    let output = child.wait_with_output()?;
+fn report_process_errors(mut child: Child) -> Result<()> {
+    match child.try_wait()? {
+        Some(status) => {
+            let output = child.wait_with_output()?;
 
-    if !output.stdout.is_empty() {
-        tracing::debug!("Proccess Out: {}", String::from_utf8(output.stdout)?);
-    }
+            if !output.stdout.is_empty() {
+                tracing::debug!("Proccess Out: {}", String::from_utf8(output.stdout)?);
+            }
 
-    if !output.stderr.is_empty() {
-        tracing::error!("Proccess Err: {}", String::from_utf8(output.stderr)?);
+            if !output.stderr.is_empty() {
+                tracing::error!("Proccess Err: {}", String::from_utf8(output.stderr)?);
+            }
+
+            tracing::debug!("Process exited with: {status}");
+        }
+        None => {
+            tracing::debug!("Process still running, detaching...");
+        }
     }
 
     Ok(())
@@ -330,6 +339,11 @@ pub fn run(
         app.args.insert(0, "--".to_string());
     }
 
+    if let Some(appname) = &plugin_config.appname {
+        app.env_vars
+            .insert("NVIM_APPNAME".to_string(), appname.clone());
+    }
+
     match plugin_config.socket_type {
         Some(SocketType::Fsock) => run_fsock(&launcher, app, &nvim, &root_dir, file_str, line)?,
         Some(SocketType::Netsock) => run_netsock(&launcher, app, &nvim, &root_dir, file_str, line)?,

crates/bridge/src/launcher.rs

@@ -41,6 +41,9 @@ enum Commands {
         #[arg(long = "executable")]
         executable: Option<String>,
 
+        #[arg(long = "appname")]
+        appname: Option<String>,
+
         #[clap(value_name = "GAME_ROOT_DIR")]
         game_root_dir: String,
 
@@ -148,6 +151,7 @@ fn main() -> Result<()> {
             launcher_type,
             socket_type,
             executable,
+            appname,
             arguments,
             game_root_dir,
             file,
@@ -157,6 +161,7 @@ fn main() -> Result<()> {
                 launcher_type,
                 socket_type,
                 executable,
+                appname,
                 arguments,
             },
             absolute(game_root_dir)?,

crates/bridge/src/main.rs

@@ -21,5 +21,6 @@ pub struct PluginConfig {
     pub launcher_type: Option<LauncherType>,
     pub socket_type: Option<SocketType>,
     pub executable: Option<String>,
+    pub appname: Option<String>,
     pub arguments: Option<Vec<String>>,
 }

crates/bridge/src/plugin_config.rs

@@ -1,14 +1,14 @@
 [package]
 name = "defold-nvim-core"
-version = "0.3.3"
+version = "0.4.0"
 edition = "2024"
 
 [dependencies]
 anyhow = { version = "1.0.102", features = ["backtrace"] }
 tar = "0.4.45"
 version-compare = "0.2.1"
 flate2 = "1.1.9"
-zip = "8.4.0"
+zip = "8.5.1"
 dirs = "6.0.0"
 reqwest = { version = "0.13.2", default-features = false, features = [
     "rustls",
@@ -18,7 +18,7 @@ reqwest = { version = "0.13.2", default-features = false, features = [
 rust-ini = "0.21.3"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
-sha3 = "0.10.8"
+sha3 = "0.11.0"
 strum = { version = "0.28.0", features = ["derive"] }
 tracing = "0.1.44"
 which = "8.0.2"
@@ -27,6 +27,7 @@ walkdir = "2.5.0"
 serde_yaml = "0.9.34"
 textwrap = "0.16.2"
 fs_extra = "1.3.0"
+hex = "0.4.3"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 dmg = "0.1.2"