From 1f49e001b5a1779359590c2d05c5d08834dc4699 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Mon, 12 Jan 2026 20:57:34 -0600 Subject: [PATCH] perf: lazy-initialize media server to save CPU when not casting The media server was starting at app launch and polling every 250ms even when not using Chromecast/DLNA casting. Now it only starts when the user actually tries to cast audio. --- src-tauri/src/cast/commands.rs | 28 ++++++++++++++++++++++++---- src-tauri/src/cast/dlna/commands.rs | 23 ++++++++++++++++++++--- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/src-tauri/src/cast/commands.rs b/src-tauri/src/cast/commands.rs index b0abe4374..72ccd83e2 100644 --- a/src-tauri/src/cast/commands.rs +++ b/src-tauri/src/cast/commands.rs @@ -17,7 +17,8 @@ use crate::library::{AudioFormat, LibraryState}; pub struct CastState { pub discovery: Arc>, pub chromecast: ChromecastHandle, - pub media_server: Arc>, + /// Media server is lazily initialized on first cast operation to save CPU when not casting + pub media_server: Arc>>, pub connected_device_ip: Arc>>, } @@ -26,10 +27,21 @@ impl CastState { Ok(Self { discovery: Arc::new(Mutex::new(DeviceDiscovery::new())), chromecast: ChromecastHandle::new(), - media_server: Arc::new(Mutex::new(MediaServer::start()?)), + // Don't start media server until needed - saves CPU when not casting + media_server: Arc::new(Mutex::new(None)), connected_device_ip: Arc::new(Mutex::new(None)), }) } + + /// Get or create the media server (lazy initialization) + pub async fn get_or_create_media_server(&self) -> Result<(), CastError> { + let mut server_guard = self.media_server.lock().await; + if server_guard.is_none() { + log::info!("Starting media server on demand (lazy init)"); + *server_guard = Some(MediaServer::start()?); + } + Ok(()) + } } // === Discovery === @@ -131,8 +143,12 @@ pub async fn cast_play_track( connected.clone() }; + // Ensure media server is started (lazy init) + state.get_or_create_media_server().await.map_err(|e| e.to_string())?; + let url = { - let mut server = state.media_server.lock().await; + let mut server_guard = state.media_server.lock().await; + let server = server_guard.as_mut().ok_or("Media server not initialized")?; server.register_audio(track_id, audio_data, &content_type); let url = match target_ip.as_deref() { Some(ip) => server.get_audio_url_for_target(track_id, ip), @@ -165,8 +181,12 @@ pub async fn cast_play_local_track( connected.clone() }; + // Ensure media server is started (lazy init) + state.get_or_create_media_server().await.map_err(|e| e.to_string())?; + let url = { - let mut server = state.media_server.lock().await; + let mut server_guard = state.media_server.lock().await; + let server = server_guard.as_mut().ok_or("Media server not initialized")?; server .register_file(track_id as u64, &track.file_path) .map_err(|e| e.to_string())?; diff --git a/src-tauri/src/cast/dlna/commands.rs b/src-tauri/src/cast/dlna/commands.rs index 2a49cb216..0c3fa2333 100644 --- a/src-tauri/src/cast/dlna/commands.rs +++ b/src-tauri/src/cast/dlna/commands.rs @@ -15,17 +15,30 @@ use crate::cast::MediaServer; pub struct DlnaState { pub discovery: Arc>, pub connection: Arc>>, - pub media_server: Arc>, + /// Shared media server (lazily initialized) + pub media_server: Arc>>, } impl DlnaState { - pub fn new(media_server: Arc>) -> Result { + pub fn new(media_server: Arc>>) -> Result { Ok(Self { discovery: Arc::new(Mutex::new(DlnaDiscovery::new())), connection: Arc::new(Mutex::new(None)), media_server, }) } + + /// Ensure media server is started (lazy initialization) + pub async fn ensure_media_server(&self) -> Result<(), DlnaError> { + let mut server_guard = self.media_server.lock().await; + if server_guard.is_none() { + log::info!("Starting media server on demand for DLNA"); + *server_guard = Some(MediaServer::start().map_err(|e| { + DlnaError::Connection(format!("Failed to start media server: {}", e)) + })?); + } + Ok(()) + } } // === Discovery === @@ -125,8 +138,12 @@ pub async fn dlna_play_track( connection.as_ref().map(|conn| conn.device_ip().to_string()) }; + // Ensure media server is started (lazy init) + dlna_state.ensure_media_server().await.map_err(|e| e.to_string())?; + let url = { - let mut server = dlna_state.media_server.lock().await; + let mut server_guard = dlna_state.media_server.lock().await; + let server = server_guard.as_mut().ok_or("Media server not initialized")?; server.register_audio(track_id, audio_data, &content_type); let url = match target_ip.as_deref() { Some(ip) => server.get_audio_url_for_target(track_id, ip),