Implement working health check

ui/src/components/HealthBadge.tsx

@@ -1,49 +1,74 @@
 // ui/src/components/HealthBadge.tsx
-import React from 'react'
-import { Badge } from '@/components/ui/badge'
-import { HealthStatus } from '@/types/instance'
-import { CheckCircle, Loader2, XCircle } from 'lucide-react'
+import React from "react";
+import { Badge } from "@/components/ui/badge";
+import { HealthStatus } from "@/types/instance";
+import { CheckCircle, Loader2, XCircle } from "lucide-react";
 
 interface HealthBadgeProps {
-  health?: HealthStatus
+  health?: HealthStatus;
 }
 
 const HealthBadge: React.FC<HealthBadgeProps> = ({ health }) => {
-  if (!health) return null
+  if (!health) {
+    health = {
+      status: "unknown", // Default to unknown if not provided
+      lastChecked: new Date(), // Default to current date
+      message: undefined, // No message by default
+    };
+  }
 
   const getIcon = () => {
     switch (health.status) {
-      case 'ok': return <CheckCircle className="h-3 w-3" />
-      case 'loading': return <Loader2 className="h-3 w-3 animate-spin" />
-      case 'error': return <XCircle className="h-3 w-3" />
+      case "ok":
+        return <CheckCircle className="h-3 w-3" />;
+      case "loading":
+        return <Loader2 className="h-3 w-3 animate-spin" />;
+      case "error":
+        return <XCircle className="h-3 w-3" />;
+      case "unknown":
+        return <Loader2 className="h-3 w-3 animate-spin" />;
     }
-  }
+  };
 
   const getVariant = () => {
     switch (health.status) {
-      case 'ok': return 'default'
-      case 'loading': return 'outline'
-      case 'error': return 'destructive'
+      case "ok":
+        return "default";
+      case "loading":
+        return "outline";
+      case "error":
+        return "destructive";
+      case "unknown":
+        return "secondary";
     }
-  }
+  };
 
   const getText = () => {
     switch (health.status) {
-      case 'ok': return 'Ready'
-      case 'loading': return 'Loading'
-      case 'error': return 'Error'
+      case "ok":
+        return "Ready";
+      case "loading":
+        return "Loading";
+      case "error":
+        return "Error";
+      case "unknown":
+        return "Unknown";
     }
-  }
+  };
 
   return (
-    <Badge 
-      variant={getVariant()} 
-      className={`flex items-center gap-1.5 ${health.status === 'ok' ? 'bg-green-100 text-green-800 border-green-200 dark:bg-green-900 dark:text-green-200 dark:border-green-800' : ''}`}
+    <Badge
+      variant={getVariant()}
+      className={`flex items-center gap-1.5 ${
+        health.status === "ok"
+          ? "bg-green-100 text-green-800 border-green-200 dark:bg-green-900 dark:text-green-200 dark:border-green-800"
+          : ""
+      }`}
     >
       {getIcon()}
       <span className="text-xs">{getText()}</span>
     </Badge>
-  )
-}
+  );
+};
 
-export default HealthBadge
+export default HealthBadge;

ui/src/components/InstanceCard.tsx

@@ -1,11 +1,12 @@
+// ui/src/components/InstanceCard.tsx
 import { Button } from "@/components/ui/button";
-import { Badge } from "@/components/ui/badge";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Instance } from "@/types/instance";
 import { Edit, FileText, Play, Square, Trash2 } from "lucide-react";
 import LogsModal from "@/components/LogModal";
-import { useState } from "react";
 import HealthBadge from "@/components/HealthBadge";
