Merge pull request #583 from swimos/transit

Adds rust port of the transit app to the examples.

Author: SirCipher

Cargo.toml

@@ -31,6 +31,8 @@ members = [
     "example_apps/map_downlink",
     "example_apps/local_downlink",
     "example_apps/http_lane",
+    "example_apps/transit",
+    "example_apps/transit/transit-model",
     "example_apps/tutorial_app",
     "example_apps/tutorial_app/model",
     "example_apps/tutorial_app/generator",
@@ -71,6 +73,7 @@ nom = "7.1"
 nom_locate = "4.0"
 tracing = "0.1"
 tracing-subscriber = "0.3"
+tracing-appender = "0.2"
 base64 = "0.13"
 num-traits = "0.2"
 thiserror = "1.0"
@@ -103,5 +106,6 @@ percent-encoding = "2.1.0"
 mime = "0.3"
 serde_json = "1.0"
 serde = "1.0"
+reqwest = "0.11"
 convert_case = "0.6"
 frunk = "0.4"

example_apps/command_lane/src/main.rs

@@ -27,7 +27,7 @@ mod agent;
 mod model;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     example_logging()?;
     let route = RoutePattern::parse_str("/example/:name}")?;
 

example_apps/demand_lane/src/main.rs

@@ -26,7 +26,7 @@ use crate::agent::{ExampleAgent, ExampleLifecycle};
 mod agent;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     example_logging()?;
     let route = RoutePattern::parse_str("/example/:name}")?;
 

example_apps/demand_map_lane/src/main.rs

@@ -26,7 +26,7 @@ use crate::agent::{ExampleAgent, ExampleLifecycle};
 mod agent;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     example_logging()?;
     let route = RoutePattern::parse_str("/example/:name}")?;
 

example_apps/event_downlink/src/consumer/mod.rs

@@ -25,7 +25,7 @@ use self::agent::{ConsumerAgent, ConsumerLifecycle};
 mod agent;
 mod model;
 
-pub async fn make_server(producer_port: u16) -> Result<BoxServer, Box<dyn Error>> {
+pub async fn make_server(producer_port: u16) -> Result<BoxServer, Box<dyn Error + Send + Sync>> {
     let route = RoutePattern::parse_str("/consumer/:name}")?;
 
     let lifecycle_fn = move || ConsumerLifecycle::new(producer_port).into_lifecycle();

example_apps/event_downlink/src/main.rs

@@ -22,7 +22,7 @@ mod consumer;
 mod producer;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     example_logging()?;
 
     let server = producer::make_server().await?;
@@ -43,7 +43,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-async fn start_consumer(rx: oneshot::Receiver<StartDependent>) -> Result<(), Box<dyn Error>> {
+async fn start_consumer(
+    rx: oneshot::Receiver<StartDependent>,
+) -> Result<(), Box<dyn Error + Send + Sync>> {
     let StartDependent { bound, request } = rx.await?;
     let server = consumer::make_server(bound.port()).await?;
     let (task, handle) = server.run();

example_apps/event_downlink/src/producer/mod.rs

@@ -23,7 +23,7 @@ use swim::{
 
 mod agent;
 
-pub async fn make_server() -> Result<BoxServer, Box<dyn Error>> {
+pub async fn make_server() -> Result<BoxServer, Box<dyn Error + Send + Sync>> {
     let route = RoutePattern::parse_str("/producer/:name}")?;
 
     let lifecycle = ProducerLifecycle;

example_apps/example_util/src/lib.rs

@@ -136,20 +136,24 @@ pub async fn manage_producer_and_consumer(
     }
 }
 
-pub fn example_logging() -> Result<(), Box<dyn std::error::Error>> {
+pub fn example_filter() -> Result<EnvFilter, Box<dyn std::error::Error + Send + Sync>> {
+    let filter = if let Ok(filter) = EnvFilter::try_from_default_env() {
+        filter
+    } else {
+        EnvFilter::new("")
+            .add_directive("swim_server_app=trace".parse()?)
+            .add_directive("swim_runtime=trace".parse()?)
+            .add_directive("swim_agent=trace".parse()?)
+            .add_directive("swim_messages=trace".parse()?)
+            .add_directive("swim_remote=trace".parse()?)
+    };
+    Ok(filter)
+}
+
+pub fn example_logging() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let args = std::env::args().collect::<Vec<_>>();
     if args.get(1).map(String::as_str) == Some("--enable-logging") {
-        let filter = if let Ok(filter) = EnvFilter::try_from_default_env() {
-            filter
-        } else {
-            EnvFilter::new("")
-                .add_directive("swim_server_app=trace".parse()?)
-                .add_directive("swim_runtime=trace".parse()?)
-                .add_directive("swim_agent=trace".parse()?)
-                .add_directive("swim_messages=trace".parse()?)
-                .add_directive("swim_remote=trace".parse()?)
-                .add_directive(LevelFilter::WARN.into())
-        };
+        let filter = example_filter()?.add_directive(LevelFilter::WARN.into());
         tracing_subscriber::fmt().with_env_filter(filter).init();
     }
     Ok(())

example_apps/http_lane/src/main.rs

@@ -26,7 +26,7 @@ use crate::agent::{ExampleAgent, ExampleLifecycle};
 mod agent;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     example_logging()?;
 
     let route = RoutePattern::parse_str("/example/:name}")?;

example_apps/local_downlink/src/main.rs

@@ -30,7 +30,7 @@ mod consumer;
 mod producer;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     example_logging()?;
 
     let producer_route = RoutePattern::parse_str("/producer/:name}")?;