feat: Add TUI retest shortcuts

.gitignore

@@ -1,3 +1,5 @@
 .vscode
 *.exe
 clash-speedtest
+.gocache
+.gomodcache

main.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
@@ -72,7 +73,7 @@ func main() {
 	if !*fastMode {
 		requestedMode, err = speedtester.ParseSpeedMode(*speedMode)
 		if err != nil {
-			log.Fatalln("parse speed mode failed: %s", err)
+			log.Fatalf("parse speed mode failed: %v", err)
 		}
 	}
 
@@ -94,13 +95,13 @@ func main() {
 		UserAgent:        *userAgent,
 	})
 	if err != nil {
-		log.Fatalln("create speed tester failed: %s", err)
+		log.Fatalf("create speed tester failed: %v", err)
 	}
 	effectiveMode := speedTester.Mode()
 
 	allProxies, err := speedTester.LoadProxies()
 	if err != nil {
-		log.Fatalln("load proxies failed: %s", err)
+		log.Fatalf("load proxies failed: %v", err)
 	}
 
 	outputMode := output.DetermineOutputMode(output.IsTerminalFile)
@@ -110,7 +111,7 @@ func main() {
 		var err error
 		tsvWriter, err = output.NewTSVWriter(os.Stdout, effectiveMode)
 		if err != nil {
-			log.Fatalln("create TSV writer failed: %s", err)
+			log.Fatalf("create TSV writer failed: %v", err)
 		}
 	}
 
