Update app.py

app.py

@@ -242,7 +242,7 @@ htmlTemplate = f"""
         this.servers = new Map();
         this.instanceOwners = new Map();
         this.spaceIds = new Map();
-        this.lastMetrics = new Map(); // Store last metrics for each instance
+        this.lastData = new Map(); // Store last received data
       }}
 
       async connect(instanceId, username) {{
@@ -257,7 +257,7 @@ htmlTemplate = f"""
             eventSource.addEventListener("metric", (event) => {{
                 try {{
                     const data = JSON.parse(event.data);
-                    this.lastMetrics.set(instanceId, data); // Store the received data
+                    this.lastData.set(instanceId, data); // Store the data
                     updateServerCard(data, instanceId);
                 }} catch (error) {{
                     console.error(`解析数据失败 (${{instanceId}}):`, error);
@@ -280,6 +280,10 @@ htmlTemplate = f"""
         this.eventSources.forEach(es => es.close());
         this.eventSources.clear();
       }}
+
+      getLastData(instanceId) {{
+          return this.lastData.get(instanceId);
+      }}
     }}
 
     const metricsManager = new MetricsManager();
@@ -366,41 +370,26 @@ htmlTemplate = f"""
       let totalUpload = 0;
       let totalDownload = 0;
 
-      for (const [instanceId, lastMetric] of metricsManager.lastMetrics) {
-        const serverId = instanceId;  // instanceId is the same as serverId in this context
+      servers.forEach((lastSeen, serverId) => {
+        const isOnline = (now - lastSeen) < 10000;
         const serverCard = document.getElementById(`server-${serverId}`);
 
         if (serverCard) {
-          const lastSeen = servers.get(serverId);
-          const isOnline = lastSeen && (now - lastSeen) < 10000;
           const statusDot = serverCard.querySelector('.status-dot');
           statusDot.className = `status-dot status-${isOnline ? 'online' : 'offline'}`;
 
-          if (isOnline && lastMetric) {
-            totalUpload += lastMetric.tx_bps;
-            totalDownload += lastMetric.rx_bps;
-            online++;
-          } else if (!isOnline) {
-            offline++;
-          }
-        }
-      }
-
-      // Count servers that might not have metrics yet (newly added)
-      let totalServers = servers.size;
-        for (let serverId of servers.keys()) {
-            if (!metricsManager.lastMetrics.has(serverId)) {
-              const lastSeen = servers.get(serverId);
-              if (lastSeen && (now-lastSeen) < 10000){
-                online++;
-              } else {
-                offline++;
+          if (isOnline) {
+              const lastData = metricsManager.getLastData(serverId.split(" ")[0]); // Use the correct instanceId
+              if(lastData) {
+                totalUpload += lastData.tx_bps;
+                totalDownload += lastData.rx_bps;
               }
-            }
+          }
         }
+        isOnline ? online++ : offline++;
+      });
 
-
-      document.getElementById('totalServers').textContent = totalServers;
+      document.getElementById('totalServers').textContent = servers.size;
       document.getElementById('onlineServers').textContent = online;
       document.getElementById('offlineServers').textContent = offline;
       document.getElementById('totalUpload').textContent = `${formatBytes(totalUpload)}/s`;