gRPC and HTTP to use same port with axum multiplexing

markharding · markharding · commit 4a433ab726dc · 2026-04-28T11:31:46.000+01:00
diff --git a/.gitlab/ci/build_app.yml b/.gitlab/ci/build_app.yml
@@ -11,7 +11,7 @@
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - sapps/**/*
+        - apps/**/*
         - .gitlab/ci/build_app.yml
 
 app-web-image:
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/polycentric/.env.example b/apps/polycentric/.env.example
@@ -3,7 +3,7 @@
 # Comma-separated list of gRPC-web seed servers the client connects to
 # on startup. The server's CDN URL is fetched dynamically via
 # ServerService.GetInfo, so only the gRPC endpoint(s) need to be set.
-EXPO_PUBLIC_POLYCENTRIC_SEED_SERVERS=http://localhost:50051
+EXPO_PUBLIC_POLYCENTRIC_SEED_SERVERS=http://localhost:3000
 
 # Host Metro and the app resolve `localhost` against. Set to your dev
 # machine's LAN IP when running on a physical device/emulator.
diff --git a/apps/polycentric/Dockerfile b/apps/polycentric/Dockerfile
@@ -24,11 +24,12 @@ RUN pnpm --filter polycentric-app --prod --legacy deploy /deploy
 FROM base AS runner
 WORKDIR /app
 ENV NODE_ENV=production
+ENV PORT=8080
 
 COPY --from=build /deploy/node_modules ./node_modules
 COPY --from=build /deploy/package.json ./package.json
 COPY --from=build /app/apps/polycentric/dist ./dist
 COPY --from=build /app/apps/polycentric/server.js ./server.js
 
-EXPOSE 3000
+EXPOSE 8080
 CMD ["node", "server.js"]
diff --git a/apps/polycentric/server.js b/apps/polycentric/server.js
@@ -7,7 +7,7 @@ const CLIENT_DIR = path.join(__dirname, 'dist', 'client');
 const handler = createRequestHandler({
   build: path.join(__dirname, 'dist', 'server'),
 });
