checkpoint

Author: LuckySilver0021

backend/src/api/controllers/leaderboard.ts

@@ -27,6 +27,7 @@ import {
 } from "@monkeytype/util/date-and-time";
 import { MonkeyRequest } from "../types";
 import { omit } from "../../utils/misc";
+import { allTimeLeaderboardCache } from "../../utils/all-time-leaderboard-cache";
 
 export async function getLeaderboard(
   req: MonkeyRequest<GetLeaderboardQuery>,
@@ -68,6 +69,11 @@ export async function getLeaderboard(
     language,
     friendsOnlyUid,
   );
+
+  if (page === 0 && pageSize === 50 && uid === undefined) {
+    allTimeLeaderboardCache.set({ mode, language, mode2 }, leaderboard, count);
+  }
+
   const normalizedLeaderboard = leaderboard.map((it) => omit(it, ["_id"]));
 
   return new MonkeyResponse("Leaderboard retrieved", {

backend/src/api/controllers/result.ts

@@ -64,7 +64,6 @@ import { MonkeyRequest } from "../types";
 import { getFunbox, checkCompatibility } from "@monkeytype/funbox";
 import { tryCatch } from "@monkeytype/util/trycatch";
 import { getCachedConfiguration } from "../../init/configuration";
-import { allTimeLeaderboardCache } from "../../utils/all-time-leaderboard-cache";
 
 try {
   if (!anticheatImplemented()) throw new Error("undefined");
@@ -535,12 +534,6 @@ export async function addResult(
       },
       dailyLeaderboardsConfig,
     );
-    try {
-      allTimeLeaderboardCache.clear();
-      console.log("All-time leaderboard cache cleared");
-    } catch (error) {
-      console.warn("Cache clear failed (non-critical):", error);
-    }
 
     if (
       dailyLeaderboardRank >= 1 &&

backend/src/credentials/.gitkeep

@@ -49,7 +49,7 @@ export async function get(
   }
 
   if (page === 0 && pageSize === 50 && uid === undefined) {
-    const cached = allTimeLeaderboardCache.get({ mode, language });
+    const cached = allTimeLeaderboardCache.get({ mode, language, mode2 });
     if (cached) {
       console.log("✅ Cache HIT - leaderboards");
       return cached.data as DBLeaderboardEntry[];
@@ -94,22 +94,19 @@ export async function get(
     }
 
     if (page === 0 && pageSize === 50 && uid === undefined) {
-      try {
-        allTimeLeaderboardCache.set(
-          { mode, language },
-          leaderboard,
-          await getCount(mode, mode2, language),
-        );
-        console.log(" Cache SET - leaderboards");
-      } catch (error) {
-        console.warn("Cache set failed:", error);
-      }
+      allTimeLeaderboardCache.set(
+        { mode, language, mode2 },
+        leaderboard,
+        await getCount(mode, mode2, language),
+      );
+      console.log(" Cache SET - leaderboards");
     }
 
     return leaderboard;
   } catch (e) {
     if ((e as unknown as { error: number }).error === 175) {
       //QueryPlanKilled, collection was removed during the query
+      return false;
     }
     throw e;
   }
@@ -185,6 +182,7 @@ export async function getRank(
   } catch (e) {
     if ((e as unknown as { error: number }).error === 175) {
       //QueryPlanKilled, collection was removed during the query
+      return false;
     }
     throw e;
   }
@@ -303,6 +301,7 @@ export async function update(
   const end2 = performance.now();
 
   cachedCounts.delete(`${language}_${mode}_${mode2}`);
+  allTimeLeaderboardCache.clear();
 
   //update speedStats
   const boundaries = [...Array(32).keys()].map((it) => it * 10);

backend/src/dal/leaderboards.ts

@@ -1,35 +1,29 @@
 type AllTimeCacheKey = {
   mode: string;
   language: string;
+  mode2: string;
 };
 
 type CacheEntry = {
   data: unknown[];
   count: number;
-  timestamp: number;
 };
 
 class AllTimeLeaderboardCache {
   private cache = new Map<string, CacheEntry>();
-  private readonly TTL = 900_000; // == 15 minutes of TTL
 
-  private getKey({ mode, language }: AllTimeCacheKey): string {
-    return `alltime-lb:${mode}:${language}`;
+  private getKey({ mode, language, mode2 }: AllTimeCacheKey): string {
+    return `alltime-lb:${mode}:${language}:${mode2}`;
   }
 
   get(key: AllTimeCacheKey): CacheEntry | null {
     const cacheKey = this.getKey(key);
     const entry = this.cache.get(cacheKey);
-
-    if (!entry || Date.now() - entry.timestamp > this.TTL) {
-      if (entry) this.cache.delete(cacheKey);
-      return null;
-    }
-    return entry;
+    return entry ?? null;
   }
 
   set(key: AllTimeCacheKey, data: unknown[], count: number): void {
-    this.cache.set(this.getKey(key), { data, count, timestamp: Date.now() });
+    this.cache.set(this.getKey(key), { data, count });
   }
 
   clear(): void {