Skip to content

Enrich JSON, extend sampling intervals, show refresh hint #23

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.

Sign up for GitHub

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

Merged
programmersd21 merged 1 commit into from
Jul 8, 2026
Merged

Enrich JSON, extend sampling intervals, show refresh hint #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## [0.1.5] - 2026-07-08

### Added

- Enriched JSON snapshot output - `--once --json` now includes `status`, `timestamp` (RFC3339), `download_human`, and `upload_human` fields for more self-contained script consumption.
- Refresh rate notification - Pressing `+`/`-` briefly shows the current sampling interval (e.g. "every 500ms") in the footer.
- Extended sampling range - Added 3s, 5s, and 10s intervals for long-term monitoring.

## [0.1.4] - 2026-07-07

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.4
0.1.5
18 changes: 12 additions & 6 deletions cmd/flow/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,19 @@ func runOnce(col *collector.Collector, smp *sampler.Sampler, refresh time.Durati
cancel()

if asJSON {
down := ui.FormatBpsExt(s.DownBps, ui.UnitAuto, bits)
up := ui.FormatBpsExt(s.UpBps, ui.UnitAuto, bits)
out := map[string]interface{}{
"download_bps": s.DownBps,
"upload_bps": s.UpBps,
"peak_down_bps": s.DownBps, // peak = current in one-shot mode
"peak_up_bps": s.UpBps,
"interface": s.Interface,
"unit_display": autoUnitExt(s.DownBps, bits),
"status": "ok",
"timestamp": time.Now().Format(time.RFC3339),

@gemini-code-assist gemini-code-assist Bot Jul 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Use the sample's actual timestamp (s.At) instead of time.Now() to ensure the JSON output reflects the exact time the network metrics were captured.

Suggested change
"timestamp": time.Now().Format(time.RFC3339),
"timestamp": s.At.Format(time.RFC3339),

"interface": s.Interface,
"download_bps": s.DownBps,
"upload_bps": s.UpBps,
"download_human": down,
"upload_human": up,
"peak_down_bps": s.DownBps,
"peak_up_bps": s.UpBps,
"unit_display": autoUnitExt(s.DownBps, bits),
}
enc := json.NewEncoder(os.Stdout)
enc.SetIndent("", " ")
Expand Down
24 changes: 19 additions & 5 deletions internal/ui/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ type processesMsg []processes.Info

type pingMsg time.Duration

type refreshHintClearMsg struct{}

@gemini-code-assist gemini-code-assist Bot Jul 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Using an empty struct for refreshHintClearMsg can lead to a race/overlapping timer issue. If the user presses + or - multiple times quickly, multiple clear messages are scheduled. When the first one fires, it will prematurely clear the hint for the subsequent presses. Changing refreshHintClearMsg to carry a timestamp allows us to ensure we only clear the hint if it matches the most recent update.

Suggested change
type refreshHintClearMsg struct{}
type refreshHintClearMsg time.Time


const (
slopeWindow = 6
)
Expand Down Expand Up @@ -87,6 +89,7 @@ type Model struct {
downPulse float64
upPulse float64
pingLatency time.Duration
refreshHint string

@gemini-code-assist gemini-code-assist Bot Jul 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Add a refreshHintTime field to track when the last refresh hint was set, allowing us to prevent older scheduled timers from clearing newer hints.

Suggested change
refreshHint string
refreshHint string
refreshHintTime time.Time

err error
}

Expand Down Expand Up @@ -166,6 +169,10 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.upPulse = math.Max(0, m.upPulse-0.08)
return m, tick()

case refreshHintClearMsg:
m.refreshHint = ""
return m, nil
Comment on lines +172 to +174

@gemini-code-assist gemini-code-assist Bot Jul 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Only clear the refresh hint if the message's timestamp matches the most recently set hint's timestamp. This prevents older scheduled clear messages from clearing newer hints.

Suggested change
case refreshHintClearMsg:
m.refreshHint = ""
return m, nil
case refreshHintClearMsg:
if time.Time(msg).Equal(m.refreshHintTime) {
m.refreshHint = ""
}
return m, nil


case processesMsg:
m.procs = msg
return m, nil
Expand Down Expand Up @@ -312,12 +319,12 @@ func (m Model) handleKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
m.bitsMode = !m.bitsMode

case key.Matches(msg, m.keys.Faster):
m.adjustRefreshInterval(true)
return m, waitForSample(m.smp.Out)
cmd := m.adjustRefreshInterval(true)
return m, tea.Batch(waitForSample(m.smp.Out), cmd)

case key.Matches(msg, m.keys.Slower):
m.adjustRefreshInterval(false)
return m, waitForSample(m.smp.Out)
cmd := m.adjustRefreshInterval(false)
return m, tea.Batch(waitForSample(m.smp.Out), cmd)
Comment on lines 321 to +327

@gemini-code-assist gemini-code-assist Bot Jul 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Goroutine Leak on Refresh Interval Adjustment

Every time the refresh interval is adjusted (via Faster or Slower keys), a new Sampler is created with a new Out channel, and a new waitForSample goroutine is started to read from it via tea.Batch(waitForSample(m.smp.Out), cmd).

However, the previous waitForSample goroutine remains blocked indefinitely on the old Out channel because:

  1. The old channel is never closed.
  2. The old sampler's Run loop has exited (due to m.samplerCtx() cancellation) and will never write to it again.

This results in a goroutine leak every time the user adjusts the refresh rate (or cycles the interface).

Recommended Fix:

  1. Close the old channel in adjustRefreshInterval (and similarly in the interface cycling logic) to unblock the old reader: 
    m.samplerCtx()
close(m.smp.Out) // Unblock the old waitForSample goroutine
  2. Update waitForSample (around line 512) to handle channel closure gracefully: 
    func waitForSample(ch <-chan sampler.Sample) tea.Cmd {
    return func() tea.Msg {
        s, ok := <-ch
        if !ok {
            return nil
        }
        return sampleMsg(s)
    }
}


case key.Matches(msg, m.keys.Themes):
m.showThemes = true
Expand All @@ -339,14 +346,17 @@ func (m Model) handleKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
return m, nil
}

func (m *Model) adjustRefreshInterval(faster bool) {
func (m *Model) adjustRefreshInterval(faster bool) tea.Cmd {
intervals := []time.Duration{
50 * time.Millisecond,
100 * time.Millisecond,
250 * time.Millisecond,
500 * time.Millisecond,
1 * time.Second,
2 * time.Second,
3 * time.Second,
5 * time.Second,
10 * time.Second,
}

idx := -1
Expand Down Expand Up @@ -379,7 +389,11 @@ func (m *Model) adjustRefreshInterval(faster bool) {
col := collector.New(m.ifaceName)
m.smp = sampler.New(col, m.refreshInterval)
go m.smp.Run(ctx)

m.refreshHint = fmt.Sprintf("every %s", m.refreshInterval)

@sourcery-ai sourcery-ai Bot Jul 8, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): Sampler restart on refresh interval changes may leak goroutines or duplicate sampling without cancelling the previous one.

Adjusting the refresh interval currently creates a new sampler with a new background context but never cancels the old one. If the interval is changed multiple times, you can end up with several samplers running in parallel and leaked goroutines. Please ensure the previous sampler/context is cleanly stopped before starting a new one, or update the existing sampler’s configuration instead of recreating it.

return tea.Tick(2*time.Second, func(t time.Time) tea.Msg { return refreshHintClearMsg{} })
Comment on lines +393 to +394

@gemini-code-assist gemini-code-assist Bot Jul 8, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Capture the current timestamp when setting the refresh hint, and pass it to the scheduled refreshHintClearMsg so we can uniquely identify this timer event.

		now := time.Now()
		m.refreshHint = fmt.Sprintf("every %s", m.refreshInterval)
		m.refreshHintTime = now
		return tea.Tick(2*time.Second, func(t time.Time) tea.Msg { return refreshHintClearMsg(now) })

}
return nil
}

func (m Model) View() string {
Expand Down
3 changes: 3 additions & 0 deletions internal/ui/views.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,9 @@ func dashboardContentLines(m Model, mode ViewMode) []string {
if m.paused {
ifaceStr += theme.Muted().Render(" paused")
}
if m.refreshHint != "" {
ifaceStr += theme.Muted().Render(" " + m.refreshHint)
}

renderKey := func(k, desc string) string {
return lipgloss.NewStyle().Foreground(lipgloss.Color(theme.GetAccentColor())).Bold(true).Render(k) + " " + theme.Muted().Render(desc)
Expand Down
Loading