comfy tracing

Cargo.lock

@@ -285,9 +285,10 @@ dependencies = [
  "leptos-use",
  "leptos_meta",
  "leptos_router",
- "libcards",
+ "lib",
  "log",
  "serde-lite",
+ "serde_json",
  "wasm-bindgen",
  "wasm-bindgen-test",
  "web-sys",
@@ -1098,13 +1099,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "libcards"
+name = "lib"
 version = "0.1.0"
 dependencies = [
  "anyhow",
@@ -1113,6 +1108,12 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
 [[package]]
 name = "linear-map"
 version = "1.2.0"
@@ -1759,7 +1760,7 @@ dependencies = [
  "axum",
  "axum-extra",
  "futures",
- "libcards",
+ "lib",
  "rand",
  "serde",
  "serde_json",

Cargo.toml

@@ -1,10 +1,10 @@
 [workspace]
 resolver = "2"
-members = ["server", "client", "libcards"]
-default-members = ["server", "libcards"]
+members = ["server", "client", "lib"]
+default-members = ["server", "lib"]
 
 [workspace.dependencies]
-libcards = { path = "./libcards" }
+lib = { path = "./lib" }
 
 [profile.release.client]
 opt-level = 'z'

client/Cargo.toml

@@ -16,6 +16,9 @@ console_error_panic_hook = "0.1"
 leptos-use = "0.10.10"
 serde-lite = "0.5.0"
 
+lib = { workspace = true }
+serde_json = "1.0.120"
+
 # utils
 # strum = { version = "0.25", features = ["derive", "strum_macros"] }
 # strum_macros = "0.25"
@@ -25,5 +28,3 @@ serde-lite = "0.5.0"
 wasm-bindgen = "=0.2.92"
 wasm-bindgen-test = "0.3"
 web-sys = { version = "0.3", features = ["Document", "Window"] }
-
-libcards = { workspace = true }

client/src/components/websocket.rs

@@ -1,6 +1,8 @@
 use html::Textarea;
 use leptos::*;
 use leptos_use::{core::ConnectionReadyState, use_websocket, UseWebsocketReturn};
+use lib::models::*;
+use serde_json::to_string;
 
 #[component]
 pub fn Websocket() -> impl IntoView {
@@ -14,9 +16,9 @@ pub fn Websocket() -> impl IntoView {
     } = use_websocket("ws://0.0.0.0:3030/websocket");
 
     // Websocket stuff
-    let send_message = move |_| {
-        send("Hello, world!");
-    };
+    // let send_message = move |_| {
+    //     send("Hello, world!");
+    // };
 
     let status = move || ready_state.get().to_string();
 
@@ -30,6 +32,21 @@ pub fn Websocket() -> impl IntoView {
         close();
     };
 
+    let fake_new_game_request = NewGameRequest {
+        name: String::from("Ligma"),
+        host: CAHPlayer {
+            name: String::from("Adam"),
+            role: PlayerRole::Host,
+            white: vec![],
+            black: vec![],
+        },
+        packs: vec![0],
+    };
+
+    let new_game_test = move |_| {
+        send(&to_string(&fake_new_game_request).unwrap());
+    };
+
     // Chat stuff
     let chat_history_ref = create_node_ref::<Textarea>();
 
@@ -39,6 +56,10 @@ pub fn Websocket() -> impl IntoView {
         let _ = &history.update(|history: &mut Vec<_>| history.push(message));
     }
 
+    // fn message_handler(message) {
+    //
+    // }
+
     // handle incoming messages
     create_effect(move |_| {
         message.with(move |message| {
@@ -64,10 +85,10 @@ pub fn Websocket() -> impl IntoView {
             <p class="p-1">"status: " {status}</p>
             <div class="p-1">
                 <button on:click=open_connection disabled=connected>
-                    "Open"
+                    "Connect"
                 </button>
                 <button on:click=close_connection disabled=move || !connected()>
-                    "Close"
+                    "Disconnect"
                 </button>
             </div>
             <hr/>
@@ -96,8 +117,12 @@ pub fn Websocket() -> impl IntoView {
                     placeholder="talk shit..."
                 />
                 <br/>
-                <button on:click=send_message disabled=move || !connected()>
-                    "Send"
+                // <button on:click=send_message disabled=move || !connected()>
+                //     "Send"
+                // </button>
+                <br />
+                <button on:click=new_game_test disabled=move || !connected()>
+                    "Test New Game"
                 </button>
             </div>
             <hr/>

client/src/pages/home.rs

@@ -27,6 +27,7 @@ pub fn Home() -> impl IntoView {
             <div class="container m-auto">
                 <h1 class="text-6xl text-slate-300">"Cards For Humanity"</h1>
                 <Websocket/>
+            <a href="https://git.doordesk.net/adam/cards/">git</a>
             </div>
         </ErrorBoundary>
     }

lib/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "libcards"
+name = "lib"
 version = "0.1.0"
 edition = "2021"
 

lib/src/game_master.rs

@@ -1,117 +1,8 @@
 use anyhow::Result;
 use rand::prelude::IteratorRandom;
 use rand::thread_rng;
-use serde::{Deserialize, Serialize};
-use std::net::SocketAddr;
 
-/// User
-pub struct User {
-    pub name: String,
-    pub addr: SocketAddr,
-}
-
-/// New game request structure
-#[derive(Debug, Deserialize)]
-pub struct NewGameRequest {
-    /// Game name
-    pub name: String,
-    /// Game host
-    pub host: CAHPlayer,
-    /// Chosen packs
-    pub packs: Vec<u8>,
-}
-
-/// Game join request structure
-pub struct GameJoinRequest {
-    /// Game id
-    pub id: u8, // increase later
-    /// Game password
-    pub password: Option<String>,
-    /// Player info
-    pub player: CAHPlayer,
-}
-
-/// A CAH white card
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CAHCardWhite {
-    /// Card text
-    pub text: String,
-    /// ID of the pack it came from
-    pack: u8,
-}
-
-/// A CAH black card
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CAHCardBlack {
-    /// Card text
-    pub text: String,
-    /// Amount of cards to submit for judging
-    pick: u8,
-    /// ID of the pack it came from
-    pack: u8,
-}
-
-/// A CAH pack
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CAHCardSet {
-    /// Name of the pack
-    name: String,
-    /// Pack Description
-    description: Option<String>,
-    /// Whether or not this is an official card pack
-    official: bool,
-    /// White card data
-    white: Option<Vec<CAHCardWhite>>,
-    /// Black card data
-    black: Option<Vec<CAHCardBlack>>,
-}
-
-/// Player roles
-#[derive(Debug, Deserialize)]
-pub enum PlayerRole {
-    /// Player is host
-    Host,
-    /// Player is a player in a game where another player is host
-    Player,
-    /// Player is just spectating
-    Spectator,
-}
-
-/// A struct that represents a player
-#[derive(Debug, Deserialize)]
-pub struct CAHPlayer {
-    /// Player's username
-    pub name: String,
-    /// This player's role
-    pub role: PlayerRole,
-    /// The player's hand
-    pub white: Vec<CAHCardWhite>,
-    /// The player's wins
-    pub black: Vec<CAHCardBlack>,
-}
-
-/// The game master
-#[derive(Default)]
-pub struct CAHGame {
-    /// The name of the game
-    pub name: String,
-    /// White draw pile
-    pub white: Vec<CAHCardWhite>,
-    /// Black draw pile
-    pub black: Vec<CAHCardBlack>,
-    /// White discard pile
-    pub white_discard: Vec<CAHCardWhite>,
-    /// Black discard pile
-    pub black_discard: Vec<CAHCardBlack>,
-    /// Indicates game active/game over
-    pub game_active: bool,
-    /// List of current players
-    pub players: Vec<CAHPlayer>,
-    // /// Reference to current card czar
-    // czar: &CAHPlayer,
-    /// Black card for the current round
-    pub current_black: Option<CAHCardBlack>,
-}
+use crate::models::*;
 
 impl CAHGame {
     /// Build game decks from input data for game start.

lib/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod game_master;
+pub mod models;

lib/src/models.rs

@@ -0,0 +1,113 @@
+use serde::{Deserialize, Serialize};
+use std::net::SocketAddr;
+
+/// User
+pub struct User {
+    pub name: String,
+    pub addr: SocketAddr,
+}
+
+/// New game request structure
+#[derive(Debug, Serialize, Deserialize)]
+pub struct NewGameRequest {
+    /// Game name
+    pub name: String,
+    /// Game host
+    pub host: CAHPlayer,
+    /// Chosen packs
+    pub packs: Vec<u8>,
+}
+
+/// Game join request structure
+pub struct GameJoinRequest {
+    /// Game id
+    pub id: u8, // increase later
+    /// Game password
+    pub password: Option<String>,
+    /// Player info
+    pub player: CAHPlayer,
+}
+
+/// A CAH white card
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CAHCardWhite {
+    /// Card text
+    pub text: String,
+    /// ID of the pack it came from
+    pub pack: u8,
+}
+
+/// A CAH black card
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CAHCardBlack {
+    /// Card text
+    pub text: String,
+    /// Amount of cards to submit for judging
+    pub pick: u8,
+    /// ID of the pack it came from
+    pub pack: u8,
+}
+
+/// A CAH pack
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CAHCardSet {
+    /// Name of the pack
+    name: String,
+    /// Pack Description
+    description: Option<String>,
+    /// Whether or not this is an official card pack
+    official: bool,
+    /// White card data
+    pub white: Option<Vec<CAHCardWhite>>,
+    /// Black card data
+    pub black: Option<Vec<CAHCardBlack>>,
+}
+
+/// Player roles
+#[derive(Debug, Serialize, Deserialize)]
+pub enum PlayerRole {
+    /// Player is host
+    Host,
+    /// Player is a player in a game where another player is host
+    Player,
+    /// Player is just spectating
+    Spectator,
+}
+
+/// A struct that represents a player
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CAHPlayer {
+    /// Player's username
+    pub name: String,
+    /// This player's role
+    pub role: PlayerRole,
+    /// The player's hand
+    pub white: Vec<CAHCardWhite>,
+    /// The player's wins
+    pub black: Vec<CAHCardBlack>,
+}
+
+/// The game master
+#[derive(Default)]
+pub struct CAHGame {
+    /// The name of the game
+    pub name: String,
+    /// White draw pile
+    pub white: Vec<CAHCardWhite>,
+    /// Black draw pile
+    pub black: Vec<CAHCardBlack>,
+    /// White discard pile
+    pub white_discard: Vec<CAHCardWhite>,
+    /// Black discard pile
+    pub black_discard: Vec<CAHCardBlack>,
+    /// Indicates game active/game over
+    pub game_active: bool,
+    /// List of current players
+    pub players: Vec<CAHPlayer>,
+    // /// Reference to current card czar
+    // czar: &CAHPlayer,
+    /// Black card for the current round
+    pub current_black: Option<CAHCardBlack>,
+}
+
+

server/Cargo.toml

@@ -18,4 +18,4 @@ anyhow = "1.0.82"
 axum-extra = "0.9.3"
 tower-http = { version = "0.5.2", features = ["fs", "trace"] }
 
-libcards = { workspace = true }
+lib = { workspace = true }

server/src/api.rs

@@ -7,8 +7,8 @@ use axum::{
     response::IntoResponse,
 };
 use futures::{SinkExt, StreamExt};
+use lib::models::*;
 use std::{net::SocketAddr, sync::Arc};
-use libcards::*;
 
 pub mod message_handler;
 use crate::message_handler::*;

server/src/api/message_handler.rs

@@ -1,7 +1,7 @@
 use crate::api::{greeting, Message, User};
 use crate::AppState;
 use crate::Arc;
-use libcards::*;
+use lib::models::*;
 
 pub async fn message_handler(message: Message, state: &Arc<AppState>, who: &User) {
     let tx = &state.tx;

server/src/main.rs

@@ -1,7 +1,7 @@
 use anyhow::{Context, Result};
 use axum::{response::Html, routing::get, Router};
 use axum_extra::response::Css;
-use libcards::*;
+use lib::models::*;
 use std::{
     // collections::HashSet,
     fs,
@@ -107,7 +107,7 @@ async fn main() -> Result<()> {
     tracing_subscriber::registry()
         .with(
             tracing_subscriber::EnvFilter::try_from_default_env()
-                .unwrap_or_else(|_| "server=trace,tower_http=trace".into()),
+                .unwrap_or_else(|_| "server=trace,tower_http=trace,lib=trace".into()),
         )
         .with(tracing_subscriber::fmt::layer())
         .init();