From 129b32d16866abcb1ebd48080ab23702574b5858 Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Tue, 15 Oct 2024 22:25:34 -0400 Subject: [PATCH] increase limits --- client/src/app.rs | 27 +++++++++++++-------------- client/src/ui/gui.rs | 6 ++++-- server/src/main.rs | 4 ++-- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/client/src/app.rs b/client/src/app.rs index 531c182..2c88b5e 100644 --- a/client/src/app.rs +++ b/client/src/app.rs @@ -584,20 +584,19 @@ impl eframe::App for RealmApp { for server in missing_servers { let send_channel = self.event_channel.0.clone(); let _handle = tokio::spawn(async move { + let mut transport = tarpc::serde_transport::tcp::connect(format!("{}:{}", server.domain, server.port), Json::default); + transport.config_mut().max_frame_length(usize::MAX); + + let result = transport.await; + let connection = match result { + Ok(connection) => connection, + Err(_) => { + return; + } + }; + + let client = RealmChatClient::new(tarpc::client::Config::default(), connection).spawn(); loop { - let mut transport = tarpc::serde_transport::tcp::connect(format!("{}:{}", server.domain, server.port), Json::default); - transport.config_mut().max_frame_length(usize::MAX); - - let result = transport.await; - let connection = match result { - Ok(connection) => connection, - Err(_) => { - break; - } - }; - - let client = RealmChatClient::new(tarpc::client::Config::default(), connection).spawn(); - let result = client.poll_events_since( context::current(), server.last_event_index @@ -612,7 +611,7 @@ impl eframe::App for RealmApp { Err(_) => break, } - sleep(Duration::from_millis(75)).await; + sleep(Duration::from_millis(1000)).await; } }); } diff --git a/client/src/ui/gui.rs b/client/src/ui/gui.rs index d7a05b5..1688033 100644 --- a/client/src/ui/gui.rs +++ b/client/src/ui/gui.rs @@ -223,8 +223,8 @@ pub fn rooms(app: &mut RealmApp, ctx: &Context) { pub fn messages(app: &mut RealmApp, ctx: &Context) { egui::CentralPanel::default().show(ctx, |ui| { ui.with_layout(egui::Layout::bottom_up(egui::Align::TOP), |ui| { - ui.with_layout(egui::Layout::left_to_right(egui::Align::TOP), |ui| { - if ui.button("").on_hover_text("Send a message").clicked() { + ui.with_layout(egui::Layout::right_to_left(egui::Align::TOP), |ui| { + if ui.button("✉").on_hover_text("Send a message").clicked() { if let Some(active_servers) = &app.active_servers { for server in active_servers.clone() { if server.server_id.eq(&app.selected_serverid) { @@ -245,6 +245,8 @@ pub fn messages(app: &mut RealmApp, ctx: &Context) { } ).await; }); + + app.text_message_input.clear(); } } } diff --git a/server/src/main.rs b/server/src/main.rs index 1f37aaa..b7fc070 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -93,7 +93,7 @@ async fn main() -> anyhow::Result<()> { .filter_map(|r| future::ready(r.ok())) .map(BaseChannel::with_defaults) // Limit channels to 1 per IP. - .max_channels_per_key(1, |t| t.transport().peer_addr().unwrap().ip()) + .max_channels_per_key(2048, |t| t.transport().peer_addr().unwrap().ip()) // serve is generated by the service attribute. It takes as input any type implementing // the generated World trait. .map(|channel| { @@ -101,7 +101,7 @@ async fn main() -> anyhow::Result<()> { channel.execute(server.serve()).for_each(spawn) }) // Max 10 channels. - .buffer_unordered(10) + .buffer_unordered(4096) .for_each(|_| async {}) .await;