mirror of
https://github.com/openai/codex.git
synced 2026-11-13 21:30:47 +00:00
jif
789c72dcf6
## Why Removing each decoded prefix from a `Vec` shifts all remaining bytes. Repeating that work is costly for streams containing many invalid UTF-8 bytes or many framed messages in one relay record. ## What changed - Buffer unified exec output in a `VecDeque` and use UTF-8 error offsets to consume the largest valid prefix while continuing to make progress on invalid input. - Buffer Noise relay messages in `BytesMut` and advance past decoded frames without moving the remaining bytes. ## Testing Added regression coverage for valid data surrounding invalid UTF-8, front consumption without shifting, and reassembling many JSON-RPC messages from one record. GitOrigin-RevId: 661ccfffc68960ac6c9d37c738224da8ea83cbf0
69 lines
2.2 KiB
Rust
69 lines
2.2 KiB
Rust
use codex_exec_server_protocol::JSONRPCMessage;
|
|
use codex_exec_server_protocol::JSONRPCNotification;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
use super::JsonRpcMessageDecoder;
|
|
use super::MAX_NOISE_JSONRPC_MESSAGE_LEN;
|
|
use super::NOISE_RECORD_PLAINTEXT_LEN;
|
|
use super::frame_jsonrpc_message;
|
|
use crate::ExecServerError;
|
|
|
|
#[test]
|
|
fn fragments_and_reassembles_large_jsonrpc_message() {
|
|
let message = JSONRPCMessage::Notification(JSONRPCNotification {
|
|
method: "large/test".to_string(),
|
|
params: Some(serde_json::json!({
|
|
"data": "x".repeat(128 * 1024),
|
|
})),
|
|
});
|
|
let framed = frame_jsonrpc_message(&message).unwrap();
|
|
assert!(framed.len() > 128 * 1024);
|
|
|
|
let mut decoder = JsonRpcMessageDecoder::default();
|
|
let mut decoded = Vec::new();
|
|
for record in framed.chunks(NOISE_RECORD_PLAINTEXT_LEN) {
|
|
decoded.extend(decoder.push(record).unwrap());
|
|
}
|
|
|
|
assert_eq!(decoded, vec![message]);
|
|
}
|
|
|
|
#[test]
|
|
fn rejects_declared_message_length_above_limit_without_payload() {
|
|
let mut decoder = JsonRpcMessageDecoder::default();
|
|
let declared_len = (MAX_NOISE_JSONRPC_MESSAGE_LEN as u32 + 1).to_be_bytes();
|
|
|
|
assert!(matches!(
|
|
decoder.push(&declared_len),
|
|
Err(ExecServerError::Protocol(message))
|
|
if message == "Noise relay JSON-RPC message has invalid length"
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn rejects_oversized_plaintext_record() {
|
|
let mut decoder = JsonRpcMessageDecoder::default();
|
|
|
|
assert!(matches!(
|
|
decoder.push(&vec![0; NOISE_RECORD_PLAINTEXT_LEN + 1]),
|
|
Err(ExecServerError::Protocol(message))
|
|
if message == "Noise relay plaintext record exceeds maximum length"
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn reassembles_many_messages_from_one_record() {
|
|
let message = JSONRPCMessage::Notification(JSONRPCNotification {
|
|
method: "small/test".to_string(),
|
|
params: None,
|
|
});
|
|
let framed = frame_jsonrpc_message(&message).expect("frame message");
|
|
let message_count = NOISE_RECORD_PLAINTEXT_LEN / framed.len();
|
|
let record = framed.repeat(message_count);
|
|
|
|
let mut decoder = JsonRpcMessageDecoder::default();
|
|
let decoded = decoder.push(&record).expect("decode record");
|
|
|
|
assert_eq!(decoded, vec![message; message_count]);
|
|
}
|