From ebd953de1cbae987d0ad7366f3d6846d659b77f1 Mon Sep 17 00:00:00 2001
From: Gorbunov Kirill Andreevich <kgorbunov@mtsbank.ru>
Date: Mon, 18 Mar 2024 16:03:26 +0300
Subject: [PATCH] New metadata

---
 handler.go | 50 +++++++++++++++++++++++++-------------------------
 http.go    |  4 ++--
 util.go    | 10 ++++------
 3 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/handler.go b/handler.go
index 23cb470..803a1c7 100644
--- a/handler.go
+++ b/handler.go
@@ -109,20 +109,20 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 			md = metadata.New(len(r.Header) + 8)
 		}
 		for k, v := range r.Header {
-			md[k] = v
+			md[k] = v[0]
 		}
-		md["RemoteAddr"] = []string{r.RemoteAddr}
-		md["Method"] = []string{r.Method}
-		md["URL"] = []string{r.URL.String()}
-		md["Proto"] = []string{r.Proto}
-		md["Content-Length"] = []string{fmt.Sprintf("%d", r.ContentLength)}
-		md["Transfer-Encoding"] = r.TransferEncoding
-		md["Host"] = []string{r.Host}
-		md["RequestURI"] = []string{r.RequestURI}
+		md["RemoteAddr"] = r.RemoteAddr
+		md["Method"] = r.Method
+		md["URL"] = r.URL.String()
+		md["Proto"] = r.Proto
+		md["Content-Length"] = fmt.Sprintf("%d", r.ContentLength)
+		md["Transfer-Encoding"] = r.TransferEncoding[0]
+		md["Host"] = r.Host
+		md["RequestURI"] = r.RequestURI
 		if r.TLS != nil {
-			md["TLS"] = []string{"true"}
-			md["TLS-ALPN"] = []string{r.TLS.NegotiatedProtocol}
-			md["TLS-ServerName"] = []string{r.TLS.ServerName}
+			md["TLS"] = "true"
+			md["TLS-ALPN"] = r.TLS.NegotiatedProtocol
+			md["TLS-ServerName"] = r.TLS.ServerName
 		}
 
 		ctx = metadata.NewIncomingContext(ctx, md)
@@ -290,7 +290,7 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 		w.Header().Set(metadata.HeaderContentType, ct)
 		if md, ok := metadata.FromOutgoingContext(ctx); ok {
 			for k, v := range md {
-				w.Header()[k] = v
+				w.Header()[k] = []string{v}
 			}
 		}
 		if md := getRspHeader(ctx); md != nil {
@@ -349,23 +349,23 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		md = metadata.New(len(r.Header) + 8)
 	}
 	for k, v := range r.Header {
-		md[k] = v
+		md[k] = v[0]
 	}
-	md["RemoteAddr"] = []string{r.RemoteAddr}
+	md["RemoteAddr"] = r.RemoteAddr
 	if r.TLS != nil {
-		md["Scheme"] = []string{"https"}
+		md["Scheme"] = "https"
 	} else {
-		md["Scheme"] = []string{"http"}
+		md["Scheme"] = "http"
 	}
-	md["Method"] = []string{r.Method}
-	md["URL"] = []string{r.URL.String()}
-	md["Proto"] = []string{r.Proto}
-	md["Content-Length"] = []string{fmt.Sprintf("%d", r.ContentLength)}
+	md["Method"] = r.Method
+	md["URL"] = r.URL.String()
+	md["Proto"] = r.Proto
+	md["Content-Length"] = fmt.Sprintf("%d", r.ContentLength)
 	if len(r.TransferEncoding) > 0 {
-		md["Transfer-Encoding"] = r.TransferEncoding
+		md["Transfer-Encoding"] = r.TransferEncoding[0]
 	}
-	md["Host"] = []string{r.Host}
-	md["RequestURI"] = []string{r.RequestURI}
+	md["Host"] = r.Host
+	md["RequestURI"] = r.RequestURI
 	ctx = metadata.NewIncomingContext(ctx, md)
 
 	path := r.URL.Path
@@ -550,7 +550,7 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set(metadata.HeaderContentType, ct)
 	if md, ok := metadata.FromOutgoingContext(ctx); ok {
 		for k, v := range md {
-			w.Header()[k] = v
+			w.Header()[k] = []string{v}
 		}
 	}
 	if md := getRspHeader(ctx); md != nil {
diff --git a/http.go b/http.go
index d8f41e9..9dfdffd 100644
--- a/http.go
+++ b/http.go
@@ -217,7 +217,7 @@ func (h *Server) newHTTPHandler(handler interface{}, opts ...options.Option) *ht
 		pth := &patHandler{mtype: mtype, name: name, rcvr: rcvr}
 		hdlr.name = name
 
-		if err := hdlr.handlers.Insert(md["Method"], md["Path"][0], pth); err != nil {
+		if err := hdlr.handlers.Insert([]string{md["Method"]}, md["Path"], pth); err != nil {
 			h.opts.Logger.Error(h.opts.Context, fmt.Sprintf("cant add handler for %s %s", md["Method"][0], md["Path"][0]))
 		}
 
@@ -468,7 +468,7 @@ func (h *Server) Start() error {
 
 	go func() {
 		if cerr := hs.Serve(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) {
-			h.opts.Logger.Error(h.opts.Context, cerr)
+			h.opts.Logger.Error(h.opts.Context, cerr.Error())
 		}
 	}()
 
diff --git a/util.go b/util.go
index d856146..d07d3ad 100644
--- a/util.go
+++ b/util.go
@@ -33,13 +33,11 @@ func FillRequest(ctx context.Context, req interface{}, opts ...FillRequestOption
 
 	cookies := md["Cookie"]
 	cmd := make(map[string]string, len(cookies))
-	for _, cookie := range cookies {
-		kv := strings.Split(cookie, "=")
-		if len(kv) != 2 {
-			continue
-		}
-		cmd[strings.TrimSpace(kv[0])] = strings.TrimSpace(kv[1])
+	kv := strings.Split(cookies, "=")
+	if len(kv) != 2 {
+		return nil
 	}
+	cmd[strings.TrimSpace(kv[0])] = strings.TrimSpace(kv[1])
 	for idx := 0; idx < len(options.cookies)/2; idx += 2 {
 		k := http.CanonicalHeaderKey(options.cookies[idx])
 		v, ok := cmd[k]