-
-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #29 from danieleades/update-hyper
port hyperlocal client to latest hyper
- Loading branch information
Showing
12 changed files
with
319 additions
and
266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| version = "Two" | ||
| use_field_init_shorthand = true | ||
| merge_imports = true | ||
| wrap_comments = true | ||
| use_try_shorthand = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| use futures_util::future::BoxFuture; | ||
| use hex::FromHex; | ||
| use hyper::{ | ||
| client::connect::{Connected, Connection}, | ||
| service::Service, | ||
| Body, Client, Uri, | ||
| }; | ||
| use pin_project::pin_project; | ||
| use std::{ | ||
| io, | ||
| path::{Path, PathBuf}, | ||
| pin::Pin, | ||
| task::{Context, Poll}, | ||
| }; | ||
|
|
||
| #[pin_project] | ||
| #[derive(Debug)] | ||
| pub struct UnixStream { | ||
| #[pin] | ||
| unix_stream: tokio::net::UnixStream, | ||
| } | ||
|
|
||
| impl UnixStream { | ||
| async fn connect<P>(path: P) -> std::io::Result<Self> | ||
| where | ||
| P: AsRef<Path>, | ||
| { | ||
| let unix_stream = tokio::net::UnixStream::connect(path).await?; | ||
| Ok(Self { unix_stream }) | ||
| } | ||
| } | ||
|
|
||
| impl tokio::io::AsyncWrite for UnixStream { | ||
| fn poll_write( | ||
| self: Pin<&mut Self>, | ||
| cx: &mut Context<'_>, | ||
| buf: &[u8], | ||
| ) -> Poll<Result<usize, io::Error>> { | ||
| self.project().unix_stream.poll_write(cx, buf) | ||
| } | ||
| fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> { | ||
| self.project().unix_stream.poll_flush(cx) | ||
| } | ||
| fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> { | ||
| self.project().unix_stream.poll_shutdown(cx) | ||
| } | ||
| } | ||
|
|
||
| impl tokio::io::AsyncRead for UnixStream { | ||
| fn poll_read( | ||
| self: Pin<&mut Self>, | ||
| cx: &mut Context<'_>, | ||
| buf: &mut [u8], | ||
| ) -> Poll<io::Result<usize>> { | ||
| self.project().unix_stream.poll_read(cx, buf) | ||
| } | ||
| } | ||
|
|
||
| /// the `[UnixConnector]` can be used to construct a `[hyper::Client]` which can | ||
| /// speak to a unix domain socket. | ||
| /// | ||
| /// # Example | ||
| /// ``` | ||
| /// use hyper::{Client, Body}; | ||
| /// use hyperlocal::UnixConnector; | ||
| /// | ||
| /// let connector = UnixConnector; | ||
| /// let client: Client<UnixConnector, Body> = Client::builder().build(connector); | ||
| /// ``` | ||
| /// | ||
| /// # Note | ||
| /// If you don't need access to the low-level `[hyper::Client]` builder | ||
| /// interface, consider using the `[UnixClientExt]` trait instead. | ||
| #[derive(Clone, Copy, Debug, Default)] | ||
| pub struct UnixConnector; | ||
|
|
||
| impl Unpin for UnixConnector {} | ||
|
|
||
| impl Service<Uri> for UnixConnector { | ||
| type Response = UnixStream; | ||
| type Error = std::io::Error; | ||
| type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>; | ||
| fn call(&mut self, req: Uri) -> Self::Future { | ||
| let fut = async move { | ||
| let path = parse_socket_path(req)?; | ||
| UnixStream::connect(path).await | ||
| }; | ||
|
|
||
| Box::pin(fut) | ||
| } | ||
| fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> { | ||
| Poll::Ready(Ok(())) | ||
| } | ||
| } | ||
|
|
||
| impl Connection for UnixStream { | ||
| fn connected(&self) -> Connected { | ||
| Connected::new() | ||
| } | ||
| } | ||
|
|
||
| fn parse_socket_path(uri: Uri) -> Result<std::path::PathBuf, io::Error> { | ||
| if uri.scheme_str() != Some("unix") { | ||
| return Err(io::Error::new( | ||
| io::ErrorKind::InvalidInput, | ||
| "invalid URL, scheme must be unix", | ||
| )); | ||
| } | ||
|
|
||
| if let Some(host) = uri.host() { | ||
| let bytes = Vec::from_hex(host).map_err(|_| { | ||
| io::Error::new( | ||
| io::ErrorKind::InvalidInput, | ||
| "invalid URL, host must be a hex-encoded path", | ||
| ) | ||
| })?; | ||
|
|
||
| Ok(PathBuf::from(String::from_utf8_lossy(&bytes).into_owned())) | ||
| } else { | ||
| Err(io::Error::new( | ||
| io::ErrorKind::InvalidInput, | ||
| "invalid URL, host must be present", | ||
| )) | ||
| } | ||
| } | ||
|
|
||
| /// Extention trait for constructing a hyper HTTP client over a Unix domain | ||
| /// socket. | ||
| pub trait UnixClientExt { | ||
| /// Construct a client which speaks HTTP over a Unix domain socket | ||
| /// | ||
| /// # Example | ||
| /// ``` | ||
| /// use hyper::Client; | ||
| /// use hyperlocal::UnixClientExt; | ||
| /// | ||
| /// let client = Client::unix(); | ||
| /// ``` | ||
| fn unix() -> Client<UnixConnector, Body> { | ||
| Client::builder().build(UnixConnector) | ||
| } | ||
| } | ||
|
|
||
| impl UnixClientExt for Client<UnixConnector> {} |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.