Skip to content

refactor(transport): use bytes crate for a payload handling instead of a plain Vec #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Alex Yusiuk (RRRadicalEdward) wants to merge 1 commit into from
Closed

refactor(transport): use bytes crate for a payload handling instead of a plain Vec #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions crates/test-utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ where
let compat = stream.filter_map(|item| {
let mapped = item
.map(|msg| match msg {
tungstenite::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into_bytes())),
tungstenite::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data)),
tungstenite::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into())),
tungstenite::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data.into())),
tungstenite::Message::Ping(_) | tungstenite::Message::Pong(_) => None,
tungstenite::Message::Close(_) => Some(transport::WsReadMsg::Close),
tungstenite::Message::Frame(_) => unreachable!("raw frames are never returned when reading"),
Expand Down Expand Up @@ -233,8 +233,8 @@ where
.filter_map(|item| {
let mapped = item
.map(|msg| match msg {
tungstenite::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into_bytes())),
tungstenite::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data)),
tungstenite::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into())),
tungstenite::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data.into())),
tungstenite::Message::Ping(_) | tungstenite::Message::Pong(_) => None,
tungstenite::Message::Close(_) => Some(transport::WsReadMsg::Close),
tungstenite::Message::Frame(_) => unreachable!("raw frames are never returned when reading"),
Expand Down
1 change: 1 addition & 0 deletions crates/transport/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ futures-util = { version = "0.3", features = ["sink"] }
pin-project-lite = "0.2"
parking_lot = "0.12"
tracing = "0.1"
bytes = { version = "1.10", default-features = false }

[dev-dependencies]
futures-util = "0.3"
Expand Down
11 changes: 5 additions & 6 deletions crates/transport/src/ws.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
use std::fmt::Display;
use std::io;
use std::pin::Pin;
use std::task::{Context, Poll};

use bytes::Bytes;
use futures_core::{ready, Stream};
use futures_sink::Sink;
use pin_project_lite::pin_project;
use tokio::io::{AsyncRead, AsyncWrite};

pub enum WsReadMsg {
Payload(Vec<u8>),
Payload(Bytes),
Close,
}

Expand All @@ -18,7 +18,7 @@ pin_project! {
pub struct WsStream<S> {
#[pin]
pub inner: S,
read_buf: Option<Vec<u8>>,
read_buf: Option<Bytes>,
}
}

Expand Down Expand Up @@ -64,11 +64,10 @@ where

// TODO: can we get better performance with `unfilled_mut` and a bit of unsafe code?
let dest = buf.initialize_unfilled_to(bytes_to_copy);
dest.copy_from_slice(&data[..bytes_to_copy]);
dest.copy_from_slice(&data.split_to(bytes_to_copy));
buf.advance(bytes_to_copy);

if data.len() > bytes_to_copy {
data.drain(..bytes_to_copy);
if !data.is_empty() {
*this.read_buf = Some(data);
}

Expand Down
4 changes: 2 additions & 2 deletions crates/video-streamer/examples/stream/local_websocket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ fn websocket_compat(ws: WebSocket) -> impl AsyncRead + AsyncWrite + Unpin + Send
.filter_map(|item| {
let mapped = item
.map(|msg| match msg {
ws::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into_bytes())),
ws::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data)),
ws::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into())),
ws::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data.into())),
ws::Message::Ping(_) | ws::Message::Pong(_) => None,
ws::Message::Close(_) => Some(transport::WsReadMsg::Close),
})
Expand Down
4 changes: 2 additions & 2 deletions devolutions-gateway/src/api/fwd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,8 +639,8 @@ async fn fwd_http(
.filter_map(|item| {
let mapped = item
.map(|msg| match msg {
tungstenite::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into_bytes())),
tungstenite::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data)),
tungstenite::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into())),
tungstenite::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data.into())),
tungstenite::Message::Ping(_) | tungstenite::Message::Pong(_) => None,
tungstenite::Message::Close(_) => Some(transport::WsReadMsg::Close),
tungstenite::Message::Frame(_) => unreachable!("raw frames are never returned when reading"),
Expand Down
4 changes: 2 additions & 2 deletions devolutions-gateway/src/ws.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ fn websocket_compat(ws: transport::Shared<WebSocket>) -> impl AsyncRead + AsyncW
let ws_compat = ws
.filter_map(|item| {
item.map(|msg| match msg {
ws::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into_bytes())),
ws::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data)),
ws::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into())),
ws::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data.into())),
ws::Message::Ping(_) | ws::Message::Pong(_) => None,
ws::Message::Close(_) => Some(transport::WsReadMsg::Close),
})
Expand Down
4 changes: 2 additions & 2 deletions jetsocat/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ where
.filter_map(|item| {
let mapped = item
.map(|msg| match msg {
tungstenite::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into_bytes())),
tungstenite::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data)),
tungstenite::Message::Text(s) => Some(transport::WsReadMsg::Payload(s.into())),
tungstenite::Message::Binary(data) => Some(transport::WsReadMsg::Payload(data.into())),
Comment thread
RRRadicalEdward marked this conversation as resolved.
tungstenite::Message::Ping(_) | tungstenite::Message::Pong(_) => None,
tungstenite::Message::Close(_) => Some(transport::WsReadMsg::Close),
tungstenite::Message::Frame(_) => unreachable!("raw frames are never returned when reading"),
Expand Down