From 89529b3d0035a3835f6282873243ae02e2985bee Mon Sep 17 00:00:00 2001 From: bflatastic Date: Tue, 20 Oct 2026 04:22:26 +0700 Subject: [PATCH] #889: drop the hub write-cap and core-limit changes (neither is read) --- crates/collab-net/src/hub.rs | 20 +++++++++----------- crates/collab-net/src/link.rs | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/crates/collab-net/src/hub.rs b/crates/collab-net/src/hub.rs index 8ddde6e2..5cf3e519 100644 --- a/crates/collab-net/src/hub.rs +++ b/crates/collab-net/src/hub.rs @@ -860,7 +860,7 @@ fn serve(mut stream: TcpStream, conn: u64, hub: &Sender, limits: NetLimit let Ok(peer) = stream.peer_addr().map(|a| a.ip().to_canonical()) else { return }; let proxied = limits.trusted_proxy.is_some_and(|p| p.to_canonical() == peer); let Ok((rd, wr, sock)) = Duplex::split(stream, None) else { return }; - let write_cfg = config(limits.max_server_message); + let cfg = config(limits.max_client_message); let mut forwarded = None; // The handshake callback's type is tungstenite's (its error is an HTTP response). #[allow(clippy::result_large_err)] @@ -904,16 +904,14 @@ fn serve(mut stream: TcpStream, conn: u64, hub: &Sender, limits: NetLimit max_block: limits.max_queued_block, max_all: limits.max_queued_total, }; - let writer = match sock - .try_clone() - .map(|s| spawn("live-write", move || write_loop(WebSocket::from_raw_socket(wr, Role::Server, Some(write_cfg)), &rx, &s))) - { - Ok(Ok(t)) => t, - _ => { - shutdown(&sock); - return; - } - }; + let writer = + match sock.try_clone().map(|s| spawn("live-write", move || write_loop(WebSocket::from_raw_socket(wr, Role::Server, Some(cfg)), &rx, &s))) { + Ok(Ok(t)) => t, + _ => { + shutdown(&sock); + return; + } + }; let end = |why: Option<&str>| { if let Some(why) = why { refuse(&out, why); diff --git a/crates/collab-net/src/link.rs b/crates/collab-net/src/link.rs index 66d07477..a84395aa 100644 --- a/crates/collab-net/src/link.rs +++ b/crates/collab-net/src/link.rs @@ -139,7 +139,7 @@ impl LiveLink for NetLink { doc, name: o.name, limits: self.limits, - core: figcraft_collab::Limits { max_message_bytes: self.limits.max_server_message, ..figcraft_collab::Limits::default() }, + core: figcraft_collab::Limits::default(), }; let host = Host::start(cfg, inbox.clone()).map_err(|e| format!("can't listen on {ip}: {e}"))?; let invite = Invite::new(host.addr().to_string(), file, token);