shuttle: performed last needed changes to support build for shuttle deployment

Cargo.lock

@@ -405,7 +405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
-name = "caesar"
+name = "caesar-transfer-iu"
 version = "0.0.1"
 dependencies = [
  "aes-gcm",

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "caesar"
+name = "caesar-transfer-iu"
 version = "0.0.1"
 edition = "2021"
 build = "src/build.rs"
@@ -9,6 +9,10 @@ authors = ["Manuel Keidel", "Patryk Hegenberg", "Krzysztof Stankiewicz"]
 name = "caesar"
 path = "src/main.rs"
 
+[[bin]]
+name = "caesar-transfer-iu"
+path = "src/shuttle.rs"
+
 [dependencies]
 futures-util = "0.3"
 tungstenite = "0.21.0"
@@ -40,8 +44,8 @@ local-ip-address = "0.6.1"
 axum-extra = { version = "0.9.3", features = ["typed-header"] }
 headers = "0.4"
 tower = { version = "0.4", features = ["util"] }
-shuttle-axum = { version = "0.44.0", optional = true }
-shuttle-runtime = { version = "0.44.0", optional = true }
+shuttle-axum = { version = "0.44.0" }
+shuttle-runtime = { version = "0.44.0" }
 dotenvy = "0.15.7"
 
 [build-dependencies]

src/main.rs

@@ -1,12 +1,6 @@
 use crate::cli::args::Args;
-#[cfg(not(feature = "shuttle"))]
 use dotenv::dotenv;
-#[cfg(feature = "shuttle")]
-use dotenvy::dotenv;
-#[cfg(feature = "shuttle")]
-use shuttle_axum::ShuttleAxum;
 use tracing::error;
-#[cfg(not(feature = "shuttle"))]
 use tracing_subscriber::filter::EnvFilter;
 
 pub mod cli;
@@ -15,7 +9,6 @@ pub mod relay;
 pub mod sender;
 pub mod shared;
 
-#[cfg(not(feature = "shuttle"))]
 #[tokio::main]
 // This is the entrypoint of caesar.
 // The #[tokio::main] attribute is required for any async code, and it
@@ -42,29 +35,3 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     // Return an Ok result, which just means that our program exited successfully.
     Ok(())
 }
-
-#[cfg(feature = "shuttle")]
-#[shuttle_runtime::main]
-async fn main() -> ShuttleAxum {
-    dotenv().ok();
-    let app_host = env::var("APP_HOST").unwrap_or("0.0.0.0".to_string());
-    let app_port = env::var("APP_PORT").unwrap_or("8000".to_string());
-
-    // Log information about the server's configuration.
-    debug!("Server configured to accept connections on host {app_host}...",);
-    debug!("Server configured to listen connections on port {app_port}...",);
-
-    // Create a new server data structure.
-    let server = server::Server::new();
-
-    // Set up the application routes.
-    let app = Router::new()
-        .route("/ws", get(ws_handler))
-        .with_state(server)
-        .layer(SecureClientIpSource::ConnectInfo.into_extension())
-        .layer(
-            TraceLayer::new_for_http()
-                .make_span_with(DefaultMakeSpan::default().include_headers(true)),
-        );
-    Ok(app.into())
-}

src/receiver/mod.rs

@@ -44,10 +44,8 @@ use tokio_tungstenite::{
     tungstenite::{client::IntoClientRequest, http::HeaderValue},
 };
 use tracing::error;
