Skip to content

Commit 6023c87

Browse files
committed
fix: Add native gRPC support to HTTP port (8080) - simplified
1 parent 0cad7d6 commit 6023c87

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

  • libsql-server/src/http/user

libsql-server/src/http/user/mod.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -431,19 +431,14 @@ where
431431
.with_state(state);
432432

433433
// Merge the grpc based axum router into our regular http router
434-
let replication = ReplicationLogServer::new(self.replication_service.clone());
435-
let write_proxy = ProxyServer::new(self.proxy_service.clone());
436-
437-
// Add native gRPC services (HTTP/2) alongside gRPC-Web (HTTP/1.1)
438-
let native_replication = ReplicationLogServer::new(self.replication_service);
439-
let native_write_proxy = ProxyServer::new(self.proxy_service);
434+
// Add services directly - tonic handles both HTTP/1.1 (gRPC-Web) and HTTP/2 (native gRPC)
435+
let replication = ReplicationLogServer::new(self.replication_service);
436+
let write_proxy = ProxyServer::new(self.proxy_service);
440437

441438
let grpc_router = Server::builder()
442439
.accept_http1(true)
443-
.add_service(tonic_web::enable(replication))
444-
.add_service(tonic_web::enable(write_proxy))
445-
.add_service(native_replication)
446-
.add_service(native_write_proxy);
440+
.add_service(replication)
441+
.add_service(write_proxy);
447442
// Convert to axum Router - into_router() is deprecated but functional
448443
#[allow(deprecated)]
449444
let grpc_router = grpc_router.into_router();

0 commit comments

Comments
 (0)