Render Markdown with plain terminal styles

[onechat] / terminal.go

diff --git a/terminal.go b/terminal.go
index 876986a4479f38a679d9d2dc586be8a85164ac15..4f1c37836a6685c9bb9d704bfa55cf0b4985759e 100644 (file)
--- 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,18 +61,25 @@ 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
        }
 
-       return err
+       if err != nil {
+               return fmt.Errorf("run terminal client: %w", err)
+       }
+
+       return nil
 }
 
 // terminalSendLines sends each line of in as a request until the input ends.
@@ -79,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{
@@ -113,7 +122,12 @@ func terminalSendLines(ctx context.Context, conn net.Conn, in io.Reader) error {
                }
        }
 
-       return scanner.Err()
+       err := scanner.Err()
+       if err != nil {
+               return fmt.Errorf("read terminal input: %w", err)
+       }
+
+       return nil
 }
 
 // terminalShowEvents writes each event from the daemon to out until the
@@ -121,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)
@@ -135,11 +151,16 @@ func terminalShowEvents(conn net.Conn, out io.Writer) error {
 
                _, err = io.WriteString(out, text+"\n")
                if err != nil {
-                       return err
+                       return fmt.Errorf("write terminal event: %w", err)
                }
        }
 
-       return scanner.Err()
+       err := scanner.Err()
+       if err != nil {
+               return fmt.Errorf("read daemon events: %w", err)
+       }
+
+       return nil
 }
 
 // terminalCmpError returns err, or fallback when err is nil.