Start RPC server when starting backend

ellmo-ai · Aug 21, 2024 · f1f74d4 · f1f74d4
1 parent 5cfe227
commit f1f74d4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/server/Cargo.toml b/server/Cargo.toml
@@ -2,8 +2,12 @@
 name = "server"
 version = "0.1.0"
 edition = "2021"
+default-run = "server"
 
 [dependencies]
+# Local
+olly_proto = { package = "proto", path = "../proto" }
+
 axum = "0.7.5"
 chrono = "0.4.38"
 deno_core = "0.289.0"

diff --git a/server/src/main.rs b/server/src/main.rs
@@ -8,21 +8,29 @@ use axum::{
     routing::{get, post},
     Router,
 };
-
 use tower_http::cors::CorsLayer;
 
+use olly_proto::server::RpcServer;
+
 #[tokio::main]
 async fn main() {
-    let app = Router::new()
-        .route("/", get(root))
-        .route("/api/v1/tracing", post(tracing::post))
-        .route("/register/test", post(register::test_post))
-        .layer(CorsLayer::permissive());
+    tokio::task::spawn_blocking(|| async {
+        let app = Router::new()
+            .route("/", get(root))
+            .route("/api/v1/tracing", post(tracing::post))
+            .route("/register/test", post(register::test_post))
+            .layer(CorsLayer::permissive());
+
+        let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
+        println!("listening on {}", listener.local_addr().unwrap());
+
+        axum::serve(listener, app).await.unwrap();
+    });
 
-    let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
-    println!("listening on {}", listener.local_addr().unwrap());
+    let addr: core::net::SocketAddr = "[::1]:50051".parse().unwrap();
 
-    axum::serve(listener, app).await.unwrap();
+    let server: RpcServer = RpcServer::new(addr).await;
+    server.serve().await.unwrap();
 }
 
 async fn root() -> &'static str {