reya/coop
1
0
Fork 0
Code Issues Pull Requests 1 Releases 2 Activity

optimize

Browse Source
This commit is contained in:
Ren Amamiya
2026-07-27 10:14:19 +07:00
parent dfda7ff157
commit 8bbb472103
7 changed files with 123 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
crates/chat/src/lib.rs
View File

@@ -1,10 +1,8 @@
use std::cmp::Reverse; use std::cmp::Reverse;
use std::collections::{BTreeSet, HashMap, HashSet}; use std::collections::{BTreeSet, HashMap, HashSet};
use std::hash::{DefaultHasher, Hash, Hasher}; use std::hash::{DefaultHasher, Hash, Hasher};
use std::sync::Arc;
#[cfg(target_arch = "wasm32")]
use std::sync::RwLock;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, RwLock};
use std::time::Duration; use std::time::Duration;
use anyhow::{Context as AnyhowContext, Error, anyhow}; use anyhow::{Context as AnyhowContext, Error, anyhow};
@@ -17,8 +15,6 @@ use gpui::{
}; };
use nostr_sdk::prelude::*; use nostr_sdk::prelude::*;
use smallvec::{SmallVec, smallvec}; use smallvec::{SmallVec, smallvec};
#[cfg(not(target_arch = "wasm32"))]
use smol::lock::RwLock;
use state::{DEVICE_GIFTWRAP, NostrRegistry, USER_GIFTWRAP, UniversalSigner}; use state::{DEVICE_GIFTWRAP, NostrRegistry, USER_GIFTWRAP, UniversalSigner};
mod message; mod message;
@@ -103,6 +99,12 @@ pub struct ChatRegistry {
/// Async tasks /// Async tasks
tasks: SmallVec<[Task<Result<(), Error>>; 2]>, tasks: SmallVec<[Task<Result<(), Error>>; 2]>,
/// Notification listener task (cancelled on signer change)
notification_listener: Option<Task<Result<(), Error>>>,
/// Signal consumer task (cancelled on signer change)
signal_consumer: Option<Task<Result<(), Error>>>,
/// Subscriptions /// Subscriptions
_subscriptions: SmallVec<[Subscription; 2]>, _subscriptions: SmallVec<[Subscription; 2]>,
} }
@@ -153,12 +155,18 @@ impl ChatRegistry {
signal_rx: rx, signal_rx: rx,
signal_tx: tx, signal_tx: tx,
tasks: smallvec![], tasks: smallvec![],
notification_listener: None,
signal_consumer: None,
_subscriptions: subscriptions, _subscriptions: subscriptions,
} }
} }
/// Handle nostr notifications /// Handle nostr notifications
fn handle_notifications(&mut self, cx: &mut Context<Self>) { fn handle_notifications(&mut self, cx: &mut Context<Self>) {
// Cancel previous notification tasks before spawning new ones
self.notification_listener = None;
self.signal_consumer = None;
let nostr = NostrRegistry::global(cx); let nostr = NostrRegistry::global(cx);
let client = nostr.read(cx).client(); let client = nostr.read(cx).client();
let signer = nostr.read(cx).signer(); let signer = nostr.read(cx).signer();
@@ -176,7 +184,7 @@ impl ChatRegistry {
let tx = self.signal_tx.clone(); let tx = self.signal_tx.clone();
let rx = self.signal_rx.clone(); let rx = self.signal_rx.clone();
self.tasks.push(cx.background_spawn(async move { self.notification_listener = Some(cx.background_spawn(async move {
let mut notifications = client.notifications(); let mut notifications = client.notifications();
let mut processed_events = HashSet::new(); let mut processed_events = HashSet::new();
@@ -209,7 +217,7 @@ impl ChatRegistry {
// Keep track of which relays have seen this event // Keep track of which relays have seen this event
{ {
let mut seens = seens.write().await; let mut seens = seens.write().unwrap();
seens.entry(event.id).or_default().insert(relay_url); seens.entry(event.id).or_default().insert(relay_url);
} }
@@ -217,9 +225,13 @@ impl ChatRegistry {
match extract_rumor(&client, &signer, event.as_ref()).await { match extract_rumor(&client, &signer, event.as_ref()).await {
Ok(rumor) => { Ok(rumor) => {
// Map the rumor id to the gift wrap event id for later lookup // Map the rumor id to the gift wrap event id for later lookup
let Some(rumor_id) = rumor.id else {
log::error!("Rumor missing id after ensure_id");
continue;
};
{ {
let mut event_map = event_map.write().await; let mut event_map = event_map.write().unwrap();
event_map.insert(rumor.id.unwrap(), event.id); event_map.insert(rumor_id, event.id);
} }
// Check if the rumor has a recipient // Check if the rumor has a recipient
@@ -256,7 +268,7 @@ impl ChatRegistry {
Ok(()) Ok(())
})); }));
self.tasks.push(cx.spawn(async move |this, cx| { self.signal_consumer = Some(cx.spawn(async move |this, cx| {
while let Ok(message) = rx.recv_async().await { while let Ok(message) = rx.recv_async().await {
match message { match message {
Signal::Message(message) => { Signal::Message(message) => {
@@ -287,21 +299,23 @@ impl ChatRegistry {
})); }));
} }
/// Tracking the status of unwrapping gift wrap events. /// Check periodically whether old gift-wrap events have finished processing,
/// and refresh rooms once the backlog is caught up.
fn tracking(&mut self, cx: &mut Context<Self>) { fn tracking(&mut self, cx: &mut Context<Self>) {
let status = self.tracking.clone(); let status = self.tracking.clone();
let tx = self.signal_tx.clone(); let tx = self.signal_tx.clone();
let check_interval = Duration::from_secs(15);
self.tasks.push(cx.spawn(async move |_, cx| { self.tasks.push(cx.spawn(async move |_, cx| {
let loop_duration = Duration::from_secs(15);
loop { loop {
if status.load(Ordering::Acquire) { cx.background_executor().timer(check_interval).await;
_ = status.compare_exchange(true, false, Ordering::Release, Ordering::Relaxed);
_ = tx.send_async(Signal::Eose).await; // Only trigger a room refresh if old events were being tracked
} else { // (i.e. the notification handler set the flag while catching up).
// `swap` atomically reads and clears the flag.
if status.swap(false, Ordering::AcqRel) {
_ = tx.send_async(Signal::Eose).await; _ = tx.send_async(Signal::Eose).await;
} }
cx.background_executor().timer(loop_duration).await;
} }
})); }));
} }
@@ -345,8 +359,6 @@ impl ChatRegistry {
self.tasks.push(cx.spawn(async move |this, cx| { self.tasks.push(cx.spawn(async move |this, cx| {
cx.background_executor().timer(Duration::from_secs(5)).await; cx.background_executor().timer(Duration::from_secs(5)).await;
if !cx
.background_spawn(async move {
// Construct inbox relays filter // Construct inbox relays filter
let filter = Filter::new() let filter = Filter::new()
.kind(Kind::InboxRelays) .kind(Kind::InboxRelays)
@@ -354,16 +366,15 @@ impl ChatRegistry {
.limit(1); .limit(1);
// Check the latest inbox relays event in database // Check the latest inbox relays event in database
client let found = client
.database() .database()
.query(filter) .query(filter)
.await .await
.unwrap_or_default() .unwrap_or_default()
.first_owned() .first_owned()
.is_some() .is_some();
})
.await if !found {
{
this.update(cx, |_this, cx| { this.update(cx, |_this, cx| {
cx.emit(ChatEvent::InboxRelayNotFound); cx.emit(ChatEvent::InboxRelayNotFound);
})?; })?;
@@ -469,7 +480,8 @@ impl ChatRegistry {
/// Count the number of messages seen by a given relay. /// Count the number of messages seen by a given relay.
pub fn count_messages(&self, relay_url: &RelayUrl) -> usize { pub fn count_messages(&self, relay_url: &RelayUrl) -> usize {
self.seens self.seens
.read_blocking() .read()
.unwrap()
.values() .values()
.filter(|seen| seen.contains(relay_url)) .filter(|seen| seen.contains(relay_url))
.count() .count()
@@ -488,7 +500,8 @@ impl ChatRegistry {
/// Get the relays that have seen a given rumor id. /// Get the relays that have seen a given rumor id.
pub fn rumor_seen_on(&self, id: &EventId) -> Option<HashSet<RelayUrl>> { pub fn rumor_seen_on(&self, id: &EventId) -> Option<HashSet<RelayUrl>> {
self.event_map self.event_map
.read_blocking() .read()
.unwrap()
.get(id) .get(id)
.map(|id| self.seen_on(id)) .map(|id| self.seen_on(id))
} }
@@ -496,7 +509,8 @@ impl ChatRegistry {
/// Get the relays that have seen a given gift wrap id. /// Get the relays that have seen a given gift wrap id.
pub fn seen_on(&self, id: &EventId) -> HashSet<RelayUrl> { pub fn seen_on(&self, id: &EventId) -> HashSet<RelayUrl> {
self.seens self.seens
.read_blocking() .read()
.unwrap()
.get(id) .get(id)
.cloned() .cloned()
.unwrap_or_default() .unwrap_or_default()
@@ -513,17 +527,17 @@ impl ChatRegistry {
return; return;
}; };
cx.spawn(async move |this, cx| { self.tasks.push(cx.spawn(async move |this, cx| {
let room: Room = room.into().organize(&public_key); let room: Room = room.into().organize(&public_key);
this.update(cx, |this, cx| { this.update(cx, |this, cx| {
this.rooms.insert(0, cx.new(|_| room)); this.rooms.insert(0, cx.new(|_| room));
cx.emit(ChatEvent::Ping); cx.emit(ChatEvent::Ping);
cx.notify(); cx.notify();
}) })?;
.ok()
}) Ok(())
.detach(); }));
} }
/// Emit an open room event. /// Emit an open room event.
@@ -635,7 +649,9 @@ impl ChatRegistry {
})?; })?;
} }
Err(e) => { Err(e) => {
log::error!("Failed to load rooms: {}", e); this.update(cx, |_, cx| {
cx.emit(ChatEvent::Error(e.to_string()));
})?;
} }
}; };

62
crates/device/src/lib.rs
View File

@@ -258,27 +258,19 @@ impl DeviceRegistry {
})); }));
let announcement_existed = self.announcement_existed.clone(); let announcement_existed = self.announcement_existed.clone();
let executor = cx.background_executor().clone();
self.tasks.push(cx.spawn(async move |this, cx| { self.tasks.push(cx.spawn(async move |this, cx| {
if !cx
.background_spawn(async move {
// Wait for 5 seconds // Wait for 5 seconds
executor.timer(Duration::from_secs(5)).await; cx.background_executor().timer(Duration::from_secs(5)).await;
// Then check if the msg relays have been found // Then check if the msg relays have been found
if !announcement_existed.load(Ordering::Acquire) { if announcement_existed.load(Ordering::Acquire) {
return true; return Ok(());
} }
false
})
.await
{
this.update(cx, |_this, cx| { this.update(cx, |_this, cx| {
cx.emit(DeviceEvent::NotSet); cx.emit(DeviceEvent::NotSet);
})?; })?;
}
Ok(()) Ok(())
})); }));
@@ -404,11 +396,10 @@ impl DeviceRegistry {
let client = nostr.read(cx).client(); let client = nostr.read(cx).client();
let signer = nostr.read(cx).signer(); let signer = nostr.read(cx).signer();
let Ok(app_keys) = get_or_init_app_keys(cx) else { let app_keys_task = get_or_init_app_keys(cx);
return;
};
let task: Task<Result<Option<Event>, Error>> = cx.background_spawn(async move { let task: Task<Result<Option<Event>, Error>> = cx.background_spawn(async move {
let app_keys = app_keys_task.await?;
let app_pubkey = app_keys.public_key(); let app_pubkey = app_keys.public_key();
let public_key = signer.get_public_key_async().await?; let public_key = signer.get_public_key_async().await?;
@@ -489,11 +480,10 @@ impl DeviceRegistry {
/// Parse the approval event to get encryption key then set it /// Parse the approval event to get encryption key then set it
fn extract_encryption(&mut self, event: Event, cx: &mut Context<Self>) { fn extract_encryption(&mut self, event: Event, cx: &mut Context<Self>) {
let Ok(app_keys) = get_or_init_app_keys(cx) else { let app_keys_task = get_or_init_app_keys(cx);
return;
};
let task: Task<Result<Keys, Error>> = cx.background_spawn(async move { let task: Task<Result<Keys, Error>> = cx.background_spawn(async move {
let app_keys = app_keys_task.await?;
let master = event let master = event
.tags .tags
.iter() .iter()
@@ -573,7 +563,7 @@ impl DeviceRegistry {
Ok(()) Ok(())
}); });
cx.spawn_in(window, async move |_this, cx| { self.tasks.push(cx.spawn_in(window, async move |_this, cx| {
match task.await { match task.await {
Ok(_) => { Ok(_) => {
cx.update(|window, cx| { cx.update(|window, cx| {
@@ -591,8 +581,9 @@ impl DeviceRegistry {
.ok(); .ok();
} }
}; };
})
.detach(); Ok(())
}));
} }
/// Handle encryption request /// Handle encryption request
@@ -715,33 +706,34 @@ impl DeviceRegistry {
struct DeviceNotification; struct DeviceNotification;
/// Get or create new app keys /// Get or create new app keys (async, returns a task)
fn get_or_init_app_keys(cx: &App) -> Result<Keys, Error> { fn get_or_init_app_keys(cx: &App) -> Task<Result<Keys, Error>> {
let read = cx.read_credentials(CLIENT_NAME); let read = cx.read_credentials(CLIENT_NAME);
let stored_keys: Option<Keys> = cx.foreground_executor().block_on(async move {
if let Ok(Some((_, secret))) = read.await {
SecretKey::from_slice(&secret).map(Keys::new).ok()
} else {
None
}
});
if let Some(keys) = stored_keys { cx.spawn(async move |cx| {
Ok(keys) if let Ok(Some((_, secret))) = read.await
} else { && let Ok(keys) = SecretKey::from_slice(&secret).map(Keys::new)
{
return Ok(keys);
}
// No stored keys found or invalid — generate new ones
let keys = Keys::generate(); let keys = Keys::generate();
let user = keys.public_key().to_hex(); let user = keys.public_key().to_hex();
let secret = keys.secret_key().to_secret_bytes(); let secret = keys.secret_key().to_secret_bytes();
let write = cx.write_credentials(CLIENT_NAME, &user, &secret);
cx.foreground_executor().block_on(async move { cx.update(|cx| {
let write = cx.write_credentials(CLIENT_NAME, &user, &secret);
cx.background_spawn(async move {
if let Err(e) = write.await { if let Err(e) = write.await {
log::error!("Keyring not available or panic: {e}") log::error!("Keyring not available or panic: {e}")
} }
})
.detach();
}); });
Ok(keys) Ok(keys)
} })
} }
/// Encrypt and store device keys in the local database. /// Encrypt and store device keys in the local database.

8
crates/state/src/lib.rs
View File

@@ -164,7 +164,7 @@ impl NostrRegistry {
<T as AsyncSignEvent>::Error: std::error::Error + Send + Sync + 'static, <T as AsyncSignEvent>::Error: std::error::Error + Send + Sync + 'static,
<T as AsyncNip44>::Error: std::error::Error + Send + Sync + 'static, <T as AsyncNip44>::Error: std::error::Error + Send + Sync + 'static,
{ {
cx.spawn(async move |this, cx| { let task = cx.spawn(async move |this, cx| {
match new_signer.get_public_key_async().await { match new_signer.get_public_key_async().await {
Ok(public_key) => { Ok(public_key) => {
this.update(cx, |this, cx| { this.update(cx, |this, cx| {
@@ -181,9 +181,9 @@ impl NostrRegistry {
} }
}; };
Ok::<(), anyhow::Error>(()) Ok(())
}) });
.detach(); self.tasks.push(task);
} }
/// Connect to the bootstrapping relays /// Connect to the bootstrapping relays

7
crates/workspace/src/dialogs/import.rs
View File

@@ -146,7 +146,7 @@ impl ImportIdentity {
let password = uri.to_string(); let password = uri.to_string();
let save = cx.write_credentials(USER_KEYRING, "bunker", password.as_bytes()); let save = cx.write_credentials(USER_KEYRING, "bunker", password.as_bytes());
cx.spawn_in(window, async move |_this, cx| { self.tasks.push(cx.spawn_in(window, async move |_this, cx| {
let keys = master_keys.await; let keys = master_keys.await;
let timeout = Duration::from_secs(30); let timeout = Duration::from_secs(30);
@@ -162,9 +162,8 @@ impl ImportIdentity {
cx.notify(); cx.notify();
}); });
Ok::<(), anyhow::Error>(()) Ok(())
}) }));
.detach();
} }
fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) { fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {

14
crates/workspace/src/lib.rs
View File

@@ -1,13 +1,14 @@
use std::sync::Arc; use std::sync::Arc;
use ::settings::AppSettings; use ::settings::AppSettings;
use anyhow::Error;
use chat::{ChatEvent, ChatRegistry}; use chat::{ChatEvent, ChatRegistry};
use common::{CoopImageCache, download_dir}; use common::{CoopImageCache, download_dir};
use device::{DeviceEvent, DeviceRegistry}; use device::{DeviceEvent, DeviceRegistry};
use gpui::prelude::FluentBuilder; use gpui::prelude::FluentBuilder;
use gpui::{ use gpui::{
Action, App, AppContext, Axis, Context, Entity, InteractiveElement, IntoElement, ParentElement, Action, App, AppContext, Axis, Context, Entity, InteractiveElement, IntoElement, ParentElement,
Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Window, div, Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Task, Window, div,
image_cache, px, relative, image_cache, px, relative,
}; };
use nostr_sdk::prelude::*; use nostr_sdk::prelude::*;
@@ -65,6 +66,9 @@ pub struct Workspace {
/// App's Image Cache /// App's Image Cache
image_cache: Entity<CoopImageCache>, image_cache: Entity<CoopImageCache>,
/// Async tasks
tasks: Vec<Task<Result<(), Error>>>,
/// Event subscriptions /// Event subscriptions
_subscriptions: SmallVec<[Subscription; 6]>, _subscriptions: SmallVec<[Subscription; 6]>,
} }
@@ -245,6 +249,7 @@ impl Workspace {
Self { Self {
dock, dock,
image_cache, image_cache,
tasks: vec![],
_subscriptions: subscriptions, _subscriptions: subscriptions,
} }
} }
@@ -390,7 +395,7 @@ impl Workspace {
let device = DeviceRegistry::global(cx).downgrade(); let device = DeviceRegistry::global(cx).downgrade();
let save_dialog = cx.prompt_for_new_path(download_dir(), Some("encryption.txt")); let save_dialog = cx.prompt_for_new_path(download_dir(), Some("encryption.txt"));
cx.spawn_in(window, async move |_this, cx| { self.tasks.push(cx.spawn_in(window, async move |_this, cx| {
// Get the output path from the save dialog // Get the output path from the save dialog
let output_path = match save_dialog.await { let output_path = match save_dialog.await {
Ok(Ok(Some(path))) => path, Ok(Ok(Some(path))) => path,
@@ -417,9 +422,8 @@ impl Workspace {
cx.open_with_system(output_path.as_path()); cx.open_with_system(output_path.as_path());
})?; })?;
Ok::<_, anyhow::Error>(()) Ok(())
}) }));
.detach();
} }
Command::ImportEncryption => { Command::ImportEncryption => {
self.import_encryption(window, cx); self.import_encryption(window, cx);

12
crates/workspace/src/panels/greeter.rs
View File

@@ -1,6 +1,7 @@
use anyhow::Error;
use gpui::{ use gpui::{
AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
IntoElement, ParentElement, Render, SharedString, Styled, Window, div, svg, IntoElement, ParentElement, Render, SharedString, Styled, Task, Window, div, svg,
}; };
use state::NostrRegistry; use state::NostrRegistry;
use theme::ActiveTheme; use theme::ActiveTheme;
@@ -18,6 +19,7 @@ pub fn init(window: &mut Window, cx: &mut App) -> Entity<GreeterPanel> {
pub struct GreeterPanel { pub struct GreeterPanel {
name: SharedString, name: SharedString,
focus_handle: FocusHandle, focus_handle: FocusHandle,
tasks: Vec<Task<Result<(), Error>>>,
} }
impl GreeterPanel { impl GreeterPanel {
@@ -25,6 +27,7 @@ impl GreeterPanel {
Self { Self {
name: "Onboarding".into(), name: "Onboarding".into(),
focus_handle: cx.focus_handle(), focus_handle: cx.focus_handle(),
tasks: vec![],
} }
} }
@@ -32,7 +35,7 @@ impl GreeterPanel {
let nostr = NostrRegistry::global(cx); let nostr = NostrRegistry::global(cx);
if let Some(public_key) = nostr.read(cx).current_user() { if let Some(public_key) = nostr.read(cx).current_user() {
cx.spawn_in(window, async move |_this, cx| { self.tasks.push(cx.spawn_in(window, async move |_this, cx| {
cx.update(|window, cx| { cx.update(|window, cx| {
Workspace::add_panel( Workspace::add_panel(
profile::init(public_key, window, cx), profile::init(public_key, window, cx),
@@ -42,8 +45,9 @@ impl GreeterPanel {
); );
}) })
.ok(); .ok();
})
.detach(); Ok(())
}));
} }
} }
} }

7
crates/workspace/src/panels/profile.rs
View File

@@ -132,7 +132,7 @@ impl ProfilePanel {
cx.notify(); cx.notify();
if status { if status {
cx.spawn_in(window, async move |this, cx| { self.tasks.push(cx.spawn_in(window, async move |this, cx| {
cx.background_executor().timer(Duration::from_secs(2)).await; cx.background_executor().timer(Duration::from_secs(2)).await;
// Reset the copied state after a delay // Reset the copied state after a delay
@@ -143,8 +143,9 @@ impl ProfilePanel {
.ok(); .ok();
}) })
.ok(); .ok();
})
.detach(); Ok(())
}));
} }
} }