bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Remove user from queue on lobby disconnect

Browse Source
This commit is contained in:
NG (Graham)
2025-07-24 19:47:10 -04:00
parent a904423a83
commit f48334ef0c
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rc_lobby_room/src/lobby.rs
View File

@@ -143,4 +143,15 @@ impl QueueHandler {
} }
} }
} }
pub async fn leave_queue(&self, user: &(dyn oj_rc_core::persist::user::LobbyUser + Send + Sync)) {
let user_id = user.user_id();
for queue in self.users_in_queue.lock().await.values_mut() {
if let Some((i, _)) = queue.iter().enumerate().find(|(_, user)| user.user_id == user_id) {
queue.remove(i);
log::info!("User {} was removed from a queue", user_id);
break;
}
}
}
} }

17
rc_lobby_room/src/main.rs
View File

@@ -20,7 +20,7 @@ pub struct InitConfig {
pub queue: std::sync::Arc<QueueHandler>, pub queue: std::sync::Arc<QueueHandler>,
} }
pub type UserTy = oj_rc_core::UserState<()>; pub type UserTy = std::sync::Arc<oj_rc_core::UserState<()>>;
#[tokio::main] #[tokio::main]
async fn main() -> std::io::Result<()> { async fn main() -> std::io::Result<()> {
@@ -49,11 +49,11 @@ async fn main() -> std::io::Result<()> {
if args.once { if args.once {
log::warn!("Handling first connection and then exiting"); log::warn!("Handling first connection and then exiting");
let (socket, address) = listener.accept().await?; let (socket, address) = listener.accept().await?;
process_socket(socket, address, server.clone(), init_ctx.users.clone()).await; process_socket(socket, address, server.clone(), init_ctx.users.clone(), init_ctx.queue.clone()).await;
} else { } else {
loop { loop {
let (socket, address) = listener.accept().await?; let (socket, address) = listener.accept().await?;
tokio::spawn(process_socket(socket, address, server.clone(), init_ctx.users.clone())); tokio::spawn(process_socket(socket, address, server.clone(), init_ctx.users.clone(), init_ctx.queue.clone()));
} }
} }
server.join(); server.join();
@@ -61,7 +61,7 @@ async fn main() -> std::io::Result<()> {
Ok(()) Ok(())
} }
async fn process_socket(mut socket: net::TcpStream, address: std::net::SocketAddr, server: std::sync::Arc<polariton_server::Server<crate::UserTy>>, users: std::sync::Arc<oj_rc_core::persist::user::UserImpl>) { async fn process_socket(mut socket: net::TcpStream, address: std::net::SocketAddr, server: std::sync::Arc<polariton_server::Server<crate::UserTy>>, users: std::sync::Arc<oj_rc_core::persist::user::UserImpl>, queue: std::sync::Arc<QueueHandler>) {
log::debug!("Accepting connection from address {}", address); log::debug!("Accepting connection from address {}", address);
let enc = match do_connect_handshake(&mut socket).await { let enc = match do_connect_handshake(&mut socket).await {
Some(x) => x, Some(x) => x,
@@ -72,9 +72,14 @@ async fn process_socket(mut socket: net::TcpStream, address: std::net::SocketAdd
}; };
let (socket_r, socket_w) = socket.into_split(); let (socket_r, socket_w) = socket.into_split();
let (chann_tx, chann_rx) = tokio::sync::mpsc::unbounded_channel(); let (chann_tx, chann_rx) = tokio::sync::mpsc::unbounded_channel();
let user_state = oj_rc_core::UserState::<()>::new(users, chann_tx.clone()); let user_state = std::sync::Arc::new(oj_rc_core::UserState::<()>::new(users, chann_tx.clone()));
let ctx = polariton::packet::SerdesContext::from_boxed(Default::default(), enc); let ctx = polariton::packet::SerdesContext::from_boxed(Default::default(), enc);
server.handle_async_with_channel(socket_r, socket_w, user_state, ctx, chann_tx, chann_rx).await; server.handle_async_with_channel_join(socket_r, socket_w, user_state.clone(), ctx, chann_tx, chann_rx).await;
if let Ok(user_info) = user_state.user() {
queue.leave_queue(user_info.as_ref().as_ref()).await;
} else {
log::info!("Unauthenticated user disconnected");
}
log::debug!("Goodbye connection from address {}", address); log::debug!("Goodbye connection from address {}", address);
} }