Refactor Besu installation process and enhance error handling

- Updated error messages in the Besu installation process for improved clarity, changing "Docker daemon" to "docker daemon" for consistency.
- Removed redundant symlink creation and verification steps in the installation method, streamlining the process.
- Enhanced the ChaincodeDefinitionCard component by removing the deploy mutation logic, delegating it to the DeployChaincodeDialog for better separation of concerns.
- Simplified the DeployChaincodeDialog by removing unused imports and ensuring it integrates smoothly with the updated deployment logic.

These changes improve the maintainability and clarity of the Besu installation and chaincode management processes, enhancing overall user experience.

Signed-off-by: David VIEJO <dviejo@kungfusoftware.es>

Author: dviejokfs

pkg/nodes/besu/besu.go

@@ -227,7 +227,7 @@ func (b *LocalBesu) checkPrerequisites() error {
 		// Ping Docker daemon to verify connectivity
 		ctx := context.Background()
 		if _, err := cli.Ping(ctx); err != nil {
-			return fmt.Errorf("Docker daemon is not running or not accessible: %w", err)
+			return fmt.Errorf("docker daemon is not running or not accessible: %w", err)
 		}
 	}
 
@@ -348,15 +348,6 @@ func (b *LocalBesu) installBesu() error {
 
 	b.logger.Info("Installing Besu binary", "version", b.opts.Version, "platform", runtime.GOOS)
 
-	if runtime.GOOS == "darwin" {
-		err := b.installBesuMacOS()
-		if err != nil {
-			return err
-		}
-		b.logger.Info("Besu installed via Homebrew", "path", besuBinary)
-		return nil
-	}
-
 	err := b.downloadBesu(b.opts.Version)
 	if err != nil {
 		return err
@@ -551,82 +542,6 @@ func copyDir(src string, dst string) error {
 	return nil
 }
 
-func (b *LocalBesu) installBesuMacOS() error {
-	// Check if brew is installed
-	if _, err := exec.LookPath("brew"); err != nil {
-		return fmt.Errorf("homebrew is not installed: %w", err)
-	}
-
-	// Add hyperledger/besu tap if not already added
-	tapCmd := exec.Command("brew", "tap", "hyperledger/besu")
-	if err := tapCmd.Run(); err != nil {
-		return fmt.Errorf("failed to tap hyperledger/besu: %w", err)
-	}
-
-	// Check if besu is already installed
-	checkCmd := exec.Command("brew", "list", "hyperledger/besu/besu")
-	if checkCmd.Run() == nil {
-		// Besu is installed, check version
-		versionCmd := exec.Command("besu", "--version")
-		output, err := versionCmd.Output()
-		if err != nil {
-			return fmt.Errorf("failed to get installed Besu version: %w", err)
-		}
-
-		// Parse installed version
-		installedVersion := strings.TrimSpace(string(output))
-		if strings.Contains(installedVersion, b.opts.Version) {
-			// Correct version is already installed, create symlink structure
-			return b.createMacOSBinaryStructure()
-		}
-
-		// Uninstall current version if it's different
-		uninstallCmd := exec.Command("brew", "uninstall", "hyperledger/besu/besu")
-		if err := uninstallCmd.Run(); err != nil {
-			return fmt.Errorf("failed to uninstall existing Besu version: %w", err)
-		}
-	}
-
-	// Install specific version
-	installCmd := exec.Command("brew", "install", "hyperledger/besu/besu")
-	if output, err := installCmd.CombinedOutput(); err != nil {
-		return fmt.Errorf("failed to install Besu %s: %w\nOutput: %s", b.opts.Version, err, string(output))
-	}
-
-	// Create binary structure
-	return b.createMacOSBinaryStructure()
-}
-
-// createMacOSBinaryStructure creates the proper directory structure and symlinks for macOS
-func (b *LocalBesu) createMacOSBinaryStructure() error {
-	binDir := filepath.Join(b.configService.GetDataPath(), "bin/besu", b.opts.Version)
-
-	// Create the bin directory structure
-	if err := os.MkdirAll(filepath.Join(binDir, "bin"), 0755); err != nil {
-		return fmt.Errorf("failed to create bin directory: %w", err)
-	}
-
-	// Determine the Homebrew binary path
-	brewPrefix := "/usr/local/opt/besu/bin/besu"
-	if runtime.GOARCH == "arm64" {
-		brewPrefix = "/opt/homebrew/opt/besu/bin/besu"
-	}
-
-	// Create symlink to our bin directory
-	targetBinary := b.GetBinaryPath()
-	if err := os.Symlink(brewPrefix, targetBinary); err != nil && !os.IsExist(err) {
-		return fmt.Errorf("failed to create symlink: %w", err)
-	}
-
-	// Verify the symlink works
-	if _, err := os.Stat(targetBinary); err != nil {
-		return fmt.Errorf("failed to verify symlink: %w", err)
-	}
-
-	b.logger.Info("Created Besu binary symlink", "path", targetBinary, "target", brewPrefix)
-	return nil
-}
-
 // TailLogs tails the logs of the besu service
 func (b *LocalBesu) TailLogs(ctx context.Context, tail int, follow bool) (<-chan string, error) {
 	logChan := make(chan string, 100)

web/src/components/fabric/ChaincodeDefinitionCard.tsx

@@ -125,16 +125,6 @@ export function ChaincodeDefinitionCard({ definition: v, DefinitionTimelineCompo
 		},
 	})
 
-	// Deploy mutation - now handled by DeployChaincodeDialog
-	const deployMutation = useMutation({
-		...postScFabricDefinitionsByDefinitionIdDeployMutation(),
-		onSuccess: () => {
-			setTimelineKey((prev) => prev + 1)
-			onSuccess?.()
-			refetch?.()
-		},
-	})
-
 	// Undeploy mutation
 	const stopMutation = useMutation({
 		...postScFabricDefinitionsByDefinitionIdUndeployMutation(),

web/src/components/fabric/DeployChaincodeDialog.tsx

@@ -1,7 +1,7 @@
 import { postScFabricDefinitionsByDefinitionIdDeployMutation } from '@/api/client/@tanstack/react-query.gen'
 import { Button } from '@/components/ui/button'
 import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'
-import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form'
+import { Form, FormLabel } from '@/components/ui/form'
 import { Input } from '@/components/ui/input'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { useMutation } from '@tanstack/react-query'
@@ -183,4 +183,4 @@ function DeployChaincodeDialog({ deployDialogOpen, setDeployDialogOpen, definiti
 	)
 }
 
-export { DeployChaincodeDialog } 
+export { DeployChaincodeDialog }

web/src/pages/nodes/[id].tsx

@@ -13,7 +13,7 @@ import { BesuNodeDetails } from '@/components/nodes/BesuNodeDetails'
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/components/ui/alert-dialog'
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'
 import { TimeAgo } from '@/components/ui/time-ago'
 import { cn } from '@/lib/utils'
@@ -131,9 +131,10 @@ export default function NodeDetailPage() {
 	const [searchParams, setSearchParams] = useSearchParams()
 	const [logs, setLogs] = useState<string>('')
 	const logsRef = useRef<HTMLTextAreaElement>(null)
-	const abortControllerRef = useRef<AbortController | null>(null)
+	const eventSourceRef = useRef<EventSource | null>(null)
 	const [showRenewCertDialog, setShowRenewCertDialog] = useState(false)
 	const [showDeleteDialog, setShowDeleteDialog] = useState(false)
+	const [logRefreshKey, setLogRefreshKey] = useState(0)
 
 	// Get the active tab from URL or default to 'logs'
 	const activeTab = searchParams.get('tab') || 'logs'
@@ -158,33 +159,27 @@ export default function NodeDetailPage() {
 	const startNode = useMutation({
 		...postNodesByIdStartMutation(),
 		onSuccess: () => {
-			toast.success('Node started successfully')
+			refetchEvents()
 			refetch()
-		},
-		onError: (error: any) => {
-			toast.error(`Failed to start node: ${(error as any).error.message}`)
+			setLogRefreshKey(prev => prev + 1)
 		},
 	})
 
 	const stopNode = useMutation({
 		...postNodesByIdStopMutation(),
 		onSuccess: () => {
-			toast.success('Node stopped successfully')
+			refetchEvents()
 			refetch()
-		},
-		onError: (error: any) => {
-			toast.error(`Failed to stop node: ${(error as any).error.message}`)
+			setLogRefreshKey(prev => prev + 1)
 		},
 	})
 
 	const restartNode = useMutation({
 		...postNodesByIdRestartMutation(),
 		onSuccess: () => {
-			toast.success('Node restarted successfully')
+			refetchEvents()
 			refetch()
-		},
-		onError: (error: any) => {
-			toast.error(`Failed to restart node: ${(error as any).error.message}`)
+			setLogRefreshKey(prev => prev + 1)
 		},
 	})
 
@@ -214,22 +209,46 @@ export default function NodeDetailPage() {
 		}),
 	})
 
+	// Function to refresh logs by restarting the EventSource connection
+	const refreshLogs = () => {
+		setLogRefreshKey(prev => prev + 1)
+		setLogs('') // Clear existing logs
+	}
+
 	const handleAction = async (action: string) => {
 		if (!node) return
 
 		try {
 			switch (action) {
 				case 'start':
-					await startNode.mutateAsync({ path: { id: node.id! } })
-					refetchEvents()
+					await toast.promise(
+						startNode.mutateAsync({ path: { id: node.id! } }),
+						{
+							loading: 'Starting node...',
+							success: 'Node started successfully',
+							error: (error: any) => `Failed to start node: ${error?.error?.message || error.message}`,
+						}
+					)
 					break
 				case 'stop':
-					await stopNode.mutateAsync({ path: { id: node.id! } })
-					refetchEvents()
+					await toast.promise(
+						stopNode.mutateAsync({ path: { id: node.id! } }),
+						{
+							loading: 'Stopping node...',
+							success: 'Node stopped successfully',
+							error: (error: any) => `Failed to stop node: ${error?.error?.message || error.message}`,
+						}
+					)
 					break
 				case 'restart':
-					await restartNode.mutateAsync({ path: { id: node.id! } })
-					refetchEvents()
+					await toast.promise(
+						restartNode.mutateAsync({ path: { id: node.id! } }),
+						{
+							loading: 'Restarting node...',
+							success: 'Node restarted successfully',
+							error: (error: any) => `Failed to restart node: ${error?.error?.message || error.message}`,
+						}
+					)
 					break
 				case 'delete':
 					setShowDeleteDialog(true)
@@ -239,7 +258,7 @@ export default function NodeDetailPage() {
 					break
 			}
 		} catch (error) {
-			// Error handling is done in the mutation callbacks
+			// Error handling is now done by toast.promise
 		}
 	}
 
@@ -257,10 +276,16 @@ export default function NodeDetailPage() {
 	}
 
 	useEffect(() => {
+		// Close existing EventSource if it exists
+		if (eventSourceRef.current) {
+			eventSourceRef.current.close()
+		}
+
 		const eventSource = new EventSource(`/api/v1/nodes/${id}/logs?follow=true`, {
 			withCredentials: true,
 		})
 
+		eventSourceRef.current = eventSource
 		let fullText = ''
 
 		eventSource.onmessage = (event) => {
@@ -284,8 +309,11 @@ export default function NodeDetailPage() {
 
 		return () => {
 			eventSource.close()
+			if (eventSourceRef.current === eventSource) {
+				eventSourceRef.current = null
+			}
 		}
-	}, [id])
+	}, [id, logRefreshKey])
 
 	if (isLoading) {
 		return <div>Loading...</div>