feat: use last visitors to show recent clicks

src/components/window.svelte

@@ -59,7 +59,7 @@
 			class="
 				window-titlebar p-1 border-ralsei-white border-8
 				bg-gradient-to-l from-ralsei-pink-neon to-ralsei-black to-75%
-				{!isOnMobile ? "cursor-move" : ""} uppercase
+				{!isOnMobile ? "cursor-move" : ""}
 			"
 			style="border-style: hidden hidden ridge hidden;"
 		>

src/lib/visits.ts

@@ -2,15 +2,15 @@ import { env } from "$env/dynamic/private";
 import { scopeCookies } from "$lib";
 import type { Cookies } from "@sveltejs/kit";
 import { existsSync, readFileSync, writeFileSync } from "fs";
+import { nanoid } from "nanoid";
 import { get, writable } from "svelte/store";
 
 const visitCountFile = `${env.WEBSITE_DATA_DIR}/visitcount`
-const visitCount = writable(parseInt(existsSync(visitCountFile) ? readFileSync(visitCountFile).toString() : '0'));
+const visitCount = writable(parseInt(existsSync(visitCountFile) ? readFileSync(visitCountFile).toString() : '0'))
 
-type Visitor = { since: number }
-const lastVisitors = writable<Visitor[]>([]);
-const MAX_VISITORS = 10
-const VISITOR_EXPIRY_SECONDS = 60 * 30 // half an hour is reasonable
+type Visitor = { count: number, since: number }
+const lastVisitors = writable<Map<string, Visitor>>(new Map())
+const VISITOR_EXPIRY_SECONDS = 60 * 60 * 1
 
 export const incrementVisitCount = (request: Request, cookies: Cookies) => {
     let currentVisitCount = get(visitCount)
@@ -35,31 +35,45 @@ export const incrementVisitCount = (request: Request, cookies: Cookies) => {
 }
 
 export const addLastVisitor = (request: Request, cookies: Cookies) => {
+    let visitors = get(lastVisitors)
+    console.log(visitors)
+    visitors = _addLastVisitor(visitors, request, cookies)
+    lastVisitors.set(visitors)
+    return visitors
+}
+
+// why not use this for incrementVisitCount? cuz i wanna have separate visit counts (one per hour and one per day, per hour being recent visitors)
+const _addLastVisitor = (visitors: Map<string, Visitor>, request: Request, cookies: Cookies) => {
     const currentTime = Date.now()
-    let visitors = get(lastVisitors).filter(
-        (value) => { return currentTime - value.since > 1000 * VISITOR_EXPIRY_SECONDS }
+    // filter out old entries
+    visitors = new Map(
+        visitors.entries().filter(
+            ([_, value]) =>
+                { return currentTime - value.since < 1000 * VISITOR_EXPIRY_SECONDS }
+        )
     )
     // check whether the request is from a bot or not (this doesnt need to be accurate we just want to filter out honest bots)
     if (isBot(request)) { return visitors }
     const scopedCookies = scopeCookies(cookies, '/')
     // parse the last visit timestamp from cookies if it exists
-    const visitorTimestamp = parseInt(scopedCookies.get('visitorTimestamp') || "0")
-    // get unix timestamp
-    const timeSinceVisit = currentTime - visitorTimestamp
-    // check if this is the first time a client is visiting or if an hour has passed since they last visited
-    if (visitorTimestamp === 0 || timeSinceVisit > 1000 * VISITOR_EXPIRY_SECONDS) {
-        visitors.push({ since: currentTime })
-        if (visitors.length > MAX_VISITORS) { visitors.shift() }
-        // update the cookie with the current timestamp
-        scopedCookies.set('visitorTimestamp', currentTime.toString())
+    let visitorId = scopedCookies.get('visitorId') || ""
+    // if no such id exists, create one and assign it to the client
+    if (! visitors.has(visitorId)) {
+        visitorId = nanoid()
+        scopedCookies.set('visitorId', visitorId)
+        console.log(`new client id ${visitorId}`)
     }
+    // update the entry
+    let visitorEntry = visitors.get(visitorId) || {count: 0, since: 0}
+    visitorEntry.count += 1
+    visitorEntry.since = currentTime
+    visitors.set(visitorId, visitorEntry);
     return visitors
 }
 
 const isBot = (request: Request) => {
     const ua = request.headers.get('user-agent')
     return ua ? ua.toLowerCase().match(/(bot|crawl|spider|walk|fetch|scrap|proxy|image)/) !== null : true
-
 }
 
 export const notifyDarkVisitors = (url: URL, request: Request) => {

src/routes/+layout.server.ts

@@ -1,5 +1,5 @@
 import { testUa } from '$lib/robots.js';
-import { incrementVisitCount, notifyDarkVisitors } from '$lib/visits.js';
+import { addLastVisitor, incrementVisitCount, notifyDarkVisitors } from '$lib/visits.js';
 import { error } from '@sveltejs/kit';
 
 export const csr = true;
@@ -18,5 +18,6 @@ export async function load({ request, cookies, url }) {
     return {
         route: url.pathname,
         visitCount: incrementVisitCount(request, cookies),
+        lastVisitors: addLastVisitor(request, cookies),
     }
 }

src/routes/+layout.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { browser } from '$app/environment';
 	import getTitle from '$lib/getTitle';
+	import type { Visitor } from 'svelte/types/compiler/interfaces';
 	import NavButton from '../components/navButton.svelte';
 	import Tooltip from '../components/tooltip.svelte';
 	import Window from '../components/window.svelte';
@@ -41,6 +42,10 @@
 
 	$: title = getTitle(data.route);
 
+	$: recentVisitCount = data.lastVisitors.values().reduce(
+		(total, visitor) => { return total + visitor.count; }, 0
+	)
+
 	const svgSquiggles = [[2], [3], [2], [3], [1]];
 </script>
 
@@ -140,7 +145,7 @@
 	<slot />
 </div>
 
-<nav class="w-full min-h-[5vh] max-h-[6vh] fixed bottom-0 z-[999] bg-ralsei-black overflow-visible uppercase">
+<nav class="w-full min-h-[5vh] max-h-[6vh] fixed bottom-0 z-[999] bg-ralsei-black overflow-visible">
 	<div
 		class="
 			max-w-full max-h-fit p-1 z-[999]
@@ -160,14 +165,17 @@
 			<div class="hidden md:block grow" />
 			<div class="navbox">
 				<a title="previous site" class="hover:underline" href="https://xn--sr8hvo.ws/previous">⮜</a>
-				<a class="hover:underline" href="https://xn--sr8hvo.ws">IndieWeb 🕸💍</a>
+				<a class="hover:underline" href="https://xn--sr8hvo.ws">indieweb 🕸💍</a>
 				<a title="next site" class="hover:underline" href="https://xn--sr8hvo.ws/next">⮞</a>
 			</div>
 			<Tooltip>
 				<svelte:fragment slot="tooltipContent">
-					<img class="min-w-64" style="image-rendering: crisp-edges pixelated;" alt="visits" src="https://count.getloli.com/@yusdacrawebsite?name=yusdacrawebsitetest&theme=booru-lewd&padding=5&offset=0&align=center&scale=1&pixelated=1&darkmode=0&num={data.visitCount}"/>
+					<p class="font-monospace">
+						<nobr>total visits = <span class="text-ralsei-green-light text-shadow-green">{data.visitCount.toString().padStart(10, "0")}</span></nobr>
+						<nobr>unique recent visits = <span class="text-ralsei-green-light text-shadow-green">{data.lastVisitors.size.toString().padStart(2, "0")}</span></nobr>
+					</p>
 				</svelte:fragment>
-				<div class="navbox"><p><span class="text-ralsei-green-light text-shadow-green">{data.visitCount}</span> visit(s)</p></div>
+				<div class="navbox"><p><span class="text-ralsei-green-light text-shadow-green">{recentVisitCount}</span> recent clicks</p></div>
 			</Tooltip>
 			{#if isRoute("entries") || isRoute("log")}
 			<div class="navbox !gap-1">

src/routes/+page.svelte

@@ -19,6 +19,7 @@
 						<img
 							width="150"
 							height="20"
+							title="banners from https://blinkies.cafe/"
 							alt="banner"
 							class="
 								{hideIfMobile ? 'hidden' : ''} sm:inline w-[150px] [height:20px]