feat(gnobro): add json log format

contribs/gnodev/cmd/gnobro/main.go

@@ -5,6 +5,7 @@ import (
  "errors"
  "flag"
  "fmt"
+ "io"
  "log/slog"
  "net"
  "net/url"
@@ -21,7 +22,6 @@ import (
  "github.com/charmbracelet/wish"
  "github.com/charmbracelet/wish/activeterm"
  "github.com/charmbracelet/wish/bubbletea"
- "github.com/charmbracelet/wish/logging"
  "golang.org/x/sync/errgroup"
 
  "github.com/gnolang/gno/contribs/gnodev/pkg/browser"
@@ -47,6 +47,7 @@ type broCfg struct {
  sshListener string
  sshHostKeyPath string
  banner bool
+ jsonlog bool
 }
 
 var defaultBroOptions = broCfg{
@@ -152,6 +153,13 @@ func (c *broCfg) RegisterFlags(fs *flag.FlagSet) {
  defaultBroOptions.readonly,
  "readonly mode, no commands allowed",
  )
+
+ fs.BoolVar(
+ &c.jsonlog,
+ "jsonlog",
+ defaultBroOptions.jsonlog,
+ "display server log as json format",
+ )
 }
 
 func execBrowser(cfg *broCfg, args []string, cio commands.IO) error {
@@ -277,9 +285,7 @@ func runLocal(ctx context.Context, gnocl *gnoclient.Client, cfg *broCfg, bcfg br
 
 func runServer(ctx context.Context, gnocl *gnoclient.Client, cfg *broCfg, bcfg browser.Config, io commands.IO) error {
  // setup logger
- charmlogger := charmlog.New(io.Out())
- charmlogger.SetLevel(charmlog.DebugLevel)
- logger := slog.New(charmlogger)
+ logger := newlogger(io.Out(), cfg.jsonlog)
 
  teaHandler := func(s ssh.Session) (tea.Model, []tea.ProgramOption) {
  shortid := fmt.Sprintf("%.10s", s.Context().SessionID())
@@ -326,8 +332,8 @@ func runServer(ctx context.Context, gnocl *gnoclient.Client, cfg *broCfg, bcfg b
  bubbletea.Middleware(teaHandler),
  activeterm.Middleware(), // ensure PTY
  ValidatePathCommandMiddleware(bcfg.URLPrefix),
- logging.StructuredMiddlewareWithLogger(
- charmlogger, charmlog.DebugLevel,
+ StructuredMiddlewareWithLogger(
+ ctx, logger, slog.LevelInfo,
  ),
  // XXX: add ip throttler
  ),
@@ -358,7 +364,9 @@ func runServer(ctx context.Context, gnocl *gnoclient.Client, cfg *broCfg, bcfg b
  return err
  }
 
- io.Println("Bye!")
+ if !cfg.jsonlog {
+ io.Println("Bye!")
+ }
  return nil
 }
 
@@ -460,3 +468,47 @@ func ValidatePathCommandMiddleware(pathPrefix string) wish.Middleware {
  }
  }
 }
+
+func StructuredMiddlewareWithLogger(ctx context.Context, logger *slog.Logger, level slog.Level) wish.Middleware {
+ return func(next ssh.Handler) ssh.Handler {
+ return func(sess ssh.Session) {
+ ct := time.Now()
+ hpk := sess.PublicKey() != nil
+ pty, _, _ := sess.Pty()
+ logger.Log(
+ ctx,
+ level,
+ "connect",
+ "user", sess.User(),
+ "remote-addr", sess.RemoteAddr().String(),
+ "public-key", hpk,
+ "command", sess.Command(),
+ "term", pty.Term,
+ "width", pty.Window.Width,
+ "height", pty.Window.Height,
+ "client-version", sess.Context().ClientVersion(),
+ )
+ next(sess)
+ logger.Log(
+ ctx,
+ level,
+ "disconnect",
+ "user", sess.User(),
+ "remote-addr", sess.RemoteAddr().String(),
+ "duration", time.Since(ct),
+ )
+ }
+ }
+}
+
+func newlogger(out io.Writer, json bool) *slog.Logger {
+ if json {
+ return slog.New(slog.NewJSONHandler(out, &slog.HandlerOptions{
+ Level: slog.LevelDebug,
+ }))
+ }
+
+ charmlogger := charmlog.New(out)
+ charmlogger.SetLevel(charmlog.DebugLevel)
+ return slog.New(charmlogger)
+}