Merge pull request #127 from gofiber/codex/2025-07-09-13-01-54

Author: ReneWerner87

cmd/dev.go

@@ -14,6 +14,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"sync"
 	"sync/atomic"
 	"syscall"
 	"time"
@@ -77,6 +78,8 @@ type escort struct {
 	watcherErrors chan error
 	sig           chan os.Signal
 
+	wg sync.WaitGroup
+
 	binPath    string
 	bin        *exec.Cmd
 	stdoutPipe io.ReadCloser
@@ -108,14 +111,17 @@ func (e *escort) run() (err error) {
 		_ = os.Remove(e.binPath)
 	}()
 
-	go e.runBin()
-	go e.watchingBin()
-	go e.watchingFiles()
+	e.wg.Add(3)
+	go func() { defer e.wg.Done(); e.runBin() }()
+	go func() { defer e.wg.Done(); e.watchingBin() }()
+	go func() { defer e.wg.Done(); e.watchingFiles() }()
 
 	signal.Notify(e.sig, syscall.SIGTERM, syscall.SIGINT, os.Interrupt)
 	<-e.sig
 
 	e.terminate()
+	close(e.hitCh)
+	e.wg.Wait()
 
 	log.Println("See you next time 👋")
 
@@ -153,7 +159,11 @@ func (e *escort) init() (err error) {
 		e.binPath += ".exe"
 	}
 
-	e.hitFunc = e.runBin
+	e.hitFunc = func() {
+		e.wg.Add(1)
+		e.runBin()
+		e.wg.Done()
+	}
 
 	e.preRunCommands = parsePreRunCommands(c.preRun)
 
@@ -214,15 +224,22 @@ func (e *escort) watchingFiles() {
 
 func (e *escort) watchingBin() {
 	var timer *time.Timer
-	for range e.hitCh {
-		// reset timer
-		if timer != nil && !timer.Stop() {
-			select {
-			case <-timer.C:
-			default:
+	for {
+		select {
+		case <-e.ctx.Done():
+			if timer != nil {
+				timer.Stop()
+			}
+			return
+		case <-e.hitCh:
+			if timer != nil && !timer.Stop() {
+				select {
+				case <-timer.C:
+				default:
+				}
 			}
+			timer = time.AfterFunc(e.delay, e.hitFunc)
 		}
-		timer = time.AfterFunc(e.delay, e.hitFunc)
 	}
 }
 

cmd/dev_test.go

@@ -312,5 +312,7 @@ func getEscort() *escort {
 		},
 		ctx:       c,
 		terminate: t,
+		hitCh:     make(chan struct{}, 1),
+		sig:       make(chan os.Signal, 1),
 	}
 }

cmd/internal/prompt.go

@@ -2,9 +2,11 @@ package internal
 
 import (
 	"fmt"
+	"os"
 
 	input "github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/muesli/termenv"
 )
 
 type errMsg error
@@ -27,7 +29,7 @@ func NewPrompt(title string, placeholder ...string) *Prompt {
 		p.textInput.Placeholder = placeholder[0]
 	}
 
-	p.p = tea.NewProgram(p)
+	p.p = tea.NewProgram(p, tea.WithOutput(termenv.NewOutput(os.Stdout)))
 
 	return p
 }