|
|
@ -19,6 +19,7 @@ use crate::error::{Error, Result}; |
|
|
|
use crate::extensions::uncompressed::UncompressedExt; |
|
|
|
use crate::extensions::uncompressed::UncompressedExt; |
|
|
|
use crate::extensions::WebSocketExtension; |
|
|
|
use crate::extensions::WebSocketExtension; |
|
|
|
use crate::util::NonBlockingResult; |
|
|
|
use crate::util::NonBlockingResult; |
|
|
|
|
|
|
|
use crate::protocol::frame::coding::Data; |
|
|
|
|
|
|
|
|
|
|
|
pub(crate) const MAX_MESSAGE_SIZE: usize = 64 << 20; |
|
|
|
pub(crate) const MAX_MESSAGE_SIZE: usize = 64 << 20; |
|
|
|
|
|
|
|
|
|
|
@ -608,12 +609,29 @@ where |
|
|
|
}; |
|
|
|
}; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let max_frame_size = self.config.max_frame_size.unwrap_or_else(usize::max_value); |
|
|
|
|
|
|
|
if frame.payload().len() > max_frame_size { |
|
|
|
|
|
|
|
let mut chunks = frame.payload().chunks(self.config.max_frame_size.unwrap_or_else(usize::max_value)).peekable(); |
|
|
|
|
|
|
|
let data_frame = Frame::message(Vec::from(chunks.next().unwrap()), frame.header().opcode, false); |
|
|
|
|
|
|
|
self.frame.write_frame(stream, data_frame).check_connection_reset(self.state)?; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while let Some(chunk) = chunks.next() { |
|
|
|
|
|
|
|
let frame = Frame::message(Vec::from(chunk), OpCode::Data(Data::Continue), chunks.peek().is_none()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
trace!("Sending frame: {:?}", frame); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self.frame.write_frame(stream, frame).check_connection_reset(self.state)?; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(()) |
|
|
|
|
|
|
|
} else { |
|
|
|
trace!("Sending frame: {:?}", frame); |
|
|
|
trace!("Sending frame: {:?}", frame); |
|
|
|
self.frame |
|
|
|
self.frame |
|
|
|
.write_frame(stream, frame) |
|
|
|
.write_frame(stream, frame) |
|
|
|
.check_connection_reset(self.state) |
|
|
|
.check_connection_reset(self.state) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// The current connection state.
|
|
|
|
/// The current connection state.
|
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy)] |
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy)] |
|
|
@ -685,6 +703,8 @@ mod tests { |
|
|
|
use crate::extensions::uncompressed::UncompressedExt; |
|
|
|
use crate::extensions::uncompressed::UncompressedExt; |
|
|
|
use std::io; |
|
|
|
use std::io; |
|
|
|
use std::io::Cursor; |
|
|
|
use std::io::Cursor; |
|
|
|
|
|
|
|
use crate::protocol::frame::Frame; |
|
|
|
|
|
|
|
use crate::protocol::frame::coding::{OpCode, Data}; |
|
|
|
|
|
|
|
|
|
|
|
struct WriteMoc<Stream>(Stream); |
|
|
|
struct WriteMoc<Stream>(Stream); |
|
|
|
|
|
|
|
|
|
|
@ -756,4 +776,41 @@ mod tests { |
|
|
|
"Space limit exceeded: Message too big: 0 + 3 > 2" |
|
|
|
"Space limit exceeded: Message too big: 0 + 3 > 2" |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[test] |
|
|
|
|
|
|
|
fn fragmented_tx() { |
|
|
|
|
|
|
|
let max_message_size = 2; |
|
|
|
|
|
|
|
let input_str = "hello unit test"; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let limit = WebSocketConfig { |
|
|
|
|
|
|
|
max_send_queue: None, |
|
|
|
|
|
|
|
max_frame_size: Some(2), |
|
|
|
|
|
|
|
encoder: UncompressedExt::new(Some(max_message_size)), |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut socket = WebSocket::from_raw_socket(Cursor::new(Vec::new()), Role::Client, Some(limit)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
socket.write_message(Message::text(input_str)).unwrap(); |
|
|
|
|
|
|
|
socket.socket.set_position(0); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let WebSocket { mut socket, mut context } = socket; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let vec = input_str.chars().collect::<Vec<_>>(); |
|
|
|
|
|
|
|
let mut iter = vec.chunks(max_message_size).map(|c| c.iter().collect::<String>()) |
|
|
|
|
|
|
|
.into_iter().peekable(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let frame_eq = |expected: Frame, actual: Frame| { |
|
|
|
|
|
|
|
assert_eq!(expected.payload(), actual.payload()); |
|
|
|
|
|
|
|
assert_eq!(expected.header().opcode, actual.header().opcode); |
|
|
|
|
|
|
|
assert_eq!(expected.header().rsv1, actual.header().rsv1); |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let expected = Frame::message(iter.next().unwrap().into(), OpCode::Data(Data::Text), false); |
|
|
|
|
|
|
|
frame_eq(expected, context.frame.read_frame(&mut socket, Some(max_message_size)).unwrap().unwrap()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while let Some(chars) = iter.next() { |
|
|
|
|
|
|
|
let expected = Frame::message(chars.into(), OpCode::Data(Data::Continue), iter.peek().is_none()); |
|
|
|
|
|
|
|
frame_eq(expected, context.frame.read_frame(&mut socket, Some(max_message_size)).unwrap().unwrap()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|