wip: implemented incoming-like body for asynchronous operation in http/3
This commit is contained in:
parent
1dc88ce056
commit
4b6f63e09f
11 changed files with 376 additions and 68 deletions
189
rpxy-lib/src/hyper_ext/body_incoming_like.rs
Normal file
189
rpxy-lib/src/hyper_ext/body_incoming_like.rs
Normal file
|
|
@ -0,0 +1,189 @@
|
|||
use super::watch;
|
||||
use crate::error::*;
|
||||
use futures_channel::{mpsc, oneshot};
|
||||
use futures_util::{stream::FusedStream, Future, Stream};
|
||||
use http::HeaderMap;
|
||||
use hyper::body::{Body, Bytes, Frame, SizeHint};
|
||||
use std::{
|
||||
pin::Pin,
|
||||
task::{Context, Poll},
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Incoming like body to handle incoming request body
|
||||
pub struct IncomingLike {
|
||||
content_length: DecodedLength,
|
||||
want_tx: watch::Sender,
|
||||
data_rx: mpsc::Receiver<Result<Bytes, hyper::Error>>,
|
||||
trailers_rx: oneshot::Receiver<HeaderMap>,
|
||||
}
|
||||
|
||||
macro_rules! ready {
|
||||
($e:expr) => {
|
||||
match $e {
|
||||
Poll::Ready(v) => v,
|
||||
Poll::Pending => return Poll::Pending,
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
type BodySender = mpsc::Sender<Result<Bytes, hyper::Error>>;
|
||||
type TrailersSender = oneshot::Sender<HeaderMap>;
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||
pub(crate) struct DecodedLength(u64);
|
||||
impl DecodedLength {
|
||||
pub(crate) const CLOSE_DELIMITED: DecodedLength = DecodedLength(::std::u64::MAX);
|
||||
pub(crate) const CHUNKED: DecodedLength = DecodedLength(::std::u64::MAX - 1);
|
||||
pub(crate) const ZERO: DecodedLength = DecodedLength(0);
|
||||
|
||||
pub(crate) fn sub_if(&mut self, amt: u64) {
|
||||
match *self {
|
||||
DecodedLength::CHUNKED | DecodedLength::CLOSE_DELIMITED => (),
|
||||
DecodedLength(ref mut known) => {
|
||||
*known -= amt;
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Converts to an Option<u64> representing a Known or Unknown length.
|
||||
pub(crate) fn into_opt(self) -> Option<u64> {
|
||||
match self {
|
||||
DecodedLength::CHUNKED | DecodedLength::CLOSE_DELIMITED => None,
|
||||
DecodedLength(known) => Some(known),
|
||||
}
|
||||
}
|
||||
}
|
||||
pub(crate) struct Sender {
|
||||
want_rx: watch::Receiver,
|
||||
data_tx: BodySender,
|
||||
trailers_tx: Option<TrailersSender>,
|
||||
}
|
||||
|
||||
const WANT_PENDING: usize = 1;
|
||||
const WANT_READY: usize = 2;
|
||||
|
||||
impl IncomingLike {
|
||||
/// Create a `Body` stream with an associated sender half.
|
||||
///
|
||||
/// Useful when wanting to stream chunks from another thread.
|
||||
#[inline]
|
||||
#[allow(unused)]
|
||||
pub(crate) fn channel() -> (Sender, IncomingLike) {
|
||||
Self::new_channel(DecodedLength::CHUNKED, /*wanter =*/ false)
|
||||
}
|
||||
|
||||
pub(crate) fn new_channel(content_length: DecodedLength, wanter: bool) -> (Sender, IncomingLike) {
|
||||
let (data_tx, data_rx) = mpsc::channel(0);
|
||||
let (trailers_tx, trailers_rx) = oneshot::channel();
|
||||
|
||||
// If wanter is true, `Sender::poll_ready()` won't becoming ready
|
||||
// until the `Body` has been polled for data once.
|
||||
let want = if wanter { WANT_PENDING } else { WANT_READY };
|
||||
|
||||
let (want_tx, want_rx) = watch::channel(want);
|
||||
|
||||
let tx = Sender {
|
||||
want_rx,
|
||||
data_tx,
|
||||
trailers_tx: Some(trailers_tx),
|
||||
};
|
||||
let rx = IncomingLike {
|
||||
content_length,
|
||||
want_tx,
|
||||
data_rx,
|
||||
trailers_rx,
|
||||
};
|
||||
|
||||
(tx, rx)
|
||||
}
|
||||
}
|
||||
|
||||
impl Body for IncomingLike {
|
||||
type Data = Bytes;
|
||||
type Error = hyper::Error;
|
||||
|
||||
fn poll_frame(
|
||||
mut self: Pin<&mut Self>,
|
||||
cx: &mut Context<'_>,
|
||||
) -> Poll<Option<Result<Frame<Self::Data>, Self::Error>>> {
|
||||
self.want_tx.send(WANT_READY);
|
||||
|
||||
if !self.data_rx.is_terminated() {
|
||||
if let Some(chunk) = ready!(Pin::new(&mut self.data_rx).poll_next(cx)?) {
|
||||
self.content_length.sub_if(chunk.len() as u64);
|
||||
return Poll::Ready(Some(Ok(Frame::data(chunk))));
|
||||
}
|
||||
}
|
||||
|
||||
// check trailers after data is terminated
|
||||
match ready!(Pin::new(&mut self.trailers_rx).poll(cx)) {
|
||||
Ok(t) => Poll::Ready(Some(Ok(Frame::trailers(t)))),
|
||||
Err(_) => Poll::Ready(None),
|
||||
}
|
||||
}
|
||||
|
||||
fn is_end_stream(&self) -> bool {
|
||||
self.content_length == DecodedLength::ZERO
|
||||
}
|
||||
|
||||
fn size_hint(&self) -> SizeHint {
|
||||
macro_rules! opt_len {
|
||||
($content_length:expr) => {{
|
||||
let mut hint = SizeHint::default();
|
||||
|
||||
if let Some(content_length) = $content_length.into_opt() {
|
||||
hint.set_exact(content_length);
|
||||
}
|
||||
|
||||
hint
|
||||
}};
|
||||
}
|
||||
|
||||
opt_len!(self.content_length)
|
||||
}
|
||||
}
|
||||
|
||||
impl Sender {
|
||||
/// Check to see if this `Sender` can send more data.
|
||||
pub(crate) fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<RpxyResult<()>> {
|
||||
// Check if the receiver end has tried polling for the body yet
|
||||
ready!(self.poll_want(cx)?);
|
||||
self
|
||||
.data_tx
|
||||
.poll_ready(cx)
|
||||
.map_err(|_| RpxyError::HyperIncomingLikeNewClosed)
|
||||
}
|
||||
|
||||
fn poll_want(&mut self, cx: &mut Context<'_>) -> Poll<RpxyResult<()>> {
|
||||
match self.want_rx.load(cx) {
|
||||
WANT_READY => Poll::Ready(Ok(())),
|
||||
WANT_PENDING => Poll::Pending,
|
||||
watch::CLOSED => Poll::Ready(Err(RpxyError::HyperIncomingLikeNewClosed)),
|
||||
unexpected => unreachable!("want_rx value: {}", unexpected),
|
||||
}
|
||||
}
|
||||
|
||||
async fn ready(&mut self) -> RpxyResult<()> {
|
||||
futures_util::future::poll_fn(|cx| self.poll_ready(cx)).await
|
||||
}
|
||||
|
||||
/// Send data on data channel when it is ready.
|
||||
#[allow(unused)]
|
||||
pub(crate) async fn send_data(&mut self, chunk: Bytes) -> RpxyResult<()> {
|
||||
self.ready().await?;
|
||||
self
|
||||
.data_tx
|
||||
.try_send(Ok(chunk))
|
||||
.map_err(|_| RpxyError::HyperIncomingLikeNewClosed)
|
||||
}
|
||||
|
||||
/// Send trailers on trailers channel.
|
||||
#[allow(unused)]
|
||||
pub(crate) async fn send_trailers(&mut self, trailers: HeaderMap) -> RpxyResult<()> {
|
||||
let tx = match self.trailers_tx.take() {
|
||||
Some(tx) => tx,
|
||||
None => return Err(RpxyError::HyperIncomingLikeNewClosed),
|
||||
};
|
||||
tx.send(trailers).map_err(|_| RpxyError::HyperIncomingLikeNewClosed)
|
||||
}
|
||||
}
|
||||
41
rpxy-lib/src/hyper_ext/body_type.rs
Normal file
41
rpxy-lib/src/hyper_ext/body_type.rs
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
use crate::error::*;
|
||||
use http::{Response, StatusCode};
|
||||
use http_body_util::{combinators, BodyExt, Either, Empty, Full};
|
||||
use hyper::body::{Bytes, Incoming};
|
||||
|
||||
/// Type for synthetic boxed body
|
||||
pub(crate) type BoxBody = combinators::BoxBody<Bytes, hyper::Error>;
|
||||
/// Type for either passthrough body or given body type, specifically synthetic boxed body
|
||||
pub(crate) type IncomingOr<B> = Either<Incoming, B>;
|
||||
|
||||
/// helper function to build http response with passthrough body
|
||||
pub(crate) fn passthrough_response<B>(response: Response<Incoming>) -> RpxyResult<Response<IncomingOr<B>>>
|
||||
where
|
||||
B: hyper::body::Body,
|
||||
{
|
||||
Ok(response.map(IncomingOr::Left))
|
||||
}
|
||||
|
||||
/// helper function to build http response with synthetic body
|
||||
pub(crate) fn synthetic_response<B>(response: Response<B>) -> RpxyResult<Response<IncomingOr<B>>> {
|
||||
Ok(response.map(IncomingOr::Right))
|
||||
}
|
||||
|
||||
/// build http response with status code of 4xx and 5xx
|
||||
pub(crate) fn synthetic_error_response(status_code: StatusCode) -> RpxyResult<Response<IncomingOr<BoxBody>>> {
|
||||
let res = Response::builder()
|
||||
.status(status_code)
|
||||
.body(IncomingOr::Right(BoxBody::new(empty())))
|
||||
.unwrap();
|
||||
Ok(res)
|
||||
}
|
||||
|
||||
/// helper function to build a empty body
|
||||
fn empty() -> BoxBody {
|
||||
Empty::<Bytes>::new().map_err(|never| match never {}).boxed()
|
||||
}
|
||||
|
||||
/// helper function to build a full body
|
||||
pub(crate) fn full(body: Bytes) -> BoxBody {
|
||||
Full::new(body).map_err(|never| match never {}).boxed()
|
||||
}
|
||||
23
rpxy-lib/src/hyper_ext/executor.rs
Normal file
23
rpxy-lib/src/hyper_ext/executor.rs
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
use tokio::runtime::Handle;
|
||||
|
||||
#[derive(Clone)]
|
||||
/// Executor for hyper
|
||||
pub struct LocalExecutor {
|
||||
runtime_handle: Handle,
|
||||
}
|
||||
|
||||
impl LocalExecutor {
|
||||
pub fn new(runtime_handle: Handle) -> Self {
|
||||
LocalExecutor { runtime_handle }
|
||||
}
|
||||
}
|
||||
|
||||
impl<F> hyper::rt::Executor<F> for LocalExecutor
|
||||
where
|
||||
F: std::future::Future + Send + 'static,
|
||||
F::Output: Send,
|
||||
{
|
||||
fn execute(&self, fut: F) {
|
||||
self.runtime_handle.spawn(fut);
|
||||
}
|
||||
}
|
||||
13
rpxy-lib/src/hyper_ext/mod.rs
Normal file
13
rpxy-lib/src/hyper_ext/mod.rs
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
mod body_incoming_like;
|
||||
mod body_type;
|
||||
mod executor;
|
||||
mod watch;
|
||||
|
||||
pub(crate) mod rt {
|
||||
pub(crate) use super::executor::LocalExecutor;
|
||||
}
|
||||
pub(crate) mod body {
|
||||
pub(crate) use super::body_incoming_like::IncomingLike;
|
||||
pub(crate) use super::body_type::{BoxBody, IncomingOr};
|
||||
}
|
||||
pub(crate) use body_type::{full, passthrough_response, synthetic_error_response, synthetic_response};
|
||||
67
rpxy-lib/src/hyper_ext/watch.rs
Normal file
67
rpxy-lib/src/hyper_ext/watch.rs
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
//! An SPSC broadcast channel.
|
||||
//!
|
||||
//! - The value can only be a `usize`.
|
||||
//! - The consumer is only notified if the value is different.
|
||||
//! - The value `0` is reserved for closed.
|
||||
// from https://github.com/hyperium/hyper/blob/master/src/common/watch.rs
|
||||
|
||||
use futures_util::task::AtomicWaker;
|
||||
use std::sync::{
|
||||
atomic::{AtomicUsize, Ordering},
|
||||
Arc,
|
||||
};
|
||||
use std::task;
|
||||
|
||||
type Value = usize;
|
||||
|
||||
pub(super) const CLOSED: usize = 0;
|
||||
|
||||
pub(super) fn channel(initial: Value) -> (Sender, Receiver) {
|
||||
debug_assert!(initial != CLOSED, "watch::channel initial state of 0 is reserved");
|
||||
|
||||
let shared = Arc::new(Shared {
|
||||
value: AtomicUsize::new(initial),
|
||||
waker: AtomicWaker::new(),
|
||||
});
|
||||
|
||||
(Sender { shared: shared.clone() }, Receiver { shared })
|
||||
}
|
||||
|
||||
pub(super) struct Sender {
|
||||
shared: Arc<Shared>,
|
||||
}
|
||||
|
||||
pub(super) struct Receiver {
|
||||
shared: Arc<Shared>,
|
||||
}
|
||||
|
||||
struct Shared {
|
||||
value: AtomicUsize,
|
||||
waker: AtomicWaker,
|
||||
}
|
||||
|
||||
impl Sender {
|
||||
pub(super) fn send(&mut self, value: Value) {
|
||||
if self.shared.value.swap(value, Ordering::SeqCst) != value {
|
||||
self.shared.waker.wake();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Sender {
|
||||
fn drop(&mut self) {
|
||||
self.send(CLOSED);
|
||||
}
|
||||
}
|
||||
|
||||
impl Receiver {
|
||||
pub(crate) fn load(&mut self, cx: &mut task::Context<'_>) -> Value {
|
||||
self.shared.waker.register(cx.waker());
|
||||
self.shared.value.load(Ordering::SeqCst)
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub(crate) fn peek(&self) -> Value {
|
||||
self.shared.value.load(Ordering::Relaxed)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue