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

Make edit mode usable; complete #11

Browse Source
This commit is contained in:
NGnius (Graham)
2025-03-15 11:03:35 -04:00
parent 47eb32056c
commit 6fd4d673ca
40 changed files with 5313 additions and 2162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rc_services_room/src/main.rs
View File

@@ -12,10 +12,11 @@ use tokio::net;
use polariton::packet::{Data, Message, Packet, StandardMessage};
use polariton::operation::{OperationResponse, Typed};
pub type UserTy = std::sync::RwLock<state::UserState>;
pub type UserTy = std::sync::RwLock<state::UserState<()>>;
pub struct InitConfig {
pub cubes: persist::config::CubeConfig,
pub cubes: persist::config::ConfigImpl,
pub users: std::sync::Arc<persist::user::UserImpl>,
}
#[tokio::main]
@@ -24,8 +25,11 @@ async fn main() -> std::io::Result<()> {
let args = cli::CliArgs::get();
log::debug!("Got cli args {:?}", args);
let cubes = persist::config::ConfigImpl::load(&args.assets).expect("Bad config data");
let users = std::sync::Arc::new(persist::user::UserImpl::load(&args.data, &cubes).expect("Bad user data"));
let init_ctx = InitConfig {
cubes: persist::config::CubeConfig::load(&args.assets).expect("Bad cube config data"),
cubes,
users,
};
let server = polariton_server::Server::new(operations::handler(&init_ctx));
@@ -37,17 +41,17 @@ async fn main() -> std::io::Result<()> {
#[cfg(not(debug_assertions))]
loop {
let (socket, address) = listener.accept().await?;
tokio::spawn(process_socket(socket, address, &server));
tokio::spawn(process_socket(socket, address, &server, &init_ctx));
}
#[cfg(debug_assertions)]
{
let (socket, address) = listener.accept().await?;
process_socket(socket, address, &server).await;
process_socket(socket, address, &server, &init_ctx).await;
Ok(())
}
}
async fn process_socket(mut socket: net::TcpStream, address: std::net::SocketAddr, server: &polariton_server::Server<crate::UserTy>) {
async fn process_socket(mut socket: net::TcpStream, address: std::net::SocketAddr, server: &polariton_server::Server<crate::UserTy>, init_ctx: &InitConfig) {
log::debug!("Accepting connection from address {}", address);
let enc = match do_connect_handshake(&mut socket).await {
Some(x) => x,
@@ -56,7 +60,7 @@ async fn process_socket(mut socket: net::TcpStream, address: std::net::SocketAdd
return;
}
};
let user_state = state::UserState::new();
let user_state = std::sync::RwLock::new(state::UserState::<()>::new(init_ctx.users.clone()));
server.handle_async(socket, user_state, enc, Default::default()).await;
log::debug!("Goodbye connection from address {}", address);
}