+import { useState } from "react";
+import { useInstanceHealth } from "@/hooks/useInstanceHealth";
 
 interface InstanceCardProps {
   instance: Instance;
@@ -22,8 +23,8 @@ function InstanceCard({
   deleteInstance,
   editInstance,
 }: InstanceCardProps) {
-
   const [isLogsOpen, setIsLogsOpen] = useState(false);
+  const health = useInstanceHealth(instance.name, instance.running);
 
   const handleStart = () => {
     startInstance(instance.name);
@@ -55,7 +56,7 @@ function InstanceCard({
         <CardHeader className="pb-3">
           <div className="flex items-center justify-between">
             <CardTitle className="text-lg">{instance.name}</CardTitle>
-            {instance.running ? <HealthBadge health={instance.health} /> : <Badge variant="secondary">Stopped</Badge>}
+            {instance.running && <HealthBadge health={health} />}
           </div>
         </CardHeader>
 
@@ -122,4 +123,4 @@ function InstanceCard({
   );
 }
 
-export default InstanceCard;
+export default InstanceCard;

ui/src/components/InstanceList.tsx

@@ -1,11 +1,16 @@
+// ui/src/components/InstanceList.tsx
 import { useInstances } from '@/contexts/InstancesContext'
 import InstanceCard from '@/components/InstanceCard'
 import { Instance } from '@/types/instance'
+import { memo } from 'react'
 
 interface InstanceListProps {
   editInstance: (instance: Instance) => void
 }
 
+// Memoize InstanceCard to prevent re-renders when other instances change
+const MemoizedInstanceCard = memo(InstanceCard)
+
 function InstanceList({ editInstance }: InstanceListProps) {
   const { instances, loading, error, startInstance, stopInstance, deleteInstance } = useInstances()
 
@@ -48,7 +53,7 @@ function InstanceList({ editInstance }: InstanceListProps) {
       
       <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
         {instances.map((instance) => (
-          <InstanceCard 
+          <MemoizedInstanceCard 
             key={instance.name} 
             instance={instance}
             startInstance={startInstance}

ui/src/contexts/InstancesContext.tsx

@@ -1,7 +1,6 @@
 import { createContext, useContext, useState, useEffect, useCallback, ReactNode } from 'react'
-import { CreateInstanceOptions, Instance, HealthStatus } from '@/types/instance'
+import { CreateInstanceOptions, Instance } from '@/types/instance'
 import { instancesApi } from '@/lib/api'
-import { healthService } from '@/lib/healthService'
 
 interface InstancesContextState {
   instances: Instance[]
@@ -29,45 +28,29 @@ interface InstancesProviderProps {
 }
 
 export const InstancesProvider = ({ children }: InstancesProviderProps) => {
-  const [instances, setInstances] = useState<Instance[]>([])
+  const [instancesMap, setInstancesMap] = useState<Map<string, Instance>>(new Map())
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState<string | null>(null)
 
+  // Convert map to array for consumers
+  const instances = Array.from(instancesMap.values())
+
   const clearError = useCallback(() => {
     setError(null)
   }, [])
 
-  const updateInstanceHealth = useCallback((instanceName: string, health: HealthStatus) => {
-    setInstances(prev => prev.map(instance => 
-      instance.name === instanceName 
-        ? { ...instance, health }
-        : instance
-    ))
-  }, [])
-
-  useEffect(() => {
-    instances.forEach(instance => {
-      if (instance.running) {
-        healthService.startHealthCheck(
-          instance.name,
-          (health) => updateInstanceHealth(instance.name, health)
-        )
-      } else {
-        healthService.stopHealthCheck(instance.name)
-      }
-    })
-  }, [instances, updateInstanceHealth])
-
-  useEffect(() => {
-    return () => healthService.stopAll()
-  }, [])
-
   const fetchInstances = useCallback(async () => {
     try {
       setLoading(true)
       setError(null)
       const data = await instancesApi.list()
-      setInstances(data)
+      
+      // Convert array to map
+      const newMap = new Map<string, Instance>()
+      data.forEach(instance => {
+        newMap.set(instance.name, instance)
+      })
+      setInstancesMap(newMap)
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to fetch instances')
     } finally {
@@ -75,67 +58,100 @@ export const InstancesProvider = ({ children }: InstancesProviderProps) => {
     }
   }, [])
 
+  const updateInstanceInMap = useCallback((name: string, updates: Partial<Instance>) => {
+    setInstancesMap(prev => {
+      const newMap = new Map(prev)
+      const existing = newMap.get(name)
+      if (existing) {
+        newMap.set(name, { ...existing, ...updates })
+      }
+      return newMap
+    })
+  }, [])
+
   const createInstance = useCallback(async (name: string, options: CreateInstanceOptions) => {
     try {
       setError(null)
-      await instancesApi.create(name, options)
-      await fetchInstances()
+      const newInstance = await instancesApi.create(name, options)
+      
+      // Add to map directly
+      setInstancesMap(prev => {
+        const newMap = new Map(prev)
+        newMap.set(name, newInstance)
+        return newMap
+      })
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to create instance')
     }
-  }, [fetchInstances])
+  }, [])
 
   const updateInstance = useCallback(async (name: string, options: CreateInstanceOptions) => {
     try {
       setError(null)
-      await instancesApi.update(name, options)
-      await fetchInstances()
+      const updatedInstance = await instancesApi.update(name, options)
+      
+      // Update in map directly
+      setInstancesMap(prev => {
+        const newMap = new Map(prev)
+        newMap.set(name, updatedInstance)
+        return newMap
+      })
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to update instance')
     }
-  }, [fetchInstances])
+  }, [])
 
   const startInstance = useCallback(async (name: string) => {
     try {
       setError(null)
       await instancesApi.start(name)
-      await fetchInstances()
+      
+      // Update only this instance's running status
+      updateInstanceInMap(name, { running: true })
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to start instance')
     }
-  }, [fetchInstances])
+  }, [updateInstanceInMap])
 
   const stopInstance = useCallback(async (name: string) => {
     try {
       setError(null)
-      healthService.stopHealthCheck(name)
       await instancesApi.stop(name)
-      await fetchInstances()
+      
+      // Update only this instance's running status
+      updateInstanceInMap(name, { running: false })
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to stop instance')
     }
-  }, [fetchInstances])
+  }, [updateInstanceInMap])
 
   const restartInstance = useCallback(async (name: string) => {
     try {
       setError(null)
       await instancesApi.restart(name)
-      await fetchInstances()
+      
+      // Update only this instance's running status
+      updateInstanceInMap(name, { running: true })
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to restart instance')
     }
-  }, [fetchInstances])
+  }, [updateInstanceInMap])
 
   const deleteInstance = useCallback(async (name: string) => {
     try {
       setError(null)
-      healthService.stopHealthCheck(name)
       await instancesApi.delete(name)
-      await fetchInstances()
+      
+      // Remove from map directly
+      setInstancesMap(prev => {
+        const newMap = new Map(prev)
+        newMap.delete(name)
+        return newMap
+      })
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to delete instance')
     }
-  }, [fetchInstances])
+  }, [])
 
   useEffect(() => {
     fetchInstances()

ui/src/hooks/useInstanceHealth.ts

@@ -0,0 +1,25 @@
+// ui/src/hooks/useInstanceHealth.ts
+import { useState, useEffect } from 'react'
+import { HealthStatus } from '@/types/instance'
+import { healthService } from '@/lib/healthService'
+
+export function useInstanceHealth(instanceName: string, isRunning: boolean): HealthStatus | undefined {
+  const [health, setHealth] = useState<HealthStatus | undefined>()
+
+  useEffect(() => {
+    if (!isRunning) {
+      setHealth(undefined)
+      return
+    }
+
+    // Subscribe to health updates for this instance
+    const unsubscribe = healthService.subscribe(instanceName, (healthStatus) => {
+      setHealth(healthStatus)
+    })
+
+    // Cleanup subscription on unmount or when running changes
+    return unsubscribe
+  }, [instanceName, isRunning])
+
+  return health
+}

ui/src/lib/healthService.ts

@@ -1,9 +1,10 @@
-// ui/src/lib/healthService.ts
 import { HealthStatus } from '@/types/instance'
 
+type HealthCallback = (health: HealthStatus) => void
+
 class HealthService {
   private intervals: Map<string, NodeJS.Timeout> = new Map()
-  private startupTimeouts: Map<string, NodeJS.Timeout> = new Map()
+  private callbacks: Map<string, Set<HealthCallback>> = new Map()
 
   async checkHealth(instanceName: string): Promise<HealthStatus> {
     try {
@@ -37,37 +38,54 @@ class HealthService {
     }
   }
 
-  startHealthCheck(instanceName: string, onUpdate: (health: HealthStatus) => void): void {
-    // Don't start if already checking
-    if (this.isChecking(instanceName)) {
-      return
+  subscribe(instanceName: string, callback: HealthCallback): () => void {
+    if (!this.callbacks.has(instanceName)) {
+      this.callbacks.set(instanceName, new Set())
     }
     
-    const startupTimeout = setTimeout(() => {
-      this.startupTimeouts.delete(instanceName)
-      
-      const check = async () => {
-        const health = await this.checkHealth(instanceName)
-        onUpdate(health)
+    this.callbacks.get(instanceName)!.add(callback)
+
+    // Start health checking if this is the first subscriber
+    if (this.callbacks.get(instanceName)!.size === 1) {
+      this.startHealthCheck(instanceName)
+    }
+
+    // Return unsubscribe function
+    return () => {
+      const callbacks = this.callbacks.get(instanceName)
+      if (callbacks) {
+        callbacks.delete(callback)
+        
+        // Stop health checking if no more subscribers
+        if (callbacks.size === 0) {
+          this.stopHealthCheck(instanceName)
+          this.callbacks.delete(instanceName)
+        }
       }
-      
-      check()
-      const interval = setInterval(check, 60000)
-      this.intervals.set(instanceName, interval)
-    }, 2000)
-    
-    this.startupTimeouts.set(instanceName, startupTimeout)
+    }
   }
 
-  stopHealthCheck(instanceName: string): void {
-    // Clear startup timeout if exists
-    const startupTimeout = this.startupTimeouts.get(instanceName)
-    if (startupTimeout) {
-      clearTimeout(startupTimeout)
-      this.startupTimeouts.delete(instanceName)
+  private startHealthCheck(instanceName: string): void {
+    if (this.intervals.has(instanceName)) {
+      return // Already checking
     }
-    
-    // Clear interval if exists
+
+    // Initial check with delay
+    setTimeout(async () => {
+      const health = await this.checkHealth(instanceName)
+      this.notifyCallbacks(instanceName, health)
+      
+      // Start periodic checks
+      const interval = setInterval(async () => {
+        const health = await this.checkHealth(instanceName)
+        this.notifyCallbacks(instanceName, health)
+      }, 60000)
+      
+      this.intervals.set(instanceName, interval)
+    }, 2000)
+  }
+
+  private stopHealthCheck(instanceName: string): void {
     const interval = this.intervals.get(instanceName)
     if (interval) {
       clearInterval(interval)
@@ -75,16 +93,23 @@ class HealthService {
     }
   }
 
-  stopAll(): void {
-    this.startupTimeouts.forEach(timeout => clearTimeout(timeout))
-    this.startupTimeouts.clear()
-    this.intervals.forEach(interval => clearInterval(interval))
-    this.intervals.clear()
+  private notifyCallbacks(instanceName: string, health: HealthStatus): void {
+    const callbacks = this.callbacks.get(instanceName)
+    if (callbacks) {
+      callbacks.forEach(callback => callback(health))
+    }
   }
 
-  isChecking(instanceName: string): boolean {
-    return this.intervals.has(instanceName) || this.startupTimeouts.has(instanceName)
+  stopAll(): void {
+    this.intervals.forEach(interval => clearInterval(interval))
+    this.intervals.clear()
+    this.callbacks.clear()
   }
 }
 
-export const healthService = new HealthService()
+export const healthService = new HealthService()
+
+// Export the individual checkHealth function as well
+export async function checkHealth(instanceName: string): Promise<HealthStatus> {
+  return healthService.checkHealth(instanceName)
+}

ui/src/types/instance.ts

@@ -3,7 +3,7 @@ import { CreateInstanceOptions } from '@/schemas/instanceOptions'
 export { type CreateInstanceOptions } from '@/schemas/instanceOptions'
 
 export interface HealthStatus {
-  status: 'ok' | 'loading' | 'error'
+  status: 'ok' | 'loading' | 'error' | 'unknown'
   message?: string
   lastChecked: Date
 }
@@ -12,5 +12,4 @@ export interface Instance {
   name: string;
   running: boolean;
   options?: CreateInstanceOptions;
-  health?: HealthStatus;
 }