From 998924512c716fab50885c6ac6757cf3daf7bbe6 Mon Sep 17 00:00:00 2001 From: Adam <24621027+adoyle0@users.noreply.github.com> Date: Sat, 27 Apr 2024 05:24:45 -0400 Subject: [PATCH] cleanup and make client better --- src/main.rs | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/src/main.rs b/src/main.rs index 38ef780..3a9a9a3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,14 +1,20 @@ use futures_util::{SinkExt, StreamExt, TryFutureExt}; -use std::collections::HashMap; -use std::sync::{ - atomic::{AtomicUsize, Ordering}, - Arc, +use std::{ + collections::HashMap, + error::Error, + fs, + result::Result, + sync::{ + atomic::{AtomicUsize, Ordering}, + Arc, + }, }; -use std::{error::Error, fs, result::Result}; use tokio::sync::{mpsc, RwLock}; use tokio_stream::wrappers::UnboundedReceiverStream; -use warp::ws::{Message, WebSocket}; -use warp::Filter; +use warp::{ + ws::{Message, WebSocket}, + Filter, +}; #[allow(non_snake_case)] pub mod CAHd_game; @@ -125,7 +131,13 @@ async fn user_connected(ws: WebSocket, users: Users) { let (tx, rx) = mpsc::unbounded_channel(); let mut rx = UnboundedReceiverStream::new(rx); - let _ = user_ws_tx.send(Message::text(format!("Server Message: Welcome User {}",my_id))).await; + let _ = user_ws_tx + .send(Message::text(format!( + "Server Message: Welcome User {}", + my_id + ))) + .await; + tokio::task::spawn(async move { while let Some(message) = rx.next().await { user_ws_tx @@ -169,7 +181,7 @@ async fn user_message(my_id: usize, msg: Message, users: &Users) { return; }; - let new_msg = format!(": {}", my_id, msg); + let new_msg = format!("User {}: {}", my_id, msg); // New message from this user, send it to everyone else (except same uid)... for (&uid, tx) in users.read().await.iter() { @@ -193,15 +205,17 @@ async fn user_disconnected(my_id: usize, users: &Users) { static INDEX_HTML: &str = r#" - Warp Chat + Cards For Humanity Test Client

Cards

Connecting...

- - +
+ + +