Compare commits

...

1 commit

Author SHA1 Message Date
Ayman Bagabas
0c534a6b9f
refactor: improve input reading with timeout to handle incomplete sequences 2025-09-29 17:54:13 -04:00
3 changed files with 109 additions and 9 deletions

21
key.go
View file

@ -606,6 +606,27 @@ loop:
}
}
func scanInput(b []byte, expired bool, msgs chan<- Msg) (n int) {
if len(b) == 0 {
return
}
for len(b) > 0 {
w, msg := detectOneMsg(b, expired)
if w == 0 {
// Expecting more bytes beyond the current buffer. Try waiting
// for more input.
break
}
b = b[w:]
n += w
msgs <- msg
}
return n
}
var (
unknownCSIRe = regexp.MustCompile(`^\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]`)
mouseSGRRegex = regexp.MustCompile(`(\d+);(\d+);(\d+)([Mm])`)

84
tty.go
View file

@ -1,13 +1,11 @@
package tea
import (
"errors"
"bytes"
"fmt"
"io"
"time"
"github.com/charmbracelet/x/term"
"github.com/muesli/cancelreader"
)
func (p *Program) suspend() {
@ -88,19 +86,87 @@ func (p *Program) initCancelReader(cancel bool) error {
}
p.readLoopDone = make(chan struct{})
go p.readLoop()
readc := make(chan []byte)
go func() {
defer close(readc)
p.readInput(readc)
}()
go p.readLoop(readc)
return nil
}
func (p *Program) readLoop() {
defer close(p.readLoopDone)
const (
readTimeout = 50 * time.Millisecond
readBufSize = 4096
)
func (p *Program) readData(readc chan<- []byte) error {
for {
var readBuf [readBufSize]byte
n, err := p.cancelReader.Read(readBuf[:])
if err != nil {
return err //nolint:wrapcheck
}
err := readInputs(p.ctx, p.msgs, p.cancelReader)
if !errors.Is(err, io.EOF) && !errors.Is(err, cancelreader.ErrCanceled) {
select {
case <-p.ctx.Done():
case p.errs <- err:
return nil
case readc <- readBuf[:n]:
}
}
}
func (p *Program) readLoop(readc chan []byte) {
defer close(p.readLoopDone)
var buf bytes.Buffer
timer := time.NewTimer(readTimeout)
expires := time.Now().Add(readTimeout)
for {
select {
case <-p.ctx.Done():
scanInput(buf.Bytes(), true, p.msgs)
return
case <-timer.C:
timedout := time.Now().After(expires)
if buf.Len() > 0 && timedout {
buf.Next(scanInput(buf.Bytes(), timedout, p.msgs))
}
if buf.Len() > 0 {
if !timer.Stop() {
select {
case <-timer.C:
default:
}
}
timer.Reset(readTimeout)
}
case data, ok := <-readc:
if !ok {
scanInput(buf.Bytes(), true, p.msgs)
return
}
buf.Write(data)
expires = time.Now().Add(readTimeout)
n := scanInput(buf.Bytes(), false, p.msgs)
if !timer.Stop() {
select {
case <-timer.C:
default:
}
}
if n > 0 {
buf.Next(n)
}
if buf.Len() > 0 {
timer.Reset(readTimeout)
}
}
}
}

View file

@ -4,12 +4,15 @@
package tea
import (
"errors"
"fmt"
"io"
"os"
"os/signal"
"syscall"
"github.com/charmbracelet/x/term"
"github.com/muesli/cancelreader"
)
func (p *Program) initInput() (err error) {
@ -29,6 +32,16 @@ func (p *Program) initInput() (err error) {
return nil
}
func (p *Program) readInput(readc chan<- []byte) {
err := p.readData(readc)
if !errors.Is(err, io.EOF) && !errors.Is(err, cancelreader.ErrCanceled) {
select {
case <-p.ctx.Done():
case p.errs <- err:
}
}
}
func openInputTTY() (*os.File, error) {
f, err := os.Open("/dev/tty")
if err != nil {