serve.zone/remoteingress
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(remoteingress-core): preserve stream close ordering and add flow-control stall timeouts

Browse Source
This commit is contained in:
Jürgen Kunz
2026-03-15 21:06:44 +00:00
parent 579e553da0
commit c490e35a8f
4 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rust/crates/remoteingress-core/src/edge.rs
View File

@@ -703,13 +703,17 @@ async fn handle_client_connection(
// Task: client -> hub (upload direction) with per-stream flow control
let mut buf = vec![0u8; 32768];
loop {
// Wait for send window to have capacity
// Wait for send window to have capacity (with stall timeout)
loop {
let w = send_window.load(Ordering::Acquire);
if w > 0 { break; }
tokio::select! {
_ = window_notify.notified() => continue,
_ = client_token.cancelled() => break,
_ = tokio::time::sleep(Duration::from_secs(120)) => {
log::warn!("Stream {} upload stalled (window empty for 120s)", stream_id);
break;
}
}
}
if client_token.is_cancelled() { break; }
@@ -737,10 +741,10 @@ async fn handle_client_connection(
}
}
// Send CLOSE frame via control channel (only if not cancelled)
// Send CLOSE frame via DATA channel (must arrive AFTER last DATA for this stream)
if !client_token.is_cancelled() {
let close_frame = encode_frame(stream_id, FRAME_CLOSE, &[]);
let _ = tunnel_ctrl_tx.try_send(close_frame);
let _ = tunnel_data_tx.try_send(close_frame);
}
// Cleanup