fix: Audit 02/26 (#1845)

* Fix template git.

* Fix port issue.

* Fix graph servers.

Author: milesj

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## Unreleased
+
+#### 🚀 Updates
+
+- Updated `moon task-graph`, `moon-project-graph`, and `moon action-graph` to request a port
+  dynamically, instead of defaulting to 8000.
+
+#### 🐞 Fixes
+
+- Fixed an issue where `moon *-graph` commands could not be CTRL+C'd.
+- Fixed an issue where Git based template locations would fail if the initial `git clone` failed.
+
 ## 1.32.6
 
 #### 🐞 Fixes

crates/app/src/commands/graph/action.rs

@@ -1,10 +1,9 @@
-use crate::commands::graph::utils::{action_graph_repr, respond_to_request, setup_server};
+use crate::commands::graph::utils::{action_graph_repr, run_server};
 use crate::session::CliSession;
 use clap::Args;
 use moon_action_graph::RunRequirements;
 use moon_task::Target;
 use starbase::AppResult;
-use starbase_styles::color;
 use starbase_utils::json;
 use tracing::instrument;
 
@@ -38,9 +37,9 @@ pub async fn action_graph(session: CliSession, args: ActionGraphArgs) -> AppResu
         for target in targets {
             action_graph_builder.run_task_by_target(target, &requirements)?;
         }
-
-        // Show all targets and actions
-    } else {
+    }
+    // Show all targets and actions
+    else {
         for project in workspace_graph.get_projects()? {
             for task in workspace_graph.get_tasks_from_project(&project.id)? {
                 action_graph_builder.run_task(&project, &task, &requirements)?;
@@ -64,15 +63,7 @@ pub async fn action_graph(session: CliSession, args: ActionGraphArgs) -> AppResu
         return Ok(None);
     }
 
-    let (server, mut tera) = setup_server().await?;
-    let url = format!("http://{}", server.server_addr());
-    let _ = open::that(&url);
-
-    println!("Started server on {}", color::url(url));
-
-    for req in server.incoming_requests() {
-        respond_to_request(req, &mut tera, &graph_info, "Action graph".to_owned())?;
-    }
+    run_server("Action graph", graph_info).await?;
 
     Ok(None)
 }

crates/app/src/commands/graph/project.rs

@@ -1,10 +1,9 @@
-use super::utils::{project_graph_repr, respond_to_request, setup_server};
+use super::utils::{project_graph_repr, run_server};
 use crate::session::CliSession;
 use clap::Args;
 use moon_common::Id;
 use moon_project_graph::{GraphToDot, GraphToJson};
 use starbase::AppResult;
-use starbase_styles::color;
 use std::sync::Arc;
 use tracing::instrument;
 
@@ -46,16 +45,7 @@ pub async fn project_graph(session: CliSession, args: ProjectGraphArgs) -> AppRe
         return Ok(None);
     }
 
-    let graph_info = project_graph_repr(&project_graph).await;
-    let (server, mut tera) = setup_server().await?;
-    let url = format!("http://{}", server.server_addr());
-    let _ = open::that(&url);
-
-    println!("Started server on {}", color::url(url));
-
-    for req in server.incoming_requests() {
-        respond_to_request(req, &mut tera, &graph_info, "Project graph".to_owned())?;
-    }
+    run_server("Project graph", project_graph_repr(&project_graph).await).await?;
 
     Ok(None)
 }

crates/app/src/commands/graph/task.rs

@@ -1,10 +1,9 @@
-use super::utils::{respond_to_request, setup_server, task_graph_repr};
+use super::utils::{run_server, task_graph_repr};
 use crate::session::CliSession;
 use clap::Args;
 use moon_task::Target;
 use moon_task_graph::{GraphToDot, GraphToJson};
 use starbase::AppResult;
-use starbase_styles::color;
 use std::sync::Arc;
 use tracing::instrument;
 
@@ -46,16 +45,7 @@ pub async fn task_graph(session: CliSession, args: TaskGraphArgs) -> AppResult {
         return Ok(None);
     }
 
-    let graph_info = task_graph_repr(&task_graph).await;
-    let (server, mut tera) = setup_server().await?;
-    let url = format!("http://{}", server.server_addr());
-    let _ = open::that(&url);
-
-    println!("Started server on {}", color::url(url));
-
-    for req in server.incoming_requests() {
-        respond_to_request(req, &mut tera, &graph_info, "Task graph".to_owned())?;
-    }
+    run_server("Task graph", task_graph_repr(&task_graph).await).await?;
 
     Ok(None)
 }