-const port = process.env.PORT || 3000;
+const port = process.env.PORT || 8080;
 
 const MIME_TYPES = {
   '.html': 'text/html',
diff --git a/apps/polycentric/src/common/lib/polycentric-hooks/PolycentricProvider.tsx b/apps/polycentric/src/common/lib/polycentric-hooks/PolycentricProvider.tsx
@@ -43,15 +43,15 @@ const DEFAULT_HOST = Platform.OS === 'android' ? '10.0.2.2' : 'localhost';
 /**
  * Comma-separated list of gRPC-web server URLs the client seeds
  * `client.servers` with. Read from `EXPO_PUBLIC_POLYCENTRIC_SEED_SERVERS`;
- * falls back to `http://<host>:50051` for local dev.
+ * falls back to `http://<host>:3000` for local dev.
  */
 export const DEFAULT_SEED_SERVERS: string[] = (() => {
   const raw = (process.env.EXPO_PUBLIC_POLYCENTRIC_SEED_SERVERS ?? '').trim();
   const parsed = raw
     .split(',')
     .map((s) => s.trim())
     .filter((s) => s.length > 0);
-  return parsed.length > 0 ? parsed : [`http://${DEFAULT_HOST}:50051`];
+  return parsed.length > 0 ? parsed : [`http://${DEFAULT_HOST}:3000`];
 })();
 
 /** First seed server — used by identity onboarding helpers. */
diff --git a/packages/js-browser/examples/react/src/components/sync/sync-panel.tsx b/packages/js-browser/examples/react/src/components/sync/sync-panel.tsx
@@ -102,7 +102,7 @@ export const SyncPanel = () => {
           value={newServer}
           onChange={(e) => setNewServer(e.target.value)}
           onKeyDown={(e) => e.key === 'Enter' && addServer()}
-          placeholder="http://localhost:50051"
+          placeholder="http://localhost:3000"
           style={{ flex: 1 }}
         />
         <button onClick={addServer}>Add</button>
diff --git a/packages/js-core/src/platform-interfaces/runtime-core.ts b/packages/js-core/src/platform-interfaces/runtime-core.ts
@@ -72,7 +72,7 @@ export interface IPolycentricCore {
    * Fetch events from a server via gRPC-web.
    *
    * # Arguments
-   * * `server_url` - The base URL of the gRPC-web server (e.g. "http://localhost:50051")
+   * * `server_url` - The base URL of the gRPC-web server (e.g. "http://localhost:3000")
    * * `limit` - Maximum number of events to fetch
    * * `identity` - Optional serialized Identity message bytes to filter by
    * * `stream_id` - Optional stream ID to filter by
diff --git a/packages/js-core/src/polycentric-client.ts b/packages/js-core/src/polycentric-client.ts
@@ -43,7 +43,7 @@ export interface PolycentricClientConfig {
   /**
    * gRPC-web URLs the client should start with. Used to seed
    * `client.servers` before `initialize()` fetches each server's
-   * `ServerInfo`. Defaults to `['http://localhost:50051']`.
+   * `ServerInfo`.
    */
   seedServers?: string[];
 }
@@ -71,7 +71,7 @@ export class PolycentricClient {
   public currentKeyPair: KeyPair | null = null;
   /** The identity key the current key pair is actively using. Set by publishIdentity or claimIdentity. */
   public activeIdentityKey: string | null = null;
-  public servers: string[] = ['http://localhost:50051'];
+  public servers: string[] = ['http://localhost:3000'];
 
   /** CDN URL per server, populated by `fetchServerInfo` during init. */
   private cdnUrlByServer = new Map<string, string>();
diff --git a/services/server/Cargo.toml b/services/server/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2024"
 # Workspace
 entity = { path = "./entity" }
 # 3rd Party
-axum = "0.8.8"
+axum = { version = "0.8.8", features = ["http2"] }
 ed25519-dalek = "2.2.0"
 log = "0.4"
 polycentric-common = { path = "../../packages/rs-common" }
@@ -22,5 +22,6 @@ tonic-prost = "*"
 tonic-reflection = "*"
 tonic-web = "*"
 tower-http = { version = "*", features = ["cors"] }
+tower-layer = "*"
 http = "*"
 
diff --git a/services/server/README.md b/services/server/README.md
@@ -28,9 +28,8 @@ DATABASE_URL=postgres://postgres:testing@localhost:5432 cargo run -- fresh
 cargo run -p server
 ```
 
-The server starts two services:
-- gRPC on `0.0.0.0:50051`
-- HTTP on `0.0.0.0:3000`
+The server listens on `0.0.0.0:3000`, multiplexing gRPC (h2c), gRPC-Web,
+and plain HTTP routes on the same port.
 
 The `DATABASE_URL` environment variable can be set to override the default connection string (`postgres://postgres:testing@localhost:5432`).
 
diff --git a/services/server/src/grpc/server.rs b/services/server/src/grpc/server.rs
@@ -1,10 +1,13 @@
 use crate::service;
 use crate::service::content::content_filestore::ContentFilestore;
 use crate::service::server::server_service::ServerConfig;
+use axum::Router;
 use http::header::HeaderName;
 use sea_orm::DatabaseConnection;
-use tonic::transport::Server;
+use tonic::service::Routes;
+use tonic_web::GrpcWebLayer;
 use tower_http::cors::{AllowOrigin, CorsLayer};
+use tower_layer::Layer;
 
 /// Builds reflection for gRPC docs. The file descriptors are created in ./build.rs.
 fn build_reflection_service() -> Result<
@@ -21,13 +24,13 @@ fn build_reflection_service() -> Result<
     Ok(service)
 }
 
-/// Serve the gRPC
-pub async fn serve_grpc(
+/// Build the gRPC services as an `axum::Router` so they can be merged with
+/// the HTTP router and served on a single port.
+pub fn build_grpc_router(
     db: DatabaseConnection,
     filestore: ContentFilestore,
     server_config: ServerConfig,
-) -> Result<(), Box<dyn std::error::Error>> {
-    let addr = "0.0.0.0:50051".parse()?;
+) -> Result<Router, Box<dyn std::error::Error>> {
     let events_service =
         service::events::events_service::build_events_service(db.clone());
     let feeds_service =
@@ -38,7 +41,14 @@ pub async fn serve_grpc(
         service::server::server_service::build_server_service(server_config);
     let reflection_service = build_reflection_service()?;
 
-    println!("GRPC server is listening on {addr}");
+    let grpc_web = GrpcWebLayer::new();
+
+    let routes = Routes::default()
+        .add_service(grpc_web.layer(reflection_service))
+        .add_service(grpc_web.layer(events_service))
+        .add_service(grpc_web.layer(feeds_service))
+        .add_service(grpc_web.layer(content_service))
+        .add_service(grpc_web.layer(server_info_service));
 
     let cors = CorsLayer::new()
         .allow_origin(AllowOrigin::any())
@@ -53,17 +63,5 @@ pub async fn serve_grpc(
         ])
         .allow_methods([http::Method::POST, http::Method::OPTIONS]);
 
-    Server::builder()
-        .accept_http1(true)
-        .layer(cors)
-        .layer(tonic_web::GrpcWebLayer::new())
-        .add_service(reflection_service)
-        .add_service(events_service)
-        .add_service(feeds_service)
-        .add_service(content_service)
-        .add_service(server_info_service)
-        .serve(addr)
-        .await?;
-
-    Ok(())
+    Ok(routes.into_axum_router().layer(cors))
 }
diff --git a/services/server/src/main.rs b/services/server/src/main.rs
@@ -5,7 +5,7 @@ mod service;
 mod util;
 
 use crate::db::client::build_db_client;
-use crate::grpc::server;
+use crate::grpc::server::build_grpc_router;
 use crate::routes::build_routes;
 use crate::service::content::content_filestore::ContentFilestore;
 use crate::service::server::server_service::ServerConfig;
@@ -56,24 +56,15 @@ async fn main() {
     let filestore = ContentFilestore::new(blobs_dir());
     let server_cfg = server_config();
 
-    let grpc = {
-        let db = db.clone();
-        let filestore = filestore.clone();
-        let server_cfg = server_cfg.clone();
-        tokio::spawn(async move {
-            if let Err(e) = server::serve_grpc(db, filestore, server_cfg).await
-            {
-                eprintln!("gRPC server error: {e}");
-            }
-        })
-    };
+    let grpc_router =
+        build_grpc_router(db.clone(), filestore.clone(), server_cfg)
+            .expect("failed to build gRPC router");
+    let http_router = build_routes(db, filestore);
+
+    let app = http_router.merge(grpc_router);
 
-    let routes = build_routes(db, filestore);
     let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
-    println!("HTTP server listening on http://0.0.0.0:3000");
+    println!("Server listening on http://0.0.0.0:3000");
     println!("API docs available at http://0.0.0.0:3000/docs");
-    let http =
-        tokio::spawn(async { axum::serve(listener, routes).await.unwrap() });
-
-    tokio::try_join!(grpc, http).unwrap();
+    axum::serve(listener, app).await.unwrap();
 }
diff --git a/services/server/tests/src/lib.rs b/services/server/tests/src/lib.rs
@@ -8,8 +8,7 @@ use proto::{
 };
 use sha2::{Digest, Sha256};
 
-/// Default gRPC server address for tests
-pub const GRPC_ADDR: &str = "http://localhost:50051";
+pub const GRPC_ADDR: &str = "http://localhost:3000";
 
 pub fn sha256(data: &[u8]) -> Vec<u8> {
     let mut hasher = Sha256::new();

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ export interface IPolycentricCore {`
`72`	`72`	`* Fetch events from a server via gRPC-web.`
`73`	`73`	`*`
`74`	`74`	`* # Arguments`
`75`		- * * `server_url` - The base URL of the gRPC-web server (e.g. "http://localhost:50051")
	`75`	+ * * `server_url` - The base URL of the gRPC-web server (e.g. "http://localhost:3000")
`76`	`76`	* * `limit` - Maximum number of events to fetch
`77`	`77`	* * `identity` - Optional serialized Identity message bytes to filter by
`78`	`78`	* * `stream_id` - Optional stream ID to filter by