Try some HTTP/2 support.

Author: alistairjevans

Cargo.lock

@@ -16,6 +16,6 @@ bytes = "1.5"
 tokio-stream = { version = "0.1", features = ["net"] }
 crossbeam-channel = "0.5.14"
 rb-sys = "0.9.110"
-hyper = { version = "1.0", features = ["http1", "server"] }
-hyper-util = { version = "0.1", features = ["tokio"] }
+hyper = { version = "1.0", features = ["http1", "http2", "server"] }
+hyper-util = { version = "0.1", features = ["tokio", "server", "http1", "http2"] }
 http-body-util = "0.1.2"

ext/hyper_ruby/Cargo.toml

@@ -23,11 +23,11 @@ use tokio::sync::{Mutex, oneshot};
 use tokio::task::JoinHandle;
 use crossbeam_channel;
 
-use hyper::server::conn::http1;
 use hyper::service::service_fn;
 use hyper::{Error, Request as HyperRequest, Response as HyperResponse, StatusCode};
 use hyper::body::Incoming;
 use hyper_util::rt::TokioIo;
+use hyper_util::server::conn::auto;
 use http_body_util::BodyExt; // You'll need this
 use http_body_util::Full;
 
@@ -177,20 +177,10 @@ impl Server {
 
                     loop {
                         let (stream, _) = listener.accept().await.unwrap();
-                        let io = TokioIo::new(stream);
                         let work_tx = work_tx.clone();
 
                         tokio::task::spawn(async move {
-                            let service = service_fn(move |req: HyperRequest<Incoming>| {
-                                let work_tx = work_tx.clone();
-                                handle_request(req, work_tx)
-                            });
-
-                            if let Err(err) = http1::Builder::new()
-                                .serve_connection(io, service)
-                                .await {
-                                eprintln!("Error serving connection: {:?}", err);
-                            }
+                            handle_connection(stream, work_tx).await;
                         });
                     }
                 } else {
@@ -200,20 +190,10 @@ impl Server {
 
                     loop {
                         let (stream, _) = listener.accept().await.unwrap();
-                        let io = TokioIo::new(stream);
                         let work_tx = work_tx.clone();
 
                         tokio::task::spawn(async move {
-                            let service = service_fn(move |req: HyperRequest<Incoming>| {
-                                let work_tx = work_tx.clone();
-                                handle_request(req, work_tx)
-                            });
-
-                            if let Err(err) = http1::Builder::new()
-                                .serve_connection(io, service)
-                                .await {
-                                eprintln!("Error serving connection: {:?}", err);
-                            }
+                            handle_connection(stream, work_tx).await;
                         });
                     }
                 }
@@ -294,6 +274,25 @@ async fn handle_request(
     }
 }
 
+async fn handle_connection(
+    stream: impl tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static,
+    work_tx: Arc<crossbeam_channel::Sender<RequestWithCompletion>>,
+) {
+    let service = service_fn(move |req: HyperRequest<Incoming>| {
+        let work_tx = work_tx.clone();
+        handle_request(req, work_tx)
+    });
+
+    let io = TokioIo::new(stream);
+    
+    if let Err(err) = auto::Builder::new(hyper_util::rt::TokioExecutor::new())
+        .serve_connection(io, service)
+        .await
+    {
+        eprintln!("Error serving connection: {:?}", err);
+    }
+}
+
 #[magnus::init]
 fn init(ruby: &Ruby) -> Result<(), MagnusError> {
     let module = ruby.define_module("HyperRuby")?;