Merge pull request #41 from dispatchrun/color-fix

Color fixes

Author: chriso

cli/color.go

@@ -3,9 +3,12 @@ package cli
 import "github.com/charmbracelet/lipgloss"
 
 var (
-	grayColor   = lipgloss.Color("#7D7D7D")
-	whiteColor  = lipgloss.Color("#FFFFFF")
-	redColor    = lipgloss.Color("#FF0000")
-	greenColor  = lipgloss.Color("#00FF00")
-	yellowColor = lipgloss.Color("#FFAA00")
+	defaultColor = lipgloss.NoColor{}
+
+	// See https://www.hackitu.de/termcolor256/
+	grayColor    = lipgloss.ANSIColor(102)
+	redColor     = lipgloss.ANSIColor(124)
+	greenColor   = lipgloss.ANSIColor(34)
+	yellowColor  = lipgloss.ANSIColor(142)
+	magentaColor = lipgloss.ANSIColor(127)
 )

cli/config.go

@@ -23,8 +23,6 @@ var (
 	DispatchConsoleUrl       string
 
 	DispatchConfigPath string
-
-	Color bool
 )
 
 func init() {
@@ -53,18 +51,6 @@ func init() {
 		}
 		DispatchConfigPath = filepath.Join(os.ExpandEnv(configHome), "dispatch/config.toml")
 	}
-
-	// Enable color when connected to a terminal, unless the NO_COLOR
-	// environment variable is set (to any value). If stdout or stderr are
-	// redirected, colors are disabled. If the FORCE_COLOR environment
-	// variable is set (to any value), color is unconditionally enabled.
-	Color = isTerminal(os.Stdout) && isTerminal(os.Stderr)
-	if os.Getenv("NO_COLOR") != "" {
-		Color = false
-	}
-	if os.Getenv("FORCE_COLOR") != "" {
-		Color = true
-	}
 }
 
 func isTerminal(f *os.File) bool {

cli/log.go

@@ -15,8 +15,8 @@ var (
 	logTimeStyle = lipgloss.NewStyle().Foreground(grayColor)
 	logAttrStyle = lipgloss.NewStyle().Foreground(grayColor)
 
-	logDebugStyle = lipgloss.NewStyle().Foreground(whiteColor)
-	logInfoStyle  = lipgloss.NewStyle().Foreground(whiteColor)
+	logDebugStyle = lipgloss.NewStyle().Foreground(defaultColor)
+	logInfoStyle  = lipgloss.NewStyle().Foreground(defaultColor)
 	logWarnStyle  = lipgloss.NewStyle().Foreground(yellowColor)
 	logErrorStyle = lipgloss.NewStyle().Foreground(redColor)
 )

cli/run.go

@@ -24,6 +24,7 @@ import (
 
 	sdkv1 "buf.build/gen/go/stealthrocket/dispatch-proto/protocolbuffers/go/dispatch/sdk/v1"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
 	"github.com/google/uuid"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/proto"
@@ -47,6 +48,12 @@ var httpClient = &http.Client{
 	Timeout:   pollTimeout,
 }
 
+var (
+	dispatchLogPrefixStyle  = lipgloss.NewStyle().Foreground(greenColor)
+	appLogPrefixStyle       = lipgloss.NewStyle().Foreground(magentaColor)
+	logPrefixSeparatorStyle = lipgloss.NewStyle().Foreground(grayColor)
+)
+
 func runCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "run",
@@ -103,14 +110,10 @@ previous run.`, defaultEndpoint),
 			if Verbose {
 				level = slog.LevelDebug
 			}
-			dispatchPrefix := []byte(pad("dispatch", prefixWidth) + " | ")
-			if Color {
-				dispatchPrefix = []byte("\033[32m" + pad("dispatch", prefixWidth) + " \033[90m|\033[0m ")
-			}
 			slog.SetDefault(slog.New(&slogHandler{
 				stream: &prefixLogWriter{
 					stream: logWriter,
-					prefix: dispatchPrefix,
+					prefix: []byte(dispatchLogPrefixStyle.Render(pad("dispatch", prefixWidth)) + logPrefixSeparatorStyle.Render(" | ")),
 				},
 				level: level,
 			}))
@@ -275,13 +278,9 @@ Run 'dispatch help run' to learn about Dispatch sessions.`, BridgeSession)
 			}
 
 			// Add a prefix to the local application's logs.
-			appPrefix := []byte(pad(arg0, prefixWidth) + " | ")
-			appSuffix := []byte("\n")
-			if Color {
-				appPrefix = []byte("\033[35m" + pad(arg0, prefixWidth) + " \033[90m|\033[0m ")
-			}
-			go printPrefixedLines(logWriter, stdout, appPrefix, appSuffix)
-			go printPrefixedLines(logWriter, stderr, appPrefix, appSuffix)
+			appLogPrefix := []byte(appLogPrefixStyle.Render(pad(arg0, prefixWidth)) + logPrefixSeparatorStyle.Render(" | "))
+			go printPrefixedLines(logWriter, stdout, appLogPrefix)
+			go printPrefixedLines(logWriter, stderr, appLogPrefix)
 
 			err = cmd.Wait()
 
@@ -591,15 +590,15 @@ func withoutEnv(env []string, prefixes ...string) []string {
 	})
 }
 
-func printPrefixedLines(w io.Writer, r io.Reader, prefix, suffix []byte) {
+func printPrefixedLines(w io.Writer, r io.Reader, prefix []byte) {
 	scanner := bufio.NewScanner(r)
 	buffer := bytes.NewBuffer(nil)
 	buffer.Write(prefix)
 
 	for scanner.Scan() {
 		buffer.Truncate(len(prefix))
 		buffer.Write(scanner.Bytes())
-		buffer.Write(suffix)
+		buffer.WriteByte('\n')
 		_, _ = w.Write(buffer.Bytes())
 	}
 }

cli/tui.go

@@ -29,11 +29,11 @@ var (
 	viewportStyle = lipgloss.NewStyle().Margin(1, 2)
 
 	// Styles for the dispatch_ ASCII logo.
-	logoStyle           = lipgloss.NewStyle().Foreground(whiteColor)
+	logoStyle           = lipgloss.NewStyle().Foreground(defaultColor)
 	logoUnderscoreStyle = lipgloss.NewStyle().Foreground(greenColor)
 
 	// Style for the table of function calls.
-	tableHeaderStyle = lipgloss.NewStyle().Foreground(whiteColor).Bold(true)
+	tableHeaderStyle = lipgloss.NewStyle().Foreground(defaultColor).Bold(true)
 
 	// Styles for function names and statuses in the table.
 	pendingStyle = lipgloss.NewStyle().Foreground(grayColor)