From 01d8dceedccac3ee389e5ad97bb161cdaf8b4a84 Mon Sep 17 00:00:00 2001
From: core <core@coredoes.dev>
Date: Sat, 8 Apr 2023 21:35:25 -0400
Subject: [PATCH] hell pt2

---
 Cargo.lock                   | 22 ++++++++++++++++++++++
 client/Cargo.toml            |  4 +++-
 client/src/lib.rs            |  7 ++++---
 server/Cargo.toml            |  3 ++-
 server/src/main.rs           | 23 ++++++++++++++---------
 server/src/timer.rs          |  2 +-
 web/play.html                | 31 +++++++++++++++++++++++++++++++
 web/static/css/stylemain.css |  0
 8 files changed, 77 insertions(+), 15 deletions(-)
 create mode 100644 web/play.html
 create mode 100644 web/static/css/stylemain.css

diff --git a/Cargo.lock b/Cargo.lock
index f6fa4946d3a5f2f7f7721350fca745f4416fabcd..cda70f76b30f5409717ced3552d6afaedebbaff5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -62,7 +62,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 name = "client"
 version = "0.1.0"
 dependencies = [
+ "js-sys",
  "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
@@ -330,6 +332,15 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
+[[package]]
+name = "js-sys"
+version = "0.3.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+dependencies = [
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -531,6 +542,7 @@ version = "0.1.0"
 dependencies = [
  "futures",
  "hyper",
+ "lazy_static",
  "log",
  "protocol",
  "rmp-serde",
@@ -895,6 +907,16 @@ version = "0.2.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
+[[package]]
+name = "web-sys"
+version = "0.3.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index f46839ef35a2a9f8387d559897d1a2c35e464309..54d3e1a641b0c7d961673f1bdfaa9ba1fe50ef5c 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -9,4 +9,6 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-wasm-bindgen = "0.2"
\ No newline at end of file
+wasm-bindgen = "0.2"
+js-sys = "0.3"
+web-sys = { version = "0.3", features = ["CanvasRenderingContext2d", "Document", "Element", "HtmlCanvasElement", "Window"]}
\ No newline at end of file
diff --git a/client/src/lib.rs b/client/src/lib.rs
index d6fe5ca6c4614a640e959497ccf7f014d357ad5a..71e5564ec3ae691dc5535be5630f8f7211e103aa 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -6,6 +6,7 @@ extern {
 }
 
 #[wasm_bindgen]
-pub fn greet(name: &str) {
-    alert(&format!("Hello, {}!", name))
-}
\ No newline at end of file
+pub fn send_chat(chat: &str) {
+    println!("sending chat: {}", chat);
+}
+
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 3c9f485eccedc532fd91003175d7dd7ed73bdb72..2205eed16659a87500820ba07f4d94d8d1fc2e55 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -15,4 +15,5 @@ tungstenite = { version = "0.18", default-features = false }
 tokio-tungstenite = { version = "0.18" }
 log = "0.4"
 simple_logger = "4.1"
-protocol = { version = "0.1.0", path = "../protocol" }
\ No newline at end of file
+protocol = { version = "0.1.0", path = "../protocol" }
+lazy_static = "1.4.0"
\ No newline at end of file
diff --git a/server/src/main.rs b/server/src/main.rs
index 7530990d34623e6b5adc11c549639698c98c8314..e0b73dc080acd66cde96e2557d2fe25fd48e8fc0 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -6,10 +6,11 @@ use hyper::service::{make_service_fn, service_fn};
 use tokio_tungstenite::WebSocketStream;
 use tungstenite::{handshake, Error};
 use futures::stream::StreamExt;
+use lazy_static::lazy_static;
 use log::{error, info};
 use tokio::sync::RwLock;
 use protocol::State;
-use crate::handler::{ClientData, ClientHandler, ClientManager};
+use crate::handler::{ClientHandler, ClientManager};
 use crate::wsserver::handle_client;
 
 pub mod wsserver;
@@ -99,14 +100,17 @@ async fn handle_request(mut request: Request<Body>, remote_addr: SocketAddr, mgr
         }
     }
 }
-#[tokio::main]
-async fn main() {
-    simple_logger::init_with_env().expect("Unable to start logging service");
 
-    info!("Creating client handler");
-    let mut mgr: ClientManager = ClientManager {
+lazy_static! {
+    static ref cmgr: ClientManager = ClientManager {
         clients: Arc::new(RwLock::new(Default::default())),
+        usernames: Arc::new(RwLock::new(Default::default())),
     };
+}
+
+#[tokio::main]
+async fn main() {
+    simple_logger::init_with_env().expect("Unable to start logging service");
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
 
@@ -115,10 +119,11 @@ async fn main() {
     let make_svc = make_service_fn(|conn: &AddrStream| {
         let remote_addr = conn.remote_addr();
 
-        let mgr_for_this_thread = mgr.clone();
         async move {
-            Ok::<_, Infallible>(service_fn(move |request: Request<Body>| {
-                handle_request(request, remote_addr, mgr_for_this_thread)
+            Ok::<_, Infallible>(service_fn({
+                move |request: Request<Body>| {
+                    handle_request(request, remote_addr, cmgr.clone())
+                }
             }))
         }
     });
diff --git a/server/src/timer.rs b/server/src/timer.rs
index 73cbb3429881abab180a5de9278ef98f5bcb4433..301313b42f16361677cd04d47a52f1203f6e8412 100644
--- a/server/src/timer.rs
+++ b/server/src/timer.rs
@@ -9,7 +9,7 @@ pub async fn timer_main(mgr: ClientManager) {
     loop {
         sleep(Duration::from_millis(5)).await;
 
-        for client_thread in mgr.clients.read().await.iter() {
+        for (addr, client_thread) in mgr.clients.read().await.iter() {
             match client_thread.tx.send(ClientHandlerMessage::Tick).await {
                 Ok(_) => (),
                 Err(e) => {
diff --git a/web/play.html b/web/play.html
new file mode 100644
index 0000000000000000000000000000000000000000..b84c57eab5bc982025855565c797041c7aa48c08
--- /dev/null
+++ b/web/play.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+    <title>StarKingdoms.TK</title>
+    <link rel="stylesheet" href="/static/css/stylemain.css"></link>
+    <link rel="favicon" href="/static/img/favicon.ico"></link>
+    <meta charset="utf-8">
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+</head>
+
+    <body>
+        <div class="chatbox">
+            <div id="chats">
+                <p>hello: blsdkjf</p>
+            </div>
+            <input type="text" placeholder="chat text goes here" />
+            <button id="chat-submit">submit</button>
+        </div>
+
+        <script type="module">
+            // If you're getting build errors here | you need to run `just build_client_bundle` first, to compile client code
+            //                                     v
+            import init, { send_chat } from "./dist/client.js";
+            init().then(() => {
+                document.getElementById("chat-submit").addEventListener("click", e => {
+                    send_chat(e.target.value);
+                })
+            })
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/web/static/css/stylemain.css b/web/static/css/stylemain.css
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391