fetchSystemData changed with fetchSystemDataWithRetries

Author: codeperfectplus

src/routes/error_handlers.py

@@ -24,6 +24,10 @@ def method_not_allowed(e):
     """Handle 405 Method Not Allowed error."""
     return "Method not allowed", 405
 
+@app.errorhandler(429)
+def ratelimit_handler(e):
+    return "Too many requests, please try again later.", 429
+
 @app.errorhandler(500)
 def internal_server_error(e):
     """Handle 500 Internal Server Error."""

src/static/js/refreshCardData.js

@@ -48,16 +48,66 @@ async function postRefreshInterval(newInterval) {
 }
 
 // Fetch system data from a given API endpoint
-async function fetchSystemData(apiEndpoint) {
+// Note: depcrecated in favor of fetchSystemDataWithRetries
+
+// async function fetchSystemData(apiEndpoint) {
+//     try {
+//         const response = await fetch(apiEndpoint);
+//         return await response.json();
+//     } catch (error) {
+//         console.error(`Error fetching ${apiEndpoint}:`, error);
+//         return null;
+//     }
+// }
+
+async function fetchSystemDataWithRetries(apiEndpoint, retries = 3, delay = 2000) {
+    for (let i = 0; i < retries; i++) {
+        try {
+            const response = await fetch(apiEndpoint);
+            if (response.ok) {
+                return await response.json();
+            } else {
+                const errorText = await response.text();
+                console.error(`Error fetching ${apiEndpoint} - Status: ${response.status}, Response: ${errorText}`);
+            }
+        } catch (error) {
+            console.error(`Fetch attempt ${i + 1} failed: ${error.message}`);
+        }
+        if (i < retries - 1) {
+            await new Promise(res => setTimeout(res, delay));
+        }
+    }
+    return null; // Return null after exhausting retries
+}
+
+
+let requestQueue = [];
+let isRequestInProgress = false;
+
+async function processQueue() {
+    if (isRequestInProgress || requestQueue.length === 0) return;
+    isRequestInProgress = true;
+
+    const { apiEndpoint, resolve, reject } = requestQueue.shift();
     try {
-        const response = await fetch(apiEndpoint);
-        return await response.json();
+        const data = await fetchSystemDataWithRetries(apiEndpoint);
+        resolve(data);
     } catch (error) {
-        console.error(`Error fetching ${apiEndpoint}:`, error);
-        return null;
+        reject(error);
     }
+
+    isRequestInProgress = false;
+    processQueue(); // Continue processing the next request
 }
 
+function queueRequest(apiEndpoint) {
+    return new Promise((resolve, reject) => {
+        requestQueue.push({ apiEndpoint, resolve, reject });
+        processQueue(); // Start processing if not already in progress
+    });
+}
+
+
 // Update card content and bar width based on fetched data
 function updateCard(cardSelector, dataKey, data, unit = '', barSelector = null, maxDataKey = null) {
     const cardElement = document.querySelector(cardSelector);
@@ -109,7 +159,7 @@ async function refreshCardText(cardSelector, dataKey, data) {
 
 // Refresh all card data
 async function refreshData() {
-    const data = await fetchSystemData('/api/system-info');
+    const data = await queueRequest('/api/system-info');
     if (!data) return;
 
     updateCard('.bg-disk', 'disk_percent', data, '%', '.disk-bar');

src/utils.py

@@ -470,7 +470,6 @@ def _get_system_info():
     memory_available = get_cached_value("memory_available", get_memory_available) 
     # Gathering fresh system information
     battery_data = check_battery_status()
-    print("Battery Data: ", battery_data)
     memory_info = psutil.virtual_memory()
     disk_info = psutil.disk_usage('/')
     network_sent, network_received = get_network_io()