@@ -18,7 +18,6 @@ prost = "0.14.1"
 tonic = "0.14.2"
 tonic-middleware = "0.4.0"
 tonic-prost = "0.14.2"
-tokio-stream = "0.1"
 tonic-web = "0.14.2"
 tower-http = { version = "0.6.6", features = ["cors"] }
 clerk-rs = { version = "0.4.2", features = ["axum"] }
 
@@ -1,4 +1,3 @@
-use tokio::net::TcpListener;
 use tonic::transport::Server;
 use tonic_web::GrpcWebLayer;
 
@@ -13,29 +12,15 @@ use crate::services::HelloWorldServiceImpl;
 pub mod middleware;
 pub mod services;
 
-const MAX_PORT_ATTEMPTS: u16 = 10;
-
-async fn bind_listener(start_port: u16) -> Result<(TcpListener, u16), Box<dyn std::error::Error>> {
-    for offset in 0..MAX_PORT_ATTEMPTS {
-        let port = start_port + offset;
-        match TcpListener::bind(format!("0.0.0.0:{}", port)).await {
-            Ok(listener) => return Ok((listener, port)),
-            Err(e) if offset < MAX_PORT_ATTEMPTS - 1 => {
-                tracing::warn!("Port {} unavailable ({}), trying {}...", port, e, port + 1);
-            }
-            Err(e) => return Err(format!("No available port found after {} attempts: {}", MAX_PORT_ATTEMPTS, e).into()),
-        }
-    }
-    unreachable!()
-}
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     dotenv::dotenv().ok();
     tracing_subscriber::fmt().with_env_filter("info").init();
 
-    let (listener, port) = bind_listener(50051).await?;
-    let incoming = tokio_stream::wrappers::TcpListenerStream::new(listener);
+    let port: u16 = std::env::var("GRPC_PORT")
+        .unwrap_or_else(|_| "50051".to_string())
+        .parse()?;
+    let addr = format!("0.0.0.0:{}", port).parse()?;
 
     // Initialize database
     let db_config = data::DatabaseConfig::from_env();
@@ -57,7 +42,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .layer(GrpcWebLayer::new())
         // .layer(RequestInterceptorLayer::new(auth_interceptor.clone()))
         .add_service(GreeterServer::new(greeter_service))
-        .serve_with_incoming(incoming)
+        .serve(addr)
         .await?;
 
     Ok(())
 
@@ -4,6 +4,6 @@
   "scripts": {
     "dev:backend": "cd backend/api && cargo run --bin grpc-server",
     "dev:frontend": "cd frontend && bun dev",
-    "dev": "bash scripts/dev.sh"
+    "dev": "concurrently \"bun run dev:backend\" \"bun run dev:frontend\""
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`"scripts": {`
`5`	`5`	`"dev:backend": "cd backend/api && cargo run --bin grpc-server",`
`6`	`6`	`"dev:frontend": "cd frontend && bun dev",`
`7`		`- "dev": "bash scripts/dev.sh"`
	`7`	`+ "dev": "concurrently \"bun run dev:backend\" \"bun run dev:frontend\""`
`8`	`8`	`}`
`9`	`9`	`}`