-use url::Url;
 
 pub async fn start_receiver(relay: &str, name: &str) {
-    let argument = name;
     let Ok(mut request) = relay.into_client_request() else {
         println!("Error: Failed to create request.");
         return;
@@ -66,17 +64,8 @@ pub async fn start_receiver(relay: &str, name: &str) {
         return;
     };
 
-    // If the URL is valid and contains an invite code fragment,
-    // extract it and pass it to the receiver::client::start
-    // function. The start function is defined in the
+    // The start function is defined in the
     // receiver::client module and is the function that interacts with
     // the server to receive files.
-    if let Ok(url) = Url::parse(argument) {
-        let Some(fragment) = url.fragment() else {
-            error!("Error: Missing invite code fragment in url.");
-            return;
-        };
-
-        receiver::start(socket, fragment).await
-    }
+    receiver::start(socket, name).await
 }

src/relay/mod.rs

@@ -17,12 +17,11 @@
 /// host and port, it logs an error and exits.
 pub mod server;
 use axum::{
-    extract::{ws::WebSocket, ConnectInfo, State, WebSocketUpgrade},
+    extract::{ws::WebSocket, State, WebSocketUpgrade},
     response::IntoResponse,
     routing::get,
     Router,
 };
-use axum_client_ip::SecureClientIpSource;
 
 use futures_util::StreamExt;
 use std::{env, net::SocketAddr, sync::Arc};
@@ -32,7 +31,7 @@ use tokio::{
     sync::{Mutex, RwLock},
 };
 use tower_http::trace::{DefaultMakeSpan, TraceLayer};
-use tracing::{debug, error, info};
+use tracing::{debug, error, info, warn};
 
 use self::server::Client;
 
@@ -97,7 +96,6 @@ pub async fn start_ws(port: Option<&i32>, listen_addr: Option<&String>) {
     let app = Router::new()
         .route("/ws", get(ws_handler))
         .with_state(server)
-        .layer(SecureClientIpSource::ConnectInfo.into_extension())
         .layer(
             TraceLayer::new_for_http()
                 .make_span_with(DefaultMakeSpan::default().include_headers(true)),
@@ -157,15 +155,15 @@ pub async fn start_ws(port: Option<&i32>, listen_addr: Option<&String>) {
 /// `handle_message` function is defined in the `src/relay/client.rs` file. The
 /// `handle_message` function handles incoming messages from the client and
 /// takes care of sending the appropriate response back to the client.
-async fn ws_handler(
+pub async fn ws_handler(
     ws: WebSocketUpgrade,
     State(shared_state): State<Arc<RwLock<server::Server>>>,
-    ConnectInfo(addr): ConnectInfo<SocketAddr>,
+    // ConnectInfo(addr): ConnectInfo<SocketAddr>,
 ) -> impl IntoResponse {
     debug!("Got Request on Websocket route");
-    debug!("WebSocket connection established from:{}", addr.to_string());
+    // debug!("WebSocket connection established from:{}", addr.to_string());
     debug!("Upgrading Connection");
-    ws.on_upgrade(move |socket| handle_socket(socket, addr, shared_state))
+    ws.on_upgrade(move |socket| handle_socket(socket, shared_state))
 }
 
 /// This function is called when a new WebSocket connection is established.
@@ -203,7 +201,7 @@ async fn ws_handler(
 /// `Client` object that it created. The `handle_close` method is defined in the
 /// `src/relay/client.rs` file. The `handle_close` method handles the close event
 /// from the client.
-async fn handle_socket(socket: WebSocket, who: SocketAddr, rooms: Arc<RwLock<server::Server>>) {
+async fn handle_socket(socket: WebSocket, rooms: Arc<RwLock<server::Server>>) {
     let (sender, mut receiver) = socket.split();
 
     let sender = Arc::new(Mutex::new(sender));
@@ -214,7 +212,7 @@ async fn handle_socket(socket: WebSocket, who: SocketAddr, rooms: Arc<RwLock<ser
                 client.handle_message(&rooms, message).await;
             }
             Err(error) => {
-                error!("Failed to read message from client {}: {}", who, error);
+                warn!("Failed to read message from client: {}", error);
                 break;
             }
         }

src/sender/client.rs

@@ -28,7 +28,6 @@ const DESTINATION: u8 = 1;
 const NONCE_SIZE: usize = 12;
 const MAX_CHUNK_SIZE: isize = u16::MAX as isize;
 const DELAY: Duration = Duration::from_millis(750);
-const URL: &str = "https://0.0.0.0:8000/#";
 
 /// A file that is to be sent.
 ///
@@ -120,7 +119,7 @@ struct Context {
 /// message to the console with the URL.
 fn on_create_room(context: &Context, id: String) -> Status {
     let base64 = general_purpose::STANDARD.encode(&context.hmac);
-    let url = format!("{}{}-{}", URL, id, base64);
+    let url = format!("{}-{}", id, base64);
 
     // Print a newline to the console to separate the output from the command
     // line.

src/sender/mod.rs

@@ -47,8 +47,6 @@ use tokio_tungstenite::{
 };
 use tracing::{debug, error};
 
-// const ORIGIN: &str = "ws://0.0.0.0:8000/ws";
-
 pub async fn start_sender(relay: &str, files: &[String]) {
     let Ok(mut request) = relay.into_client_request() else {
         println!("Error: Failed to create request.");
@@ -59,7 +57,7 @@ pub async fn start_sender(relay: &str, files: &[String]) {
         .headers_mut()
         .insert("Origin", HeaderValue::from_str(relay).unwrap());
 
-    debug!("Attempting to connect...");
+    debug!("Attempting to connect to {relay}...");
 
     let Ok((socket, _)) = connect_async(request).await else {
         error!("Error: Failed to connect.");

src/shuttle.rs

@@ -0,0 +1,23 @@
+use axum::{routing::get, Router};
+use axum_client_ip::SecureClientIpSource;
+use relay::server;
+use shuttle_axum::ShuttleAxum;
+
+pub mod receiver;
+pub mod relay;
+pub mod sender;
+pub mod shared;
+
+#[shuttle_runtime::main]
+async fn axum() -> ShuttleAxum {
+    // Create a new server data structure.
+    let server = server::Server::new();
+
+    // Set up the application routes.
+    let app = Router::new()
+        .route("/ws", get(relay::ws_handler))
+        .with_state(server)
+        .layer(SecureClientIpSource::ConnectInfo.into_extension());
+
+    Ok(app.into())
+}