refactor: integrate UI components and enhance logging in webhook-cli

This commit enhances the webhook-cli by integrating UI components for improved output formatting and user interaction. It replaces standard error handling with formatted error messages and updates logging to utilize a new logging interface. Additionally, it refines command outputs for capture operations, including delete and list commands, to provide clearer and more structured information. Test cases have been added to validate these changes, ensuring robustness and reliability in user interactions.

Author: endalk200

apps/webhook-cli/cmd/better-webhook/main.go

@@ -25,6 +25,7 @@ import (
 	rootcmd "github.com/endalk200/better-webhook/apps/webhook-cli/internal/cli/root"
 	templatescmd "github.com/endalk200/better-webhook/apps/webhook-cli/internal/cli/templates"
 	platformtime "github.com/endalk200/better-webhook/apps/webhook-cli/internal/platform/time"
+	"github.com/endalk200/better-webhook/apps/webhook-cli/internal/platform/ui"
 	"github.com/endalk200/better-webhook/apps/webhook-cli/internal/version"
 )
 
@@ -48,7 +49,7 @@ func main() {
 	})
 
 	if err := rootCommand.Execute(); err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, err)
+		_, _ = fmt.Fprintln(os.Stderr, ui.FormatError(err))
 		os.Exit(1)
 	}
 }

apps/webhook-cli/internal/adapters/transport/httpcapture/server.go

@@ -6,14 +6,15 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"net/http"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
+	charmlog "github.com/charmbracelet/log"
+
 	appcapture "github.com/endalk200/better-webhook/apps/webhook-cli/internal/app/capture"
 	domain "github.com/endalk200/better-webhook/apps/webhook-cli/internal/domain/capture"
 	"github.com/endalk200/better-webhook/apps/webhook-cli/internal/platform/logging"
