yearly review wip checkpoint

package.json

@@ -23,6 +23,7 @@
 		"@sveltejs/vite-plugin-svelte": "^4.0.4",
 		"@types/bun": "^1.1.14",
 		"@types/markdown-it": "^14.1.2",
+		"@types/sqlstring": "^2.3.2",
 		"autoprefixer": "^10.4.20",
 		"croner": "^9.0.0",
 		"keyv": "^5.2.3",
@@ -34,6 +35,7 @@
 		"prettier-plugin-tailwindcss": "^0.6.9",
 		"rollup": "^4.29.1",
 		"rss-parser": "^3.13.0",
+		"sqlstring": "^2.3.3",
 		"svelte": "^5.15.0",
 		"svelte-adapter-bun": "^0.5.2",
 		"svelte-check": "^4.1.1",

src/lib/components/TeeRender.svelte

@@ -39,7 +39,7 @@
 		'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAACACAYAAADktbcKAAAFVklEQVR4nO3dXW8UVRjA8f+2ZVsJYCuCpYoYFYjKmwQSFRHilZFPwCf0K3ilCIbEqBWRKCSG+AYCKgUE6ZbWevHMZueCttTd2bN75v9LNsyy285zYOfZc+a8gSRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkqSB0UgdgIbOOLCx+HMcGAMWgQWgBfwDzCeLTusyljoADZ0DwJurvD4LfNWnWNSlkdQBaOj83eXrGiDWANS2AdgLPAOcXeV9c8BtorrfAh4VP9skmgR31jjPSSJJfEc0G5SQ9wDUBPYXjyawDHwE3K/gXJuA08TnrkUkgUuYCJIZTR2AknoR+BDYReez0AAeAjcqON9rwAvF8RgwA7xK1CruVXA+rcEEUE9N4B3gbaL63jYHfAH8QNQEeu0W8CcwSfQktGPZDUwB14ClCs6rFZgA6ul54uJve0C0+88Df1HNxd92F7hMJJtpOgloCvgdawJ9ZQKop7vE//00cBX4mPhm7qc5IhGMA9uAC0TNQ1IfjAA7UgdRmMEuaUmSJKkHchnnkUs5Bo7trnw1iD7+fakD6dIe4BQmgUrYC5Cv/cDrwE5iBN7PacP5X04AR4DNxIzDm2nDyY81gDxtAY6Wnq81Pn9QleM+QowVUA+ZAPJ0nM5Er1vAxYSxdOMiET9EbfVYwliyZALIzzQx0g9iWO0Zqh3ZV6VlIv728OAZBmfsQhZMAPk5XDq+zPBW/9vuAFdKzw+v9EatnwkgL9vpzLb7F/g2YSy9dIEoD0TtZjphLFmxFyAv88Rkms3EXf8f04bTMwtET8YYseTYr3QSgqTHyC2551YeSZIkSZIkSZKeTF3vkNe13D3jxiB5eA94iRgDcJ5YXDNXM8SKxpuBn4BPk0Yz5EwAeZggVtfdSv7fimPE7kUQC4qqCw4FzkP5Qmgli6I/yuVrJosiEyaAPJQvhNy32SonAGsAXTIB5KE83bdOS2fVqayVMAHkoU7V4jo1dypnAshDudo/kSyK/ignOBNAl0wAeWgBj4DbxOKZOVsk9i98RP73O6QnknvX30rqWm5JkiRJkiRJUt3ldoc8t/IMBP9R8zIK7AZOEjMDh3FD0JW8C7xFDP+dw2XBe8KBQHl5ls7Fv4eYM5+DTcBeYJJYC2Br2nDyYQLIy03genE8AhxMGEsvHaLzWf0NuJEwlqyYAPIzWzpuf2sOsymiHG2zK71R62cCyM91OkuCjRJNgmGdNtsATtC5V3UNv/17ygSQp3N0JgVtBw4kjKUbB4n4IcrzecJYsmQCyNMd4OvS82FtBjxdOv4SuJsqEGnYNIBTwL7UgXRpD1GOYW3GSMnkctHkUg5JkiQpoRFil51BsANvSCfhXID6OkpsKTZFjB1IsZZgkxjae4xIANcSxFBrJoB62gkcL46niAlE94nuw35oAK8AH9CphUwDf2BXX1+ZAOppnlhff1vxfAPwcvFYJFYXrkID2AW8T3RPbii9dhX4Hliq6Nx6DBNAPS0BvxCTh3bQWWv/KWKX4cXitV47RAzt3Vj6uwfAJ8A3ePH3nQmg3u4BV4gLfiux8+4ycJZq1ty/T3zzN4rff4HY3ruqGofW4AALtTWBN4AtwGervO85YnGOFnERLxJV+fHid5xj9drDSSLxXMKNPZIbSx2ABsYCUQ1fyySrL8gxyeoJ4Mw6YlLF7HvVeq21ylAuqxDVgk0ArdcEcRNvvHiMEs2AVvF4SPQySJIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSVKV/gMpgLodSf6HygAAAABJRU5ErkJggg==';
 
 	let skin = $state(X_SPEC_SKIN);
-	let loadedSkin = $state(null) as string | null;
+	let loadingSkin = $state(null) as string | null;
 	let bodyFilter = $state(null) as string | null;
 	let feetFilter = $state(null) as string | null;
 
