Make serve_http() more generic (#24714)

I am going to reuse serve_http() to start a metrics/debug only handler.

GitOrigin-RevId: 90269b4b1744a5ffb1be7ec848bcf3f4d54420a2

Author: Preslav Le

crates/common/src/http/mod.rs

@@ -29,6 +29,7 @@ use axum::{
     },
     error_handling::HandleErrorLayer,
     extract::{
+        connect_info::IntoMakeServiceWithConnectInfo,
         FromRequestParts,
         State,
     },
@@ -583,6 +584,17 @@ impl ConvexHttpService {
         Self { router }
     }
 
+    pub async fn serve<F: Future<Output = ()>>(
+        self,
+        addr: SocketAddr,
+        shutdown: F,
+    ) -> anyhow::Result<()> {
+        let make_svc = self
+            .router
+            .into_make_service_with_connect_info::<SocketAddr>();
+        serve_http(make_svc, addr, shutdown).await
+    }
+
     #[cfg(any(test, feature = "testing"))]
     pub fn new_for_test(router: Router<(), Body>) -> Self {
         Self { router }
@@ -628,7 +640,7 @@ where
 
 /// Serves an HTTP server using the given service.
 pub async fn serve_http<F>(
-    service: ConvexHttpService,
+    service: IntoMakeServiceWithConnectInfo<Router, SocketAddr>,
     addr: SocketAddr,
     shutdown: F,
 ) -> anyhow::Result<()>
@@ -652,13 +664,10 @@ where
     incoming_sockets.set_sleep_on_errors(true);
     let addr = incoming_sockets.local_addr();
 
-    let make_svc = service
-        .router
-        .into_make_service_with_connect_info::<SocketAddr>();
     tracing::info!("Listening on http://{}", addr);
     hyper::Server::builder(incoming_sockets)
         .http2_max_concurrent_streams(MAX_HTTP2_STREAMS)
-        .serve(make_svc)
+        .serve(service)
         .with_graceful_shutdown(shutdown)
         .await?;
     tracing::info!("HTTP server shutdown complete");

crates/isolate/src/tests/fetch.rs

@@ -21,7 +21,6 @@ use axum::{
 use common::{
     assert_obj,
     http::{
-        serve_http,
         ConvexHttpService,
         NoopRouteMapper,
     },
@@ -64,14 +63,14 @@ async fn test_fetch_not_allowed_in_queries(rt: TestRuntime) -> anyhow::Result<()
 
 async fn serve(router: Router, port: u16) {
     let (_shutdown_tx, mut shutdown_rx) = async_broadcast::broadcast::<()>(1);
-    _ = serve_http(
-        ConvexHttpService::new(
-            router,
-            "0.0.1".to_owned(),
-            1,
-            Duration::from_secs(125),
-            NoopRouteMapper,
-        ),
+    _ = ConvexHttpService::new(
+        router,
+        "0.0.1".to_owned(),
+        1,
+        Duration::from_secs(125),
+        NoopRouteMapper,
+    )
+    .serve(
         SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1), port).into(),
         async move {
             let _ = shutdown_rx.recv().await;

crates/local_backend/src/main.rs

@@ -10,10 +10,7 @@ use clap::Parser;
 use cmd_util::env::config_service;
 use common::{
     errors::MainError,
-    http::{
-        serve_http,
-        ConvexHttpService,
-    },
+    http::ConvexHttpService,
     runtime::Runtime,
     version::SERVER_VERSION_STR,
 };
@@ -96,13 +93,9 @@ async fn run_server_inner(runtime: ProdRuntime, config: LocalConfig) -> anyhow::
         Duration::from_secs(125),
         BackendRouteMapper,
     );
-    let serve_http_future = serve_http(
-        http_service,
-        config.http_bind_address().into(),
-        async move {
-            let _ = shutdown_rx_.recv().await;
-        },
-    );
+    let serve_http_future = http_service.serve(config.http_bind_address().into(), async move {
+        let _ = shutdown_rx_.recv().await;
+    });
     let proxy_future = dev_site_proxy(
         config.site_bind_address(),
         config.convex_origin_url(),

crates/local_backend/src/proxy.rs

@@ -11,7 +11,6 @@ use axum::{
 };
 use common::{
     http::{
-        serve_http,
         ConvexHttpService,
         HttpResponseError,
         NoopRouteMapper,
@@ -63,7 +62,7 @@ pub async fn dev_site_proxy(
         Duration::from_secs(125),
         NoopRouteMapper,
     );
-    let proxy_server = serve_http(service, addr.into(), async move {
+    let proxy_server = service.serve(addr.into(), async move {
         let _ = shutdown_rx.recv().await;
         tracing::info!("Shut down proxy");
     });

crates/local_backend/src/subs/mod.rs

@@ -375,10 +375,7 @@ mod tests {
         routing::get,
         Router,
     };
-    use common::http::{
-        serve_http,
-        ConvexHttpService,
-    };
+    use common::http::ConvexHttpService;
     use futures::{
         SinkExt,
         StreamExt,
@@ -419,7 +416,7 @@ mod tests {
         let port = portpicker::pick_unused_port().expect("No ports free");
         let addr = format!("127.0.0.1:{port}").parse()?;
         let (shutdown_tx, shutdown_rx) = futures::channel::oneshot::channel();
-        let proxy_server = tokio::spawn(serve_http(app, addr, async move {
+        let proxy_server = tokio::spawn(app.serve(addr, async move {
             shutdown_rx.await.unwrap();
         }));