refactor: 统一相似代码

internal/cmd/console/visiter.go

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: MIT
+
+package console
+
+import (
+	"net/http"
+
+	"golang.org/x/text/message"
+)
+
+type visiterResponse struct {
+	http.ResponseWriter
+	status int
+}
+
+func Visiter(next http.Handler, p *message.Printer, succ, erro *Logger) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		ww := &visiterResponse{ResponseWriter: w}
+		next.ServeHTTP(ww, r)
+		ww.printLog(p, r.URL.String(), succ, erro)
+	})
+}
+
+func (r *visiterResponse) WriteHeader(status int) {
+	r.status = status
+	r.ResponseWriter.WriteHeader(status)
+}
+
+func (r *visiterResponse) printLog(p *message.Printer, url string, succ, erro *Logger) {
+	msg := p.Sprintf("visit url", r.status, url)
+	if r.status > 399 {
+		erro.Println(msg)
+	} else {
+		succ.Println(msg)
+	}
+}

internal/cmd/preview/options.go

@@ -122,12 +122,7 @@ func (o *options) watch(succ, info, erro *console.Logger) error {
 		BaseURL: o.url,
 	}
 
-	httpServer := o.b.Handler(erro.AsLogger())
-	h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ww := &console.Response{ResponseWriter: w}
-		httpServer.ServeHTTP(ww, r)
-		ww.WriteVisitLog(o.p, r.URL.String(), succ, erro)
-	})
+	h := console.Visiter(o.b.Handler(erro.AsLogger()), o.p, succ, erro)
 	o.srv = &http.Server{Addr: o.addr, Handler: http.StripPrefix(o.path, h)}
 
 	go func() {

internal/cmd/serve/options.go

@@ -65,14 +65,8 @@ func (o *options) serve(succ, info, erro *console.Logger) error {
 		return err
 	}
 
-	httpServer := o.b.Handler(erro.AsLogger())
-	h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ww := &console.Response{ResponseWriter: w}
-		httpServer.ServeHTTP(ww, r)
-		ww.WriteVisitLog(o.p, r.URL.String(), succ, erro)
-	})
-
 	mux := http.NewServeMux()
+	h := console.Visiter(o.b.Handler(erro.AsLogger()), o.p, succ, erro)
 	mux.Handle(o.path, http.StripPrefix(o.path, h))
 	if o.hookURL != "" {
 		mux.Handle(o.hookURL, http.HandlerFunc(o.webhook))

internal/filesystem/fileserver.go

@@ -63,6 +63,6 @@ func printError(erro *log.Logger, err error, w http.ResponseWriter) {
 		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
 	case err != nil:
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+		erro.Println(err)
 	}
-	erro.Println(err)
 }

internal/filesystem/fileserver_test.go

@@ -3,6 +3,7 @@
 package filesystem
 
 import (
+	"log"
 	"net/http"
 	"os"
 	"testing"
@@ -14,7 +15,7 @@ import (
 func TestFileServer(t *testing.T) {
 	a := assert.New(t, false)
 
-	fs := FileServer(os.DirFS("./"), nil)
+	fs := FileServer(os.DirFS("./"), log.Default())
 	a.NotNil(fs)
 	http.Handle("/assets/", http.StripPrefix("/assets/", fs))