Frontend refactor

.github/workflows/squire_core_ci.yml

@@ -33,6 +33,6 @@ jobs:
         with:
           mongodb-version: '6.0'
       - run: cargo fmt --check --package squire_core
-      - run: cargo build --package squire_core --verbose --features="db-tests"
+      - run: cargo build --package squire_core --verbose
       - run: cargo test --package squire_core --verbose --features="db-tests"
-      - run: cargo doc --package squire_core --verbose --features="db-tests"
+      - run: cargo doc --package squire_core --verbose

.github/workflows/squire_sdk_ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust: [nightly]
+        rust: [stable, beta, nightly]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: hecrj/setup-rust-action@v2
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rust: [nightly]
+        rust: [nightly, beta, stable]
     steps:
       - uses: hecrj/setup-rust-action@v2
         with:

.github/workflows/squire_web_ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rust: [nightly]
+        rust: [stable, beta, nightly]
     steps:
       - uses: hecrj/setup-rust-action@v2
         with:

.gitignore

@@ -2,9 +2,10 @@
 Cargo.lock
 ./cbindgen.toml
 ./squire_core.h
-
-assets/*
-
+/assets/
 squire_web/dist/*
 squire_web/target
-.history/*
+squire_web/.idea
+.history/
+build_outputs/*
+.idea/

squire_core/Cargo.toml

@@ -37,10 +37,14 @@ hyper = { version = "0.14" }
 shuttle-runtime = { version = "0.29.0", features = [] }
 shuttle-shared-db = { version = "0.29.0", features = ["mongodb"] }
 shuttle-axum = { version = "0.29.0", features = [] }
+tower-http = { version = "0.4.4", features = ["cors"] }
 
 [dev-dependencies]
 # In-house
 squire_tests = { path = "../squire_tests" }
 
 tower = { version = "0.4", features = ["util"] }
 hyper = { version = "0.14", features = ["full"] }
+
+[build-dependencies]
+flate2 = "1.0"

squire_core/build.rs

@@ -3,11 +3,18 @@
  * JS bindings. Trunk is used to compile and generate the app and the JS bindings.
  */
 
