feat: prefix grpc transport with /grpc

Author: lherman-cs

README.md

@@ -32,7 +32,7 @@ RUST_LOG='tower_http=trace,pulsebeam_server_foss=info' cargo run
 
 ## How to run a demo with the local server?
 
-https://meet.pulsebeam.dev/?baseUrl=http://localhost:3000/twirp
+https://meet.pulsebeam.dev/?baseUrl=http://localhost:3000/grpc
 
 ## Semantic Versioning
 

src/main.rs

@@ -2,7 +2,7 @@ use std::net::SocketAddr;
 use tracing::info;
 
 use std::time::Duration;
-use tonic::{service::LayerExt, transport::Server};
+use tonic::service::LayerExt;
 use tower_http::cors::{AllowOrigin, CorsLayer};
 
 #[tokio::main]
@@ -13,22 +13,25 @@ async fn main() -> anyhow::Result<()> {
         // https://github.com/tower-rs/tower-http/issues/194
         .allow_origin(AllowOrigin::mirror_request())
         .max_age(Duration::from_secs(86400));
-    let server = pulsebeam_server_foss::Server::default();
+    let server =
+        pulsebeam_server_foss::SignalingServer::new(pulsebeam_server_foss::Server::default());
     let server = tower::ServiceBuilder::new()
-        .layer(cors)
         .layer(tonic_web::GrpcWebLayer::new())
         .into_inner()
-        .named_layer(pulsebeam_server_foss::SignalingServer::new(server));
+        .named_layer(server);
+    let grpc_routes = tonic::service::Routes::new(server)
+        .prepare()
+        .into_axum_router();
 
     let addr: SocketAddr = "[::]:3000".parse().unwrap();
     info!("Listening on {addr}");
-    Server::builder()
-        // GrpcWeb is over http1 so we must enable it.
-        .accept_http1(true)
-        .layer(tower_http::trace::TraceLayer::new_for_grpc())
-        .add_service(server)
-        .serve(addr)
-        .await?;
+
+    let router = axum::Router::new()
+        .nest_service("/grpc", grpc_routes)
+        .layer(cors);
+
+    let listener = tokio::net::TcpListener::bind(addr).await?;
+    axum::serve(listener, router).await?;
 
     Ok(())
 }