@@ -120,47 +121,110 @@ func main() {
 		collectResults := *outputPath != ""
 		// Run TUI for Interactive mode
 		resultChannel := make(chan *speedtester.Result, len(allProxies))
-		resultsDone := make(chan struct{})
-		saveResult := make(chan error, 1)
-
-		// Start testing in goroutine to send results to channel
-		go func() {
-			speedTester.TestProxies(allProxies, func(result *speedtester.Result) {
-				if collectResults {
-					results = append(results, result)
+		var resultsMu sync.Mutex
+		var activeRunDone <-chan struct{}
+		setActiveRun := func(done <-chan struct{}) {
+			resultsMu.Lock()
+			activeRunDone = done
+			resultsMu.Unlock()
+		}
+		storeFullRunResults := func(runResults []*speedtester.Result) {
+			if !collectResults {
+				return
+			}
+			resultsMu.Lock()
+			results = runResults
+			resultsMu.Unlock()
+		}
+		replaceStoredResult := func(result *speedtester.Result) {
+			if !collectResults {
+				return
+			}
+			resultsMu.Lock()
+			defer resultsMu.Unlock()
+			for i, existing := range results {
+				if existing.ProxyName == result.ProxyName {
+					results[i] = result
+					return
 				}
-				resultChannel <- result
-			})
-			close(resultChannel)
-			close(resultsDone)
-		}()
-
-		if collectResults {
-			// Save results once all tests finish, without blocking the TUI loop.
+			}
+			results = append(results, result)
+		}
+		startTestRun := func(proxies map[string]*speedtester.CProxy, replaceAll bool) {
+			done := make(chan struct{})
+			setActiveRun(done)
 			go func() {
-				<-resultsDone
-				results = output.SortResults(results, effectiveMode)
-				saveResult <- saveConfig(results, effectiveMode)
+				defer close(done)
+				runResults := make([]*speedtester.Result, 0, len(proxies))
+				if len(proxies) == 1 {
+					for name, proxy := range proxies {
+						result := speedTester.TestProxy(name, proxy)
+						if replaceAll {
+							runResults = append(runResults, result)
+						} else {
+							replaceStoredResult(result)
+						}
+						resultChannel <- result
+					}
+				} else {
+					speedTester.TestProxies(proxies, func(result *speedtester.Result) {
+						if replaceAll {
+							runResults = append(runResults, result)
+						} else {
+							replaceStoredResult(result)
+						}
+						resultChannel <- result
+					})
+				}
+				if replaceAll {
+					storeFullRunResults(runResults)
+				}
+				resultChannel <- nil
 			}()
 		}
 
+		startTestRun(allProxies, true)
+
 		// Create and run TUI
+		model := tui.NewTUIModel(effectiveMode, len(allProxies), resultChannel)
+		model.SetRetestCallbacks(
+			func(_ chan<- *speedtester.Result) {
+				startTestRun(allProxies, true)
+			},
+			func(name string, out chan<- *speedtester.Result) {
+				proxy, ok := allProxies[name]
+				if !ok {
+					out <- nil
+					return
+				}
+				startTestRun(map[string]*speedtester.CProxy{name: proxy}, false)
+			},
+		)
 		p := tea.NewProgram(
-			tui.NewTUIModel(effectiveMode, len(allProxies), resultChannel),
+			model,
 			tea.WithAltScreen(),
 			tea.WithMouseAllMotion(),
 		)
 		if _, err := p.Run(); err != nil {
-			log.Fatalln("TUI failed: %s", err)
+			log.Fatalf("TUI failed: %v", err)
 		}
 
 		if !collectResults {
 			return
 		}
 
-		err = <-saveResult
+		resultsMu.Lock()
+		done := activeRunDone
+		resultsMu.Unlock()
+		if done != nil {
+			<-done
+		}
+		resultsMu.Lock()
+		results = output.SortResults(results, effectiveMode)
+		resultsMu.Unlock()
+		err = saveConfig(results, effectiveMode)
 		if err != nil {
-			log.Fatalln("save config file failed: %s", err)
+			log.Fatalf("save config file failed: %v", err)
 		}
 		fmt.Printf("\nsave config file to: %s\n", *outputPath)
 		return
@@ -182,7 +246,7 @@ func main() {
 	if *outputPath != "" {
 		err = saveConfig(results, effectiveMode)
 		if err != nil {
-			log.Fatalln("save config file failed: %s", err)
+			log.Fatalf("save config file failed: %v", err)
 		}
 		fmt.Printf("\nsave config file to: %s\n", *outputPath)
 	}

speedtester/speedtester.go

@@ -342,10 +342,14 @@ func buildProxyServerPortKey(proxy *CProxy) (string, bool) {
 
 func (st *SpeedTester) TestProxies(proxies map[string]*CProxy, tester func(result *Result)) {
 	for name, proxy := range proxies {
-		tester(st.testProxy(name, proxy))
+		tester(st.TestProxy(name, proxy))
 	}
 }
 
+func (st *SpeedTester) TestProxy(name string, proxy *CProxy) *Result {
+	return st.testProxy(name, proxy)
+}
+
 type Result struct {
 	ProxyName     string         `json:"proxy_name"`
 	ProxyType     string         `json:"proxy_type"`

tui/detail.go

@@ -98,7 +98,7 @@ func buildDetailContent(result *speedtester.Result, width int, mode speedtester.
 			lines = appendWrappedValue(lines, "Upload Error:", result.FormatUploadError(), width)
 		}
 	}
-	lines = append(lines, "", "Press ESC to close details.")
+	lines = append(lines, "", "Press R to retest this node. Press ESC to close details.")
 	return strings.Join(lines, "\n")
 }
 

tui/detail_test.go

@@ -178,6 +178,9 @@ func TestBuildDetailContentDownloadOnly(t *testing.T) {
 	if strings.Contains(content, result.UploadError) {
 		t.Fatalf("expected download-only detail to omit upload error, got %q", content)
 	}
+	if !strings.Contains(content, "Press R to retest this node.") {
+		t.Fatalf("expected detail to include retest hint, got %q", content)
+	}
 }
 
 func TestDetailPanelHeightUpdatesOnSelectionChange(t *testing.T) {

tui/help.go

@@ -14,6 +14,8 @@ type helpState struct {
 
 type helpKeyMap struct {
 	Quit        key.Binding
+	RetestAll   key.Binding
+	RetestOne   key.Binding
 	CloseDetail key.Binding
 	Table       table.KeyMap
 }
@@ -27,6 +29,14 @@ func newHelpState(tableKeys table.KeyMap) helpState {
 				key.WithKeys("q", "ctrl+c"),
 				key.WithHelp("q/ctrl+c", "quit"),
 			),
+			RetestAll: key.NewBinding(
+				key.WithKeys("r"),
+				key.WithHelp("r", "retest all"),
+			),
+			RetestOne: key.NewBinding(
+				key.WithKeys("r"),
+				key.WithHelp("r", "retest node"),
+			),
 			CloseDetail: key.NewBinding(
 				key.WithKeys("esc"),
 				key.WithHelp("esc", "close details"),
@@ -43,6 +53,8 @@ func (h *helpState) setWidth(width int) {
 
 func (h *helpState) setDetailVisible(visible bool) {
 	h.keyMap.CloseDetail.SetEnabled(visible)
+	h.keyMap.RetestOne.SetEnabled(visible)
+	h.keyMap.RetestAll.SetEnabled(!visible)
 }
 
 func (h helpState) view() string {
@@ -61,6 +73,8 @@ func (km helpKeyMap) ShortHelp() []key.Binding {
 	return []key.Binding{
 		km.Table.LineUp,
 		km.Table.LineDown,
+		km.RetestAll,
+		km.RetestOne,
 		km.Quit,
 		km.CloseDetail,
 	}
@@ -70,6 +84,6 @@ func (km helpKeyMap) FullHelp() [][]key.Binding {
 	return [][]key.Binding{
 		{km.Table.LineUp, km.Table.LineDown, km.Table.GotoTop, km.Table.GotoBottom},
 		{km.Table.PageUp, km.Table.PageDown, km.Table.HalfPageUp, km.Table.HalfPageDown},
-		{km.CloseDetail, km.Quit},
+		{km.RetestAll, km.RetestOne, km.CloseDetail, km.Quit},
 	}
 }

tui/help_test.go

@@ -27,13 +27,25 @@ func TestHelpViewShowsQuitAndDetailKeys(t *testing.T) {
 	if !strings.Contains(helpView, "q/ctrl+c") {
 		t.Fatalf("expected help to include quit shortcut, got %q", helpView)
 	}
+	if !strings.Contains(helpView, "retest all") {
+		t.Fatalf("expected help to include retest-all shortcut, got %q", helpView)
+	}
 	if strings.Contains(helpView, "esc") {
 		t.Fatalf("expected help to hide detail shortcut when detail is closed, got %q", helpView)
 	}
+	if strings.Contains(helpView, "retest node") {
+		t.Fatalf("expected help to hide retest-node shortcut when detail is closed, got %q", helpView)
+	}
 
 	model.toggleDetail(result)
 	helpView = model.help.view()
 	if !strings.Contains(helpView, "esc") {
 		t.Fatalf("expected help to include detail shortcut when detail is visible, got %q", helpView)
 	}
+	if !strings.Contains(helpView, "retest node") {
+		t.Fatalf("expected help to include retest-node shortcut when detail is visible, got %q", helpView)
+	}
+	if strings.Contains(helpView, "retest all") {
+		t.Fatalf("expected help to hide retest-all shortcut when detail is visible, got %q", helpView)
+	}
 }