Update http and try to figure out some hyper changes

> The free functions `hyper::body::to_bytes` and `aggregate` have been removed. Similar functionality is on `http_body_util::BodyExt::collect`. (0888623d)
>
> https://github.com/hyperium/hyper/blob/master/CHANGELOG.md#v100-rc1-2022-10-25

> remove higher-level `hyper::Client` ([#2941](hyperium/hyper#2941)) (bb3af17c)
>
> https://github.com/hyperium/hyper/blob/master/CHANGELOG.md#v100-rc1-2022-10-25

> remove client::connect module ([#2949](hyperium/hyper#2949)) (5e206883)
>
>
> https://github.com/hyperium/hyper/blob/master/CHANGELOG.md#v100-rc1-2022-10-25

> remove `server::conn::{Http, Connection}` types ([#3013](hyperium/hyper#3013)) (0766d3f7, closes #3012)
>
> https://github.com/hyperium/hyper/blob/master/CHANGELOG.md#v100-rc1-2022-10-25

> The `poll_ready` method has been removed. (fee7d361)
>
> https://github.com/hyperium/hyper/blob/master/CHANGELOG.md#v100-rc1-2022-10-25

> replace IO traits with hyper::rt ones ([#3230](hyperium/hyper#3230)) (f9f65b7a, closes #3110)
>
> https://github.com/hyperium/hyper/blob/master/CHANGELOG.md#v100-rc1-2022-10-25

Author: MadLittleMods

Cargo.toml

@@ -9,19 +9,22 @@ license = "Apache-2.0"
 [dependencies]
 anyhow = "1.0.70"
 base64 = "0.21.0"
+bytes = "1.10.0"
 doc-comment = "0.3.3"
 ed25519-dalek = "2.0.0"
 futures = "0.3.28"
 futures-util = "0.3.28"
-http = "0.2.9"
-hyper = { version = "0.14.25", features = ["client", "http1", "server", "stream"] }
-hyper-rustls = "0.24.0"
+http = "1.2.0"
+http-body-util = "0.1.2"
+hyper = { version = "1.6.0", features = ["client", "http1", "server"] }
+hyper-rustls = "0.27.5"
+hyper-util = { version = "0.1.10", features = ["server"] }
 log = "0.4.17"
 rand = "0.8.5"
 serde = { version = "1.0.159", features = ["derive"] }
 serde_json = "1.0.95"
 signed-json = { git = "https://github.com/erikjohnston/rust-signed-json.git" }
 tokio = { version = "1.27.0", features = ["macros"] }
-tokio-rustls = "0.24.0"
+tokio-rustls = "0.26.1"
 hickory-resolver = "0.24.2"
 url = "2.5.4"

src/client.rs

@@ -6,33 +6,36 @@ use std::sync::Arc;
 use anyhow::{bail, format_err, Context, Error};
 use base64::prelude::BASE64_STANDARD_NO_PAD;
 use base64::Engine;
+use bytes::Bytes;
 use ed25519_dalek::SigningKey;
 use http::header::{AUTHORIZATION, CONTENT_TYPE};
 use http::request::{Builder, Parts};
 use http::{HeaderValue, Uri};
-use hyper::body::{to_bytes, HttpBody};
-use hyper::client::connect::Connect;
-use hyper::{Body, Client, Request, Response};
+use http_body_util::{BodyExt, Full};
+use hyper::{Request, Response};
+use hyper_util::client::legacy::connect::Connect;
+use hyper_util::client::legacy::Client;
+use hyper_util::rt::TokioExecutor;
 use serde::Serialize;
 use serde_json::value::RawValue;
 use signed_json::signed::Wrap;
 use signed_json::{Canonical, CanonicalWrapper, Signed};
 
 use crate::server_resolver::{handle_delegated_server, MatrixConnector};
 
-/// A [`hyper::Client`] that routes `matrix://` (Synapse <1.87.0rc1 (2023-06-27)) and
-/// `matrix-federation://` (Synapse >=1.87.0rc1 (2023-06-27)) URIs correctly, but does
-/// not sign the requests.
+/// A [`hyper_util::client::legacy::Client`] that routes `matrix://` (Synapse <1.87.0rc1
+/// (2023-06-27)) and `matrix-federation://` (Synapse >=1.87.0rc1 (2023-06-27)) URIs
+/// correctly, but does not sign the requests.
 ///
 /// Either use [`SigningFederationClient`] if you want requests to be automatically
 /// signed, or [`sign_and_build_json_request`] to sign the requests.
 #[derive(Debug, Clone)]
 pub struct FederationClient {
-    pub client: hyper::Client<MatrixConnector>,
+    pub client: Client<MatrixConnector, Full<Bytes>>,
 }
 
 impl FederationClient {
-    pub fn new(client: hyper::Client<MatrixConnector>) -> Self {
+    pub fn new(client: Client<MatrixConnector, Full<Bytes>>) -> Self {
         FederationClient { client }
     }
 
@@ -41,11 +44,14 @@ impl FederationClient {
         let connector = MatrixConnector::with_default_resolver()?;
 
         Ok(FederationClient {
-            client: Client::builder().build(connector),
+            client: Client::builder(TokioExecutor::new()).build(connector),
         })
     }
 
-    pub async fn request(&self, mut req: Request<Body>) -> Result<Response<Body>, Error> {
+    pub async fn request(
+        &self,
+        mut req: Request<Full<Bytes>>,
+    ) -> Result<Response<Full<Bytes>>, Error> {
         req = handle_delegated_server(&self.client, req).await?;
 
         Ok(self.client.request(req).await?)
@@ -79,7 +85,7 @@ impl SigningFederationClient<MatrixConnector> {
         let connector = MatrixConnector::with_default_resolver()?;
 
         Ok(SigningFederationClient {
-            client: Client::builder().build(connector),
+            client: Client::builder(TokioExecutor::new()).build(connector),
             server_name: server_name.to_string(),
             key_id: key_id.to_string(),
             secret_key: Arc::new(secret_key),
@@ -114,8 +120,8 @@ where
     /// Make a GET request to the given URI.
     ///
     /// Will sign the request if the URI has a `matrix` scheme.
-    pub async fn get(&self, uri: Uri) -> Result<Response<Body>, Error> {
-        let body = Body::default();
+    pub async fn get(&self, uri: Uri) -> Result<Response<Full<Bytes>>, Error> {
+        let body = Full::new(Bytes::new());
 
         let mut req = Request::new(body);
         *req.uri_mut() = uri;
@@ -126,7 +132,10 @@ where
     ///
     /// For `matrix://` or `matrix-federation://` URIs the request body must be JSON (if
     /// not empty) and the request will be signed.
-    pub async fn request(&self, mut req: Request<Body>) -> Result<Response<Body>, Error> {
+    pub async fn request(
+        &self,
+        mut req: Request<Full<Bytes>>,
+    ) -> Result<Response<Full<Bytes>>, Error> {
         req = handle_delegated_server(&self.client, req).await?;
 
         // Return-early and make a normal request if the URI scheme is not `matrix://`
@@ -136,19 +145,14 @@ where
             _ => return Ok(self.client.request(req).await?),
         }
 
-        if !req.body().is_end_stream()
-            && req.headers().get(CONTENT_TYPE)
-                != Some(&HeaderValue::from_static("application/json"))
-        {
+        if req.headers().get(CONTENT_TYPE) != Some(&HeaderValue::from_static("application/json")) {
             bail!("Request has a non-JSON body")
         }
 
         let (mut parts, body) = req.into_parts();
 
-        let content = if body.is_end_stream() {
-            None
-        } else {
-            let bytes = to_bytes(body).await?;
+        let content = {
+            let bytes = BodyExt::collect(body).await.unwrap().to_bytes();
             let json_string = String::from_utf8(bytes.to_vec())?;
             Some(RawValue::from_string(json_string)?)
         };
@@ -167,7 +171,7 @@ where
         let new_body = if let Some(raw_value) = content {
             raw_value.to_string().into()
         } else {
-            Body::default()
+            Full::new(Bytes::new())
         };
 
         let new_req = Request::from_parts(parts, new_body);
@@ -237,7 +241,7 @@ pub fn sign_and_build_json_request<T: serde::Serialize>(
     secret_key: &SigningKey,
     mut request_builder: Builder,
     content: Option<T>,
-) -> Result<Request<Body>, Error> {
+) -> Result<Request<Full<Bytes>>, Error> {
     let uri = request_builder
         .uri_ref()
         .ok_or_else(|| format_err!("URI must be set"))?;
@@ -276,9 +280,9 @@ pub fn sign_and_build_json_request<T: serde::Serialize>(
     let header_value = header_string.try_into()?;
 
     let body = if let Some(c) = canonical_content {
-        Body::from(c.into_canonical())
+        Full::new(Bytes::from(c.into_canonical()))
     } else {
-        Body::default()
+        Full::new(Bytes::new())
     };
 
     request_builder
@@ -327,7 +331,7 @@ pub trait SignedRequestBuilderExt {
         server_name: &str,
         key_id: &str,
         secret_key: &SigningKey,
-    ) -> Result<Request<Body>, Error>;
+    ) -> Result<Request<Full<Bytes>>, Error>;
 
     /// Sign and build the request with the given JSON body.
     fn signed_json<T: Serialize>(
@@ -336,7 +340,7 @@ pub trait SignedRequestBuilderExt {
         key_id: &str,
         secret_key: &SigningKey,
         content: T,
-    ) -> Result<Request<Body>, Error>;
+    ) -> Result<Request<Full<Bytes>>, Error>;
 
     /// Sign and build the request with optional JSON body.
     fn signed_json_opt<T: Serialize>(
@@ -345,7 +349,7 @@ pub trait SignedRequestBuilderExt {
         key_id: &str,
         secret_key: &SigningKey,
         content: Option<T>,
-    ) -> Result<Request<Body>, Error>;
+    ) -> Result<Request<Full<Bytes>>, Error>;
 }
 
 impl SignedRequestBuilderExt for Builder {
@@ -354,7 +358,7 @@ impl SignedRequestBuilderExt for Builder {
         server_name: &str,
         key_id: &str,
         secret_key: &SigningKey,
-    ) -> Result<Request<Body>, Error> {
+    ) -> Result<Request<Full<Bytes>>, Error> {
         sign_and_build_json_request::<()>(server_name, key_id, secret_key, self, None)
     }
 
@@ -364,7 +368,7 @@ impl SignedRequestBuilderExt for Builder {
         key_id: &str,
         secret_key: &SigningKey,
         content: T,
-    ) -> Result<Request<Body>, Error> {
+    ) -> Result<Request<Full<Bytes>>, Error> {
         sign_and_build_json_request(server_name, key_id, secret_key, self, Some(content))
     }
 
@@ -374,7 +378,7 @@ impl SignedRequestBuilderExt for Builder {
         key_id: &str,
         secret_key: &SigningKey,
         content: Option<T>,
-    ) -> Result<Request<Body>, Error> {
+    ) -> Result<Request<Full<Bytes>>, Error> {
         if let Some(content) = content {
             self.signed_json(server_name, key_id, secret_key, content)
         } else {

src/lib.rs

@@ -28,9 +28,9 @@
 //!
 //! # [`FederationClient`]
 //!
-//! The [`FederationClient`] is just a standard [`hyper::Client`] with a
-//! [`MatrixConnector`] that can route `matrix://` and `matrix-federation://` URIs, but
-//! does *not* sign the requests automatically:
+//! The [`FederationClient`] is just a standard [`hyper_util::client::legacy::Client`]
+//! with a [`MatrixConnector`] that can route `matrix://` and `matrix-federation://`
+//! URIs, but does *not* sign the requests automatically:
 //!
 //! ```no_run
 //! # use matrix_hyper_federation_client::FederationClient;