KV bindings

Author: MegapolisPlayer

package-lock.json

@@ -19,11 +19,12 @@
 		"i18n": "npx paraglide-js compile --project ./project.inlang --outdir ./src/lib/paraglide"
 	},
 	"devDependencies": {
+		"@cloudflare/types": "^7.0.0",
+		"@cloudflare/workers-types": "^4.20251224.0",
 		"@eslint/compat": "^1.4.0",
 		"@eslint/js": "^9.36.0",
 		"@inlang/paraglide-js": "^2.3.2",
 		"@sveltejs/adapter-cloudflare": "^7.2.4",
-		"@sveltejs/adapter-vercel": "^6.2.0",
 		"@sveltejs/kit": "^2.43.2",
 		"@sveltejs/vite-plugin-svelte": "^6.2.0",
 		"@tailwindcss/typography": "^0.5.18",
@@ -47,7 +48,6 @@
 		"wrangler": "^4.53.0"
 	},
 	"dependencies": {
-		"@vercel/analytics": "^1.6.0",
 		"cloc": "^2.6.0-cloc",
 		"remixicon": "^4.7.0"
 	}

package.json

@@ -1,12 +1,23 @@
+import type { KVNamespace } from '@cloudflare/workers-types';
+import type { SvelteMap } from 'svelte/reactivity';
+
 // See https://svelte.dev/docs/kit/types#app.d.ts
 // for information about these interfaces
 declare global {
 	namespace App {
 		// interface Error {}
-		// interface Locals {}
+		interface Locals {
+			localmap: SvelteMap<string, number>;
+			prodmap: KVNamespace<string>;
+			dev: Boolean;
+		}
 		// interface PageData {}
 		// interface PageState {}
-		// interface Platform {}
+		interface Platform {
+			env: {
+				CONCURRENCY: KVNamespace<string>;
+			}
+		}
 	}
 }
 

src/app.d.ts

@@ -3,6 +3,9 @@ import { paraglideMiddleware } from '$lib/paraglide/server';
 import { sequence } from '@sveltejs/kit/hooks';
 import { isLimited } from '$lib/server/rate';
 import { error } from '@sveltejs/kit';
