Merge pull request #11 from algorandfoundation/fix/catchup-and-zero-tc-blocks

fix: catchup and zero tc blocks

Author: PhearZero

cmd/root.go

@@ -76,8 +76,12 @@ var (
 			)
 			go func() {
 				state.Watch(func(status *internal.StateModel, err error) {
-					cobra.CheckErr(err)
-					p.Send(state)
+					if err == nil {
+						p.Send(state)
+					}
+					if err != nil {
+						p.Send(err)
+					}
 				}, context.Background(), client)
 			}()
 			_, err = p.Run()

internal/block.go

@@ -30,10 +30,11 @@ type BlockMetrics struct {
 }
 
 func GetBlockMetrics(ctx context.Context, client *api.ClientWithResponses, round uint64, window int) (*BlockMetrics, error) {
-	var avgs BlockMetrics
+	var avgs = BlockMetrics{
+		AvgTime: 0,
+		TPS:     0,
+	}
 	if round < uint64(window) {
-		avgs.AvgTime = 0
-		avgs.TPS = 0
 		return &avgs, nil
 	}
 	var format api.GetBlockParamsFormat = "json"
@@ -52,12 +53,14 @@ func GetBlockMetrics(ctx context.Context, client *api.ClientWithResponses, round
 	// Push to the transactions count list
 	aTimestamp := time.Duration(a.JSON200.Block["ts"].(float64)) * time.Second
 	bTimestamp := time.Duration(b.JSON200.Block["ts"].(float64)) * time.Second
-	//
-	aTransactions := a.JSON200.Block["tc"].(float64)
-	bTransactions := b.JSON200.Block["tc"].(float64)
+	// Transaction Counter
+	aTransactions := a.JSON200.Block["tc"]
+	bTransactions := b.JSON200.Block["tc"]
 
 	avgs.AvgTime = time.Duration((int(aTimestamp - bTimestamp)) / window)
-	avgs.TPS = (aTransactions - bTransactions) / (float64(window) * avgs.AvgTime.Seconds())
+	if aTransactions != nil && bTransactions != nil {
+		avgs.TPS = (aTransactions.(float64) - bTransactions.(float64)) / (float64(window) * avgs.AvgTime.Seconds())
+	}
 
 	return &avgs, nil
 }

internal/state.go

@@ -41,6 +41,7 @@ func (s *StateModel) Watch(cb func(model *StateModel, err error), ctx context.Co
 		}
 		if status.StatusCode() != 200 {
 			cb(nil, errors.New(status.Status()))
+			return
 		}
 
 		// Update Status

ui/error.go

@@ -0,0 +1,48 @@
+package ui
+
+import (
+	"github.com/algorandfoundation/hack-tui/ui/controls"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
+	"strings"
+)
+
+type ErrorViewModel struct {
+	Height   int
+	Width    int
+	controls controls.Model
+	Message  string
+}
+
+func NewErrorViewModel(message string) ErrorViewModel {
+	return ErrorViewModel{
+		Height:   0,
+		Width:    0,
+		controls: controls.New(" Error "),
+	}
+}
+
+func (m ErrorViewModel) Init() tea.Cmd {
+	return nil
+}
+
+func (m ErrorViewModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+	return m.HandleMessage(msg)
+}
+
+func (m ErrorViewModel) HandleMessage(msg tea.Msg) (ErrorViewModel, tea.Cmd) {
+	var cmd tea.Cmd
+	switch msg := msg.(type) {
+
+	case tea.WindowSizeMsg:
+		m.Width = msg.Width
+		m.Height = msg.Height - 2
+	}
+	m.controls, cmd = m.controls.HandleMessage(msg)
+	return m, cmd
+}
+
+func (m ErrorViewModel) View() string {
+	pad := strings.Repeat("\n", max(0, m.Height/2-1))
+	return lipgloss.JoinVertical(lipgloss.Center, pad, red.Render(m.Message), pad, m.controls.View())
+}

ui/style.go

@@ -23,6 +23,7 @@ var (
 	cyan    = lipgloss.NewStyle().Foreground(lipgloss.Color("14"))
 	yellow  = lipgloss.NewStyle().Foreground(lipgloss.Color("11"))
 	green   = lipgloss.NewStyle().Foreground(lipgloss.Color("10"))
+	red     = lipgloss.NewStyle().Foreground(lipgloss.Color("9"))
 	Magenta = lipgloss.NewStyle().
 		Foreground(lipgloss.Color("5")).
 		Render

ui/viewport.go

@@ -21,6 +21,7 @@ const (
 	KeysPage        ViewportPage = "keys"
 	GeneratePage    ViewportPage = "generate"
 	TransactionPage ViewportPage = "transaction"
+	ErrorPage       ViewportPage = "error"
 )
 
 type ViewportViewModel struct {
@@ -41,6 +42,10 @@ type ViewportViewModel struct {
 
 	page   ViewportPage
 	client *api.ClientWithResponses
+
+	// Error Handler
+	errorMsg  *string
+	errorPage ErrorViewModel
 }
 
 type DeleteFinished string
@@ -73,6 +78,9 @@ func (m ViewportViewModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	cmds = append(cmds, cmd)
 
 	switch msg := msg.(type) {
+	case error:
+		strMsg := msg.Error()
+		m.errorMsg = &strMsg
 	// When the state updates
 	case internal.StateModel:
 		m.Data = &msg
@@ -170,6 +178,7 @@ func (m ViewportViewModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.transactionPage, cmd = m.transactionPage.HandleMessage(pageMsg)
 		cmds = append(cmds, cmd)
 		//}
+		m.errorPage, cmd = m.errorPage.HandleMessage(pageMsg)
 		cmds = append(cmds, cmd)
 		// Avoid triggering commands again
 		return m, tea.Batch(cmds...)
@@ -192,6 +201,13 @@ func (m ViewportViewModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 // View renders the viewport.Model
 func (m ViewportViewModel) View() string {
+	errMsg := m.errorMsg
+
+	if errMsg != nil {
+		m.errorPage.Message = *errMsg
+		m.page = ErrorPage
+	}
+
 	// Handle Page render
 	var page tea.Model
 	switch m.page {
@@ -203,6 +219,8 @@ func (m ViewportViewModel) View() string {
 		page = m.keysPage
 	case TransactionPage:
 		page = m.transactionPage
+	case ErrorPage:
+		page = m.errorPage
 	}
 
 	if page == nil {
@@ -247,6 +265,8 @@ func MakeViewportViewModel(state *internal.StateModel, client *api.ClientWithRes
 		page: AccountsPage,
 		// RPC client
 		client: client,
+
+		errorPage: NewErrorViewModel(""),
 	}
 
 	return &m, nil