diff --git a/Cargo.lock b/Cargo.lock index 24f3ccc..7ccd5e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -755,18 +755,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.199" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", diff --git a/src/api.rs b/src/api.rs index 12d13ab..e999089 100644 --- a/src/api.rs +++ b/src/api.rs @@ -29,13 +29,11 @@ pub async fn websocket(stream: WebSocket, state: Arc) { Message::Text(text) => { tracing::debug!("Text: {}", text); // let message_str: &str = message.to_text().unwrap(); - tracing::debug!( - "{:#?}", - serde_json::from_str::(&text) - .unwrap() - .host - .name - ); + if let Ok(new_game) = serde_json::from_str::(&text) { + tracing::debug!("{:#?}", new_game); + } else { + tracing::debug!("Not JSON!"); + } } Message::Binary(data) => { tracing::debug!("Binary: {:?}", data) diff --git a/test_client.html b/test_client.html index f411bc4..f722952 100644 --- a/test_client.html +++ b/test_client.html @@ -5,6 +5,7 @@ Cards For Humanity Test Client

Cards For Humanity Test Client

+
+

Status

Disconnected...

-
- -

Username

-

Game Name

- - -
- - -
- -
- +
+
+

Socket Test

+
+

int 3000-4999

+ +

string 123 bytes or less

+ + +
-
+
+
+

Create Game

+
+

Username:

+ +

Game Name:

+ + +
+
+
+
+

Join Game

+
+

Username:

+ +

Game Name:

+ + +
+
+
+
+

Chat

- - + +