+import { env } from '$env/dynamic/private';
+import { localConcurrencyMap } from '$lib/server/concurrency';
+import type { KVNamespace } from '@cloudflare/workers-types';
 
 const handleParaglide: Handle = ({ event, resolve }) =>
 	paraglideMiddleware(event.request, ({ request, locale }) => {
@@ -37,4 +40,19 @@ const handleRateLimit: Handle = async ({ event, resolve }) => {
 	return resolve(event);
 };
 
-export const handle: Handle = sequence(handleParaglide, handleSecurity, handleRateLimit);
+const handleMap: Handle = async ({ event, resolve }) => {
+	if(env.DEV == 'true') {
+		console.log("Using local map");
+		event.locals.localmap = localConcurrencyMap;
+		event.locals.dev = true;
+	}
+	else {
+		console.log("Using KV binding map");
+		event.locals.prodmap = (event.platform?.env.CONCURRENCY as KVNamespace<string>);
+		event.locals.dev = false;
+	}
+
+	return resolve(event);	
+}
+
+export const handle: Handle = sequence(handleMap, handleParaglide, handleSecurity, handleRateLimit);

src/hooks.server.ts

@@ -1,29 +1,57 @@
 import { BEAT_FREQUENCY } from '$lib';
+import type { RequestEvent } from '@sveltejs/kit';
 import { SvelteMap } from 'svelte/reactivity';
+import type { KVNamespace } from '@cloudflare/workers-types';
 
 export const LAST_BEAT_AGE_FOR_ACTIVE = Math.trunc(BEAT_FREQUENCY * 1.25);
 
-const concurrencyMap: SvelteMap<string, number> = new SvelteMap();
+export let localConcurrencyMap: SvelteMap<string, number> = new SvelteMap();
 
-export const containsId = (key: string) => {
-	return concurrencyMap.has(key);
+export const containsId = async (event: RequestEvent, key: string) => {
+	if (event.locals.dev) return event.locals.localmap.has(key);
+	else return ((await event.locals.prodmap.get(key)) != null);
 };
 
-export const updateId = (key: string) => {
-	concurrencyMap.set(key, Date.now());
+export const updateId = async (event: RequestEvent, key: string) => {
+	if (event.locals.dev) event.locals.localmap.set(key, Date.now());
+	else await event.locals.prodmap.put(key, String(Date.now()));
 };
 
-export const removeOld = (key: string) => {
-	concurrencyMap.delete(key);
+export const removeOld = async (event: RequestEvent, key: string) => {
+	if (event.locals.dev) event.locals.localmap.delete(key);
+	else await event.locals.prodmap.delete(key);
 };
 
-export const getActive = () => {
+export const getActive = async (event: RequestEvent) => {
 	const now = Date.now();
-	concurrencyMap.forEach((value, key, map) => {
-		if (now - value > LAST_BEAT_AGE_FOR_ACTIVE) {
-			map.delete(key);
-		}
-	});
 
-	return concurrencyMap.size;
+	if (event.locals.dev) {
+		event.locals.localmap.forEach((value, key, map) => {
+			if (now - value > LAST_BEAT_AGE_FOR_ACTIVE) {
+				map.delete(key);
+			}
+		});
+		return event.locals.localmap.size;
+	}
+	else {
+		let keys = [];
+		let list = undefined;
+		do {
+			list = await event.locals.prodmap.list({
+				cursor: list == undefined ? undefined : list.cursor
+			});
+			keys.push(...list.keys);
+		}
+		while (!list.list_complete);
+		let removed = 0;
+		for (let i = 0; i < keys.length; i++) {
+			const key = keys[i].name;
+			const value = parseInt(await event.locals.prodmap.get(key) as string);
+			if (now - value > LAST_BEAT_AGE_FOR_ACTIVE) {
+				await event.locals.prodmap.delete(key);
+				removed++;
+			}
+		}
+		return list.keys.length - removed;
+	}
 };

src/lib/server/concurrency/index.ts

@@ -3,14 +3,14 @@ import { json } from '@sveltejs/kit';
 
 export const POST = async (event) => {
 	let sessionId = event.cookies.get('sessionid');
-	if (!sessionId || !containsId(sessionId)) {
+	if (!sessionId || !(await containsId(event, sessionId))) {
 		const uuid = crypto.randomUUID();
 		event.cookies.set('sessionid', uuid, { path: '/' });
 		sessionId = uuid;
 		console.log('New user');
 	}
 
-	updateId(sessionId);
+	await updateId(event, sessionId);
 	//console.log("User heartbeat");
 
 	return json({});

src/routes/analytics/+server.ts

@@ -2,12 +2,12 @@ import { asyncDelay } from '$lib';
 import { getActive } from '$lib/server/concurrency/index.js';
 import { produce } from 'sveltekit-sse';
 
-export const POST = async () => {
+export const POST = async (event) => {
 	return produce(
 		async (payload) => {
 			while (true) {
-				payload.emit('users', String(getActive()));
-				await asyncDelay(100);
+				payload.emit('users', String(await getActive(event)));
+				await asyncDelay(500);
 			}
 		},
 		{

src/routes/count/+server.ts

@@ -5,11 +5,11 @@ import { error, json } from '@sveltejs/kit';
 
 export const POST = async (event) => {
 	const sessionId = event.cookies.get('sessionid');
-	if (!sessionId || !containsId(sessionId)) {
+	if (!sessionId || !(await containsId(event, sessionId))) {
 		return error(404);
 	}
 
-	removeOld(sessionId);
+	await removeOld(event, sessionId);
 	event.cookies.delete('sessionid', { path: '/' });
 
 	console.log('User left');

src/routes/goodbye/+server.ts

@@ -9,8 +9,8 @@
 	let { settingsModal = $bindable(false), data } = $props();
 
 	let hasDifferentTime = $state(false);
-	let hasPlaylist = $state(data.playlist.length > 0);
-	let snowAmount = $state(data.snow);
+	let hasPlaylist = $derived(data.playlist.length > 0);
+	let snowAmount = $derived(data.snow);
 </script>
 
 <Modal bind:showModal={settingsModal}>