Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: improve resilience and error handling #16

Merged
merged 2 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ package cmd
import (
"context"
"encoding/json"
"io"
"os"
"strings"

"github.com/algorandfoundation/hack-tui/api"
"github.com/algorandfoundation/hack-tui/internal"
"github.com/algorandfoundation/hack-tui/ui"
Expand All @@ -15,6 +11,9 @@ import (
"github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"io"
"os"
"strings"
)

const BANNER = `
Expand Down Expand Up @@ -43,6 +42,7 @@ var (
cobra.CheckErr(err)

partkeys, err := internal.GetPartKeys(context.Background(), client)
cobra.CheckErr(err)

state := internal.StateModel{
Status: internal.StatusModel{
Expand Down Expand Up @@ -80,6 +80,7 @@ var (
p.Send(state)
}
if err != nil {
p.Send(state)
p.Send(err)
}
}, context.Background(), client)
Expand Down
3 changes: 2 additions & 1 deletion cmd/root_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import (

// Test the stub root command
func Test_ExecuteRootCommand(t *testing.T) {
viper.Set("server", "https://mainnet-api.4160.nodely.dev:443")
viper.Set("token", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
viper.Set("server", "http://localhost:8080")

// Execute
err := rootCmd.Execute()
Expand Down
6 changes: 6 additions & 0 deletions internal/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,15 @@ func GetBlockMetrics(ctx context.Context, client *api.ClientWithResponses, round
if err != nil {
return nil, err
}
if a.StatusCode() != 200 {
return nil, errors.New("invalid status code")
}
b, err := client.GetBlockWithResponse(ctx, int(round)-window, &api.GetBlockParams{
Format: &format,
})
if a.StatusCode() != 200 {
return nil, errors.New("invalid status code")
PhearZero marked this conversation as resolved.
Show resolved Hide resolved
}
if err != nil {
return nil, err
}
Expand Down
21 changes: 17 additions & 4 deletions internal/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package internal
import (
"context"
"errors"
"time"

"github.com/algorandfoundation/hack-tui/api"
)
Expand All @@ -17,6 +18,14 @@ type StateModel struct {
Watching bool
}

func (s *StateModel) waitAfterError(err error, cb func(model *StateModel, err error)) {
if err != nil {
s.Status.State = "DOWN"
cb(nil, err)
time.Sleep(time.Second * 3)
}
}

// TODO: allow context to handle loop
func (s *StateModel) Watch(cb func(model *StateModel, err error), ctx context.Context, client *api.ClientWithResponses) {
s.Watching = true
Expand All @@ -36,14 +45,17 @@ func (s *StateModel) Watch(cb func(model *StateModel, err error), ctx context.Co
break
}
status, err := client.WaitForBlockWithResponse(ctx, int(lastRound))
s.waitAfterError(err, cb)
if err != nil {
cb(nil, err)
continue
}
if status.StatusCode() != 200 {
cb(nil, errors.New(status.Status()))
return
s.waitAfterError(errors.New(status.Status()), cb)
continue
}

s.Status.State = "Unknown"

// Update Status
s.Status.Update(status.JSON200.LastRound, status.JSON200.CatchupTime, status.JSON200.UpgradeNodeVote)

Expand All @@ -53,8 +65,9 @@ func (s *StateModel) Watch(cb func(model *StateModel, err error), ctx context.Co
// Run Round Averages and RX/TX every 5 rounds
if s.Status.LastRound%5 == 0 {
bm, err := GetBlockMetrics(ctx, client, s.Status.LastRound, s.Metrics.Window)
s.waitAfterError(err, cb)
if err != nil {
cb(nil, err)
continue
}
s.Metrics.RoundTime = bm.AvgTime
s.Metrics.TPS = bm.TPS
Expand Down
3 changes: 2 additions & 1 deletion main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
)

func Test_Main(t *testing.T) {
viper.Set("server", "https://mainnet-api.4160.nodely.dev")
viper.Set("token", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
viper.Set("server", "http://localhost:8080")
main()
}
4 changes: 4 additions & 0 deletions ui/viewport.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ func (m ViewportViewModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.errorMsg = &strMsg
// When the state updates
case internal.StateModel:
if m.errorMsg != nil {
m.errorMsg = nil
m.page = AccountsPage
}
m.Data = &msg
// Navigate to the transaction page when a partkey is selected
case *api.ParticipationKey:
Expand Down