Merge pull request #73 from Sportinger/tray-log-ui-master

feat: add tray live log and visitor grouping

Author: Sportinger

functions/_middleware.ts

@@ -39,18 +39,32 @@ interface VisitEntry {
   city?: string;
   ua?: string;
   referer?: string;
+  visitorId?: string;
 }
 
 function buildVisitKey(ts: number): string {
   const newestFirst = String(9_999_999_999_999 - ts).padStart(13, '0');
   return `visit2:${newestFirst}:${ts}:${crypto.randomUUID().slice(0, 8)}`;
 }
 
+async function buildVisitorId(request: Request, secret?: string): Promise<string | undefined> {
+  const ip = request.headers.get('cf-connecting-ip')?.trim();
+  if (!ip || !secret) {
+    return undefined;
+  }
+
+  const payload = new TextEncoder().encode(`${secret}:${ip}`);
+  const digest = await crypto.subtle.digest('SHA-256', payload);
+  const bytes = Array.from(new Uint8Array(digest));
+  return bytes.map((byte) => byte.toString(16).padStart(2, '0')).join('').slice(0, 16);
+}
+
 async function trackVisit(context: AppContext): Promise<void> {
   try {
     const request = context.request;
     const url = new URL(request.url);
     const cfData = (request as unknown as { cf?: Record<string, string> }).cf;
+    const visitorId = await buildVisitorId(request, context.env.VISITOR_NOTIFY_SECRET);
 
     const entry: VisitEntry = {
       ts: Date.now(),
@@ -59,6 +73,7 @@ async function trackVisit(context: AppContext): Promise<void> {
       city: cfData?.city,
       ua: (request.headers.get('user-agent') ?? '').slice(0, 200),
       referer: request.headers.get('referer') ?? undefined,
+      visitorId,
     };
 
     // Store newest-first keys so polling clients can read the latest visits efficiently.

functions/api/visits.ts

@@ -8,6 +8,7 @@ interface VisitEntry {
   city?: string;
   ua?: string;
   referer?: string;
+  visitorId?: string;
 }
 
 interface ListedVisitKey {
@@ -42,6 +43,7 @@ async function loadVisitEntry(context: AppContext, key: ListedVisitKey): Promise
         referer: metadata.referer,
         ts: metadata.ts,
         ua: metadata.ua,
+        visitorId: metadata.visitorId,
       };
     }
   }

tools/visitor-tray/.env.example

@@ -6,3 +6,4 @@ ALERT_SECONDS=10
 ENABLE_SOUND=true
 ENABLE_BALLOON=true
 OPEN_SITE_ON_BALLOON_CLICK=true
+HISTORY_LIMIT=200

tools/visitor-tray/README.md

@@ -28,6 +28,10 @@ The script loads config in this order:
 
 Later sources override earlier ones.
 
+Optional config:
+
+- `HISTORY_LIMIT`: how many recent visits should be kept in the live log window. Default: `200`
+
 ## Required Cloudflare Secret
 
 The tray app reads from `/api/visits`, which requires `VISITOR_NOTIFY_SECRET`.
@@ -64,18 +68,18 @@ Remove autostart:
 powershell -ExecutionPolicy Bypass -File tools\visitor-tray\Uninstall-Startup.ps1
 ```
 
-## Tray Menu
+## Tray UI
 
-- Open MasterSelects
-- Poll now
-- Pause / Resume polling
-- Exit
+- Right-click the tray icon to open the live log window.
+- The live log shows recent visits in a scrollable list.
+- Repeated hits from the same tracked visitor are grouped into expandable rows when a stable visitor id is available.
+- Double-click the tray icon still opens MasterSelects in the browser.
 
 On a new visit the app:
 
 - plays a Windows notification sound
 - switches the tray icon to a warning icon for a few seconds
-- shows a balloon notification
+- shows a balloon notification with the country flag when available
 
 Clicking the balloon opens the latest visited path on the site.