Added debug option for manually turning off OSC and OSCQuery servers.…

… Added flags file with flag for disabling MDNS.

src-core/Cargo.toml

@@ -85,6 +85,7 @@ system_shutdown = "4.0.1"
 async-recursion = "1.0.5"
 enumset = "1.1.3"
 tauri-plugin-aptabase = "0.5"
+config = "0.13.4"
 
 [dependencies.oyasumivr_oscquery]
 git = "https://github.com/Raphiiko/oyasumivr_oscquery.git"

src-core/flags.toml

@@ -0,0 +1 @@
+DISABLE_MDNS = false

src-core/src/globals.rs

@@ -1,3 +1,4 @@
+use config::Config;
 use tokio::sync::Mutex;
 
 pub const STEAM_APP_KEY: &str = "steam.overlay.2538150-DEV";
@@ -10,4 +11,13 @@ pub const APTABASE_APP_KEY: &str = "A-EU-0936106873";
 lazy_static! {
     pub static ref TAURI_APP_HANDLE: Mutex<Option<tauri::AppHandle>> = Default::default();
     pub static ref TAURI_CLI_MATCHES: Mutex<Option<tauri::api::cli::Matches>> = Default::default();
+    pub static ref FLAGS: Mutex<Option<Config>> = Default::default();
+}
+
+pub async fn is_flag_set(flag: &str) -> bool {
+    let flags = FLAGS.lock().await;
+    if let Some(flags) = flags.as_ref() {
+        return flags.get_bool(flag).unwrap_or(false);
+    }
+    false
 }

src-core/src/main.rs

@@ -27,11 +27,12 @@ mod vrc_log_parser;
 
 use std::sync::atomic::Ordering;
 
+use config::Config;
 pub use flavour::BUILD_FLAVOUR;
 pub use grpc::models as Models;
 
 use cronjob::CronJob;
-use globals::{APTABASE_APP_KEY, TAURI_APP_HANDLE};
+use globals::{APTABASE_APP_KEY, FLAGS, TAURI_APP_HANDLE};
 use log::{info, warn, LevelFilter};
 use oyasumivr_shared::windows::is_elevated;
 use serde_json::json;
@@ -73,6 +74,30 @@ fn main() {
         .expect("An error occurred while running the application");
 }
 
+async fn load_configs() {
+    match Config::builder()
+        .add_source(config::File::with_name("flags"))
+        .build()
+    {
+        Ok(flags) => {
+            *FLAGS.lock().await = Some(flags);
+        }
+        Err(e) => match e {
+            config::ConfigError::NotFound(_) => {
+                warn!("[Core] Could not find flags config. Using default values.");
+            }
+            _ => {
+                warn!("[Core] Could not load flags config: {:#?}", e);
+            }
+        },
+    };
+    if globals::is_flag_set("DISABLE_MDNS").await {
+        warn!(
+            "[Core] DISABLE_MDNS flag set: MDNS is disabled. OSC and OSCQuery functionality cannot be expected to work."
+        );
+    }
+}
+
 fn configure_command_handlers() -> impl Fn(tauri::Invoke) {
     tauri::generate_handler![
         openvr::commands::openvr_get_devices,
@@ -249,6 +274,8 @@ async fn app_setup(app_handle: tauri::AppHandle) {
     std::env::set_current_dir(&executable_path).unwrap();
     // Run any migrations first
     migrations::run_migrations().await;
+    // Load configs
+    load_configs().await;
     // Set up app reference
     *TAURI_APP_HANDLE.lock().await = Some(app_handle.clone());
     // Open devtools if we're in debug mode

src-core/src/osc/commands.rs

@@ -15,6 +15,9 @@ lazy_static! {
 
 #[tauri::command]
 pub async fn get_vrchat_osc_address() -> Option<String> {
+    if crate::globals::is_flag_set("DISABLE_MDNS").await {
+        return None;
+    }
     let addr = oyasumivr_oscquery::client::get_vrchat_osc_address().await;
     match addr {
         Some(addr) => Some(format!("{}:{}", addr.0, addr.1)),
@@ -24,6 +27,9 @@ pub async fn get_vrchat_osc_address() -> Option<String> {
 
 #[tauri::command]
 pub async fn get_vrchat_oscquery_address() -> Option<String> {
+    if crate::globals::is_flag_set("DISABLE_MDNS").await {
+        return None;
+    }
     let addr = oyasumivr_oscquery::client::get_vrchat_oscquery_address().await;
     match addr {
         Some(addr) => Some(format!("{}:{}", addr.0, addr.1)),
@@ -83,18 +89,21 @@ pub async fn start_osc_server() -> Option<(String, Option<String>)> {
     let cancellation_token = super::spawn_receiver_task().await;
     *CANCELLATION_TOKEN.lock().await = Some(cancellation_token);
     // Start the OSCQuery server
-    let osc_query_addr_string =
-        match oyasumivr_oscquery::server::init("OyasumiVR", "127.0.0.1", osc_addr_port).await {
-            Ok(result) => Some(format!("{}:{}", result.0, result.1)),
-            Err(err) => {
-                error!("[Core] Could not initialize OSCQuery server: {:#?}", err);
-                None
-            }
-        };
-    oyasumivr_oscquery::server::receive_vrchat_avatar_parameters().await;
-    match oyasumivr_oscquery::server::advertise().await {
-        Err(err) => error!("[Core] Could not advertise OSCQuery server: {:#?}", err),
-        _ => {}
+    let mut osc_query_addr_string = None;
+    if !crate::globals::is_flag_set("DISABLE_MDNS").await {
+        osc_query_addr_string =
+            match oyasumivr_oscquery::server::init("OyasumiVR", "127.0.0.1", osc_addr_port).await {
+                Ok(result) => Some(format!("{}:{}", result.0, result.1)),
+                Err(err) => {
+                    error!("[Core] Could not initialize OSCQuery server: {:#?}", err);
+                    None
+                }
+            };
+        oyasumivr_oscquery::server::receive_vrchat_avatar_parameters().await;
+        match oyasumivr_oscquery::server::advertise().await {
+            Err(err) => error!("[Core] Could not advertise OSCQuery server: {:#?}", err),
+            _ => {}
+        }
     }
     // Return bound address
     Some((osc_addr_string, osc_query_addr_string))
@@ -110,7 +119,6 @@ pub async fn set_osc_method_value(address: String, value: String) {
     oyasumivr_oscquery::server::set_osc_method_value(address, Some(value)).await;
 }
 
-
 #[tauri::command]
 pub async fn osc_send_int(addr: String, osc_addr: String, data: i32) -> Result<bool, String> {
     debug!(