crates/app/src/commands/graph/utils.rs

@@ -1,17 +1,20 @@
 use super::dto::{GraphEdgeDto, GraphInfoDto, GraphNodeDto};
 use miette::IntoDiagnostic;
 use moon_action_graph::ActionGraph;
+use moon_common::color;
+use moon_process::ProcessRegistry;
 use moon_project_graph::{GraphConversions, ProjectGraph};
 use moon_task_graph::TaskGraph;
 use petgraph::{graph::NodeIndex, Graph};
 use rustc_hash::FxHashMap;
 use serde::Serialize;
-use starbase::AppResult;
 use starbase_utils::json;
 use std::env;
 use std::fmt::Display;
+use std::sync::Arc;
 use tera::{Context, Tera};
 use tiny_http::{Header, Request, Response, Server};
+use tokio::task::{spawn, JoinHandle};
 
 const INDEX_HTML: &str = include_str!("graph.html.tera");
 
@@ -22,10 +25,10 @@ pub struct RenderContext {
     pub js_url: String,
 }
 
-pub async fn setup_server() -> miette::Result<(Server, Tera)> {
+pub async fn setup_server() -> miette::Result<(Arc<Server>, Tera)> {
     let port = match env::var("MOON_PORT") {
         Ok(p) => p.parse::<u16>().unwrap(),
-        Err(..) => 8000,
+        Err(..) => 0, // Uses an available port
     };
     let host = match env::var("MOON_HOST") {
         Ok(h) => h,
@@ -35,7 +38,7 @@ pub async fn setup_server() -> miette::Result<(Server, Tera)> {
     let server = Server::http(address).unwrap();
     let tera = Tera::default();
 
-    Ok((server, tera))
+    Ok((Arc::new(server), tera))
 }
 
 pub fn extract_nodes_and_edges_from_graph<T: Display>(
@@ -100,7 +103,7 @@ pub fn respond_to_request(
     tera: &mut Tera,
     graph: &GraphInfoDto,
     page_title: String,
-) -> AppResult {
+) -> miette::Result<()> {
     let response = match req.url() {
         "/graph-data" => {
             let mut response = Response::from_data(json::format(graph, false)?);
@@ -132,7 +135,7 @@ pub fn respond_to_request(
 
     req.respond(response).unwrap_or_default();
 
-    Ok(None)
+    Ok(())
 }
 
 // Use the local version of the JS file when in development mode otherwise the CDN URL.
@@ -145,3 +148,43 @@ pub fn get_js_url() -> String {
         },
     }
 }
+
+pub async fn run_server(title: &str, graph_info: GraphInfoDto) -> miette::Result<()> {
+    let (server, mut tera) = setup_server().await?;
+    let url = format!("http://{}", server.server_addr());
+    let _ = open::that(&url);
+
+    println!("Started server on {}", color::url(url));
+
+    let server_clone = server.clone();
+    let handle1: JoinHandle<miette::Result<()>> = spawn(async move {
+        let mut listener = ProcessRegistry::instance().receive_signal();
+
+        if listener.recv().await.is_ok() {
+            server_clone.unblock();
+        }
+
+        Ok(())
+    });
+
+    let title = title.to_owned();
+    let handle2: JoinHandle<miette::Result<()>> = spawn(async move {
+        for req in server.incoming_requests() {
+            respond_to_request(req, &mut tera, &graph_info, title.clone())?;
+        }
+
+        Ok(())
+    });
+
+    tokio::try_join!(flatten(handle1), flatten(handle2))?;
+
+    Ok(())
+}
+
+async fn flatten(handle: JoinHandle<miette::Result<()>>) -> miette::Result<()> {
+    match handle.await {
+        Ok(Ok(result)) => Ok(result),
+        Ok(Err(err)) => Err(err),
+        Err(err) => Err(miette::miette!("{err}")),
+    }
+}

crates/codegen/src/codegen.rs

@@ -281,7 +281,7 @@ async fn clone_and_checkout_git_repository(
     }
 
     // Clone or fetch the repository
-    if template_location.exists() {
+    if template_location.join(".git").exists() {
         debug!(
             location = ?template_location,
             "Repository already exists, fetching latest",