CI for the new server

markharding · markharding · commit 202b0f37f1b0 · 2026-03-30T16:44:55.000Z
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 include:
   - local: .gitlab/ci/build_rs_core.yml
   - local: .gitlab/ci/build_js_sdks.yml
+  - local: .gitlab/ci/build_server.yml
 
 stages:
   - setup
diff --git a/.gitlab/ci/build_server.yml b/.gitlab/ci/build_server.yml
@@ -0,0 +1,46 @@
+.server-workflow:
+  image: gitlab.futo.org:5050/devops/manifest-repo/library/docker:latest
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^server-/
+      when: always
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - services/server/*
+        - .gitlab/ci/build_server.yml
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+      when: never
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      changes:
+        - services/server/*
+        - .gitlab/ci/build_server.yml
+  variables:
+    RUNNER_SCRIPT_TIMEOUT: 179m
+    DOCKER_FULL_IMAGE_NAME: '${CI_REGISTRY}/${CI_PROJECT_PATH}'
+    RUST_IMAGE: '${CI_REGISTRY}/${CI_PROJECT_PATH}:base'
+  before_script:
+    - cd services/server
+
+.server-rust-base:
+  extends: .server-workflow
+  image: ${RUST_IMAGE}
+  stage: check
+
+server-format-check:
+  extends: .server-rust-base
+  script:
+    - cargo fmt --check
+
+server-clippy:
+  extends: .server-rust-base
+  script:
+    - cargo clippy -- -D warnings
+
+server-build:
+  extends: .server-rust-base
+  stage: build
+  script:
+    - cargo build --release
+  artifacts:
+    paths:
+      - target/release/server
+    expire_in: 1 week
diff --git a/services/server/src/db/client.rs b/services/server/src/db/client.rs
@@ -3,8 +3,9 @@ use sea_orm::{ConnectOptions, Database, DatabaseConnection};
 use std::time::Duration;
 
 pub async fn build_db_client() -> Result<DatabaseConnection, sea_orm::DbErr> {
-    let database_url = std::env::var("DATABASE_URL")
-        .unwrap_or_else(|_| "postgres://postgres:testing@localhost:5432".to_string());
+    let database_url = std::env::var("DATABASE_URL").unwrap_or_else(|_| {
+        "postgres://postgres:testing@localhost:5432".to_string()
+    });
     let mut opt = ConnectOptions::new(database_url);
     opt.max_connections(100)
         .min_connections(5)
diff --git a/services/server/src/grpc/reflection_ui.rs b/services/server/src/grpc/reflection_ui.rs
@@ -2,7 +2,7 @@ use axum::response::Html;
 use prost::Message;
 use prost_types::{FileDescriptorSet, SourceCodeInfo};
 
-use crate::lib::proto::FILE_DESCRIPTOR_SET;
+use crate::service::proto::FILE_DESCRIPTOR_SET;
 
 /// Resolve a path in source_code_info to find the leading comment.
 /// Proto paths are documented in descriptor.proto's SourceCodeInfo.
@@ -19,7 +19,10 @@ fn find_comment(source_info: &SourceCodeInfo, path: &[i32]) -> Option<String> {
     })
 }
 
-fn field_type_name(field: &prost_types::FieldDescriptorProto, package: &str) -> String {
+fn field_type_name(
+    field: &prost_types::FieldDescriptorProto,
+    package: &str,
+) -> String {
     if let Some(ref type_name) = field.type_name {
         // Strip leading dot and package prefix from fully-qualified names
         let stripped = type_name.strip_prefix('.').unwrap_or(type_name);
@@ -73,7 +76,8 @@ fn escape_html(s: &str) -> String {
 }
 
 pub async fn reflection_ui() -> Html<String> {
-    let fds = FileDescriptorSet::decode(FILE_DESCRIPTOR_SET).expect("failed to decode descriptor");
+    let fds = FileDescriptorSet::decode(FILE_DESCRIPTOR_SET)
+        .expect("failed to decode descriptor");
 
     let mut html = String::from(
         r#"<!DOCTYPE html>
@@ -118,12 +122,18 @@ pub async fn reflection_ui() -> Html<String> {
         for (si, service) in file.service.iter().enumerate() {
             let service_name = service.name.as_deref().unwrap_or("Unknown");
 
-            html.push_str(&format!(r#"<div class="service"><h2>{}</h2>"#, escape_html(service_name)));
+            html.push_str(&format!(
+                r#"<div class="service"><h2>{}</h2>"#,
+                escape_html(service_name)
+            ));
 
-            if let Some(ref si_info) = source_info {
-                if let Some(comment) = find_comment(si_info, &[6, si as i32]) {
-                    html.push_str(&format!(r#"<p class="comment">{}</p>"#, escape_html(&comment)));
-                }
+            if let Some(si_info) = source_info
+                && let Some(comment) = find_comment(si_info, &[6, si as i32])
+            {
+                html.push_str(&format!(
+                    r#"<p class="comment">{}</p>"#,
+                    escape_html(&comment)
+                ));
             }
 
             // Methods: path [6, service_index, 2, method_index]
@@ -146,24 +156,29 @@ pub async fn reflection_ui() -> Html<String> {
 
                 html.push_str(r#"<div class="method">"#);
 
-                if let Some(ref si_info) = source_info {
-                    if let Some(comment) = find_comment(si_info, &[6, si as i32, 2, mi as i32]) {
-                        html.push_str(&format!(
-                            r#"<p class="comment">{}</p>"#,
-                            escape_html(&comment)
-                        ));
-                    }
+                if let Some(si_info) = source_info
+                    && let Some(comment) =
+                        find_comment(si_info, &[6, si as i32, 2, mi as i32])
+                {
+                    html.push_str(&format!(
+                        r#"<p class="comment">{}</p>"#,
+                        escape_html(&comment)
+                    ));
                 }
 
                 let client_streaming = method.client_streaming.unwrap_or(false);
                 let server_streaming = method.server_streaming.unwrap_or(false);
 
                 let mut tags = String::new();
                 if client_streaming {
-                    tags.push_str(r#"<span class="tag">client streaming</span>"#);
+                    tags.push_str(
+                        r#"<span class="tag">client streaming</span>"#,
+                    );
                 }
                 if server_streaming {
-                    tags.push_str(r#"<span class="tag">server streaming</span>"#);
+                    tags.push_str(
+                        r#"<span class="tag">server streaming</span>"#,
+                    );
                 }
                 if !client_streaming && !server_streaming {
                     tags.push_str(r#"<span class="tag">unary</span>"#);
@@ -195,10 +210,13 @@ pub async fn reflection_ui() -> Html<String> {
                 escape_html(msg_name)
             ));
 
-            if let Some(ref si_info) = source_info {
-                if let Some(comment) = find_comment(si_info, &[4, mi as i32]) {
-                    html.push_str(&format!(r#"<p class="comment">{}</p>"#, escape_html(&comment)));
-                }
+            if let Some(si_info) = source_info
+                && let Some(comment) = find_comment(si_info, &[4, mi as i32])
+            {
+                html.push_str(&format!(
+                    r#"<p class="comment">{}</p>"#,
+                    escape_html(&comment)
+                ));
             }
 
             if !message.field.is_empty() {
@@ -213,12 +231,15 @@ pub async fn reflection_ui() -> Html<String> {
                     let flabel = label_str(field);
 
                     let field_comment = source_info
-                        .and_then(|si| find_comment(si, &[4, mi as i32, 2, fi as i32]))
+                        .and_then(|si| {
+                            find_comment(si, &[4, mi as i32, 2, fi as i32])
+                        })
                         .or_else(|| {
                             // Also check trailing comments
                             source_info.and_then(|si| {
                                 si.location.iter().find_map(|loc| {
-                                    if loc.path == [4, mi as i32, 2, fi as i32] {
+                                    if loc.path == [4, mi as i32, 2, fi as i32]
+                                    {
                                         loc.trailing_comments
                                             .as_ref()
                                             .map(|c| c.trim().to_string())
@@ -256,10 +277,13 @@ pub async fn reflection_ui() -> Html<String> {
                 escape_html(enum_name)
             ));
 
-            if let Some(ref si_info) = source_info {
-                if let Some(comment) = find_comment(si_info, &[5, ei as i32]) {
-                    html.push_str(&format!(r#"<p class="comment">{}</p>"#, escape_html(&comment)));
-                }
+            if let Some(si_info) = source_info
+                && let Some(comment) = find_comment(si_info, &[5, ei as i32])
+            {
+                html.push_str(&format!(
+                    r#"<p class="comment">{}</p>"#,
+                    escape_html(&comment)
+                ));
             }
 
             if !enum_type.value.is_empty() {
@@ -270,7 +294,9 @@ pub async fn reflection_ui() -> Html<String> {
                     let vnum = value.number.unwrap_or(0);
 
                     let value_comment = source_info
-                        .and_then(|si| find_comment(si, &[5, ei as i32, 2, vi as i32]))
+                        .and_then(|si| {
+                            find_comment(si, &[5, ei as i32, 2, vi as i32])
+                        })
                         .unwrap_or_default();
 
                     html.push_str(&format!(
@@ -290,4 +316,4 @@ pub async fn reflection_ui() -> Html<String> {
 
     html.push_str("</body></html>");
     Html(html)
-}
+}
diff --git a/services/server/src/grpc/server.rs b/services/server/src/grpc/server.rs
@@ -1,5 +1,5 @@
 use crate::db::client::build_db_client;
-use crate::lib;
+use crate::service;
 use tonic::transport::Server;
 
 /// Builds reflection for gRPC docs. The file descriptors are created in ./build.rs.
@@ -10,7 +10,9 @@ fn build_reflection_service() -> Result<
     Box<dyn std::error::Error>,
 > {
     let service = tonic_reflection::server::Builder::configure()
-        .register_encoded_file_descriptor_set(lib::proto::FILE_DESCRIPTOR_SET)
+        .register_encoded_file_descriptor_set(
+            service::proto::FILE_DESCRIPTOR_SET,
+        )
         .build_v1()?;
     Ok(service)
 }
@@ -22,7 +24,9 @@ async fn connect_db_with_retry() -> sea_orm::DatabaseConnection {
         match build_db_client().await {
             Ok(db) => return db,
             Err(e) => {
-                eprintln!("Failed to connect to database: {e}, retrying in {delay:?}");
+                eprintln!(
+                    "Failed to connect to database: {e}, retrying in {delay:?}"
+                );
                 tokio::time::sleep(delay).await;
                 delay = (delay * 2).min(std::time::Duration::from_secs(30));
             }
@@ -34,7 +38,8 @@ async fn connect_db_with_retry() -> sea_orm::DatabaseConnection {
 pub async fn serve_grpc() -> Result<(), Box<dyn std::error::Error>> {
     let addr = "0.0.0.0:50051".parse()?;
     let db = connect_db_with_retry().await;
-    let events_service = lib::events::events_service::build_events_service(db);
+    let events_service =
+        service::events::events_service::build_events_service(db);
     let reflection_service = build_reflection_service()?;
 
     println!("GRPC server is listening on {addr}");
diff --git a/services/server/src/lib/proto.rs b/services/server/src/lib/proto.rs
diff --git a/services/server/src/main.rs b/services/server/src/main.rs
@@ -1,7 +1,7 @@
 mod db;
 mod grpc;
-mod lib;
 mod routes;
+mod service;
 mod util;
 
 use crate::grpc::server;
diff --git a/services/server/src/service/content/content_repository.rs b/services/server/src/service/content/content_repository.rs
@@ -1,10 +1,6 @@
 use ::entity::content_model as ContentModel;
 use sea_orm::*;
 
-pub struct Query;
-
-impl Query {}
-
 pub struct Mutation;
 
 impl Mutation {
diff --git a/services/server/src/service/content/mod.rs b/services/server/src/service/content/mod.rs
diff --git a/services/server/src/service/events/events_repository.rs b/services/server/src/service/events/events_repository.rs
@@ -9,7 +9,8 @@ impl Query {
     pub async fn list_events(
         db: &DbConn,
         mut limit: Option<u64>,
-    ) -> Result<Vec<(EventModel::Model, Option<ContentModel::Model>)>, DbErr> {
+    ) -> Result<Vec<(EventModel::Model, Option<ContentModel::Model>)>, DbErr>
+    {
         if limit > Some(200) {
             limit = Some(200);
         }
@@ -22,9 +23,15 @@ impl Query {
                     .from(EventModel::Column::ContentDigestType)
                     .to(ContentModel::Column::DigestType)
                     .on_condition(|event_tbl, content_tbl| {
-                        Expr::col((event_tbl, EventModel::Column::ContentDigestBytes))
-                            .equals((content_tbl, ContentModel::Column::DigestBytes))
-                            .into_condition()
+                        Expr::col((
+                            event_tbl,
+                            EventModel::Column::ContentDigestBytes,
+                        ))
+                        .equals((
+                            content_tbl,
+                            ContentModel::Column::DigestBytes,
+                        ))
+                        .into_condition()
                     })
                     .into(),
             )
diff --git a/services/server/src/service/events/events_service.rs b/services/server/src/service/events/events_service.rs
@@ -1,14 +1,14 @@
 use super::events_repository as EventsRepository;
-use crate::lib::content::content_repository as ContentRepository;
-use crate::lib::proto::content::ContentBody;
-use crate::lib::proto::event_sync_service_server::{
+use crate::service::content::content_repository as ContentRepository;
+use crate::service::proto::content::ContentBody;
+use crate::service::proto::event_sync_service_server::{
     EventSyncService, EventSyncServiceServer,
 };
-use crate::lib::proto::{
+use crate::service::proto::{
     Content, Event, EventBundle, PutEventsRequest, PutEventsResponse,
     SerializedContent, SignedEvent,
 };
-use crate::lib::proto::{ListEventsRequest, ListEventsResponse};
+use crate::service::proto::{ListEventsRequest, ListEventsResponse};
 use crate::util;
 use ::entity::{
     content_block_model as ContentBlockModel,
@@ -71,7 +71,11 @@ impl EventSyncService for EventSyncServiceImpl {
             event_bundles.push(event_bundle);
         }
 
-        let reply = ListEventsResponse { event_bundles, previous_token: String::new(), next_token: String::new() };
+        let reply = ListEventsResponse {
+            event_bundles,
+            previous_token: String::new(),
+            next_token: String::new(),
+        };
         Ok(Response::new(reply))
     }
 
diff --git a/services/server/src/service/events/mod.rs b/services/server/src/service/events/mod.rs
diff --git a/services/server/src/service/mod.rs b/services/server/src/service/mod.rs
diff --git a/services/server/src/service/proto.rs b/services/server/src/service/proto.rs
@@ -0,0 +1,8 @@
+#[allow(dead_code, unused_attributes)]
+mod generated {
+    tonic::include_proto!("polycentric.v1");
+}
+pub use generated::*;
+
+pub const FILE_DESCRIPTOR_SET: &[u8] =
+    include_bytes!(concat!(env!("OUT_DIR"), "/polycentric.bin"));
diff --git a/services/server/src/util/signing.rs b/services/server/src/util/signing.rs
