From b1b35c7e175cfc11128d311f146697f7c97f1180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Snorre=20Magnus=20Dav=C3=B8en?=
 <snorre.magnus.davoen@adventuretech.no>
Date: Sun, 4 Aug 2024 19:21:08 +0200
Subject: [PATCH] fix: Sort functionality and admin dashboard sort order (#29)

Some various fixes to make sort functionality more flexible. Sort is now
handled by placing a 'sort' attribute on the element that should be
sorted, e.g. the player list ul element on the scoreboard page.

The sort attribute value is the attribute value on each child element
used to sort, e.g. for the player list each li element contains an
attribute score to use for sorting.

Finally a sortFn attribute can be specified to say which function to use
to compare sort values. In the case of stringly score numbers we need to
parse the numbers before comparing as regular string comparisons won't
work and attribute values have to be string.

Various other small fixes to the logic to clean up the chart.
HyperScript is used to update the player row li elements with new
score-attribute values to avoid having to replace the entire row. The
only other option would be handling this client side, or using something
like the morphdom plugin to htmx to allow merging the server rendered
(SSE) html data with the browser html data. Otherwise client side logic
can break.
---
 bun.lockb                           | Bin 70829 -> 74979 bytes
 package.json                        |  11 ++-
 src/client/client.ts                | 126 ++++++++++++++++------------
 src/game/state.ts                   |   2 +-
 src/index.tsx                       |   7 +-
 src/layouts/main.tsx                |   1 +
 src/pages/admin.tsx                 |   5 +-
 src/pages/scoreboard/scoreboard.tsx |  39 +++++----
 8 files changed, 115 insertions(+), 76 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index 11c77d1d5af6655715e80f1c28fb11fea4655d68..d2cb4ba2e0ac667542b12f673954d0104e31a1ae 100755
GIT binary patch
delta 15158
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

delta 12630
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

diff --git a/package.json b/package.json
index 61e36d7..c565ed2 100644
--- a/package.json
+++ b/package.json
@@ -10,14 +10,14 @@
     "build:tailwind": "tailwindcss -i ./src/tailwind.css -o ./public/tailwind.css",
     "build:server": "bun build --target=bun ./src/index.tsx --outfile=dist/index.js",
     "build:client": "bun build --target=bun ./src/client/client.ts --outdir ./public",
-    "build": "bun run --target=bun build:server && npm run build:tailwind",
+    "build": "bun run --target=bun build:server && bun run --target=bun build:tailwind && bun run --target=bun build:client",
     "format:check": "biome format ./src",
     "format": "biome format ./src --write",
     "lint": "biome lint ./src",
     "check": "biome check --write ./src",
     "typecheck": "tsc --noEmit",
     "benchmark": "bun run --target=bun tooling/benchmark.ts",
-    "simulate": "bun run --target=bun tooling/simulate.ts"
+    "simulate": "bun run build && bun run --target=bun tooling/simulate.ts"
   },
   "dependencies": {
     "@elysiajs/static": "^1.0.3",
@@ -29,7 +29,10 @@
     "chartjs-adapter-date-fns": "^3.0.0",
     "elysia": "^1.0.24",
     "html-escaper": "^3.0.3",
-    "htmx.org": "^1.9.12",
+    "htmx-ext-response-targets": "^2.0.0",
+    "htmx-ext-sse": "^2.2.1",
+    "htmx.org": "2.0.1",
+    "hyperscript.org": "^0.9.12",
     "lit": "^3.1.4"
   },
   "devDependencies": {
@@ -38,7 +41,7 @@
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/bun": "^1.1.5",
     "@types/html-escaper": "^3.0.2",
-    "bun-types": "latest",
+    "bun-types": "1.1.21",
     "concurrently": "^8.2.2",
     "daisyui": "^4.12.8",
     "mitata": "^0.1.11",
diff --git a/src/client/client.ts b/src/client/client.ts
index 3d48ab9..7aea94f 100644
--- a/src/client/client.ts
+++ b/src/client/client.ts
@@ -5,49 +5,70 @@ import {
 	type Point,
 	registerables,
 } from "chart.js";
-import * as htmx from "htmx.org";
 import "chartjs-adapter-date-fns";
 import { CmcCounter } from "./counter";
 import { startConfetti } from "./confetti";
 
-// First some type overrides
-declare global {
-	interface Window {
-		htmx: typeof htmx;
-	}
-}
-
 // Then we register some chart plugins and web components
 Chart.register(...registerables);
 customElements.define("cmc-counter", CmcCounter);
 
-// Then define some functions to sort the scoreboard and render the chart
-function sortScoreboard() {
-	const list = document.getElementById("scoreboard-list");
-	if (!list) {
-		return;
-	}
+/**
+ * Define a type for holding a map of sort functions.
+ * Each function accepts two strings and returns a number.
+ * The key is the name of the function.
+ */
+type SortFunctions = {
+	[key: string]: (a: string, b: string) => number;
+};
+
+/**
+ * A map of sort function implementations.
+ * Allows us to sort elements on different criteria.
+ * For example, we can sort elements by score or by localeCompare
+ * if values are nicknames. If values are stringly numbers we
+ * can sort them by the numeric value.
+ */
+const sortFunctions: SortFunctions = {
+	score: (a, b) => Number.parseInt(b) - Number.parseInt(a),
+	localeCompare: (a, b) => a.localeCompare(b),
+};
+
+/**
+ * Sorts all elements with the attribute "sort".
+ * The value of the attribute specifies the value in each child
+ * to use for sorting. The optional attribute "sortFn" specifies
+ * the name of the function to use for sorting.
+ *
+ * Fallbacks to "localeCompare" if the function is not found.
+ * We simply remove the elements in the list and re-append them
+ * in the sorted order.
+ *
+ * Works with auto-animate to animate the sorting.
+ */
+function sortSortable() {
+	// First find all elements with attribute "sort"
+	const sortableElements = Array.from(document.querySelectorAll("[sort]"));
+
+	// For each sortable element we sort the children by the attribute "sortkey"
+	for (const sortableElement of sortableElements) {
+		const sortAttr = sortableElement.getAttribute("sort") ?? "";
+		const fnName = sortableElement.getAttribute("sortFn") ?? "";
+		// biome-ignore lint/complexity/useLiteralKeys: <explanation>
+		const sortFn = sortFunctions[fnName] ?? sortFunctions["localeCompare"];
+		const items = Array.from(sortableElement.children);
+
+		items.sort((a, b) => {
+			const sortValueA = a.getAttribute(sortAttr) ?? "";
+			const sortValueB = b.getAttribute(sortAttr) ?? "";
+			return sortFn(sortValueA, sortValueB);
+		});
 
-	const items = Array.from(list.children);
-
-	items.sort((a, b) => {
-		const scoreA = Number.parseInt(
-			a.querySelector("span")?.innerText ?? "0",
-			10,
-		);
-		const scoreB = Number.parseInt(
-			b.querySelector("span")?.innerText ?? "0",
-			10,
-		);
-
-		const randomNumberBetweenMinus1And1 = Math.random() * 2 - 1;
-		return scoreB - (scoreA + randomNumberBetweenMinus1And1); // Sort descending order (highest score first)
-	});
-
-	// Clear the list and re-append sorted items
-	list.innerHTML = "";
-	for (const item of items) {
-		list.appendChild(item);
+		// Clear the list and re-append sorted items
+		sortableElement.innerHTML = "";
+		for (const item of items) {
+			sortableElement.appendChild(item);
+		}
 	}
 }
 
@@ -61,12 +82,12 @@ let chart: Chart<"line">;
 
 function cleanChart() {
 	const now = new Date().getTime();
+	const fiveMinutesAgo = now - 5 * 60 * 1000;
 
 	for (const dataset of chart.data.datasets) {
 		dataset.data = dataset.data.filter((point) => {
 			const x = (point as Point).x;
-			console.log("X", now - x < 5 * 60 * 1000);
-			return now - x < 5 * 60 * 1000;
+			return x >= fiveMinutesAgo;
 		});
 	}
 	chart.update();
@@ -146,11 +167,12 @@ function renderChart(datasets: ChartConfiguration<"line">["data"]["datasets"]) {
 
 window.renderChart = renderChart;
 
-htmx.onLoad(() => {
+function htmxOnLoad() {
 	// Find all elements with the auto-animate class and animate them
 	for (const element of Array.from(
 		document.querySelectorAll(".auto-animate"),
 	)) {
+		console.info("Auto animating", element);
 		autoAnimate(element as HTMLElement);
 	}
 
@@ -161,26 +183,18 @@ htmx.onLoad(() => {
 	if (confettiCanvas) {
 		startConfetti(confettiCanvas);
 	}
-});
+}
 
-// On SSE messages do DOM-manipulation where necessary
-htmx.on("htmx:sseMessage", (evt) => {
-	// If player score changes sort the scoreboard
-	if (
-		evt instanceof CustomEvent &&
-		evt.detail.type.startsWith("player-score-")
-	) {
-		// Sort the scoreboard when a player's score changes
-		sortScoreboard();
-	}
+function htmxSSEMessage(evt: Event) {
+	// On SSE messages do DOM-manipulation where necessary
+	sortSortable();
 
 	// If the event is a player-score-chart event, update the chart with the new score data
 	if (
 		evt instanceof CustomEvent &&
-		evt.detail.type.startsWith("player-score-chart-")
+		evt.detail.type.startsWith("player-score-chart")
 	) {
-		const nick = evt.detail.type.replace("player-score-chart-", "");
-		const data = JSON.parse(evt.detail.data);
+		const { nick, ...data } = JSON.parse(evt.detail.data);
 		const dataset = chart.data.datasets.find((d) => d.label === nick);
 
 		if (dataset) {
@@ -205,4 +219,12 @@ htmx.on("htmx:sseMessage", (evt) => {
 			chart.update();
 		}
 	}
-});
+}
+
+window.onload = () => {
+	console.info("Running client.ts window.onload setup function");
+	document.body.addEventListener("htmx:load", htmxOnLoad);
+	document.body.addEventListener("htmx:sseMessage", htmxSSEMessage);
+
+	htmxOnLoad();
+};
diff --git a/src/game/state.ts b/src/game/state.ts
index e28f272..81c0cf5 100644
--- a/src/game/state.ts
+++ b/src/game/state.ts
@@ -138,7 +138,7 @@ const newWorker = (player: Player) => {
 					const player = state.players.find((p) => p.uuid === uuid);
 					if (player) {
 						player.log.unshift(log);
-						player.score += log.score;
+						player.score = log.score;
 					}
 					// We need to notify all relevant listeners about the new log
 					// Multiple listeners can be listening for the same player
diff --git a/src/index.tsx b/src/index.tsx
index 22501ac..7188bc9 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -24,10 +24,11 @@ const app = new Elysia({
 		Bun.file("node_modules/htmx.org/dist/htmx.min.js"),
 	)
 	.get("/public/response-targets.js", () =>
-		Bun.file("node_modules/htmx.org/dist/ext/response-targets.js"),
+		Bun.file("node_modules/htmx-ext-response-targets/response-targets.js"),
 	)
-	.get("/public/sse.js", () =>
-		Bun.file("node_modules/htmx.org/dist/ext/sse.js"),
+	.get("/public/sse.js", () => Bun.file("node_modules/htmx-ext-sse/sse.js"))
+	.get("/public/hyperscript.js", () =>
+		Bun.file("node_modules/hyperscript.org/dist/_hyperscript.min.js"),
 	)
 	.use(adminPlugin)
 	.use(homePlugin)
diff --git a/src/layouts/main.tsx b/src/layouts/main.tsx
index 1f9fca5..5339d83 100644
--- a/src/layouts/main.tsx
+++ b/src/layouts/main.tsx
@@ -13,6 +13,7 @@ export const HTMLLayout = ({ page, header, children }: LayoutProps) => {
 				<script src="/public/htmx.min.js" />
 				<script src="/public/response-targets.js" />
 				<script src="/public/sse.js" />
+				<script src="/public/hyperscript.js" />
 				<script src="/public/client.js" />
 			</head>
 			<body class="bg-base-100" hx-ext="response-targets" hx-boost="true">
diff --git a/src/pages/admin.tsx b/src/pages/admin.tsx
index 923ded0..2e8bdcc 100644
--- a/src/pages/admin.tsx
+++ b/src/pages/admin.tsx
@@ -237,7 +237,7 @@ const Round = ({ state }: RoundProps) => {
 const PlayerRow = (player: Player) => {
 	const rowId = `player-${player.uuid}`;
 	return (
-		<tr class="odd:bg-base-300" id={rowId}>
+		<tr class="odd:bg-base-300" id={rowId} attrs={{ nick: player.nick }}>
 			<td>
 				<a
 					class="link link-hover"
@@ -310,12 +310,13 @@ const Admin = ({ state }: AdminProps) => {
 							</tr>
 						</thead>
 						<tbody
+							attrs={{ sort: "nick" }} // Enable auto-sorting
 							class="auto-animate"
 							sse-swap="player-joined"
 							hx-swap="afterbegin"
 						>
 							{state.players
-								.toSorted((a, b) => a.score - b.score)
+								.toSorted((a, b) => a.nick.localeCompare(b.nick))
 								.map((player) => (
 									// biome-ignore lint/correctness/useJsxKeyInIterable: Don't need it here
 									<PlayerRow {...player} />
diff --git a/src/pages/scoreboard/scoreboard.tsx b/src/pages/scoreboard/scoreboard.tsx
index fb0b122..00598dc 100644
--- a/src/pages/scoreboard/scoreboard.tsx
+++ b/src/pages/scoreboard/scoreboard.tsx
@@ -8,12 +8,13 @@ import { basePluginSetup } from "../../plugins";
 const PlayerRow = ({ player }: { player: Player }) => {
 	return (
 		<li
+			attrs={{ score: player.score }}
 			class="flex flex-row justify-between bg-base-300 px-4 py-2 rounded-2xl bg-opacity-30 shadow-lg z-1"
 			id={`player-${player.nick}`}
-			sse-swap={`player-left-${player.nick}`}
-			hx-swap="delete"
+			// On htmx:sseMessage event, if event matches player-score-${player.nick} update attrs score with the new score
+			_={`on htmx:sseMessage(event) if event.detail.type === "player-score-${player.nick}" set @score to event.detail.data end`}
 		>
-			<h2 class={`text-xl ${player.color.class}`} safe>
+			<h2 safe class={`text-xl ${player.color.class}`}>
 				{player.nick}
 			</h2>
 			<span
@@ -23,10 +24,10 @@ const PlayerRow = ({ player }: { player: Player }) => {
 			>
 				{player.score}
 			</span>
-			<span // Use a hidden element to swap the chart data, don't actually swap json into the DOM
-				class="hidden"
-				sse-swap={`player-score-chart-${player.nick}`}
-				hx-swap="none"
+			<span // Use a hidden element to remove the player element from the score list
+				sse-swap={`player-left-${player.nick}`}
+				hx-swap="delete"
+				hx-target={`player-${player.nick}`}
 			/>
 		</li>
 	);
@@ -39,15 +40,18 @@ interface PlayerTableProps {
 const PlayerList = ({ players }: PlayerTableProps) => {
 	return (
 		<ul
-			id="scoreboard-list"
+			// Sort here is a selector
+			attrs={{ sort: "score", sortFn: "score" }}
 			class="auto-animate flex flex-col gap-2 z-10 bg-opacity-80 backdrop-blur-sm drop-shadow-lg max-h-[80vh] overflow-y-scroll scrollbar-w-none"
 			sse-swap="player-joined"
 			hx-swap="afterbegin"
 		>
-			{players.map((player) => (
-				// biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
-				<PlayerRow player={player} />
-			))}
+			{players
+				.toSorted((a, b) => b.score - a.score)
+				.map((player) => (
+					// biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
+					<PlayerRow player={player} />
+				))}
 		</ul>
 	);
 };
@@ -108,6 +112,11 @@ export const scoreboardPlugin = basePluginSetup()
 					<div class="chart-container min-h-screen min-w-screen max-h-screen max-w-screen absolute inset-0 pt-24">
 						<div class="epic-dark" />
 						<canvas id="score-board-chart" class="relative" />
+						<span // Use a hidden element to swap the chart data, don't actually swap json into the DOM
+							class="hidden"
+							sse-swap="player-score-chart"
+							hx-swap="none"
+						/>
 					</div>
 					<div class="min-h-screen min-w-screen max-h-screen max-w-screen absolute inset-0 pt-24 flex flex-col items-center text-center justify-center">
 						<GameStatus status={state.status} />
@@ -171,9 +180,10 @@ export const scoreboardPlugin = basePluginSetup()
 							data: `${event.log.score}`,
 						},
 						{
-							event: `player-score-chart-${event.nick}`,
+							event: "player-score-chart",
 							data: JSON.stringify({
-								x: new Date(event.log.date).toISOString(),
+								nick: event.nick,
+								x: event.log.date,
 								y: event.log.score,
 							}),
 						},
@@ -215,6 +225,7 @@ export const scoreboardPlugin = basePluginSetup()
 					return [
 						{
 							event: `player-left-${event.nick}`,
+							data: "",
 						},
 						{
 							event: "player-left-chart",