clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-16 17:23:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(app-server-client): bound queued binary frames

Browse Source
This commit is contained in:
Edward Frazer
2026-05-07 13:52:10 -07:00
parent 05175aae91
commit 2ef43576a8
1 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
codex-rs/app-server-client/src/remote.rs
View File

@@ -466,11 +466,24 @@ impl RemoteAppServerClient {
break;
}
Some(Ok(Message::Binary(bytes))) => {
deliver_binary_packet(
if !deliver_binary_packet(
&mut pending_binary_waiters,
&mut pending_binary_packets,
bytes.to_vec(),
);
channel_capacity,
) {
let message = format!(
"remote app server at `{websocket_url}` sent too many pending binary frames"
);
let _ = deliver_event(
&event_tx,
AppServerEvent::Disconnected {
message: message.clone(),
},
);
worker_exit_error = Some((ErrorKind::InvalidData, message));
break;
}
}
Some(Ok(Message::Ping(_)))
| Some(Ok(Message::Pong(_)))
@@ -928,15 +941,20 @@ fn deliver_binary_packet(
pending_binary_waiters: &mut VecDeque<oneshot::Sender<IoResult<Vec<u8>>>>,
pending_binary_packets: &mut VecDeque<Vec<u8>>,
bytes: Vec<u8>,
) {
max_pending_binary_packets: usize,
) -> bool {
while let Some(response_tx) = pending_binary_waiters.pop_front() {
if response_tx.is_closed() {
continue;
}
let _ = response_tx.send(Ok(bytes));
return;
return true;
}
if pending_binary_packets.len() >= max_pending_binary_packets {
return false;
}
pending_binary_packets.push_back(bytes);
true
}
fn request_id_from_client_request(request: &ClientRequest) -> RequestId {
@@ -1034,6 +1052,7 @@ mod tests {
&mut pending_binary_waiters,
&mut pending_binary_packets,
vec![1, 2, 3],
1,
);
assert!(pending_binary_packets.is_empty());
@@ -1045,4 +1064,18 @@ mod tests {
vec![1, 2, 3]
);
}
#[test]
fn binary_packets_reject_queue_overflow() {
let mut pending_binary_waiters = VecDeque::new();
let mut pending_binary_packets = VecDeque::from([vec![1, 2, 3]]);
assert!(!deliver_binary_packet(
&mut pending_binary_waiters,
&mut pending_binary_packets,
vec![4, 5, 6],
1,
));
assert_eq!(pending_binary_packets, VecDeque::from([vec![1, 2, 3]]));
}
}