Get web ui to obey signals

Author: NicholasLYang

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

@@ -45,7 +45,7 @@ pub async fn run(base: CommandBase, telemetry: CommandEventBuilder) -> Result<i3
             .build(&handler, telemetry)
             .await?;
 
-        let (sender, handle) = run.start_web_ui()?.unzip();
+        let (sender, handle) = run.start_web_ui(&handler)?.unzip();
 
         let result = run.run(sender.clone(), false).await;
 

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

@@ -187,9 +187,23 @@ impl Run {
 
     pub fn start_web_ui(
         &self,
+        signal_handler: &SignalHandler,
     ) -> Result<Option<(WebUISender, JoinHandle<Result<(), wui::Error>>)>, Error> {
+        let subscriber = signal_handler
+            .subscribe()
+            .ok_or(Error::SignalHandler(std::io::ErrorKind::BrokenPipe.into()))?;
         let (tx, rx) = tokio::sync::broadcast::channel(100);
-        let handle = tokio::spawn(turborepo_ui::wui::start_ws_server(rx));
+
+        let handle = tokio::spawn(async {
+            select! {
+                _ = turborepo_ui::wui::start_ws_server(rx) => Ok(()),
+                _ = subscriber.listen() => {
+                    println!("shutting down");
+                    Ok(())
+                }
+            }
+        });
+
         Ok(Some((WebUISender { tx }, handle)))
     }
 

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

@@ -188,15 +188,13 @@ async fn handle_socket_inner(mut socket: WebSocket, state: AppState) -> Result<(
                 })?;
 
                 state.messages.push((event, id));
-                println!("1");
                 socket.send(Message::Text(message_payload)).await?;
             }
             // Every 100ms, check if we need to resend any messages
             _ = interval.tick() => {
                 for (event, id) in &state.messages {
                     if !state.acks.contains(&id) {
                         let message_payload = serde_json::to_string(event).unwrap();
-                        println!("2");
                         socket.send(Message::Text(message_payload)).await?;
                     }
                 };
@@ -245,7 +243,7 @@ pub async fn start_ws_server(
         });
 
     let listener = tokio::net::TcpListener::bind("127.0.0.1:1337").await?;
-    println!("Web UI listening on port 1337");
+    println!("Web UI listening on port 1337...");
     axum::serve(listener, app).await?;
 
     Ok(())

web-ui/app/task-logs.tsx

@@ -48,6 +48,7 @@ export default function TaskLogs() {
       };
 
       socketRef.current.onopen = () => {
+        console.log("connected!");
         setConnected(true);
       };
     }