loscores and pingscores tables

2026-05-29 18:00:54 +01:00
parent 28a961b881
commit 9d5d4c31d4
7 changed files with 117 additions and 101 deletions
@@ -1 +1,3 @@
 /target
+hiscores.json
+loscores.json
@@ -39,7 +39,7 @@
 		const regex = new RegExp("^[a-zA-Z0-9_-]+$");
 		let name = validate_data(prompt("Nickname for the leaderboard"));
 		console.log(name)
-		const ws = new WebSocket('ws://deadvey.com:8084/ws');
+		const ws = new WebSocket('ws://localhost:8084/ws');
 		ws.onopen = (event) => {
 			ws.send(name);
 		};
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<body>
-		<h1>Each time you press the button there's a 1/3 chance of returning to 0</h1>
-		<button id="button" onclick="send_click()">0</button>
-		<div id="score-table"></div>
-	</body>
-	<style>
-		#button {
-			background-color: red;
-			border: darkred solid 15px;
-			border-radius: 50%;
-			font-size: 50px;
-			padding: 100px;
-			width: 300px;
-			height: 300px;
-			font-family: monospace, arial;
-		}
-		#button:active {
-			background-color: red;
-			border: red solid 20px;
-		}
-		#score-table {
-			position: absolute;
-			top: 0px;
-			right: 0px;
-		}
-		td,tr,table,th {
-			border: black solid;
-		}
-		table { 
-		  border-collapse: collapse;  
-		}
-	</style>
-	<script>
-		const ws = new WebSocket('ws://localhost:8084/ws');
-		const regex = new RegExp("^[a-zA-Z0-9_-]+$");
-		let name = validate_data(prompt("Nickname for the leaderboard"));
-		ws.onopen = (event) => {
-			ws.send(name);
-		};
-		let firstMessage = true;
-		let latestMessage = 0;
-		ws.onmessage = (event) => {
-			console.log(event.data);
-			if (firstMessage) {
-				firstMessage = false;
-				data = JSON.parse(event.data);
-				const tableDiv = document.getElementById("score-table");
-				const table = document.createElement("table");
-				// Add header row
-				table.innerHTML = `<tr><th>Rank</th><th>Score</th><th>Name</th><th>P</th></tr>`;
-				// Add data rows concisely using forEach
-				data.hiscores.forEach((entry, index) => {
-					table.innerHTML += `<tr>
-						<td>#${index + 1}</td>
-						<td>${validate_data(entry.score)}</td>
-						<td>${validate_data(entry.person)}</td>
-						<td>${((2/3)**validate_data(entry.score)).toExponential(2)}</td>
-					</tr>`;
-				});
-				tableDiv.appendChild(table);
-			}
-			else { latestMessage = validate_data(event.data); }
-		};
-		function send_click()
-		{
-			ws.send(true);
-			if (latestMessage !== null) {
-				document.getElementById("button").textContent=latestMessage;
-				latestMessage = null;
-			}
-		}
-		function get_rand(min, max) {
-			return Math.round(Math.random() * (max - min) + min);
-		}
-		window.addEventListener('beforeunload', () => {
-			ws.close();
-		});
-		function validate_data(data) { // Only allow a-z, A-Z, 0-9, - and _ characters, sorry Ramón
-			if (regex.test(data)) { return data }
-			else { return "anon" }
-		}
-	</script>
-</html>
@@ -4,7 +4,12 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	</head>
 	<body>
-		<div id="score-table"></div>
+		<h1>Hiscores</h1>
+		<div id="hiscore-table"></div>
+		<h1>Loscores</h1>
+		<div id="loscore-table"></div>
+		<h1>Pingscores</h1>
+		<div id="pingscore-table"></div>
 	</body>
 	<style>
 		td,tr,table,th {
@@ -15,7 +20,7 @@
 		}
 	</style>
 	<script>