@@ -49,9 +49,9 @@
 	let root = $state(null) as Element | null;
 
 	const updateSkin = async () => {
-		const currentLoadingSkin = url || name;
+		const thisLoadingSkin = url || name;
 
-		if (currentLoadingSkin == loadedSkin) {
+		if (thisLoadingSkin == loadingSkin) {
 			return;
 		}
 
@@ -60,11 +60,12 @@
 			abortController = null;
 		}
 
+		loadingSkin = thisLoadingSkin;
 		skin = X_SPEC_SKIN;
 
 		if (!name && !url) {
 			skin = useDefault ? DEFAULT_SKIN : X_SPEC_SKIN;
-			loadedSkin = 'default';
+			loadingSkin = 'default';
 			return;
 		}
 
@@ -90,14 +91,13 @@
 				const skinData = await response.arrayBuffer();
 				const buffer = new Uint8Array(skinData);
 				skin = `data:${contentType};base64,${encodeBase64(buffer)}`;
-				loadedSkin = currentLoadingSkin;
 			} else {
 				skin = useDefault ? DEFAULT_SKIN : X_SPEC_SKIN;
-				loadedSkin = 'default';
+				loadingSkin = 'default';
 			}
 		} else {
 			skin = useDefault ? DEFAULT_SKIN : X_SPEC_SKIN;
-			loadedSkin = 'default';
+			loadingSkin = 'default';
 		}
 	};
 
@@ -108,7 +108,7 @@
 		}
 
 		if (intersectionObserver && root) {
-			intersectionObserver.unobserve(root);
+			intersectionObserver.disconnect();
 			intersectionObserver = null;
 		}
 	});
@@ -123,7 +123,7 @@
 				if (entry.isIntersecting) {
 					updateSkin();
 				} else {
-					if (abortController) {
+					if (abortController && !alwaysFetch) {
 						abortController.abort();
 						abortController = null;
 					}

src/lib/helpers.ts

@@ -117,6 +117,15 @@ export const unescapeHTML = (str: string) => {
 		.replace(/'/g, "'");
 };
 
+export const escapeHTML = (str: string) => {
+	return str
+		.replace(/&/g, '&')
+		.replace(/</g, '&lt;')
+		.replace(/>/g, '&gt;')
+		.replace(/"/g, '&quot;')
+		.replace(/'/g, '&#x27;');
+};
+
 export const secondsToTime = (totalSeconds: number) => {
 	const hours = Math.floor(totalSeconds / 3600);
 	const minutes = Math.floor((totalSeconds % 3600) / 60);

src/lib/server/fetch-cache.ts

@@ -160,9 +160,9 @@ export class FetchCache<T> {
 
 				// not outdated but no cache, means the head response is possibly not ok or errored
 				if (response) {
-					throw new Error(`Failed to fetch data: ${response.status} ${response.statusText}`);
+					throw new Error(`Failed to fetch data: ${this.url} ${response.status} ${response.statusText}`);
 				} else {
-					throw new Error('Failed to fetch data: Unknown error');
+					throw new Error(`Failed to fetch data: ${this.url} Unknown error`);
 				}
 			})();
 

src/routes/+layout.svelte

@@ -29,7 +29,9 @@
 </script>
 
 <div
-	class="flex min-h-svh flex-col bg-slate-800 {navigating.to ? 'opacity-60' : 'opacity-100'}"
+	class="max-w-svw flex min-h-svh flex-col overflow-x-hidden bg-slate-800 {navigating.to
+		? 'opacity-60'
+		: 'opacity-100'}"
 	style={navigating.to ? 'transition: opacity 0.1s ease-in-out 0.1s;' : ''}
 >
 	<header class="flex bg-slate-900 px-4 py-2 text-slate-300 md:py-4">
@@ -52,14 +54,14 @@
 		</div>
 	</header>
 
-	<main class="flex-grow basis-1 bg-slate-800 p-2 text-slate-300 md:p-4">
-		<div class="container mx-auto h-full">
+	<main class="flex flex-grow bg-slate-800 p-2 text-slate-300 md:p-4">
+		<div class="container relative mx-auto flex-grow">
 			{@render children()}
 		</div>
 	</main>
 
-	<footer class="flex flex-row bg-slate-900 px-4 py-1 text-slate-300 md:py-4 items-center">
-		<div class="text-sm sm:text-base">
+	<footer class="flex flex-row items-center bg-slate-900 px-4 py-1 text-slate-300 md:py-4">
+		<div class="text-sm md:text-base">
 			<Link href="https://beian.miit.gov.cn/" type="subtle" className="font-bold"
 				>冀ICP备2021002466号</Link
 			>

src/routes/ddnet/yearly/+page.server.ts

@@ -0,0 +1,23 @@
+import type { PageServerLoad } from './$types';
+import { getSkin } from '$lib/server/ddtracker';
+import { getPlayer } from '$lib/server/players';
+import { decodeAsciiURIComponent } from '$lib/link';
+
+export const load = (async ({ url, parent }) => {
+	const year = parseInt(url.searchParams.get('year') || '2024');
+	const name = decodeAsciiURIComponent(url.searchParams.get('name') || '');
+
+	if (!name) {
+		return { year, ...(await parent()) };
+	}
+
+	const player = await getPlayer(name);
+	if (!player || !player.name) {
+		const error = `未找到名为${name}的玩家`;
+		return { year, error, ...(await parent()) };
+	}
+
+	const skin = getSkin(name, 'as:cn') || getSkin(name);
+
+	return { year, name, skin, player, ...(await parent()) };
+}) satisfies PageServerLoad;