fix log wrapped incorrectly in WebUI, implement log SSR

2026-04-10 02:43:37 +02:00 · 2025-01-23 00:08:19 +08:00
parent 2bb13129de
commit ed3b26653c
7 changed files with 291 additions and 39 deletions
--- a/internal/logging/html.go
+++ b/internal/logging/html.go
@@ -0,0 +1,131 @@
+package logging
+
+import (
+	"bytes"
+	"time"
+
+	"github.com/rs/zerolog"
+	"github.com/yusing/go-proxy/internal/common"
+	ansiPkg "github.com/yusing/go-proxy/internal/utils/strutils/ansi"
+)
+
+func fmtMessageToHTMLBytes(msg string, buf []byte) []byte {
+	buf = append(buf, []byte(`<span class="log-message">`)...)
+	var last byte
+
+	isAnsi := false
+	nAnsi := 0
+	ansi := bytes.NewBuffer(make([]byte, 0, 4))
+	ansiContent := bytes.NewBuffer(make([]byte, 0, 30))
+	style := bytes.NewBuffer(make([]byte, 0, 30))
+
+	for _, r := range msg {
+		if last == '\n' {
+			buf = append(buf, prefixHTML...)
+		}
+		if last == '\x1b' {
+			if r != 'm' {
+				ansi.WriteRune(r)
+				if r == '[' && ansiContent.Len() > 0 {
+					buf = append(buf, []byte(`<span `)...)
+					buf = append(buf, style.Bytes()...)
+					buf = append(buf, []byte(`>`)...)
+					buf = append(buf, ansiContent.Bytes()...)
+					style.Reset()
+					ansiContent.Reset()
+					nAnsi++
+				}
+			} else {
+				ansiCode := ansi.String()
+				switch ansiCode {
+				case "[0": // reset
+					if style.Len() > 0 {
+						buf = append(buf, []byte(`<span `)...)
+						buf = append(buf, style.Bytes()...)
+						buf = append(buf, []byte(`>`)...)
+					}
+					for nAnsi-1 > 0 {
+						buf = append(buf, []byte(`</span>`)...)
+						nAnsi--
+					}
+					nAnsi = 0
+					buf = append(buf, ansiContent.Bytes()...)
+					buf = append(buf, []byte(`</span>`)...)
+					isAnsi = false
+					ansiContent.Reset()
+					style.Reset()
+				case "[1": // bold
+					style.WriteString(`class="log-bold" `)
+				default:
+					className, ok := ansiPkg.ToHTMLClass[ansiCode]
+					if ok {
+						style.WriteString(`class="` + className + `" `)
+					} else {
+						style.WriteString(`class="log-unknown-ansi" `)
+					}
+				}
+				ansi.Reset()
+				last = 0
+			}
+			continue
+		}
+
+		last = byte(r)
+		if r == '\x1b' {
+			isAnsi = true
+			continue
+		}
+		if isAnsi || nAnsi > 0 {
+			if symbol, ok := symbolMapping[r]; ok {
+				ansiContent.Write(symbol)
+			} else {
+				ansiContent.WriteRune(r)
+			}
+		} else {
+			if symbol, ok := symbolMapping[r]; ok {
+				buf = append(buf, symbol...)
+			} else {
+				buf = append(buf, last)
+			}
+		}
+	}
+
+	buf = append(buf, []byte("</span>")...)
+	return buf
+}
+
+var levelHTMLFormats = [][]byte{
+	[]byte(` <span class="log-trace">TRC</span> `),
+	[]byte(` <span class="log-debug">DBG</span> `),
+	[]byte(` <span class="log-info">INF</span> `),
+	[]byte(` <span class="log-warn">WRN</span> `),
+	[]byte(` <span class="log-error">ERR</span> `),
+	[]byte(` <span class="log-fatal">FTL</span> `),
+	[]byte(` <span class="log-panic">PAN</span> `),
+}
+
+var symbolMapping = map[rune][]byte{
+	'•':  []byte("&middot;"),
+	'>':  []byte("&gt;"),
+	'<':  []byte("&lt;"),
+	'\t': []byte("&ensp;"),
+	'\n': []byte("<br>"),
+}
+
+func timeNowHTML() []byte {
+	if !common.IsTest {
+		return []byte(time.Now().Format(timeFmt))
+	}
+	return []byte(time.Date(2024, 1, 1, 1, 1, 1, 1, time.UTC).Format(timeFmt))
+}
+
+func FormatLogEntryHTML(level zerolog.Level, message string, buf []byte) []byte {
+	buf = append(buf, []byte(`<pre class="log-entry">`)...)
+	buf = append(buf, timeNowHTML()...)
+	if level < zerolog.NoLevel {
+		buf = append(buf, levelHTMLFormats[level+1]...)
+	}
+	buf = fmtMessageToHTMLBytes(message, buf)
+	buf = append(buf, []byte("</pre>")...)
+	return buf
+}
--- a/internal/logging/html_test.go
+++ b/internal/logging/html_test.go
@@ -0,0 +1,30 @@
+package logging
+
+import (
+	"testing"
+
+	"github.com/rs/zerolog"
+	. "github.com/yusing/go-proxy/internal/utils/testing"
+)
+
+func TestFormatHTML(t *testing.T) {
+	buf := make([]byte, 0, 100)
+	buf = FormatLogEntryHTML(zerolog.InfoLevel, "This is a test.\nThis is a new line.", buf)
+	ExpectEqual(t, string(buf), `<pre class="log-entry">01-01 01:01 <span class="log-info">INF</span> <span class="log-message">This is a test.<br>`+prefix+`This is a new line.</span></pre>`)
+}
+
+func TestFormatHTMLANSI(t *testing.T) {
+	buf := make([]byte, 0, 100)
+	buf = FormatLogEntryHTML(zerolog.InfoLevel, "This is \x1b[91m\x1b[1ma test.\x1b[0mOK!.", buf)
+	ExpectEqual(t, string(buf), `<pre class="log-entry">01-01 01:01 <span class="log-info">INF</span> <span class="log-message">This is <span class="log-red" class="log-bold" >a test.</span>OK!.</span></pre>`)
+	buf = buf[:0]
+	buf = FormatLogEntryHTML(zerolog.InfoLevel, "This is \x1b[91ma \x1b[1mtest.\x1b[0mOK!.", buf)
+	ExpectEqual(t, string(buf), `<pre class="log-entry">01-01 01:01 <span class="log-info">INF</span> <span class="log-message">This is <span class="log-red" >a <span class="log-bold" >test.</span></span>OK!.</span></pre>`)
+}
+
+func BenchmarkFormatLogEntryHTML(b *testing.B) {
+	buf := make([]byte, 0, 100)
+	for range b.N {
+		FormatLogEntryHTML(zerolog.InfoLevel, "This is \x1b[91ma \x1b[1mtest.\x1b[0mOK!.", buf)
+	}
+}
--- a/internal/logging/logging.go
+++ b/internal/logging/logging.go
@@ -10,13 +10,15 @@ import (
 	"github.com/yusing/go-proxy/internal/utils/strutils"
 )

