enables incoming http2 stream

Signed-off-by: Aminu Oluwaseun Joshua <[email protected]>

Author: seun-ja

crates/trigger-http/src/server.rs

@@ -14,10 +14,10 @@ use http::{
 use http_body_util::BodyExt;
 use hyper::{
     body::{Bytes, Incoming},
-    server::conn::http1,
+    server::conn::{http1, http2},
     service::service_fn,
 };
-use hyper_util::rt::TokioIo;
+use hyper_util::rt::{TokioExecutor, TokioIo};
 use spin_app::{APP_DESCRIPTION_KEY, APP_NAME_KEY};
 use spin_factor_outbound_http::{OutboundHttpFactor, SelfRequestOrigin};
 use spin_factors::RuntimeFactors;
@@ -206,7 +206,7 @@ impl<F: RuntimeFactors> HttpServer<F> {
         loop {
             let (stream, client_addr) = listener.accept().await?;
             self.clone()
-                .serve_connection(stream, Scheme::HTTP, client_addr);
+                .http1_serve_connection(stream, Scheme::HTTP, client_addr);
         }
     }
 
@@ -220,9 +220,15 @@ impl<F: RuntimeFactors> HttpServer<F> {
         loop {
             let (stream, client_addr) = listener.accept().await?;
             match acceptor.accept(stream).await {
-                Ok(stream) => self
-                    .clone()
-                    .serve_connection(stream, Scheme::HTTPS, client_addr),
+                Ok(stream) => {
+                    if stream.get_ref().1.alpn_protocol() == Some(b"h2") {
+                        self.clone()
+                            .http2_serve_connection(stream, Scheme::HTTPS, client_addr)
+                    } else {
+                        self.clone()
+                            .http1_serve_connection(stream, Scheme::HTTPS, client_addr)
+                    }
+                }
                 Err(err) => tracing::error!(?err, "Failed to start TLS session"),
             }
         }
@@ -403,7 +409,7 @@ impl<F: RuntimeFactors> HttpServer<F> {
             .body(body::empty())?)
     }
 
-    fn serve_connection<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(
+    fn http1_serve_connection<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(
         self: Arc<Self>,
         stream: S,
         server_scheme: Scheme,
@@ -424,7 +430,32 @@ impl<F: RuntimeFactors> HttpServer<F> {
                 )
                 .await
             {
-                tracing::warn!("Error serving HTTP connection: {err:?}");
+                tracing::warn!("Error serving HTTP1 connection: {err:?}");
+            }
+        });
+    }
+
+    fn http2_serve_connection<S: AsyncRead + AsyncWrite + Unpin + Send + 'static>(
+        self: Arc<Self>,
+        stream: S,
+        server_scheme: Scheme,
+        client_addr: SocketAddr,
+    ) {
+        task::spawn(async move {
+            if let Err(err) = http2::Builder::new(TokioExecutor::new())
+                .serve_connection(
+                    TokioIo::new(stream),
+                    service_fn(move |request| {
+                        self.clone().instrumented_service_fn(
+                            server_scheme.clone(),
+                            client_addr,
+                            request,
+                        )
+                    }),
+                )
+                .await
+            {
+                tracing::warn!("Error serving HTTP2 connection: {err:?}");
             }
         });
     }