fix: increase the client-side timeout

Author: nikohoffren

components/leaderboard/LeaderBoard.tsx

@@ -23,18 +23,24 @@ export const LeaderBoard: React.FC = () => {
 
       try {
         const response = await axios.get("/api/topUsers", {
-          timeout: 30000, // Increased timeout to 30 seconds
+          timeout: 60000, // Increased timeout to 60 seconds
+          headers: {
+            'Cache-Control': 'no-cache',
+            'Pragma': 'no-cache',
+            'Expires': '0',
+          }
         });
         setLeaderBoardData(response.data);
       } catch (error) {
         console.error("Failed to fetch leaderboard data:", error);
         setIsError(true);
 
-        // Retry logic
+        // Retry logic with exponential backoff
         if (retryCount < 3) {
+          const backoffTime = Math.pow(2, retryCount) * 2000; // 2s, 4s, 8s
           setTimeout(() => {
             setRetryCount(prev => prev + 1);
-          }, 2000); // Wait 2 seconds before retrying
+          }, backoffTime);
         }
       } finally {
         setIsLoading(false);
@@ -99,3 +105,4 @@ export const LeaderBoard: React.FC = () => {
 
 
 
+

pages/api/topUsers.js

@@ -3,7 +3,7 @@ import { getTopUsersFromDb, storeTopUsersInDb } from "../../utils/fetchTopUsersF
 
 export default async function handler(req, res) {
   // Add CORS headers
-  res.setHeader('Cache-Control', 's-maxage=300, stale-while-revalidate');
+  res.setHeader('Cache-Control', 'public, s-maxage=300, stale-while-revalidate=599');
 
   try {
     console.log('API: Checking DB for cached top users...');
@@ -17,21 +17,30 @@ export default async function handler(req, res) {
       // Optionally refresh cache in background if data is old
       const cacheAge = Date.now() - new Date(data[0].timestamp).getTime();
       if (cacheAge > 3600000) { // 1 hour
-        refreshCache();
+        refreshCache().catch(console.error);
       }
       return;
     }
 
-    // If no cached data, fetch new data
+    // If no cached data, fetch new data with timeout
     console.log('API: No cached data found, fetching from GitHub...');
-    data = await fetchTopUsersByPullRequests("fork-commit-merge/fork-commit-merge");
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), 50000); // 50 second timeout
 
-    if (data && data.length > 0) {
-      console.log('API: Storing new data in DB...');
-      await storeTopUsersInDb(data);
-      res.status(200).json(data);
-    } else {
-      res.status(404).json({ error: 'No data available' });
+    try {
+      data = await fetchTopUsersByPullRequests("fork-commit-merge/fork-commit-merge");
+      clearTimeout(timeout);
+
+      if (data && data.length > 0) {
+        console.log('API: Storing new data in DB...');
+        await storeTopUsersInDb(data);
+        res.status(200).json(data);
+      } else {
+        res.status(404).json({ error: 'No data available' });
+      }
+    } catch (error) {
+      clearTimeout(timeout);
+      throw error;
     }
   } catch (error) {
     console.error('API route error:', error);
@@ -52,3 +61,4 @@ async function refreshCache() {
 }
 
 
+

utils/fetchTopUsersFromDb.ts

@@ -1,24 +1,20 @@
 import { connectToDB } from './db';
 
-interface UserStat {
-  login: string;
-  avatar_url: string;
-  html_url: string;
-  contributions: number;
-}
-
 export async function getTopUsersFromDb() {
   try {
     const { db } = await connectToDB();
-    const data = await db.collection('topUsers').find().toArray();
+    const data = await db.collection('topUsers')
+      .find()
+      .maxTimeMS(5000) // 5 second timeout for DB query
+      .toArray();
     return data.length > 0 ? data : null;
   } catch (error) {
     console.error('DB Error:', error);
     return null;
   }
 }
 
-export async function storeTopUsersInDb(data: UserStat[]) {
+export async function storeTopUsersInDb(data: any[]) {
   try {
     const { db } = await connectToDB();
     await db.collection('topUsers').deleteMany({});
@@ -65,3 +61,4 @@ export async function storeTopThreeUsersInDb(data: any[]) {
 
 
 
+