@@ -27,7 +28,8 @@ var (
 )
 
 type Logger interface {
-	Printf(format string, values ...interface{})
+	Info(msg interface{}, keyvals ...interface{})
+	Warn(msg interface{}, keyvals ...interface{})
 }
 
 type RouteResolver interface {
@@ -70,7 +72,7 @@ func NewServer(options ServerOptions) (*Server, error) {
 
 	logger := options.Logger
 	if logger == nil {
-		logger = log.Default()
+		logger = charmlog.Default()
 	}
 
 	routeResolver := options.RouteResolver
@@ -211,17 +213,23 @@ func (s *Server) handleCaptureRequest(w http.ResponseWriter, req *http.Request)
 		return
 	}
 
-	if result.RelayErr != nil && s.options.Verbose {
-		s.logger.Printf("relay hook error: %s", logging.SanitizeForLog(result.RelayErr.Error()))
+	if result.RelayErr != nil {
+		s.logger.Warn("relay hook error", "err", logging.SanitizeForLog(result.RelayErr.Error()))
 	}
+
 	if s.options.Verbose {
-		s.logger.Printf(
-			"captured %s %s provider=%s file=%s body=%dB",
-			logging.SanitizeForLog(result.Saved.Capture.Method),
-			logging.SanitizeForLog(logging.TruncateForLog(result.Saved.Capture.Path, 256)),
-			logging.SanitizeForLog(result.Saved.Capture.Provider),
-			logging.SanitizeForLog(result.Saved.File),
-			result.Saved.Capture.ContentLength,
+		s.logger.Info("captured",
+			"method", logging.SanitizeForLog(result.Saved.Capture.Method),
+			"path", logging.SanitizeForLog(logging.TruncateForLog(result.Saved.Capture.Path, 256)),
+			"provider", logging.SanitizeForLog(result.Saved.Capture.Provider),
+			"file", logging.SanitizeForLog(result.Saved.File),
+			"body", fmt.Sprintf("%dB", result.Saved.Capture.ContentLength),
+		)
+	} else {
+		s.logger.Info("captured",
+			"method", logging.SanitizeForLog(result.Saved.Capture.Method),
+			"path", logging.SanitizeForLog(logging.TruncateForLog(result.Saved.Capture.Path, 256)),
+			"provider", logging.SanitizeForLog(result.Saved.Capture.Provider),
 		)
 	}
 

apps/webhook-cli/internal/cli/capture/command.go

@@ -14,6 +14,7 @@ import (
 	"github.com/endalk200/better-webhook/apps/webhook-cli/internal/adapters/transport/httpcapture"
 	appcapture "github.com/endalk200/better-webhook/apps/webhook-cli/internal/app/capture"
 	"github.com/endalk200/better-webhook/apps/webhook-cli/internal/platform/runtime"
+	"github.com/endalk200/better-webhook/apps/webhook-cli/internal/platform/ui"
 )
 
 type (
@@ -55,9 +56,10 @@ func NewCommand(deps Dependencies) *cobra.Command {
 				return err
 			}
 
-			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Webhook capture server listening on http://%s:%d\n", captureArgs.Host, port)
-			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Captures directory: %s\n", captureArgs.CapturesDir)
-			_, _ = fmt.Fprintln(cmd.OutOrStdout(), "Press Ctrl+C to stop")
+			url := fmt.Sprintf("http://%s:%d", captureArgs.Host, port)
+			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s %s\n", ui.Bold.Render("Listening on"), ui.Info.Render(url))
+			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s %s\n", ui.Bold.Render("Captures dir"), ui.Muted.Render(captureArgs.CapturesDir))
+			_, _ = fmt.Fprintln(cmd.OutOrStdout(), ui.Faint.Render("Press Ctrl+C to stop"))
 
 			baseCtx := cmd.Context()
 			if baseCtx == nil {

apps/webhook-cli/internal/cli/captures/command.go

@@ -5,13 +5,15 @@ import (
 
 	appcaptures "github.com/endalk200/better-webhook/apps/webhook-cli/internal/app/captures"
 	replaycmd "github.com/endalk200/better-webhook/apps/webhook-cli/internal/cli/replay"
+	"github.com/endalk200/better-webhook/apps/webhook-cli/internal/platform/ui"
 )
 
 type ServiceFactory func(capturesDir string) (*appcaptures.Service, error)
 
 type Dependencies struct {
 	ServiceFactory     ServiceFactory
 	ReplayDependencies replaycmd.Dependencies
+	Prompter           ui.Prompter
 }
 
 func NewCommand(deps Dependencies) *cobra.Command {

apps/webhook-cli/internal/cli/captures/delete_command.go

@@ -1,16 +1,13 @@
 package captures
 
 import (
-	"bufio"
 	"context"
-	"errors"
 	"fmt"
-	"io"
-	"strings"
 
 	"github.com/spf13/cobra"
 
 	"github.com/endalk200/better-webhook/apps/webhook-cli/internal/platform/runtime"
+	"github.com/endalk200/better-webhook/apps/webhook-cli/internal/platform/ui"
 )
 
 func newDeleteCommand(deps Dependencies) *cobra.Command {
@@ -40,18 +37,23 @@ func newDeleteCommand(deps Dependencies) *cobra.Command {
 				return mapCaptureCommandError(err, deleteArgs.Selector)
 			}
 
+			prompter := deps.Prompter
+			if prompter == nil {
+				prompter = ui.DefaultPrompter
+			}
+
 			if !deleteArgs.Force {
 				id := target.Capture.ID
 				if len(id) > 8 {
 					id = id[:8]
 				}
-				prompt := fmt.Sprintf("Delete capture %s (%s %s)? [y/N]: ", id, target.Capture.Method, target.Capture.Path)
-				confirmed, confirmErr := promptConfirm(cmd, prompt)
+				prompt := fmt.Sprintf("Delete capture %s (%s %s)?", id, target.Capture.Method, target.Capture.Path)
+				confirmed, confirmErr := prompter.Confirm(prompt, cmd.InOrStdin(), cmd.OutOrStdout())
 				if confirmErr != nil {
 					return confirmErr
 				}
 				if !confirmed {
-					_, _ = fmt.Fprintln(cmd.OutOrStdout(), "Cancelled.")
+					_, _ = fmt.Fprintln(cmd.OutOrStdout(), ui.FormatCancelled())
 					return nil
 				}
 			}
@@ -65,7 +67,7 @@ func newDeleteCommand(deps Dependencies) *cobra.Command {
 			if len(shortID) > 8 {
 				shortID = shortID[:8]
 			}
-			_, _ = fmt.Fprintf(cmd.OutOrStdout(), "Deleted capture %s (%s)\n", shortID, deleted.File)
+			_, _ = fmt.Fprintln(cmd.OutOrStdout(), ui.FormatSuccess(fmt.Sprintf("Deleted capture %s (%s)", shortID, deleted.File)))
 			return nil
 		},
 	}
@@ -74,21 +76,3 @@ func newDeleteCommand(deps Dependencies) *cobra.Command {
 	cmd.Flags().String("captures-dir", "", "Directory where captures are stored")
 	return cmd
 }
-
-func promptConfirm(cmd *cobra.Command, prompt string) (bool, error) {
-	_, _ = fmt.Fprint(cmd.OutOrStdout(), prompt)
-	reader := bufio.NewReader(cmd.InOrStdin())
-	line, err := reader.ReadString('\n')
-	if err != nil {
-		if errors.Is(err, io.EOF) {
-			normalized := strings.TrimSpace(strings.ToLower(line))
-			if normalized == "" {
-				return false, nil
-			}
-			return normalized == "y" || normalized == "yes", nil
-		}
-		return false, err
-	}
-	normalized := strings.TrimSpace(strings.ToLower(line))
-	return normalized == "y" || normalized == "yes", nil
-}