From a21683cb9169d891b463cadf08ae4f32ed0cc145 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Wed, 18 Sep 2024 10:48:39 +0200
Subject: [PATCH 1/2] feat(gnobro): jsonlog

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 contribs/gnodev/cmd/gnobro/main.go | 66 ++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/contribs/gnodev/cmd/gnobro/main.go b/contribs/gnodev/cmd/gnobro/main.go
index 6bb6bfc2396..c8808df16f6 100644
--- a/contribs/gnodev/cmd/gnobro/main.go
+++ b/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)
+}

From 149c6e727c02e35f6aadecb30ccf5734d4fd4504 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Thu, 19 Sep 2024 09:21:34 +0200
Subject: [PATCH 2/2] chore: rename newlogger to newLogger

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 contribs/gnodev/cmd/gnobro/main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contribs/gnodev/cmd/gnobro/main.go b/contribs/gnodev/cmd/gnobro/main.go
index c8808df16f6..092a441542a 100644
--- a/contribs/gnodev/cmd/gnobro/main.go
+++ b/contribs/gnodev/cmd/gnobro/main.go
@@ -285,7 +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
-	logger := newlogger(io.Out(), cfg.jsonlog)
+	logger := newLogger(io.Out(), cfg.jsonlog)
 
 	teaHandler := func(s ssh.Session) (tea.Model, []tea.ProgramOption) {
 		shortid := fmt.Sprintf("%.10s", s.Context().SessionID())
@@ -501,7 +501,7 @@ func StructuredMiddlewareWithLogger(ctx context.Context, logger *slog.Logger, le
 	}
 }
 
-func newlogger(out io.Writer, json bool) *slog.Logger {
+func newLogger(out io.Writer, json bool) *slog.Logger {
 	if json {
 		return slog.New(slog.NewJSONHandler(out, &slog.HandlerOptions{
 			Level: slog.LevelDebug,