mirror of
https://github.com/denoland/deno.git
synced 2024-10-29 08:58:01 -04:00
990ecc99d8
Includes a lightly-modified version of hyper-util's `TokioIo` utility. Hyper changes: v1.0.0-rc.4 (2023-07-10) Bug Fixes http1: http1 server graceful shutdown fix (#3261) ([f4b51300](f4b513009d
)) send error on Incoming body when connection errors (#3256) ([52f19259](52f192593f
), closes https://github.com/hyperium/hyper/issues/3253) properly end chunked bodies when it was known to be empty (#3254) ([fec64cf0](fec64cf0ab
), closes https://github.com/hyperium/hyper/issues/3252) Features client: Make clients able to use non-Send executor (#3184) ([d977f209](d977f209bc
), closes https://github.com/hyperium/hyper/issues/3017) rt: replace IO traits with hyper::rt ones (#3230) ([f9f65b7a](f9f65b7aa6
), closes https://github.com/hyperium/hyper/issues/3110) add downcast on Sleep trait (#3125) ([d92d3917](d92d3917d9
), closes https://github.com/hyperium/hyper/issues/3027) service: change Service::call to take &self (#3223) ([d894439e](d894439e00
), closes https://github.com/hyperium/hyper/issues/3040) Breaking Changes Any IO transport type provided must not implement hyper::rt::{Read, Write} instead of tokio::io traits. You can grab a helper type from hyper-util to wrap Tokio types, or implement the traits yourself, if it's a custom type. ([f9f65b7a](f9f65b7aa6
)) client::conn::http2 types now use another generic for an Executor. Code that names Connection needs to include the additional generic parameter. ([d977f209](d977f209bc
)) The Service::call function no longer takes a mutable reference to self. The FnMut trait bound on the service::util::service_fn function and the trait bound on the impl for the ServiceFn struct were changed from FnMut to Fn.
206 lines
4.9 KiB
Rust
206 lines
4.9 KiB
Rust
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
|
|
|
// Copyright 2023 Sean McArthur <sean@seanmonstar.com>
|
|
// MIT licensed copy of unreleased hyper-util code from
|
|
// https://raw.githubusercontent.com/hyperium/hyper-util/master/src/rt/tokio_io.rs
|
|
|
|
#![allow(dead_code)]
|
|
//! Tokio IO integration for hyper
|
|
use hyper1 as hyper;
|
|
use std::pin::Pin;
|
|
use std::task::Context;
|
|
use std::task::Poll;
|
|
|
|
use pin_project::pin_project;
|
|
|
|
/// A wrapping implementing hyper IO traits for a type that
|
|
/// implements Tokio's IO traits.
|
|
#[pin_project]
|
|
#[derive(Debug)]
|
|
pub struct TokioIo<T> {
|
|
#[pin]
|
|
inner: T,
|
|
}
|
|
|
|
impl<T> TokioIo<T> {
|
|
/// Wrap a type implementing Tokio's IO traits.
|
|
pub fn new(inner: T) -> Self {
|
|
Self { inner }
|
|
}
|
|
|
|
/// Borrow the inner type.
|
|
pub fn inner(&self) -> &T {
|
|
&self.inner
|
|
}
|
|
|
|
/// Consume this wrapper and get the inner type.
|
|
pub fn into_inner(self) -> T {
|
|
self.inner
|
|
}
|
|
}
|
|
|
|
impl<T> hyper::rt::Read for TokioIo<T>
|
|
where
|
|
T: tokio::io::AsyncRead,
|
|
{
|
|
fn poll_read(
|
|
self: Pin<&mut Self>,
|
|
cx: &mut Context<'_>,
|
|
mut buf: hyper::rt::ReadBufCursor<'_>,
|
|
) -> Poll<Result<(), std::io::Error>> {
|
|
// SAFETY: Imported code from hyper-util
|
|
let n = unsafe {
|
|
let mut tbuf = tokio::io::ReadBuf::uninit(buf.as_mut());
|
|
match tokio::io::AsyncRead::poll_read(self.project().inner, cx, &mut tbuf)
|
|
{
|
|
Poll::Ready(Ok(())) => tbuf.filled().len(),
|
|
other => return other,
|
|
}
|
|
};
|
|
|
|
// SAFETY: Imported code from hyper-util
|
|
unsafe {
|
|
buf.advance(n);
|
|
}
|
|
Poll::Ready(Ok(()))
|
|
}
|
|
}
|
|
|
|
impl<T> hyper::rt::Write for TokioIo<T>
|
|
where
|
|
T: tokio::io::AsyncWrite,
|
|
{
|
|
fn poll_write(
|
|
self: Pin<&mut Self>,
|
|
cx: &mut Context<'_>,
|
|
buf: &[u8],
|
|
) -> Poll<Result<usize, std::io::Error>> {
|
|
tokio::io::AsyncWrite::poll_write(self.project().inner, cx, buf)
|
|
}
|
|
|
|
fn poll_flush(
|
|
self: Pin<&mut Self>,
|
|
cx: &mut Context<'_>,
|
|
) -> Poll<Result<(), std::io::Error>> {
|
|
tokio::io::AsyncWrite::poll_flush(self.project().inner, cx)
|
|
}
|
|
|
|
fn poll_shutdown(
|
|
self: Pin<&mut Self>,
|
|
cx: &mut Context<'_>,
|
|
) -> Poll<Result<(), std::io::Error>> {
|
|
tokio::io::AsyncWrite::poll_shutdown(self.project().inner, cx)
|
|
}
|
|
|
|
fn is_write_vectored(&self) -> bool {
|
|
tokio::io::AsyncWrite::is_write_vectored(&self.inner)
|
|
}
|
|
|
|
fn poll_write_vectored(
|
|
self: Pin<&mut Self>,
|
|
cx: &mut Context<'_>,
|
|
bufs: &[std::io::IoSlice<'_>],
|
|
) -> Poll<Result<usize, std::io::Error>> {
|
|
tokio::io::AsyncWrite::poll_write_vectored(self.project().inner, cx, bufs)
|
|
}
|
|
}
|
|
|
|
impl<T> tokio::io::AsyncRead for TokioIo<T>
|
|
where
|
|
T: hyper::rt::Read,
|
|
{
|
|
fn poll_read(
|
|
self: Pin<&mut Self>,
|
|
cx: &mut Context<'_>,
|
|
tbuf: &mut tokio::io::ReadBuf<'_>,
|
|
) -> Poll<Result<(), std::io::Error>> {
|
|
//let init = tbuf.initialized().len();
|
|
let filled = tbuf.filled().len();
|
|
// SAFETY: Imported code from hyper-util
|
|
let sub_filled = unsafe {
|
|
let mut buf = hyper::rt::ReadBuf::uninit(tbuf.unfilled_mut());
|
|
|
|
match hyper::rt::Read::poll_read(self.project().inner, cx, buf.unfilled())
|
|
{
|
|
Poll::Ready(Ok(())) => buf.filled().len(),
|
|
other => return other,
|
|
}
|
|
};
|
|
|
|
let n_filled = filled + sub_filled;
|
|
// At least sub_filled bytes had to have been initialized.
|
|
let n_init = sub_filled;
|
|
// SAFETY: Imported code from hyper-util
|
|
unsafe {
|
|
tbuf.assume_init(n_init);
|
|
tbuf.set_filled(n_filled);
|
|
}
|
|
|
|
Poll::Ready(Ok(()))
|
|
}
|
|
}
|
|
|
|
impl<T> tokio::io::AsyncWrite for TokioIo<T>
|
|
where
|
|
T: hyper::rt::Write,
|
|
{
|
|
fn poll_write(
|
|
self: Pin<&mut Self>,
|
|
cx: &mut Context<'_>,
|
|
buf: &[u8],
|
|
) -> Poll<Result<usize, std::io::Error>> {
|
|
hyper::rt::Write::poll_write(self.project().inner, cx, buf)
|
|
}
|
|
|
|
fn poll_flush(
|
|
self: Pin<&mut Self>,
|
|
cx: &mut Context<'_>,
|
|
) -> Poll<Result<(), std::io::Error>> {
|
|
hyper::rt::Write::poll_flush(self.project().inner, cx)
|
|
}
|
|
|
|
fn poll_shutdown(
|
|
self: Pin<&mut Self>,
|
|
cx: &mut Context<'_>,
|
|
) -> Poll<Result<(), std::io::Error>> {
|
|
hyper::rt::Write::poll_shutdown(self.project().inner, cx)
|
|
}
|
|
|
|
fn is_write_vectored(&self) -> bool {
|
|
hyper::rt::Write::is_write_vectored(&self.inner)
|
|
}
|
|
|
|
fn poll_write_vectored(
|
|
self: Pin<&mut Self>,
|
|
cx: &mut Context<'_>,
|
|
bufs: &[std::io::IoSlice<'_>],
|
|
) -> Poll<Result<usize, std::io::Error>> {
|
|
hyper::rt::Write::poll_write_vectored(self.project().inner, cx, bufs)
|
|
}
|
|
}
|
|
|
|
/// A wrapping implementing Tokio IO traits for a type that
|
|
/// implements Hyper's IO traits.
|
|
#[pin_project]
|
|
#[derive(Debug)]
|
|
pub struct TokioIoForHyper<T> {
|
|
#[pin]
|
|
inner: T,
|
|
}
|
|
|
|
impl<T> TokioIoForHyper<T> {
|
|
/// Wrap a type implementing Tokio's IO traits.
|
|
pub fn new(inner: T) -> Self {
|
|
Self { inner }
|
|
}
|
|
|
|
/// Borrow the inner type.
|
|
pub fn inner(&self) -> &T {
|
|
&self.inner
|
|
}
|
|
|
|
/// Consume this wrapper and get the inner type.
|
|
pub fn into_inner(self) -> T {
|
|
self.inner
|
|
}
|
|
}
|