update: serve log

Author: luopengift

options.go

@@ -49,7 +49,6 @@ type Option func(*Options)
 func newOptions(opts []Option, extends ...Option) Options {
 	opt := Options{
 		URL:      "http://127.0.0.1:80",
-		Method:   "GET",
 		RawQuery: make(url.Values),
 		Header:   make(http.Header),
 		Timeout:  30 * time.Second,
@@ -268,7 +267,9 @@ func Proxy(addr string) Option {
 // Setup is used for client middleware
 func Setup(fn ...func(tripper http.RoundTripper) http.RoundTripper) Option {
 	return func(o *Options) {
-		o.HttpRoundTripper = append(o.HttpRoundTripper, fn...)
+		for _, f := range fn {
+			o.HttpRoundTripper = append([]func(http.RoundTripper) http.RoundTripper{f}, o.HttpRoundTripper...)
+		}
 	}
 }
 
@@ -288,11 +289,12 @@ func RoundTripper(tr http.RoundTripper) Option {
 	}
 }
 
-// Logf must be used as a first option.
+// Logf xxx
 func Logf(f func(context.Context, *Stat)) Option {
 	return func(o *Options) {
 		o.HttpRoundTripper = append([]func(http.RoundTripper) http.RoundTripper{printRoundTripper(f)}, o.HttpRoundTripper...)
-		o.HttpHandler = append(o.HttpHandler, printHandler(f))
+		o.HttpHandler = append([]func(http.Handler) http.Handler{printHandler(f)}, o.HttpHandler...)
+
 	}
 }
 

server.go

@@ -153,6 +153,11 @@ func (mux *ServeMux) Use(fn ...func(http.Handler) http.Handler) {
 func (mux *ServeMux) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	current := mux.root.Find(strings.TrimLeft(r.URL.Path, "/"))
 	handler, options := current.handler, newOptions(mux.opts, current.opts...)
+
+	if options.Method != "" && r.Method != options.Method {
+		handler = ErrHandler(http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
+	}
+
 	for _, h := range options.HttpHandler {
 		handler = h(handler)
 	}

session.go

@@ -86,9 +86,8 @@ func (s *Session) RoundTripper(opts ...Option) http.RoundTripper {
 		if options.Transport == nil {
 			options.Transport = RoundTripperFunc(s.client.Do)
 		}
-		// Apply middleware in reverse order
-		for i := len(options.HttpRoundTripper) - 1; i >= 0; i-- {
-			options.Transport = options.HttpRoundTripper[i](options.Transport)
+		for _, tr := range options.HttpRoundTripper {
+			options.Transport = tr(options.Transport)
 		}
 		return options.Transport.RoundTrip(r)
 	})

use_test.go

@@ -229,13 +229,32 @@ func TestPrintHandler(t *testing.T) {
 	}
 }
 
+func requestIdMiddle() func(next http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			// 从请求头中获取 request-id
+			requestId := GenId(r.Header.Get("request-id"))
+			// 将 request-id 添加到响应头
+			r.Header.Set("request-id", requestId)
+			w.Header().Set("request-id", requestId)
+			// 调用下一个处理器
+			// 定义请求ID的上下文键类型
+			type requestIDKey struct{}
+
+			// 使用自定义类型作为上下文键
+			r2 := r.WithContext(context.WithValue(r.Context(), requestIDKey{}, requestId))
+			next.ServeHTTP(w, r2)
+		})
+	}
+}
+
 func Test_SSE(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
-	r := NewServeMux(Logf(LogS))
+	r := NewServeMux(Logf(LogS), Use(requestIdMiddle()))
 	r.Route("/123", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(200)
 		w.Write([]byte("hello world"))
-	})
+	}, Method("PUT"))
 	r.Route("/sse", func(w http.ResponseWriter, r *http.Request) {
 
 		for i := 0; i < 3; i++ {
@@ -246,7 +265,7 @@ func Test_SSE(t *testing.T) {
 				w.Write([]byte(fmt.Sprintf(`{"a":"12345\n", "b": %d}`, i)))
 			}
 		}
-	}, Use(SSE()))
+	}, Use(SSE()), Method("DELETE"))
 	s := NewServer(ctx, r, URL("http://0.0.0.0:1234"))
 	go s.ListenAndServe()
 	time.Sleep(1 * time.Second)
@@ -282,3 +301,38 @@ func SSERound(i int64, b []byte, f func([]byte) error) error {
 		return nil
 	}
 }
+
+func Test_UseStep(t *testing.T) {
+	var ss []string
+	var use = func(stage, step string) func(next http.Handler) http.Handler {
+		return func(next http.Handler) http.Handler {
+			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				ss = append(ss, fmt.Sprintf("%s-%s-start", stage, step))
+				t.Logf("use: %s-%s-start", stage, step)
+				next.ServeHTTP(w, r)
+				ss = append(ss, fmt.Sprintf("%s-%s-end", stage, step))
+				t.Logf("use: %s-%s-end", stage, step)
+			})
+		}
+	}
+
+	mux := NewServeMux(
+		Use(requestIdMiddle()),
+		Logf(func(ctx context.Context, stat *Stat) {
+			t.Logf("mux: Logf: %v", ctx.Value("request-id"))
+		}),
+		Use(use("mux", "1")),
+		Use(use("mux", "2")),
+		Use(use("mux", "3")),
+	)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	mux.Route("/", func(w http.ResponseWriter, r *http.Request) {
+		w.Write([]byte("hello world"))
+	}, Use(use("route", "1"), use("route", "2"), use("route", "3")))
+	server := NewServer(ctx, mux, URL("http://0.0.0.0:9090"), Use(use("server", "1"), use("server", "2"), use("server", "3")))
+	go server.ListenAndServe()
+
+	Get("http://127.0.0.1:9090/")
+	time.Sleep(1 * time.Second)
+}

util.go

@@ -37,7 +37,7 @@ func CopyBody(b io.ReadCloser) (*bytes.Buffer, io.ReadCloser, error) {
 }
 
 // LogS supply default handle Stat, print to stdout.
-func LogS(_ context.Context, stat *Stat) {
+func LogS(ctx context.Context, stat *Stat) {
 	if stat.Response.URL == "" {
 		_, _ = fmt.Printf("%s\n", stat)
 		return