redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-04-22 07:27:44 +00:00
Code Activity

Some Tokio tasks cleanup

Browse source
This commit is contained in:
Joshua Goins 2025-03-30 23:17:11 -04:00
parent a5ed126853
commit 88edc0b27e
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/bin/kawari-world.rs
View file

@ -142,17 +142,17 @@ struct ClientData {
} }
/// Spawn a new client actor. /// Spawn a new client actor.
pub fn spawn_client(info: ZoneConnection) { pub fn spawn_client(connection: ZoneConnection) {
let (send, recv) = channel(64); let (send, recv) = channel(64);
let id = &info.id.clone(); let id = &connection.id.clone();
let ip = &info.ip.clone(); let ip = &connection.ip.clone();
let data = ClientData { let data = ClientData {
id: info.id, id: connection.id,
handle: info.handle.clone(), handle: connection.handle.clone(),
recv, recv,
connection: info, connection,
}; };
// Spawn a new client task // Spawn a new client task
@ -182,10 +182,10 @@ async fn start_client(my_handle: oneshot::Receiver<ClientHandle>, data: ClientDa
// communication channel between client_loop and client_server_loop // communication channel between client_loop and client_server_loop
let (internal_send, internal_recv) = unbounded_channel(); let (internal_send, internal_recv) = unbounded_channel();
join! { let _ = join!(
client_loop(connection, internal_recv, my_handle), tokio::spawn(client_loop(connection, internal_recv, my_handle)),
client_server_loop(recv, internal_send) tokio::spawn(client_server_loop(recv, internal_send))
}; );
} }
async fn client_server_loop( async fn client_server_loop(
@ -1027,17 +1027,16 @@ async fn client_loop(
lua_player.status_effects = connection.status_effects.clone(); lua_player.status_effects = connection.status_effects.clone();
} }
} }
/*msg = internal_recv.recv() => match msg { msg = internal_recv.recv() => match msg {
Some(msg) => match msg { Some(msg) => match msg {
FromServer::Message(msg)=>connection.send_message(&msg).await, FromServer::Message(msg)=>connection.send_message(&msg).await,
FromServer::ActorSpawn(actor) => { FromServer::ActorSpawn(actor) => {
tracing::info!("connection {:?} is recieving an actorspawn!", connection.id);
connection.spawn_actor(actor).await connection.spawn_actor(actor).await
}, },
FromServer::ActorMove(actor_id, position) => connection.set_actor_position(actor_id, position).await, FromServer::ActorMove(actor_id, position) => connection.set_actor_position(actor_id, position).await,
}, },
None => break, None => break,
}*/ }
} }
} }
} }