Better terminal resizing and improve error handling (#146)

Author: amalshaji

tunnel/cmd/portr/start.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"log"
 
 	"os"
@@ -50,8 +49,6 @@ func startTunnels(c *cli.Context, tunnelFromCli *config.Tunnel) error {
 		}
 	}()
 
-	fmt.Println("🚨 Portr inspector running on http://localhost:7777")
-
 	signalCh := make(chan os.Signal, 1)
 	signal.Notify(signalCh, os.Interrupt, syscall.SIGTERM)
 	<-signalCh

tunnel/internal/client/ssh/ssh.go

@@ -356,7 +356,7 @@ func (s *SshClient) logHttpRequest(
 	// Get tunnel name
 	tunnelName := s.config.Tunnel.Name
 	if tunnelName == "" {
-		tunnelName = fmt.Sprintf(":%d", s.config.Tunnel.Port)
+		tunnelName = fmt.Sprintf("%d", s.config.Tunnel.Port)
 	}
 
 	// Send log directly to TUI
@@ -442,12 +442,25 @@ func (s *SshClient) Start(ctx context.Context) {
 	// Wait for either an error or successful connection
 	select {
 	case err := <-errChan:
-		// Update TUI with error and exit
+		// Update TUI with error and wait for it to quit
 		s.tui.Send(tui.ErrorMsg{Error: err})
-		time.Sleep(time.Second) // Give TUI time to show error
-		os.Exit(1)
-	case <-time.After(5 * time.Second):
 
+		// Wait for TUI to quit
+		done := make(chan struct{})
+		go func() {
+			s.tui.Wait()
+			close(done)
+		}()
+
+		// Wait for either context cancellation or TUI to quit
+		select {
+		case <-ctx.Done():
+			os.Exit(1)
+		case <-done:
+			os.Exit(1)
+		}
+
+	case <-time.After(5 * time.Second):
 		// Start the health check routine for http connections
 		if s.config.Tunnel.Type == constants.Http {
 			s.StartHealthCheck(ctx)

tunnel/internal/client/tui/tui.go

@@ -16,6 +16,8 @@ type ErrorMsg struct {
 	Error error
 }
 
+type QuitMsg struct{}
+
 type AddTunnelMsg struct {
 	Config       *config.Tunnel
 	ClientConfig *config.ClientConfig
@@ -91,33 +93,42 @@ type model struct {
 }
 
 func New(debug bool) *tea.Program {
-	// Regular table setup
+	// Initial default widths
+	const (
+		timeWidth   = 12
+		tunnelWidth = 15
+		methodWidth = 8
+		statusWidth = 8
+		urlWidth    = 50
+	)
+
+	// Regular table setup with minimum widths
 	columns := []table.Column{
-		{Title: "Time", Width: 12},
-		{Title: "Tunnel", Width: 15},
-		{Title: "Method", Width: 8},
-		{Title: "Status", Width: 8},
-		{Title: "URL", Width: 50},
+		{Title: "Time", Width: timeWidth},
+		{Title: "Tunnel", Width: tunnelWidth},
+		{Title: "Method", Width: methodWidth},
+		{Title: "Status", Width: statusWidth},
+		{Title: "URL", Width: urlWidth},
 	}
 
 	t := table.New(
 		table.WithColumns(columns),
 		table.WithFocused(true),
-		table.WithHeight(15),
+		table.WithHeight(10), // Reduced default height
 	)
 
-	// Debug table setup
+	// Debug table setup with minimum widths
 	debugColumns := []table.Column{
-		{Title: "Time", Width: 12},
-		{Title: "Level", Width: 8},
-		{Title: "Message", Width: 50},
-		{Title: "Error", Width: 30},
+		{Title: "Time", Width: timeWidth},
+		{Title: "Level", Width: methodWidth},
+		{Title: "Message", Width: 30},
+		{Title: "Error", Width: 20},
 	}
 
 	dt := table.New(
 		table.WithColumns(debugColumns),
 		table.WithFocused(false),
-		table.WithHeight(10),
+		table.WithHeight(6), // Reduced default height
 	)
 
 	// Set styles for both tables
@@ -127,10 +138,6 @@ func New(debug bool) *tea.Program {
 		BorderForeground(lipgloss.Color("240")).
 		BorderBottom(true).
 		Bold(false)
-	s.Selected = s.Selected.
-		Foreground(lipgloss.Color("229")).
-		Background(lipgloss.Color("57")).
-		Bold(false)
 
 	t.SetStyles(s)
 	dt.SetStyles(s)
@@ -164,29 +171,24 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
+		if m.err != nil {
+			// Any key press when there's an error will quit
+			m.quitting = true
+			return m, tea.Quit
+		}
+
 		switch msg.String() {
 		case "q", "ctrl+c":
 			m.quitting = true
 			return m, tea.Quit
-
-		case "tab":
-			// Cycle through tunnels
-			var ports []string
-			for port := range m.tunnels {
-				ports = append(ports, port)
-			}
-			if len(ports) > 0 {
-				for i, port := range ports {
-					if port == m.selected {
-						m.selected = ports[(i+1)%len(ports)]
-						break
-					}
-				}
-			}
 		}
 
 	case ErrorMsg:
 		m.err = msg.Error
+		// Don't quit immediately, let the user see the error
+		return m, nil
+
+	case QuitMsg:
 		m.quitting = true
 		return m, tea.Quit
 
@@ -207,8 +209,54 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 
 	case tea.WindowSizeMsg:
-		m.table.SetWidth(msg.Width - 4)
-		m.debugTable.SetWidth(msg.Width - 4)
+		// Calculate dynamic widths based on terminal size
+		totalWidth := msg.Width - 4 // Account for margins
+
+		// Adjust table heights based on terminal height
+		tableHeight := (msg.Height - 15) / 2 // Account for headers and other UI elements
+		tableHeight = max(tableHeight, 5)
+
+		m.table.SetHeight(tableHeight)
+
+		if m.debug {
+			m.debugTable.SetHeight(tableHeight / 2)
+		}
+
+		// Adjust URL column width to fill remaining space
+		timeWidth := 12
+		tunnelWidth := 15
+		methodWidth := 8
+		statusWidth := 8
+		urlWidth := totalWidth - (timeWidth + tunnelWidth + methodWidth + statusWidth + 5)
+
+		urlWidth = max(urlWidth, 20)
+
+		// Update main table columns
+		cols := []table.Column{
+			{Title: "Time", Width: timeWidth},
+			{Title: "Tunnel", Width: tunnelWidth},
+			{Title: "Method", Width: methodWidth},
+			{Title: "Status", Width: statusWidth},
+			{Title: "URL", Width: urlWidth},
+		}
+		m.table.SetColumns(cols)
+
+		// Update debug table columns if debug is enabled
+		if m.debug {
+			debugWidth := totalWidth / 2
+			debugWidth = max(debugWidth, 40)
+
+			debugCols := []table.Column{
+				{Title: "Time", Width: timeWidth},
+				{Title: "Level", Width: methodWidth},
+				{Title: "Message", Width: debugWidth / 2},
+				{Title: "Error", Width: debugWidth / 2},
+			}
+			m.debugTable.SetColumns(debugCols)
+		}
+
+		m.table.SetWidth(totalWidth)
+		m.debugTable.SetWidth(totalWidth)
 		return m, nil
 
 	case tickMsg:
@@ -231,11 +279,16 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 func (m model) View() string {
 	if m.quitting {
 		if m.err != nil {
-			return errorStyle.Render(fmt.Sprintf("Error: %v\n", m.err))
+			return "\n" + errorStyle.Render(fmt.Sprintf("Error: %v", m.err)) + "\n"
 		}
 		return "Goodbye!\n"
 	}
 
+	if m.err != nil {
+		return "\n" + errorStyle.Render(fmt.Sprintf("Error: %v", m.err)) + "\n\n" +
+			subtitleStyle.Render("Press any key to exit...") + "\n"
+	}
+
 	var s string
 
 	s += titleStyle.Render("🌍 Portr Tunnel Dashboard") + "\n"
@@ -300,12 +353,20 @@ func (m model) View() string {
 	}
 	s += "\n"
 
-	// Just render the table - no need to query DB
+	// Add waiting message if no logs
+	if len(m.table.Rows()) == 0 {
+		// Create empty table with just headers
+		m.table.SetRows([]table.Row{{"", "", "", "", "Waiting for logs..."}})
+	}
 	s += tableStyle.Render(m.table.View()) + "\n"
 
 	// Show debug table if debug mode is enabled
 	if m.debug {
 		s += "\n" + titleStyle.Render("🔍 Debug Logs") + "\n"
+		if len(m.debugTable.Rows()) == 0 {
+			// Create empty debug table with just headers
+			m.debugTable.SetRows([]table.Row{{"", "", "Waiting for logs...", ""}})
+		}
 		s += tableStyle.Render(m.debugTable.View()) + "\n"
 	}
 
@@ -317,6 +378,11 @@ func (m model) View() string {
 }
 
 func (m *model) AddLog(msg AddLogMsg) {
+	// Clear waiting message if it exists
+	if len(m.table.Rows()) == 1 && m.table.Rows()[0][4] == "Waiting for logs..." {
+		m.table.SetRows([]table.Row{})
+	}
+
 	rows := []table.Row{{
 		msg.Time,
 		msg.Name,
@@ -342,6 +408,11 @@ func (m *model) AddDebugLog(msg AddDebugLogMsg) {
 		return
 	}
 
+	// Clear waiting message if it exists
+	if len(m.debugTable.Rows()) == 1 && m.debugTable.Rows()[0][2] == "Waiting for logs..." {
+		m.debugTable.SetRows([]table.Row{})
+	}
+
 	rows := []table.Row{{
 		msg.Time,
 		msg.Level,