-		const ws = new WebSocket('ws://deadvey.com:8084/ws');
+		const ws = new WebSocket('ws://localhost:8084/ws');
 		const regex = new RegExp("^[a-zA-Z0-9_-]+$");
 		ws.onopen = (event) => {
 			ws.send("");
@@ -24,7 +29,7 @@
 		ws.onmessage = (event) => {
 			console.log(event.data);
 			data = JSON.parse(event.data);
-			const tableDiv = document.getElementById("score-table");
+			const tableDiv = document.getElementById("hiscore-table");
 			const table = document.createElement("table");
 			// Add header row
 			table.innerHTML = `<tr><th>Rank</th><th>Score</th><th>Name</th><th>P</th></tr>`;
@@ -38,6 +43,31 @@
 				</tr>`;
 			});
 			tableDiv.appendChild(table);
+			const tableDiv2 = document.getElementById("loscore-table");
+			const table2 = document.createElement("table");
+			table2.innerHTML = `<tr><th>Rank</th><th>Score</th><th>Name</th><th>P</th></tr>`;
+			data.loscores.forEach((entry, index) => {
+				table2.innerHTML += `<tr>
+					<td>#${index + 1}</td>
+					<td>${validate_data(entry.score)}</td>
+					<td>${validate_data(entry.person)}</td>
+					<td>${((1/3)**validate_data(entry.score)).toExponential(8)}</td>
+				</tr>`;
+			});
+			tableDiv2.appendChild(table2);
+			const tableDiv3 = document.getElementById("pingscore-table");
+			const table3 = document.createElement("table");
+			table3.innerHTML = `<tr><th>Rank</th><th>Score</th><th>Name</th></tr>`;
+			let pingscores = data.pingscores; 
+			let sorted = Object.entries(pingscores).sort(([,a],[,b]) => b - a)
+			sorted.forEach(([person,score],index) => {
+				table3.innerHTML += `<tr>
+					<td>#${index + 1}</td>
+					<td>${validate_data(person)}</td>
+					<td>${validate_data(score)}</td>
+				</tr>`;
+			});
+			tableDiv3.appendChild(table3);
 		};
 		window.addEventListener('beforeunload', () => {
 			ws.close();
@@ -0,0 +1 @@
+{"deadvey":58,"anon":15,"error":0}
@@ -4,6 +4,7 @@ use axum::{
 	routing::get,
 	Router,
 };
+use std::collections::HashMap;
 use axum::extract::State;
 use rand::random_bool;
 use futures::stream::StreamExt;
@@ -14,6 +15,7 @@ use std::fs;
 use std::io::Write;
 use std::sync::mpsc;
 use std::sync::{Mutex, Arc};
+use tokio::time::{sleep,Duration};
 use regex::Regex;

 #[derive(Deserialize,Serialize,Debug,Ord,Eq,PartialEq,PartialOrd,Clone)]
@@ -25,8 +27,10 @@ struct Entry

 #[derive(Clone)]
 struct AppState {
-	tx: mpsc::Sender<Entry>,
+	tx: mpsc::Sender<(Entry,u8)>,
 	hiscores: Arc<Mutex<Vec<Entry>>>,
+	loscores: Arc<Mutex<Vec<Entry>>>,
+	pingscores: Arc<Mutex<HashMap<String,u64>>>,
 }

 static CHANCE: f64 = 1.0/3.0;
@@ -35,17 +39,37 @@ static CHANCE: f64 = 1.0/3.0;
 async fn main() {
 	let file_contents: String = fs::read_to_string("hiscores.json").unwrap();
 	let hiscores: Arc<Mutex<Vec<Entry>>> = Arc::new(Mutex::new(serde_json::from_str(&file_contents).unwrap()));
+	let file_contents: String = fs::read_to_string("loscores.json").unwrap();
+	let loscores: Arc<Mutex<Vec<Entry>>> = Arc::new(Mutex::new(serde_json::from_str(&file_contents).unwrap()));
+	let file_contents: String = fs::read_to_string("pingscores.json").unwrap();
+	let pingscores: Arc<Mutex<HashMap<String,u64>>> = Arc::new(Mutex::new(serde_json::from_str(&file_contents).unwrap()));
 	let hiscore_clone1 = Arc::clone(&hiscores);
+	let loscore_clone1 = Arc::clone(&loscores);
+	let pingscore_clone1 = Arc::clone(&pingscores);

-	let (tx, rx) = mpsc::channel::<Entry>();
+	let (tx, rx) = mpsc::channel::<(Entry,u8)>();

 	tokio::spawn(
 		async move {
-			handle_hiscores(rx, hiscore_clone1);
+			handle_hiscores(rx, hiscore_clone1, loscore_clone1, pingscore_clone1);
+		}
+	);
+	let pingscore_clone2 = Arc::clone(&pingscores);
+	tokio::spawn(
+		async move {
+			loop // write pingscores every 30s
+			{
+				sleep(Duration::from_millis(30000)).await;
+				let pingscores = pingscore_clone2.lock().unwrap();
+				let file_contents: String = serde_json::to_string(&pingscores.clone()).unwrap();
+				drop(pingscores);
+				let mut file = fs::OpenOptions::new().write(true).truncate(true).open("pingscores.json").unwrap();
+				file.write_all(file_contents.as_bytes()).unwrap();
+			}
 		}
 	);

-	let state = AppState { tx,hiscores: Arc::clone(&hiscores) };
+	let state = AppState { tx,hiscores: Arc::clone(&hiscores),loscores: Arc::clone(&loscores), pingscores: Arc::clone(&pingscores)};
 	let app = Router::new()
 		.route("/", get(index))
 		.route("/ws", get(ws_handler))
@@ -68,7 +92,8 @@ async fn index() -> Html<&'static str> {
 async fn leaderboard() -> Html<&'static str> {
 	Html(include_str!("../leaderboard.html"))
 }
-fn handle_hiscores(rx: mpsc::Receiver<Entry>, hiscores_arc: Arc<Mutex<Vec<Entry>>>)
+// receiver: 0 for hiscore, 1 for loscore, 2 for pingscore
+fn handle_hiscores(rx: mpsc::Receiver<(Entry, u8)>, hiscores_arc: Arc<Mutex<Vec<Entry>>>, loscores_arc: Arc<Mutex<Vec<Entry>>>,pingscores_arc: Arc<Mutex<HashMap<String,u64>>>,) 
 {
 	// Panic galore
 	let mut hiscores = hiscores_arc.lock().unwrap();
@@ -83,11 +108,11 @@ fn handle_hiscores(rx: mpsc::Receiver<Entry>, hiscores_arc: Arc<Mutex<Vec<Entry>
 	{
 		match rx.recv()
 		{
-			Ok(new_entry) =>
+			Ok((new_entry,0)) =>
 			{
 				let mut hiscores = hiscores_arc.lock().unwrap();
 				if new_entry.score > hiscores[19].score {
-					println!("New leaderboard {new_entry:?}");
+					println!("New hiscore {new_entry:?}");
 					hiscores.push(new_entry);
 					hiscores.sort();
 					hiscores.reverse();
@@ -99,6 +124,30 @@ fn handle_hiscores(rx: mpsc::Receiver<Entry>, hiscores_arc: Arc<Mutex<Vec<Entry>
 					file.flush().unwrap();
 				}
 			},
+			Ok((new_entry,1)) =>
+			{
+				let mut loscores = loscores_arc.lock().unwrap();
+				if new_entry.score > loscores[19].score {
+					println!("New loscore {new_entry:?}");
+					loscores.push(new_entry);
+					loscores.sort();
+					loscores.reverse();
+					loscores.truncate(20);
+					let file_contents: String = serde_json::to_string(&loscores.clone()).unwrap();
+					drop(loscores);
+					let mut file = fs::OpenOptions::new().write(true).truncate(true).open("loscores.json").unwrap();
+					file.write_all(file_contents.as_bytes()).unwrap();
+					file.flush().unwrap();
+				}
+			},
+			Ok((new_entry,2)) =>
+			{
+				let name = new_entry.person;
+				let mut pingscores = pingscores_arc.lock().unwrap();
+				*pingscores.entry(name).or_insert(0) += 1;
+				drop(pingscores);
+			}
+			Ok((_,_)) => println!("Invalid number"),
 			Err(error) => println!("{error}"),
 		}
 	}
@@ -111,18 +160,29 @@ async fn ws_handler(
 	ws.on_upgrade(move |socket| {
 		let tx = state.tx.clone();
 		let hiscores = Arc::clone(&state.hiscores);
+		let loscores = Arc::clone(&state.loscores);
+		let pingscores = Arc::clone(&state.pingscores);
 		async move {
-			handle_socket(socket, tx, hiscores).await;
+			handle_socket(socket, tx, hiscores, loscores, pingscores).await;
 		}
 	})
 }

-async fn handle_socket(mut socket: WebSocket, tx: mpsc::Sender<Entry>, hiscores_arc: Arc<Mutex<Vec<Entry>>>) {
+async fn handle_socket
+(
+	mut socket: WebSocket,
+	tx: mpsc::Sender<(Entry,u8)>,
+	hiscores_arc: Arc<Mutex<Vec<Entry>>>,
+	loscores_arc: Arc<Mutex<Vec<Entry>>>,
+	pingscores_arc: Arc<Mutex<HashMap<String, u64>>>,
+) {
 	let mut value: u32 = 0;
 	let msg = 
 	{
 		let hiscores = hiscores_arc.lock().unwrap();
-		json!({ "hiscores": &*hiscores }).to_string()
+		let loscores = loscores_arc.lock().unwrap();
+		let pingscores = pingscores_arc.lock().unwrap();
+		json!({ "hiscores": &*hiscores, "loscores": &*loscores, "pingscores": &*pingscores}).to_string()
 	};
 	let name_message = socket.next().await.unwrap().unwrap();
 	let name: String = match name_message 
@@ -130,7 +190,8 @@ async fn handle_socket(mut socket: WebSocket, tx: mpsc::Sender<Entry>, hiscores_
 		Message::Text(text) => validate_name(text.to_string()),
 		_ => "anon".to_string(),
 	};
-	//println!("Client connected: {name}");
+	println!("Client connected: {name}");
+	let mut resets: u32 = 0;

 	let _ = socket
 		.send(Message::Text(msg.into()))
@@ -140,7 +201,14 @@ async fn handle_socket(mut socket: WebSocket, tx: mpsc::Sender<Entry>, hiscores_
 		match msg {
 			Ok(Message::Text(_)) => {
 				if random_bool(CHANCE) {
-					let _ = tx.send(Entry{ person: name.clone(), score: value });
+					let _ = tx.send((Entry{ person: name.clone(), score: value },0)); //hiscores
+					let _ = tx.send((Entry{ person: name.clone(), score: 0 },2)); //hiscores
+					if value == 0
+					{
+						resets += 1;
+						let _ = tx.send((Entry{ person: name.clone(), score: resets },1));//loscores
+					}
+					else { resets = 0 };
 					value = 0
 				} // 1/3 chance of failing
 				else { value += 1; }