-var logger zerolog.Logger
-
-func InitLogger(out io.Writer) {
-	var timeFmt string
-	var level zerolog.Level
-	var exclude []string
+var (
+	logger     zerolog.Logger
+	timeFmt    string
+	level      zerolog.Level
+	prefix     string
+	prefixHTML []byte
+)

+func init() {
 	switch {
 	case common.IsTrace:
 		timeFmt = "04:05"
@@ -28,27 +30,37 @@ func InitLogger(out io.Writer) {
 		timeFmt = "01-02 15:04"
 		level = zerolog.InfoLevel
 	}
-
 	prefixLength := len(timeFmt) + 5 // level takes 3 + 2 spaces
-	prefix := strings.Repeat(" ", prefixLength)
+	prefix = strings.Repeat(" ", prefixLength)
+	// prefixHTML = []byte(strings.Repeat("&nbsp;", prefixLength))
+	prefixHTML = []byte(prefix)

-	logger = zerolog.New(
-		zerolog.ConsoleWriter{
-			Out:           out,
-			TimeFormat:    timeFmt,
-			FieldsExclude: exclude,
-			FormatMessage: func(msgI interface{}) string { // pad spaces for each line
-				msg := msgI.(string)
-				lines := strutils.SplitRune(msg, '\n')
-				if len(lines) == 1 {
-					return msg
-				}
-				for i := 1; i < len(lines); i++ {
-					lines[i] = prefix + lines[i]
-				}
-				return strutils.JoinRune(lines, '\n')
-			},
+	if zerolog.TraceLevel != -1 && zerolog.NoLevel != 6 {
+		panic("zerolog implementation changed")
+	}
+}
+
+func fmtMessage(msg string) string {
+	lines := strutils.SplitRune(msg, '\n')
+	if len(lines) == 1 {
+		return msg
+	}
+	for i := 1; i < len(lines); i++ {
+		lines[i] = prefix + lines[i]
+	}
+	return strutils.JoinRune(lines, '\n')
+}
+
+func InitLogger(out io.Writer) {
+	writer := zerolog.ConsoleWriter{
+		Out:        out,
+		TimeFormat: timeFmt,
+		FormatMessage: func(msgI interface{}) string { // pad spaces for each line
+			return fmtMessage(msgI.(string))
 		},
+	}
+	logger = zerolog.New(
+		writer,
 	).Level(level).With().Timestamp().Logger()
 }