PR feedback

Author: NicholasLYang

crates/turborepo-lib/src/run/mod.rs

@@ -74,9 +74,10 @@ pub struct Run {
     should_print_prelude: bool,
 }
 
-type UIResult = Result<Option<(UISender, JoinHandle<Result<(), turborepo_ui::Error>>)>, Error>;
-type WuiResult = Result<Option<(WebUISender, JoinHandle<Result<(), turborepo_ui::Error>>)>, Error>;
-type TuiResult = Result<Option<(TuiSender, JoinHandle<Result<(), turborepo_ui::Error>>)>, Error>;
+type UIResult<T> = Result<Option<(T, JoinHandle<Result<(), turborepo_ui::Error>>)>, Error>;
+
+type WuiResult = UIResult<WebUISender>;
+type TuiResult = UIResult<TuiSender>;
 
 impl Run {
     fn has_persistent_tasks(&self) -> bool {
@@ -210,7 +211,7 @@ impl Run {
             && tui::terminal_big_enough()?)
     }
 
-    pub fn start_ui(&self) -> UIResult {
+    pub fn start_ui(&self) -> UIResult<UISender> {
         match self.opts.run_opts.ui_mode {
             UIMode::Tui => self
                 .start_terminal_ui()

crates/turborepo-ui/src/wui/server.rs

@@ -22,7 +22,7 @@ struct Task {
 }
 
 struct CurrentRun<'a> {
-    state: &'a Arc<Mutex<RefCell<WebUIState>>>,
+    state: &'a SharedState,
 }
 
 #[Object]
@@ -42,12 +42,17 @@ impl<'a> CurrentRun<'a> {
     }
 }
 
+/// We keep the state in a `Arc<Mutex<RefCell<T>>>` so both `Subscriber` and
+/// `Query` can access it, with `Subscriber` mutating it and `Query` only
+/// reading it.
+type SharedState = Arc<Mutex<RefCell<WebUIState>>>;
+
 pub struct Query {
-    state: Arc<Mutex<RefCell<WebUIState>>>,
+    state: SharedState,
 }
 
 impl Query {
-    pub fn new(state: Arc<Mutex<RefCell<WebUIState>>>) -> Self {
+    pub fn new(state: SharedState) -> Self {
         Self { state }
     }
 }
@@ -80,7 +85,7 @@ pub async fn start_server(
     Ok(())
 }
 
-pub(crate) async fn run_server(state: Arc<Mutex<RefCell<WebUIState>>>) -> Result<(), crate::Error> {
+pub(crate) async fn run_server(state: SharedState) -> Result<(), crate::Error> {
     let cors = CorsLayer::new()
         // allow `GET` and `POST` when accessing the resource
         .allow_methods([Method::GET, Method::POST])