feat(tray): connection manager

Signed-off-by: Chris Gianelloni <wolf31o2@blinklabs.io>

Author: wolf31o2

tray/app.go

@@ -16,15 +16,17 @@ package tray
 
 import (
 	"log/slog"
+	"os/exec"
+	"runtime"
 
 	"fyne.io/systray"
 )
 
 // App holds references to all major components of the tray
 // application.
 type App struct {
-	config  TrayConfig
-	process *ProcessManager
+	config TrayConfig
+	conn   *ConnectionManager
 }
 
 // NewApp creates and initialises the tray application.
@@ -40,9 +42,9 @@ func NewApp() (*App, error) {
 
 	a := &App{
 		config: cfg,
-		process: NewProcessManager(
-			WithBinary(cfg.AdderBinary),
-			WithConfigFile(cfg.AdderConfig),
+		conn: NewConnectionManager(
+			WithConnectionAddress(cfg.APIAddress),
+			WithConnectionPort(cfg.APIPort),
 		),
 	}
 
@@ -55,43 +57,65 @@ func (a *App) Run() {
 }
 
 // onReady is called when the system tray is initialised. It
-// configures the tray icon, menu, and starts adder if configured.
+// configures the tray icon, menu, and connects to adder if
+// configured.
 func (a *App) onReady() {
 	systray.SetTitle("Adder")
 	systray.SetTooltip("Adder - Cardano Event Streamer")
 
-	mStart := systray.AddMenuItem("Start", "Start adder")
-	mStop := systray.AddMenuItem("Stop", "Stop adder")
-	mRestart := systray.AddMenuItem(
-		"Restart", "Restart adder",
+	mStatus := systray.AddMenuItem(
+		"Status: "+a.conn.status.Status().String(), "",
 	)
+	mStatus.Disable()
 	systray.AddSeparator()
+
+	mConnect := systray.AddMenuItem("Connect", "Connect to adder")
+	mDisconnect := systray.AddMenuItem(
+		"Disconnect", "Disconnect from adder",
+	)
+	mReconnect := systray.AddMenuItem(
+		"Reconnect", "Reconnect to adder",
+	)
+	systray.AddSeparator()
+
+	mShowConfig := systray.AddMenuItem(
+		"Show Config Folder", "Open the config directory",
+	)
+	mShowLogs := systray.AddMenuItem(
+		"Show Logs", "Open the log directory",
+	)
+	systray.AddSeparator()
+
 	mQuit := systray.AddMenuItem("Quit", "Quit adder-tray")
 
+	// Update status menu item when connection status changes
+	a.conn.status.OnChange(func(s Status) {
+		mStatus.SetTitle("Status: " + s.String())
+	})
+
 	go func() {
 		for {
 			select {
-			case <-mStart.ClickedCh:
-				if err := a.process.Start(); err != nil {
-					slog.Error(
-						"failed to start adder",
-						"error", err,
-					)
-				}
-			case <-mStop.ClickedCh:
-				if err := a.process.Stop(); err != nil {
+			case <-mConnect.ClickedCh:
+				if err := a.conn.Connect(); err != nil {
 					slog.Error(
-						"failed to stop adder",
+						"failed to connect",
 						"error", err,
 					)
 				}
-			case <-mRestart.ClickedCh:
-				if err := a.process.Restart(); err != nil {
+			case <-mDisconnect.ClickedCh:
+				a.conn.Disconnect()
+			case <-mReconnect.ClickedCh:
+				if err := a.conn.Reconnect(); err != nil {
 					slog.Error(
-						"failed to restart adder",
+						"failed to reconnect",
 						"error", err,
 					)
 				}
+			case <-mShowConfig.ClickedCh:
+				openFolder(ConfigDir())
+			case <-mShowLogs.ClickedCh:
+				openFolder(LogDir())
 			case <-mQuit.ClickedCh:
 				systray.Quit()
 				return
@@ -102,31 +126,42 @@ func (a *App) onReady() {
 	slog.Info("starting adder-tray")
 
 	if a.config.AutoStart {
-		if err := a.process.Start(); err != nil {
+		if err := a.conn.Connect(); err != nil {
 			slog.Error(
-				"failed to auto-start adder",
+				"failed to auto-connect to adder",
 				"error", err,
 			)
 		}
 	}
 }
 
-// onExit is called when the system tray is shutting down.
+// onExit is called when the system tray is shutting down. It
+// disconnects the WS client but does NOT stop the adder service.
 func (a *App) onExit() {
 	slog.Info("shutting down adder-tray")
-
-	if a.process.IsRunning() {
-		if err := a.process.Stop(); err != nil {
-			slog.Error(
-				"error stopping adder during shutdown",
-				"error", err,
-			)
-		}
-	}
+	a.conn.Disconnect()
 }
 
-// Shutdown requests a graceful shutdown of the tray application
-// and its managed adder process.
+// Shutdown requests a graceful shutdown of the tray application.
 func (a *App) Shutdown() {
 	systray.Quit()
 }
+
+// openFolder opens the given directory in the platform file manager.
+func openFolder(dir string) {
+	var cmd string
+	switch runtime.GOOS {
+	case "darwin":
+		cmd = "open"
+	case "windows":
+		cmd = "explorer"
+	default:
+		cmd = "xdg-open"
+	}
+	p := exec.Command(cmd, dir) //nolint:gosec // directory path from internal config
+	if err := p.Start(); err != nil {
+		slog.Error("failed to open folder", "dir", dir, "error", err)
+		return
+	}
+	_ = p.Process.Release()
+}

tray/config.go

@@ -26,19 +26,22 @@ const configFileName = "adder-tray.yaml"
 
 // TrayConfig holds the configuration for the adder-tray application.
 type TrayConfig struct {
-	// AdderBinary is the path to the adder binary.
-	AdderBinary string `yaml:"adder_binary"`
+	// APIAddress is the address of the adder API server.
+	APIAddress string `yaml:"api_address"`
+	// APIPort is the port of the adder API server.
+	APIPort uint `yaml:"api_port"`
 	// AdderConfig is the path to the adder configuration file.
 	AdderConfig string `yaml:"adder_config"`
-	// AutoStart controls whether adder starts automatically
-	// with the tray application.
+	// AutoStart controls whether the tray connects to adder
+	// automatically on launch.
 	AutoStart bool `yaml:"auto_start"`
 }
 
 // DefaultConfig returns a TrayConfig with sensible defaults.
 func DefaultConfig() TrayConfig {
 	return TrayConfig{
-		AdderBinary: "adder",
+		APIAddress:  "127.0.0.1",
+		APIPort:     8080,
 		AdderConfig: "",
 		AutoStart:   false,
 	}
@@ -73,9 +76,24 @@ func LoadConfig() (TrayConfig, error) {
 		return cfg, fmt.Errorf("parsing config: %w", err)
 	}
 
+	if err := validateConfig(cfg); err != nil {
+		return cfg, err
+	}
+
 	return cfg, nil
 }
 
+// validateConfig checks that required TrayConfig fields are set.
+func validateConfig(cfg TrayConfig) error {
+	if cfg.APIAddress == "" {
+		return fmt.Errorf("invalid config: api_address must not be empty")
+	}
+	if cfg.APIPort == 0 {
+		return fmt.Errorf("invalid config: api_port must be greater than 0")
+	}
+	return nil
+}
+
 // SaveConfig writes the tray configuration to disk, creating the
 // config directory if necessary.
 func SaveConfig(cfg TrayConfig) error {

tray/config_test.go

@@ -42,7 +42,8 @@ func TestConfigPath(t *testing.T) {
 
 func TestDefaultConfig(t *testing.T) {
 	cfg := DefaultConfig()
-	assert.Equal(t, "adder", cfg.AdderBinary)
+	assert.Equal(t, "127.0.0.1", cfg.APIAddress)
+	assert.Equal(t, uint(8080), cfg.APIPort)
 	assert.Equal(t, "", cfg.AdderConfig)
 	assert.False(t, cfg.AutoStart)
 }
@@ -70,7 +71,8 @@ func TestSaveAndLoadConfig(t *testing.T) {
 	t.Setenv("XDG_CONFIG_HOME", tmpDir)
 
 	original := TrayConfig{
-		AdderBinary: "/usr/local/bin/adder",
+		APIAddress:  "192.168.1.100",
+		APIPort:     9090,
 		AdderConfig: "/etc/adder/config.yaml",
 		AutoStart:   true,
 	}
@@ -87,6 +89,53 @@ func TestSaveAndLoadConfig(t *testing.T) {
 	assert.Equal(t, original, loaded)
 }
 
+func TestLoadConfigInvalidAddress(t *testing.T) {
+	if runtime.GOOS != "linux" {
+		t.Skip("XDG_CONFIG_HOME only applies on Linux")
+	}
+	tmpDir := t.TempDir()
+	t.Setenv("XDG_CONFIG_HOME", tmpDir)
+
+	// Write a config with empty api_address
+	err := SaveConfig(TrayConfig{
+		APIAddress: "placeholder",
+		APIPort:    8080,
+	})
+	require.NoError(t, err)
+
+	// Overwrite with invalid content
+	err = os.WriteFile(
+		ConfigPath(),
+		[]byte("api_address: \"\"\napi_port: 8080\n"),
+		0o600,
+	)
+	require.NoError(t, err)
+
+	_, err = LoadConfig()
+	assert.ErrorContains(t, err, "api_address")
+}
+
+func TestLoadConfigInvalidPort(t *testing.T) {
+	if runtime.GOOS != "linux" {
+		t.Skip("XDG_CONFIG_HOME only applies on Linux")
+	}
+	tmpDir := t.TempDir()
+	t.Setenv("XDG_CONFIG_HOME", tmpDir)
+
+	err := os.MkdirAll(filepath.Dir(ConfigPath()), 0o700)
+	require.NoError(t, err)
+
+	err = os.WriteFile(
+		ConfigPath(),
+		[]byte("api_address: \"127.0.0.1\"\napi_port: 0\n"),
+		0o600,
+	)
+	require.NoError(t, err)
+
+	_, err = LoadConfig()
+	assert.ErrorContains(t, err, "api_port")
+}
+
 func TestConfigExists(t *testing.T) {
 	if runtime.GOOS != "linux" {
 		t.Skip("XDG_CONFIG_HOME only applies on Linux")