From 35a6f8b4aa2764ea895a7547516c3a305ab2c565 Mon Sep 17 00:00:00 2001
From: Leo dev <klesti.selimay@icloud.com>
Date: Thu, 17 Jul 2025 11:09:14 -0500
Subject: [PATCH] Live monitoring fix

---
 src/app/api/servers/servers.ts |  1 +
 src/app/dashboard/page.tsx     |  4 +---
 src/app/servers/Map.tsx        | 26 +++++++++++++-------------
 src/app/servers/page.tsx       | 11 ++++++++++-
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/app/api/servers/servers.ts b/src/app/api/servers/servers.ts
index bfb3b7d..248e309 100644
--- a/src/app/api/servers/servers.ts
+++ b/src/app/api/servers/servers.ts
@@ -6,6 +6,7 @@ export const useServer = (server: ServerAPI, index: number) => {
   ws.onmessage = (msg) => {
     try {
       if (deletes.has(index) || !currentServers[index]) {
+        deletes.delete(index);
         ws.close();
         return;
       }
diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx
index fc994e1..e70cade 100644
--- a/src/app/dashboard/page.tsx
+++ b/src/app/dashboard/page.tsx
@@ -76,11 +76,9 @@ export default function Dashboard() {
   useEffect(() => {
     getServers();
     const interval = setInterval(() => {
-      console.log("Refreshing servers data...");
       getServers();
     }, 3000);
-
-    // Cleanup on unmount
+    
     return () => clearInterval(interval);
   }, [session]);
 
diff --git a/src/app/servers/Map.tsx b/src/app/servers/Map.tsx
index 9f7ac13..c3ddf4e 100644
--- a/src/app/servers/Map.tsx
+++ b/src/app/servers/Map.tsx
@@ -24,7 +24,7 @@ export default function Map({ servers }: { servers: Server[] }) {
   const mapContainer = useRef<HTMLDivElement | null>(null);
   const map = useRef<maplibregl.Map | null>(null);
   const markers = useRef<maplibregl.Marker[]>([]);
-  const [sheet, setSheet] = useState<Server | undefined>();
+  const [sheet, setSheet] = useState<number | undefined>();
 
   // Initialize map only once
   useEffect(() => {
@@ -57,14 +57,14 @@ export default function Map({ servers }: { servers: Server[] }) {
     markers.current = [];
 
     // Add new markers
-    servers.forEach((server) => {
+    servers.forEach((server, i) => {
       if (server.coordinates) {
         const marker = new maplibregl.Marker({ color: "#ff3e00" })
           .setLngLat(server.coordinates)
           .addTo(map.current!);
 
         marker.getElement().addEventListener("click", () => {
-          setSheet(server);
+          setSheet(i);
         });
 
         markers.current.push(marker);
@@ -75,7 +75,7 @@ export default function Map({ servers }: { servers: Server[] }) {
   return (
     <div ref={mapContainer} className="w-full h-full">
       <Sheet open={sheet != undefined} onOpenChange={() => setSheet(undefined)}>
-        {sheet && (
+        {sheet != undefined && (
           <SheetContent>
             <SheetHeader>
               <div className="flex items-center gap-2">
@@ -83,15 +83,15 @@ export default function Map({ servers }: { servers: Server[] }) {
                   <ServerIcon className="w-4.5 h-4.5 text-current my-auto" />
                 </div>
                 <div>
-                  <SheetTitle>{sheet.name}</SheetTitle>
+                  <SheetTitle>{servers[sheet].name}</SheetTitle>
                   <SheetDescription className="flex gap-2">
-                    {sheet.status[0].toUpperCase() + sheet.status.slice(1)}{" "}
+                    {servers[sheet].status[0].toUpperCase() + servers[sheet].status.slice(1)}{" "}
                     {" · "}
-                    {sheet.ip}
-                    {sheet.location && (
+                    {servers[sheet].ip}
+                    {servers[sheet].location && (
                       <span className="flex items-center gap-0.5">
                         <MapPin size={14} />
-                        {sheet.location}
+                        {servers[sheet].location}
                       </span>
                     )}
                   </SheetDescription>
@@ -100,25 +100,25 @@ export default function Map({ servers }: { servers: Server[] }) {
             </SheetHeader>
             <div className="px-4 gap-4 flex flex-col">
               <UsageBar
-                value={sheet.cpu}
+                value={servers[sheet].cpu}
                 Icon={Cpu}
                 text="CPU"
                 color="var(--chart-2)"
               />
               <UsageBar
-                value={sheet.memory}
+                value={servers[sheet].memory}
                 Icon={MemoryStick}
                 text="Memory"
                 color="var(--chart-1)"
               />
               <UsageBar
-                value={sheet.storage}
+                value={servers[sheet].storage}
                 Icon={HardDrive}
                 text="Storage"
                 color="var(--chart-5)"
               />
               <ByteUnit
-                value={sheet.network}
+                value={servers[sheet].network}
                 Icon={Network}
                 text="Network"
                 color="var(--chart-3)"
diff --git a/src/app/servers/page.tsx b/src/app/servers/page.tsx
index cea10cf..c431cc4 100644
--- a/src/app/servers/page.tsx
+++ b/src/app/servers/page.tsx
@@ -16,12 +16,21 @@ export default function Servers() {
   const [searchedServers, setSearchedServers] = useState<Server[]>([]);
   const [serversQuery, setServersQuery] = useState("");
 
-  useEffect(() => {
+  const getServers = () => {
     if (!session) return;
 
     session.getServers().then((servers) => {
       setServers(servers);
     });
+  };
+
+  useEffect(() => {
+    getServers();
+    const interval = setInterval(() => {
+      getServers();
+    }, 3000);
+
+    return () => clearInterval(interval);
   }, [session]);
 
   useEffect(() => {