diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/Cargo.toml | 10 | ||||
| -rw-r--r-- | server/src/main.rs | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/server/Cargo.toml b/server/Cargo.toml index 3cc9f9f..4f29cde 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -5,11 +5,11 @@ edition = "2021" [dependencies] warp = "0.3" -tokio = { version = "1.21", features = ["full"] } +tokio = { version = "1.24", features = ["full"] } log = "0.4" -env_logger = "0.10.0" -futures-util = "0.3.24" +env_logger = "0.10" +futures-util = "0.3.25" listenfd = "1.0.0" -hyper = "0.14.20" -serde = { version = "1.0.144", features = ["derive"] } +hyper = "0.14.23" +serde = { version = "1.0.152", features = ["derive"] } serde_json = "*" diff --git a/server/src/main.rs b/server/src/main.rs index 229a935..413f23a 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -46,11 +46,11 @@ async fn run() { let assets: _ = warp::path("assets").and(warp::fs::dir("../client-web/public/assets")); let sw_script: _ = warp::path("sw.js").and(warp::fs::file("../client-web/public/assets/sw.js")); let favicon: _ = warp::path!("favicon.ico").map(|| ""); - let old_format_redirect: _ = warp::path!("room" / String).map(|rname| { + let old_format_redirect: _ = warp::path!("room" / String).map(|rsecret| { reply::with_header( StatusCode::MOVED_PERMANENTLY, header::LOCATION, - format!("/room#{rname}?warn_redirect=true"), + format!("/room#{rsecret}?warn_redirect=true"), ) .into_response() }); @@ -103,20 +103,20 @@ async fn handle_rejection(err: Rejection) -> Result<impl Reply, Infallible> { Ok(warp::reply::with_status(json, code)) } -fn signaling_connect(rname: String, rooms: Rooms, ws: warp::ws::Ws) -> impl Reply { - async fn inner(sock: WebSocket, rname: String, rooms: Rooms) { +fn signaling_connect(rsecret: String, rooms: Rooms, ws: warp::ws::Ws) -> impl Reply { + async fn inner(sock: WebSocket, rsecret: String, rooms: Rooms) { debug!("ws upgrade"); let mut guard = rooms.write().await; let room = guard - .entry(rname.clone()) + .entry(rsecret.clone()) .or_insert_with(|| Default::default()) .to_owned(); drop(guard); room.client_connect(sock).await; if room.should_remove().await { - rooms.write().await.remove(&rname); + rooms.write().await.remove(&rsecret); } } - ws.on_upgrade(move |sock| inner(sock, rname, rooms)) + ws.on_upgrade(move |sock| inner(sock, rsecret, rooms)) } |