-use std::{env, process::Command};
+use std::{
+    env,
+    fs::File,
+    io::{BufWriter, Read, Write},
+    process::Command,
+};
+
+use flate2::{write::GzEncoder, Compression};
 
 fn main() -> Result<(), i32> {
     if env::var("CARGO_FEATURE_IGNORE_FRONTEND").is_ok() {
-        return Ok(())
+        return Ok(());
     }
 
     let wd = env::var("CARGO_MANIFEST_DIR").unwrap();
@@ -55,9 +62,23 @@ fn main() -> Result<(), i32> {
 
     // If in debug mode, all for failed compilation of frontend.
     // In release mode, require that the frontend to be functional.
-    if matches!(cmd.status().map(|s| s.success()), Ok(false) | Err(_)) && is_release {
-        Err(1)
-    } else {
-        Ok(())
+    if matches!(cmd.status().map(|s| s.success()), Ok(false) | Err(_)) {
+        eprintln!("Failed to compile frontend!");
+        if is_release {
+            return Err(1);
+        }
     }
+
+    // Compresses the wasm package
+    let wasm_package = format!("{wd}/../assets/squire_web_bg.wasm");
+    let mut wasm_file = File::open(wasm_package).expect("Failed to open WASM file");
+    let mut wasm_data = Vec::new();
+    wasm_file.read_to_end(&mut wasm_data).unwrap();
+
+    let output_path = format!("{wd}/../assets/squire_web_bg.wasm.gz");
+    let output_file = File::create(output_path).unwrap();
+    let mut encoder = GzEncoder::new(BufWriter::new(output_file), Compression::default());
+    encoder.write_all(&wasm_data).unwrap();
+
+    Ok(())
 }

squire_core/src/assets.rs

@@ -24,7 +24,7 @@ mod frontend {
     use hyper::{body::Bytes, Body};
 
     const INDEX_HTML: &str = include_str!("../../assets/index.html");
-    const APP_WASM: &[u8] = include_bytes!("../../assets/squire_web_bg.wasm");
+    const APP_WASM: &[u8] = include_bytes!("../../assets/squire_web_bg.wasm.gz");
     const APP_JS: &str = include_str!("../../assets/squire_web.js");
 
     pub async fn landing() -> Html<&'static str> {
@@ -36,6 +36,7 @@ mod frontend {
         let body: Body = bytes.into();
 
         Response::builder()
+            .header(header::CONTENT_ENCODING, "gzip") // Unzips the compressed file
             .header(header::CONTENT_TYPE, "application/wasm")
             .body(body)
             .unwrap()

squire_core/src/main.rs

@@ -1,6 +1,7 @@
 use axum::{routing::get, Router};
 use mongodb::Database;
 use squire_sdk::{api::*, server};
+use tower_http::cors::CorsLayer;
 
 #[cfg(test)]
 mod tests;
@@ -25,11 +26,15 @@ pub fn create_router(state: AppState) -> Router {
         .add_route::<0, POST, Reauth, _, _>(reauth)
         .add_route::<0, DELETE, Terminate, _, _>(terminate)
         .into_router()
-        .route("/api/v1/tournaments/subscribe/other/:t_id", get(tournaments::join_gathering))
+        .route(
+            "/api/v1/tournaments/subscribe/other/:t_id",
+            get(tournaments::join_gathering),
+        )
         .route("/", get(assets::landing))
         .route("/squire_web_bg.wasm", get(assets::get_wasm))
         .route("/squire_web.js", get(assets::get_js))
         .fallback(assets::landing)
+        .layer(CorsLayer::permissive())
         .with_state(state)
 }
 

squire_core/src/state/boilerplate.rs

@@ -35,7 +35,10 @@ impl Trackable<AnyUser, SessionToken> for SessionCommand {
 }
 
 impl Trackable<SessionToken, Option<watch::Receiver<SquireSession>>> for SessionCommand {
-    fn track(msg: SessionToken, send: OneshotSender<Option<watch::Receiver<SquireSession>>>) -> Self {
+    fn track(
+        msg: SessionToken,
+        send: OneshotSender<Option<watch::Receiver<SquireSession>>>,
+    ) -> Self {
         Self::Subscribe(msg, send)
     }
 }
@@ -48,7 +51,7 @@ impl Trackable<AnyUser, bool> for SessionCommand {
 
 impl Debug for SessionCommand {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self{
+        match self {
             Self::Create(value, _) => write!(f, "Create({value:?})"),
             Self::Guest(_) => write!(f, "Guest()"),
             Self::Get(value, _) => write!(f, "Get({value:?})"),

squire_core/src/state/session.rs

@@ -114,7 +114,9 @@ impl ActorState for SessionStore {
     async fn process(&mut self, scheduler: &mut Scheduler<Self>, msg: Self::Message) {
         println!("Got session message: {msg:?}");
         match msg {
-            SessionCommand::Create(id, send) => drop(send.send(self.create_session(scheduler, id).token)),
+            SessionCommand::Create(id, send) => {
+                drop(send.send(self.create_session(scheduler, id).token))
+            }
             SessionCommand::Get(token, send) => drop(send.send(self.get_session(token))),
             SessionCommand::Reauth(id, send) => drop(send.send(self.reauth_session(scheduler, id))),
             SessionCommand::Delete(id, send) => drop(send.send(self.delete_session(scheduler, id))),
@@ -145,11 +147,7 @@ impl SessionStore {
         digest
     }
 
-    fn create_session(
-        &mut self,
-        scheduler: &mut Scheduler<Self>,
-        id: SquireAccountId,
-    ) -> Session {
+    fn create_session(&mut self, scheduler: &mut Scheduler<Self>, id: SquireAccountId) -> Session {
         let token = self.generate_session(scheduler);
         let session = Session::new_with_id(token.clone(), id);
         self.sessions.insert(token.clone(), session.clone());
@@ -254,10 +252,7 @@ impl SessionStore {
         self.sessions.remove(token)
     }
 
-    fn sub_to_session(
-        &mut self,
-        token: &SessionToken,
-    ) -> Option<Watcher<SquireSession>> {
+    fn sub_to_session(&mut self, token: &SessionToken) -> Option<Watcher<SquireSession>> {
         self.comms
             .get(token)
             .map(|comm| comm.subscribe())
@@ -274,8 +269,8 @@ impl SessionStore {
 }
 
 impl SessionDb {
-    const ACTIVE_SESSION_TABLE: &str = "ActiveSessions";
-    const EXPIRED_SESSION_TABLE: &str = "ExpiredSessions";
+    const ACTIVE_SESSION_TABLE: &'static str = "ActiveSessions";
+    const EXPIRED_SESSION_TABLE: &'static str = "ExpiredSessions";
 
     pub fn new(db: Database) -> Self {
         Self { db }
@@ -460,5 +455,3 @@ impl Session {
         }
     }
 }
-
-

squire_core/src/state/tournaments.rs

@@ -1,13 +1,14 @@
-use std::{sync::Arc, ops::Range};
+use std::{ops::Range, sync::Arc};
 
 use futures::StreamExt;
 use mongodb::{
     bson::{doc, spec::BinarySubtype, Binary, Document},
-    Collection, Database, options::{UpdateModifications, UpdateOptions, Hint, FindOptions},
+    options::{FindOptions, Hint, UpdateModifications, UpdateOptions},
+    Collection, Database,
 };
 use squire_sdk::{
-    actor::*, model::tournament::TournamentId, server::gathering::PersistMessage,
-    sync::TournamentManager, api::TournamentSummary,
+    actor::*, api::TournamentSummary, model::tournament::TournamentId,
+    server::gathering::PersistMessage, sync::TournamentManager,
 };
 use tracing::Level;
 
@@ -48,7 +49,7 @@ impl TournPersister {
 }
 
 impl TournDb {
-    const TOURN_INDEX_NAME: &str = "tourn_id";
+    const TOURN_INDEX_NAME: &'static str = "tourn_id";
 
     pub fn new(db_conn: Database, tourn_coll: Arc<str>) -> Self {
         Self {

squire_lib/src/identifiers.rs

@@ -106,6 +106,10 @@ impl<T> TypeId<T> {
     pub fn new(id: Uuid) -> Self {
         Self(id, PhantomData)
     }
+    /// Converts type id into another type id of type U
+    pub fn convert<U>(self) -> TypeId<U> {
+        TypeId::<U>::new(self.0)
+    }
 }
 
 impl<T> Default for TypeId<T> {

squire_lib/src/tournament.rs

@@ -1001,7 +1001,7 @@ impl Tournament {
 }
 
 impl TournamentSeed {
-    const MAGIC_SYNONYMS: &[&'static str] = &[
+    const MAGIC_SYNONYMS: &'static [&'static str] = &[
         "Magic",
         "Illusion",
         "Wizardry",
@@ -1031,7 +1031,7 @@ impl TournamentSeed {
         "Witchcraft",
     ];
 
-    const GATHERING_SYNONYMS: &[&'static str] = &[
+    const GATHERING_SYNONYMS: &'static [&'static str] = &[
         "Gathering",
         "Association",
         "Caucus",

squire_sdk/Cargo.toml

@@ -21,6 +21,7 @@ server = [
   "axum/json",
   "axum/macros",
   "axum/headers",
+  "tokio/full",
   "headers",
   "serde_json",
   "cookie",

squire_sdk/src/client/builder.rs

@@ -89,7 +89,11 @@ impl<UP: OnUpdate> ClientBuilder<UP, String, ()> {
         let user = state.subscribe();
         let client = ActorBuilder::new(state).launch();
         let tourns = TournsClient::new(client.clone(), on_update);
-        Ok(SquireClient { client, tourns, user })
+        Ok(SquireClient {
+            client,
+            tourns,
+            user,
+        })
     }
 
     /// Creates a client but does not check if the URL is valid.
@@ -99,7 +103,11 @@ impl<UP: OnUpdate> ClientBuilder<UP, String, ()> {
         let user = state.subscribe();
         let client = ActorBuilder::new(state).launch();
         let tourns = TournsClient::new(client.clone(), on_update);
-        SquireClient { client, tourns, user }
+        SquireClient {
+            client,
+            tourns,
+            user,
+        }
     }
 }
 
@@ -112,7 +120,11 @@ impl<UP: OnUpdate> ClientBuilder<UP, String, Credentials> {
         let user = state.subscribe();
         let client = ActorBuilder::new(state).launch();
         let tourns = TournsClient::new(client.clone(), on_update);
-        Ok(SquireClient { client, tourns, user })
+        Ok(SquireClient {
+            client,
+            tourns,
+            user,
+        })
     }
 }
 
@@ -129,7 +141,11 @@ impl<UP: OnUpdate> ClientBuilder<UP, String, SquireAccount> {
         let user = state.subscribe();
         let client = ActorBuilder::new(state).launch();
         let tourns = TournsClient::new(client.clone(), on_update);
-        Ok(SquireClient { client, tourns, user })
+        Ok(SquireClient {
+            client,
+            tourns,
+            user,
+        })
     }
 
     /// Creates a client but does not check if the URL is valid.
@@ -143,6 +159,10 @@ impl<UP: OnUpdate> ClientBuilder<UP, String, SquireAccount> {
         let user = state.subscribe();
         let client = ActorBuilder::new(state).launch();
         let tourns = TournsClient::new(client.clone(), on_update);
-        SquireClient { client, tourns, user }
+        SquireClient {
+            client,
+            tourns,
+            user,
+        }
     }
 }

squire_sdk/src/client/network.rs

@@ -50,7 +50,8 @@ impl ActorState for NetworkState {
     type Message = NetworkCommand;
 
     async fn start_up(&mut self, scheduler: &mut Scheduler<Self>) {
-        let resp = self.post_request(GuestSession, [])
+        let resp = self
+            .post_request(GuestSession, [])
             .map(|resp| resp.map(|resp| SessionToken::try_from(resp.headers()).ok()))
             .await;
         self.process(scheduler, resp.into()).await;

squire_sdk/src/client/session.rs

@@ -6,7 +6,7 @@ use std::{
 use futures::Future;
 use instant::{Duration, Instant};
 use pin_project::pin_project;
-use squire_lib::accounts::SquireAccount;
+use squire_lib::{accounts::SquireAccount, identifiers::SquireAccountId};
 use tokio::sync::watch::{channel, Receiver as Watcher, Sender as Broadcaster};
 
 use crate::compat::{sleep_until, Sleep};
@@ -121,6 +121,10 @@ impl SessionWatcher {
     pub fn session_info(&self) -> SessionInfo {
         self.recv.borrow().clone()
     }
+
+    pub fn get_squire_account_id(&self) -> Option<SquireAccountId> {
+        self.session_info().get_user().map(|acc| acc.id)
+    }
 }
 
 impl SessionInfo {