Separate packages for core lib and server

.dockerignore

@@ -1,3 +1,4 @@
 /target/
 /.env
 /node_modules/
+rust-toolchain.toml

.github/workflows/build.yml

@@ -43,5 +43,3 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

Cargo.toml

@@ -1,50 +1,8 @@
-[package]
-name = "citadels"
-edition = "2021"
-default-run = "citadels"
-version = "0.7.1"
-
-[[bin]]
-name = "citadels"
-path = "src/main.rs" 
-
-[dependencies]
-askama = { version = "0.12.1", default-features = false }
-axum = { version = "0.7.2", features = ["ws","macros"], default-features = true }
-axum-extra = { version = "0.9.0", features = ["cookie-private"], default-features = false }
-futures = { version = "0.3.30", default-features = false }
-http = { version = "1.0.0", default-features = false }
-rand = { version = "0.8.5", default-features = false }
-tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
-tokio-stream = { version = "0.1.14", default-features = false }
-tower = "0.4.13"
-tower-http = { version = "0.5.0", features = ["fs", "trace"] }
-log = "0.4.20"
-env_logger = { version = "0.10.1", features = ["color"] }
-rand_xoshiro = "0.6.0"
-rand_core = { version = "0.6.4", features = ["getrandom"] }
-serde = { version = "1.0.195", features = ["derive", "rc"] }
-serde_json = "1.0.111"
-time = "0.3.31"
-dotenv = { version = "0.15.0", optional = true }
-axum-core = "0.4.3"
-serde_with = "3.5.0"
-tracing = { version = "0.1.40", default-features = false }
-macros = { path = "./macros"}
-reqwest = { version = "0.12.4", features = ["json"], default-features = false }
-anyhow = { version = "1.0.83", default-features = true }
-maud = { version = "0.26.0", features = ["axum"], default-features = false}
-arcstr = { version = "1.2.0", features = ["serde"], default-features = false }
-uuid = { version = "1.8.0", features = ["v4"] }
-thiserror = "1.0.61"
-
-[features]
-dev = []
-dotenv = ["dep:dotenv"]
-
-# https://old.reddit.com/r/rust/comments/gvrgca/this_is_a_neat_trick_for_getting_good_runtime/
-[profile.dev.package."*"]
-opt-level = 3
-
-[profile.dev]
-opt-level = 0
+[workspace]
+resolver = "2"
+members = [
+  "citadels_server", 
+  "citadels",
+  "macros",
+  "macros-impl"
+]

Dockerfile

@@ -1,10 +1,6 @@
 # syntax=docker/dockerfile:1.3.1
 # https://github.com/LukeMathWalker/cargo-chef?tab=readme-ov-file#without-the-pre-built-image
-FROM rust:alpine AS chef
-RUN apk add --no-cache musl-dev
-RUN cargo --version
-RUN cargo install cargo-chef
-
+FROM lukemathwalker/cargo-chef:latest-rust-1.80.1 AS chef
 WORKDIR /app
 
 FROM chef AS planner
@@ -14,16 +10,15 @@ RUN cargo chef prepare --recipe-path recipe.json
 FROM chef AS builder 
 COPY --from=planner /app/recipe.json recipe.json
 
-COPY macros/ macros/
-COPY macros-impl/ macros-impl/
-
+# build dependencies
 RUN cargo chef cook --release --recipe-path recipe.json
-# Build application
+
+# build application
 COPY . .
-RUN cargo build --release --bin citadels
+RUN cargo build --release --bin citadels_server
 
-FROM alpine AS runtime
+FROM debian:bookworm-slim AS runtime
 WORKDIR /app
-COPY --from=builder /app/target/release/citadels /usr/local/bin
+COPY --from=builder /app/target/release/citadels_server /usr/local/bin
 COPY public/ public/
-ENTRYPOINT ["/usr/local/bin/citadels"]
+ENTRYPOINT ["/usr/local/bin/citadels_server"]

citadels/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "citadels"
+edition = "2021"
+
+
+[dependencies]
+rand = { version = "0.8.5" }
+log = "0.4.20"
+env_logger = { version = "0.10.1", features = ["color"] }
+rand_xoshiro = "0.6.0"
+
+rand_core = { version = "0.6.4", features = ["getrandom"] }
+serde = { version = "1.0.195", features = ["derive", "rc"] }
+serde_json = "1.0.111"
+time = "0.3.31"
+dotenv = { version = "0.15.0", optional = true }
+serde_with = "3.5.0"
+tracing = { version = "0.1.40", default-features = false }
+macros = { path = "../macros"}
+reqwest = { version = "0.12.4", features = ["json"], default-features = false }
+anyhow = { version = "1.0.83", default-features = true }
+maud = { version = "0.26.0", features = ["axum"], default-features = false}
+arcstr = { version = "1.2.0", features = ["serde"], default-features = false }
+uuid = { version = "1.8.0", features = ["v4"] }
+thiserror = "1.0.61"
+
+[features]
+dev = []
+dotenv = ["dep:dotenv"]

