Resolves PR comments

Author: SirCipher

example_apps/ripple/Cargo.toml

@@ -20,5 +20,4 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros", "sync", "io
 tokio-util = { workspace = true }
 rand = { workspace = true }
 parking_lot = { workspace = true, features = ["send_guard"] }
-chrono = { workspace = true }
-swimos_recon = { workspace = true }
+chrono = { workspace = true }

example_apps/ripple/README.md

@@ -15,7 +15,7 @@ $ cargo run --bin ripple
 ```
 
 Internally, this will spawn two servers: the Swim server which is running at localhost:9001 and a UI server running
-at http://localhost:9002/index.html. Using your browser, navigate to http://localhost:9002/index.html and randomly click
+at http://localhost:9002. Using your browser, navigate to http://localhost:9002/index.html and randomly click
 on the screen to generate 'ripples'. These ripples are propagated to all users which are connected to the Swim server.
 You may also hold your mouse's left button down to generate a 'charge' which is denoted by a larger circle displayed on
 the screen.

example_apps/ripple/src/agent.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use std::collections::HashMap;
+use std::fmt::{Display, Formatter};
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -110,7 +111,7 @@ pub struct Charge {
     /// The charge's current Y position.
     y: f64,
     /// The color of the charge.
-    color: Color,
+    color: String,
     /// The radius of the charge.
     #[form(name = "r")]
     radius: i32,
@@ -134,7 +135,7 @@ pub enum ChargeAction {
         /// The charge's current Y position.
         y: f64,
         /// The color of the charge.
-        color: Color,
+        color: String,
         /// The radius of the charge.
         #[form(name = "r")]
         radius: i32,
@@ -149,7 +150,7 @@ pub enum ChargeAction {
         /// The charge's current Y position.
         y: f64,
         /// The color of the charge.
-        color: Color,
+        color: String,
         /// The radius of the charge.
         #[form(name = "r")]
         radius: i32,
@@ -303,7 +304,7 @@ pub struct Ripple {
     /// Phases are the subsequent ripples that are generated by a ripple.
     phases: Vec<f64>,
     /// The color of the charge.
-    color: Color,
+    color: String,
 }
 
 impl Default for Ripple {
@@ -332,7 +333,7 @@ impl Ripple {
             x: rng.gen::<f64>(),
             y: rng.gen::<f64>(),
             phases,
-            color: Color::select_random(rng),
+            color: Color::select_random(rng).to_string(),
         }
     }
 }
@@ -348,6 +349,16 @@ pub enum Color {
     Cyan,
 }
 
+impl Display for Color {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Color::Green => write!(f, "#80dc1a"),
+            Color::Magenta => write!(f, "#c200fa"),
+            Color::Cyan => write!(f, "#56dbb6"),
+        }
+    }
+}
+
 impl Color {
     /// Returns a random color generated using `rng`.
     fn select_random(rng: &mut StdRng) -> Color {

example_apps/ripple/src/main.rs

@@ -25,32 +25,27 @@
 //! http://127.0.0.1:9002/index.html
 //! ```
 
+use std::convert::Infallible;
+use std::{error::Error, net::SocketAddr, time::Duration};
+
 use axum::body::Body;
 use axum::http::{header, HeaderValue};
 use axum::response::IntoResponse;
 use axum::routing::get;
 use axum::Router;
-use futures::future::{select, Either};
 use rand::rngs::StdRng;
 use rand::SeedableRng;
-use std::convert::Infallible;
-use std::future::IntoFuture;
-use std::{error::Error, net::SocketAddr, pin::pin, sync::Arc, time::Duration};
 use tokio::net::TcpListener;
-use tokio::sync::Notify;
 use tracing_subscriber::filter::LevelFilter;
 
 use swimos::agent::agent_model::AgentModel;
 use swimos::server::{Server, ServerBuilder};
 use swimos_utilities::routing::RoutePattern;
-use swimos_utilities::trigger::trigger;
 
 use crate::agent::{MirrorAgent, MirrorLifecycle};
 
 mod agent;
-mod util;
 
-const SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
 static HTML: HeaderValue = HeaderValue::from_static("text/html; charset=utf-8");
 const INDEX: &[u8] = include_bytes!("../ui/index.html");
 const RIPPLE: &[u8] = include_bytes!("../ui/swim-ripple.js");
@@ -60,45 +55,21 @@ const RIPPLE_MAP: &[u8] = include_bytes!("../ui/swim-ripple.js.map");
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     example_logging()?;
 
-    let shutdown_tx = Arc::new(Notify::new());
-    let shutdown_rx = shutdown_tx.clone();
-
     let server_task = tokio::spawn(run_swim_server());
-    let ui_task = tokio::spawn(ui_server(shutdown_rx, SHUTDOWN_TIMEOUT));
+    let ui_task = tokio::spawn(ui_server());
     ui_task.await??;
     server_task.await??;
 
     Ok(())
 }
 
 /// Spawns the UI server on 0.0.0.0:9002.
-///
-/// # Arguments:
-/// * `shutdown_signal` - Future which completes when the server should terminate.
-/// * `shutdown_timeout` - How long to wait for the UI server to terminate before returning.
-async fn ui_server(
-    shutdown_signal: Arc<Notify>,
-    shutdown_timeout: Duration,
-) -> Result<(), Box<dyn Error + Send + Sync>> {
+async fn ui_server() -> Result<(), Box<dyn Error + Send + Sync>> {
     let app = ui_server_router();
     let bind_to: SocketAddr = "0.0.0.0:9002".parse()?;
-    let (stop_tx, stop_rx) = trigger();
     let listener = TcpListener::bind(bind_to).await?;
 
-    let server =
-        axum::serve(listener, app.into_make_service()).with_graceful_shutdown(async move {
-            let _ = stop_rx.await;
-        });
-
-    let server_task = pin!(server.into_future());
-    let shutdown_notified = pin!(shutdown_signal.notified());
-    match select(server_task, shutdown_notified).await {
-        Either::Left((result, _)) => result?,
-        Either::Right((_, server)) => {
-            assert!(stop_tx.trigger());
-            tokio::time::timeout(shutdown_timeout, server).await??;
-        }
-    }
+    axum::serve(listener, app.into_make_service()).await?;
 
     Ok(())
 }