WIP: integrate subman into Notedeck and AppContext

Author: ksedgwic

crates/notedeck/src/app.rs

@@ -1,7 +1,7 @@
 use crate::persist::{AppSizeHandler, ZoomHandler};
 use crate::{
     Accounts, AppContext, Args, DataPath, DataPathType, Directory, FileKeyStorage, ImageCache,
-    KeyStorageType, NoteCache, RelayDebugView, ThemeHandler, UnknownIds,
+    KeyStorageType, NoteCache, RelayDebugView, SubMan, ThemeHandler, UnknownIds,
 };
 use egui::ThemePreference;
 use enostr::RelayPool;
@@ -21,7 +21,6 @@ pub struct Notedeck {
     ndb: Ndb,
     img_cache: ImageCache,
     unknown_ids: UnknownIds,
-    pool: RelayPool,
     note_cache: NoteCache,
     accounts: Accounts,
     path: DataPath,
@@ -31,6 +30,7 @@ pub struct Notedeck {
     zoom: ZoomHandler,
     app_size: AppSizeHandler,
     unrecognized_args: BTreeSet<String>,
+    subman: SubMan,
 }
 
 fn margin_top(narrow: bool) -> f32 {
@@ -71,7 +71,7 @@ impl eframe::App for Notedeck {
         puffin::GlobalProfiler::lock().new_frame();
 
         // handle account updates
-        self.accounts.update(&mut self.ndb, &mut self.pool, ctx);
+        self.accounts.update(&mut self.ndb, self.subman.pool(), ctx);
 
         main_panel(&ctx.style(), crate::ui::is_narrow(ctx)).show(ctx, |ui| {
             // render app
@@ -85,11 +85,11 @@ impl eframe::App for Notedeck {
         self.app_size.try_save_app_size(ctx);
 
         if self.args.relay_debug {
-            if self.pool.debug.is_none() {
-                self.pool.use_debug();
+            if self.subman.pool().debug.is_none() {
+                self.subman.pool().use_debug();
             }
 
-            if let Some(debug) = &mut self.pool.debug {
+            if let Some(debug) = &mut self.subman.pool().debug {
                 RelayDebugView::window(ctx, debug);
             }
         }
@@ -199,11 +199,12 @@ impl Notedeck {
             error!("error migrating image cache: {e}");
         }
 
+        let subman = SubMan::new(ndb.clone(), pool);
+
         Self {
             ndb,
             img_cache,
             unknown_ids,
-            pool,
             note_cache,
             accounts,
             path: path.clone(),
@@ -213,6 +214,7 @@ impl Notedeck {
             zoom,
             app_size,
             unrecognized_args,
+            subman,
         }
     }
 
@@ -226,12 +228,12 @@ impl Notedeck {
             ndb: &mut self.ndb,
             img_cache: &mut self.img_cache,
             unknown_ids: &mut self.unknown_ids,
-            pool: &mut self.pool,
             note_cache: &mut self.note_cache,
             accounts: &mut self.accounts,
             path: &self.path,
             args: &self.args,
             theme: &mut self.theme,
+            subman: &mut self.subman,
         }
     }
 

crates/notedeck/src/context.rs

@@ -1,6 +1,5 @@
-use crate::{Accounts, Args, DataPath, ImageCache, NoteCache, ThemeHandler, UnknownIds};
+use crate::{Accounts, Args, DataPath, ImageCache, NoteCache, SubMan, ThemeHandler, UnknownIds};
 
-use enostr::RelayPool;
 use nostrdb::Ndb;
 
 // TODO: make this interface more sandboxed
@@ -9,10 +8,10 @@ pub struct AppContext<'a> {
     pub ndb: &'a mut Ndb,
     pub img_cache: &'a mut ImageCache,
     pub unknown_ids: &'a mut UnknownIds,
-    pub pool: &'a mut RelayPool,
     pub note_cache: &'a mut NoteCache,
     pub accounts: &'a mut Accounts,
     pub path: &'a DataPath,
     pub args: &'a Args,
     pub theme: &'a mut ThemeHandler,
+    pub subman: &'a mut SubMan,
 }

crates/notedeck/src/lib.rs

@@ -47,6 +47,7 @@ pub use storage::{
     DataPath, DataPathType, Directory, FileKeyStorage, KeyStorageResponse, KeyStorageType,
 };
 pub use style::NotedeckTextStyle;
+pub use subman::SubMan;
 pub use theme::ColorTheme;
 pub use time::time_ago_since;
 pub use timecache::TimeCached;

crates/notedeck_columns/src/app.rs

@@ -93,12 +93,12 @@ fn try_process_event(
         ctx2.request_repaint();
     };
 
-    app_ctx.pool.keepalive_ping(wakeup);
+    app_ctx.subman.pool().keepalive_ping(wakeup);
 
     // NOTE: we don't use the while let loop due to borrow issues
     #[allow(clippy::while_let_loop)]
     loop {
-        let ev = if let Some(ev) = app_ctx.pool.try_recv() {
+        let ev = if let Some(ev) = app_ctx.subman.pool().try_recv() {
             ev.into_owned()
         } else {
             break;
@@ -108,14 +108,14 @@ fn try_process_event(
             RelayEvent::Opened => {
                 app_ctx
                     .accounts
-                    .send_initial_filters(app_ctx.pool, &ev.relay);
+                    .send_initial_filters(app_ctx.subman.pool(), &ev.relay);
 
                 timeline::send_initial_timeline_filters(
                     app_ctx.ndb,
                     damus.since_optimize,
                     &mut damus.timeline_cache,
                     &mut damus.subscriptions,
-                    app_ctx.pool,
+                    app_ctx.subman.pool(),
                     &ev.relay,
                 );
             }
@@ -130,8 +130,12 @@ fn try_process_event(
     }
 
     for (_kind, timeline) in damus.timeline_cache.timelines.iter_mut() {
-        let is_ready =
-            timeline::is_timeline_ready(app_ctx.ndb, app_ctx.pool, app_ctx.note_cache, timeline);
+        let is_ready = timeline::is_timeline_ready(
+            app_ctx.ndb,
+            app_ctx.subman.pool(),
+            app_ctx.note_cache,
+            timeline,
+        );
 
         if is_ready {
             let txn = Transaction::new(app_ctx.ndb).expect("txn");
@@ -153,7 +157,7 @@ fn try_process_event(
     }
 
     if app_ctx.unknown_ids.ready_to_send() {
-        unknown_id_send(app_ctx.unknown_ids, app_ctx.pool);
+        unknown_id_send(app_ctx.unknown_ids, app_ctx.subman.pool());
     }
 
     Ok(())
@@ -229,14 +233,14 @@ fn handle_eose(
             );
             // this is possible if this is the first time
             if ctx.unknown_ids.ready_to_send() {
-                unknown_id_send(ctx.unknown_ids, ctx.pool);
+                unknown_id_send(ctx.unknown_ids, ctx.subman.pool());
             }
         }
 
         // oneshot subs just close when they're done
         SubKind::OneShot => {
             let msg = ClientMessage::close(subid.to_string());
-            ctx.pool.send_to(&msg, relay_url);
+            ctx.subman.pool().send_to(&msg, relay_url);
         }
 
         SubKind::FetchingContactList(timeline_uid) => {
@@ -287,12 +291,13 @@ fn handle_eose(
 fn process_message(damus: &mut Damus, ctx: &mut AppContext<'_>, relay: &str, msg: &RelayMessage) {
     match msg {
         RelayMessage::Event(_subid, ev) => {
-            let relay = if let Some(relay) = ctx.pool.relays.iter().find(|r| r.url() == relay) {
-                relay
-            } else {
-                error!("couldn't find relay {} for note processing!?", relay);
-                return;
-            };
+            let relay =
+                if let Some(relay) = ctx.subman.pool().relays.iter().find(|r| r.url() == relay) {
+                    relay
+                } else {
+                    error!("couldn't find relay {} for note processing!?", relay);
+                    return;
+                };
 
             match relay {
                 PoolRelay::Websocket(_) => {
@@ -387,7 +392,7 @@ impl Damus {
                     &txn,
                     ctx.ndb,
                     ctx.note_cache,
-                    ctx.pool,
+                    ctx.subman.pool(),
                     &timeline_kind,
                 ) {
                     add_result.process(

crates/notedeck_columns/src/decks.rs

@@ -323,7 +323,7 @@ pub fn demo_decks(
             &txn,
             ctx.ndb,
             ctx.note_cache,
-            ctx.pool,
+            ctx.subman.pool(),
             &kind,
         ) {
             results.process(

crates/notedeck_columns/src/nav.rs

@@ -72,7 +72,7 @@ impl SwitchingAction {
                     let kinds_to_pop =
                         get_active_columns_mut(ctx.accounts, decks_cache).delete_column(index);
                     for kind in &kinds_to_pop {
-                        if let Err(err) = timeline_cache.pop(kind, ctx.ndb, ctx.pool) {
+                        if let Err(err) = timeline_cache.pop(kind, ctx.ndb, ctx.subman.pool()) {
                             error!("error popping timeline: {err}");
                         }
                     }
@@ -144,7 +144,7 @@ impl RenderNavResponse {
                     let kinds_to_pop = app.columns_mut(ctx.accounts).delete_column(col);
 
                     for kind in &kinds_to_pop {
-                        if let Err(err) = app.timeline_cache.pop(kind, ctx.ndb, ctx.pool) {
+                        if let Err(err) = app.timeline_cache.pop(kind, ctx.ndb, ctx.subman.pool()) {
                             error!("error popping timeline: {err}");
                         }
                     }
@@ -154,7 +154,7 @@ impl RenderNavResponse {
 
                 RenderNavAction::PostAction(post_action) => {
                     let txn = Transaction::new(ctx.ndb).expect("txn");
-                    let _ = post_action.execute(ctx.ndb, &txn, ctx.pool, &mut app.drafts);
+                    let _ = post_action.execute(ctx.ndb, &txn, ctx.subman.pool(), &mut app.drafts);
                     get_active_columns_mut(ctx.accounts, &mut app.decks_cache)
                         .column_mut(col)
                         .router_mut()
@@ -170,7 +170,7 @@ impl RenderNavResponse {
                         col,
                         &mut app.timeline_cache,
                         ctx.note_cache,
-                        ctx.pool,
+                        ctx.subman.pool(),
                         &txn,
                         ctx.unknown_ids,
                     );
@@ -187,7 +187,7 @@ impl RenderNavResponse {
                     profile_action.process(
                         &mut app.view_state.pubkey_to_profile_state,
                         ctx.ndb,
-                        ctx.pool,
+                        ctx.subman.pool(),
                         get_active_columns_mut(ctx.accounts, &mut app.decks_cache)
                             .column_mut(col)
                             .router_mut(),
@@ -206,7 +206,7 @@ impl RenderNavResponse {
                         .pop();
 
                     if let Some(Route::Timeline(kind)) = &r {
-                        if let Err(err) = app.timeline_cache.pop(kind, ctx.ndb, ctx.pool) {
+                        if let Err(err) = app.timeline_cache.pop(kind, ctx.ndb, ctx.subman.pool()) {
                             error!("popping timeline had an error: {err} for {:?}", kind);
                         }
                     };
@@ -275,7 +275,7 @@ fn render_nav_body(
                 .map(|f| RenderNavAction::SwitchingAction(SwitchingAction::Accounts(f)))
         }
         Route::Relays => {
-            let manager = RelayPoolManager::new(ctx.pool);
+            let manager = RelayPoolManager::new(ctx.subman.pool());
             RelayView::new(ctx.accounts, manager, &mut app.view_state.id_string_map).ui(ui);
             None
         }

crates/notedeck_columns/src/ui/add_column.rs

@@ -634,7 +634,7 @@ pub fn render_add_column_routes(
                     &mut timeline,
                     ctx.ndb,
                     &mut app.subscriptions,
-                    ctx.pool,
+                    ctx.subman.pool(),
                     ctx.note_cache,
                     app.since_optimize,
                 );
@@ -675,7 +675,7 @@ pub fn render_add_column_routes(
                             &mut timeline,
                             ctx.ndb,
                             &mut app.subscriptions,
-                            ctx.pool,
+                            ctx.subman.pool(),
                             ctx.note_cache,
                             app.since_optimize,
                         );