src/lib.rs → citadels/src/lib.rs

@@ -7,10 +7,7 @@ pub mod game;
 pub mod game_actions;
 pub mod lobby;
 pub mod logger;
-pub mod markup;
 pub mod museum;
 pub mod random;
 pub mod roles;
-pub mod server;
-pub mod templates;
 pub mod types;

src/museum.rs → citadels/src/museum.rs

@@ -35,14 +35,12 @@ impl Museum {
         if self.cards.len() > self.artifacts.len() {
             let mut artifacts = Museum::ARTIFACTS;
             artifacts.shuffle(&mut rand::thread_rng());
-            for artifact in artifacts {
-                self.artifacts.push(artifact);
-            }
+            self.artifacts.extend(artifacts);
         }
     }
 
     const ARTIFACTS: [&'static str; 19] = [
-        "⚱️", "🏺", "🖼️", "🗿", "🏛️", "⛲", "🕰️", "🦴", "🦾", "⚰️", "🚀", "🦖", "🦣", "🦤", "🦕", "💎",
-        "🪩", "🔱", "🧋",
+        "⚱️", "🏺", "🖼️", "🗿", "🏛️", "⛲", "🕰️", "🦴", "🦾", "⚰️", "🚀", "🦖", "🦣", "🦤", "🦕",
+        "💎", "🪩", "🔱", "🧋",
     ];
 }

citadels_server/Cargo.toml

@@ -0,0 +1,39 @@
+[package]
+name = "citadels_server"
+edition = "2021"
+
+
+[dependencies]
+citadels = { path = "../citadels/" }
+askama = { version = "0.12.1", default-features = false }
+axum = { version = "0.7.2", features = ["ws","macros"], default-features = true }
+axum-extra = { version = "0.9.0", features = ["cookie-private"], default-features = false }
+futures = { version = "0.3.30", default-features = false }
+http = { version = "1.0.0", default-features = false }
+rand = { version = "0.8.5", default-features = false }
+tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread"] }
+tokio-stream = { version = "0.1.14", default-features = false }
+tower = "0.4.13"
+tower-http = { version = "0.5.0", features = ["fs", "trace"] }
+log = "0.4.20"
+env_logger = { version = "0.10.1", features = ["color"] }
+rand_xoshiro = "0.6.0"
+rand_core = { version = "0.6.4", features = ["getrandom"] }
+serde = { version = "1.0.195", features = ["derive", "rc"] }
+serde_json = "1.0.111"
+time = "0.3.31"
+dotenv = { version = "0.15.0", optional = true }
+axum-core = "0.4.3"
+serde_with = "3.5.0"
+tracing = { version = "0.1.40", default-features = false }
+macros = { path = "../macros"}
+reqwest = { version = "0.12.4", features = ["json"], default-features = false }
+anyhow = { version = "1.0.83", default-features = true }
+maud = { version = "0.26.0", features = ["axum"], default-features = false}
+arcstr = { version = "1.2.0", features = ["serde"], default-features = false }
+uuid = { version = "1.8.0", features = ["v4"] }
+thiserror = "1.0.61"
+
+[features]
+dev = []
+dotenv = ["dep:dotenv"]

citadels_server/src/lib.rs

@@ -0,0 +1,3 @@
+pub mod markup;
+pub mod server;
+pub mod templates;

src/main.rs → citadels_server/src/main.rs

