feat(qconnect): apply startup_mode + CLI override during app setup
Spawns a background auto-connect task during the Tauri setup hook when the effective startup decision says so. Failures log a warn and leave lifecycle in Off; no infinite reconnect loop on first-time failure. cc
This commit is contained in:
3 files changed
+52
-3
No files matched your search
+50
-1
@@ -495,7 +495,7 @@ fn handle_qobuz_link(handle: &tauri::AppHandle, url: &str, delay: bool) {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn run(_qconnect_cli_override: Option<bool>) {
|
||||
pub fn run(qconnect_cli_override: Option<bool>) {
|
||||
// Load .env file if present (for development)
|
||||
// Silently ignore if not found (production builds use compile-time env vars)
|
||||
dotenvy::dotenv().ok();
|
||||
@@ -1007,6 +1007,55 @@ pub fn run(_qconnect_cli_override: Option<bool>) {
|
||||
}
|
||||
}
|
||||
|
||||
// QConnect auto-connect-on-startup decision.
|
||||
{
|
||||
use qconnect_app::compute_effective_startup;
|
||||
let mode = crate::qconnect::startup::load_startup_mode();
|
||||
let last = crate::qconnect::startup::load_last_known_state();
|
||||
let should_connect = compute_effective_startup(mode, qconnect_cli_override, last);
|
||||
|
||||
log::info!(
|
||||
"[QConnect] startup decision: mode={} cli_override={:?} last_known={:?} -> {}",
|
||||
mode.as_str(),
|
||||
qconnect_cli_override,
|
||||
last,
|
||||
should_connect
|
||||
);
|
||||
|
||||
if should_connect {
|
||||
let app_handle = app.handle().clone();
|
||||
tauri::async_runtime::spawn(async move {
|
||||
// Best-effort: pull the managed states by handle.
|
||||
let service = app_handle.state::<crate::qconnect::QconnectServiceState>();
|
||||
let core_bridge = app_handle.state::<crate::core_bridge::CoreBridgeState>();
|
||||
let app_state = app_handle.state::<crate::AppState>();
|
||||
|
||||
// Use default options; auto-discovery via qws/createToken resolves
|
||||
// endpoint+JWT (see transport.rs::resolve_transport_config).
|
||||
let config = match crate::qconnect::transport::resolve_transport_config(
|
||||
Default::default(),
|
||||
&app_state,
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(c) => c,
|
||||
Err(e) => {
|
||||
log::warn!("[QConnect] startup auto-connect transport resolve failed: {e}");
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
if let Err(e) = service.connect(app_handle.clone(), core_bridge.0.clone(), config).await {
|
||||
log::warn!("[QConnect] startup auto-connect failed: {e}");
|
||||
// Lifecycle stays Off; existing reconnect loop only fires for
|
||||
// established sessions, not for failed initial connects.
|
||||
} else {
|
||||
log::info!("[QConnect] startup auto-connect succeeded");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize CoreBridge (new multi-crate architecture)
|
||||
// Store V2 player state for event loop access
|
||||
let v2_player_state: Arc<tokio::sync::RwLock<Option<qbz_player::SharedState>>> =
|
||||
|
||||
@@ -15,7 +15,7 @@ mod service;
|
||||
mod session;
|
||||
pub mod startup;
|
||||
mod track_loading;
|
||||
mod transport;
|
||||
pub(crate) mod transport;
|
||||
mod types;
|
||||
|
||||
pub use commands::*;
|
||||
|
||||
@@ -178,7 +178,7 @@ pub(super) fn persist_device_name(name: Option<&str>) {
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) async fn resolve_transport_config(
|
||||
pub(crate) async fn resolve_transport_config(
|
||||
options: QconnectConnectOptions,
|
||||
app_state: &AppState,
|
||||
) -> Result<WsTransportConfig, String> {
|
||||
|
||||
Reference in new issue
Block a user