diff --git a/crates/radicle-tauri/src/commands/startup.rs b/crates/radicle-tauri/src/commands/startup.rs index 4ba895830..2a5417c56 100644 --- a/crates/radicle-tauri/src/commands/startup.rs +++ b/crates/radicle-tauri/src/commands/startup.rs @@ -1,12 +1,8 @@ -use std::collections::BTreeMap; - use serde::Serialize; use tauri::{AppHandle, Emitter, Manager}; use radicle::cob::cache::COBS_DB_FILE; -use radicle::identity::RepoId; use radicle::node::{Handle, Node, NOTIFICATIONS_DB_FILE}; -use radicle::storage::ReadStorage; use radicle_types::config::Config; use radicle_types::error::Error; @@ -49,8 +45,6 @@ pub(crate) fn check_radicle_cli(ctx: tauri::State) -> Result<(), Error pub(crate) fn startup(app: AppHandle) -> Result { let profile = radicle::Profile::load()?; let home = profile.home(); - let repositories = profile.storage.repositories()?; - let public_key = profile.public_key; let cobs_cache = radicle::cob::cache::Store::open(home.cobs().join(COBS_DB_FILE))?; cobs_cache.check_version()?; @@ -65,14 +59,10 @@ pub(crate) fn startup(app: AppHandle) -> Result { let patch_service = domain::patch::service::Service::new(cob_db); let node_handle = app.app_handle().clone(); - let sync_handle = app.app_handle().clone(); - let events_handle = app.app_handle().clone(); let node = Node::new(profile.socket()); let node_status = node.clone(); - let mut node_seeds = node.clone(); - app.manage(inbox_service); app.manage(patch_service); @@ -83,47 +73,6 @@ pub(crate) fn startup(app: AppHandle) -> Result { } }); - tauri::async_runtime::spawn(async move { - loop { - let mut sync_status = - BTreeMap::>::new(); - for repo in &repositories { - if let Ok(seeds) = node_seeds.seeds(repo.rid).map(Into::>::into) { - if let Some(status) = - seeds - .iter() - .find_map(|radicle::node::Seed { nid, sync, .. }| { - (*nid == public_key).then_some(sync.clone()) - }) - { - sync_status.insert(repo.rid, status.map(Into::into)); - } else { - // The local node wasn't found in the seed nodes table. - sync_status.insert(repo.rid, None); - } - } - } - let _ = sync_handle.emit("sync_status", sync_status); - tokio::time::sleep(std::time::Duration::from_secs(10)).await; - } - }); - - tauri::async_runtime::spawn(async move { - loop { - if node.is_running() { - log::info!("node: spawned node event subscription."); - while let Ok(events) = node.subscribe(std::time::Duration::MAX) { - for event in events.into_iter().flatten() { - let _ = events_handle.emit("event", event); - } - } - log::info!("node: event subscription loop has exited."); - } - - tokio::time::sleep(std::time::Duration::from_secs(2)).await; - } - }); - let state = AppState { profile }; app.manage(state.clone()); diff --git a/src/App.svelte b/src/App.svelte index ca506654b..06eb80237 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -1,24 +1,28 @@