X-Git-Url: http://git.giacomolli.uk/onechat/blobdiff_plain/a3b9849a54a6cd8a4cc5b1ae03a39aab31322f7b..522d7fd117285e4e4ce3ea5ec9b5a1722521b681:/terminal.go diff --git a/terminal.go b/terminal.go index eff009c..4f1c378 100644 --- a/terminal.go +++ b/terminal.go @@ -37,6 +37,7 @@ func terminal(ctx context.Context, in io.Reader, out io.Writer) error { } var dialer net.Dialer + conn, err := dialer.DialContext(ctx, "unix", path) if err != nil { return fmt.Errorf(`connect to the daemon (start it with "onechat daemon"): %w`, err) @@ -60,14 +61,17 @@ func terminalSession(ctx context.Context, conn net.Conn, in io.Reader, out io.Wr }() var err error + select { case err = <-sent: err = errors.Join(err, conn.Close()) + <-shown case err = <-shown: err = errors.Join(terminalCmpError(err, errTerminalDaemonClosed), conn.Close()) case <-ctx.Done(): err = conn.Close() + <-shown } @@ -83,6 +87,7 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error { encoder := json.NewEncoder(conn) scanner := bufio.NewScanner(in) scanner.Buffer(make([]byte, 64*1024), socketRequestBytes) + for ctx.Err() == nil && scanner.Scan() { line := scanner.Text() request := SocketRequest{ @@ -130,8 +135,10 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error { func terminalShowEvents(conn net.Conn, out io.Writer) error { scanner := bufio.NewScanner(conn) scanner.Buffer(make([]byte, 64*1024), socketRequestBytes) + for scanner.Scan() { var event Event + err := json.Unmarshal(scanner.Bytes(), &event) if err != nil { return fmt.Errorf("decode event: %w", err)