@@ -1,4 +1,4 @@
-use citadels::server::routes::get_router;
+use citadels_server::server::routes::get_router;
 
 #[tokio::main]
 async fn main() {

src/server/routes.rs → citadels_server/src/server/routes.rs

@@ -1,22 +1,22 @@
-use crate::actions::{ActionSubmission, ActionTag};
-use crate::districts::DistrictName;
-use crate::game::Game;
-use crate::lobby::{ConfigOption, Lobby};
-use crate::roles::{Rank, RoleName};
 use crate::server::state::AppState;
 use crate::templates::game::menu::*;
 use crate::templates::game::menus::*;
 use crate::templates::game::*;
 use crate::templates::lobby::*;
 use crate::templates::*;
-use crate::types::{Marker, PlayerName};
 use askama::Template;
 use axum::extract::{Json, Path, State};
 use axum::response::{ErrorResponse, Html, Redirect, Response, Result};
 use axum::routing::{get, post};
 use axum::Router;
 use axum::{extract::ws::WebSocketUpgrade, response::IntoResponse};
 use axum_extra::extract::{cookie::Cookie, PrivateCookieJar};
+use citadels::actions::{ActionSubmission, ActionTag};
+use citadels::districts::DistrictName;
+use citadels::game::Game;
+use citadels::lobby::{ConfigOption, Lobby};
+use citadels::roles::{Rank, RoleName};
+use citadels::types::{Marker, PlayerName};
 use http::StatusCode;
 use rand_core::SeedableRng;
 use serde::Deserialize;

src/server/state.rs → citadels_server/src/server/state.rs

@@ -1,7 +1,7 @@
 use crate::server::ws;
-use crate::{game::Game, lobby::Lobby};
 use axum::extract::FromRef;
 use axum_extra::extract::cookie;
+use citadels::{game::Game, lobby::Lobby};
 use std::sync::{Arc, Mutex};
 
 #[derive(Clone)]

src/templates.rs → citadels_server/src/templates.rs

@@ -4,12 +4,12 @@ pub mod lobby;
 
 use std::borrow::Cow;
 
-use crate::districts::DistrictName;
-use crate::game::{CityDistrict, Game};
-use crate::roles::{Rank, RoleName};
-use crate::types::CardSuit;
 use askama::Template;
 use axum::response::Html;
+use citadels::districts::DistrictName;
+use citadels::game::{CityDistrict, Game};
+use citadels::roles::{Rank, RoleName};
+use citadels::types::CardSuit;
 
 #[derive(Eq, PartialEq, Clone, Copy, Debug)]
 pub enum GamePhase {

src/templates/filters.rs → citadels_server/src/templates/filters.rs

@@ -1,5 +1,5 @@
-use crate::actions::ActionTag;
-use crate::types::CardSuit;
+use citadels::actions::ActionTag;
+use citadels::types::CardSuit;
 use std::borrow::Cow;
 use std::fmt::Debug;
 

src/templates/game.rs → citadels_server/src/templates/game.rs

@@ -1,16 +1,16 @@
 pub mod menu;
 pub mod menus;
 
-use crate::actions::ActionTag;
-use crate::game::{Game, GameRole, Player, PlayerIndex, Turn};
-use crate::roles::RoleName;
 use crate::templates::game::menu::{MenuTemplate, MenuView};
 use crate::templates::MyTemplate;
 use crate::templates::{filters, DAISY_THEMES};
 use crate::templates::{DistrictTemplate, RoleTemplate};
-use crate::types::Marker;
 use askama::Template;
 use axum::response::Html;
+use citadels::actions::ActionTag;
+use citadels::game::{Game, GameRole, Player, PlayerIndex, Turn};
+use citadels::roles::RoleName;
+use citadels::types::Marker;
 use std::borrow::{Borrow, Cow};
 
 #[derive(Template)]

src/templates/game/menu.rs → citadels_server/src/templates/game/menu.rs

@@ -1,11 +1,11 @@
 use super::{get_myself, GameContext};
-use crate::actions::ActionTag;
-use crate::game::{Call, Draft, Followup, ForcedToGatherReason, Game, Player, Turn};
-use crate::roles::{Rank, RoleName};
 use crate::templates::filters;
 use crate::templates::game::menus::{BuildMenu, EmperorMenu};
 use crate::templates::{DistrictTemplate, RoleTemplate};
 use askama::Template;
+use citadels::actions::ActionTag;
+use citadels::game::{Call, Draft, Followup, ForcedToGatherReason, Game, Player, Turn};
+use citadels::roles::{Rank, RoleName};
 use std::borrow::{Borrow, Cow};
 
 #[derive(Template)]

src/templates/game/menus.rs → citadels_server/src/templates/game/menus.rs

@@ -1,11 +1,11 @@
-use crate::actions::ActionTag;
-use crate::districts::DistrictName;
-use crate::game::{self, Followup, Game, Player};
-use crate::roles::RoleName;
 use crate::templates::{filters, DistrictTemplate, RoleTemplate};
-use crate::types::CardSuit;
-use crate::types::Marker;
 use askama::Template;
+use citadels::actions::ActionTag;
+use citadels::districts::DistrictName;
+use citadels::game::{self, Followup, Game, Player};
+use citadels::roles::RoleName;
+use citadels::types::CardSuit;
+use citadels::types::Marker;
 
 use std::borrow::{Borrow, Cow};
 

src/templates/lobby.rs → citadels_server/src/templates/lobby.rs

@@ -1,12 +1,12 @@
 use crate::templates::filters;
 use crate::templates::{DistrictTemplate, RoleTemplate};
-use crate::{
+use askama::Template;
+use citadels::{
     data::characters::ROLES,
     districts::{DistrictName, UNIQUE},
     lobby::{ConfigOption, Player},
     roles::{Rank, RoleName},
 };
-use askama::Template;
 use std::collections::{HashMap, HashSet};
 
 #[derive(Template)]