From 228251bc559abc75db1a4d805bb4693843d24deb Mon Sep 17 00:00:00 2001
From: Evstigneev Denis <danteevstigneev@yandex.ru>
Date: Fri, 27 Dec 2024 01:56:04 +0300
Subject: [PATCH] v3 (#197)

## Pull Request template
Please, go through these steps before clicking submit on this PR.

1. Give a descriptive title to your PR.
2. Provide a description of your changes.
3. Make sure you have some relevant tests.
4. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if applicable).

**PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING**

Reviewed-on: https://git.unistack.org/unistack-org/micro-server-http/pulls/197
Co-authored-by: Evstigneev Denis <danteevstigneev@yandex.ru>
Co-committed-by: Evstigneev Denis <danteevstigneev@yandex.ru>
---
 handler.go    | 7 ++++---
 request.go    | 4 +---
 subscriber.go | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/handler.go b/handler.go
index 7b3c1e4..d001c8e 100644
--- a/handler.go
+++ b/handler.go
@@ -172,7 +172,7 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 						hdlr := shdlr.(*httpHandler)
 						fh, mp, err := hdlr.handlers.Search(http.MethodPost, "/"+microMethod)
 						if err == nil {
-							match = true
+							// match = true
 							for k, v := range mp {
 								matches[k] = v
 							}
@@ -278,7 +278,7 @@ func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error)
 		}
 
 		// wrap the handler func
-		h.opts.Hooks.EachNext(func(hook options.Hook) {
+		h.opts.Hooks.EachPrev(func(hook options.Hook) {
 			if h, ok := hook.(server.HookHandler); ok {
 				fn = h(fn)
 			}
@@ -589,6 +589,7 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.Body != nil {
 		var buf []byte
 		buf, err = io.ReadAll(r.Body)
+		r.Body.Close()
 		if err != nil && err != io.EOF {
 			h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
 			return
@@ -645,7 +646,7 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return err
 	}
 
-	h.opts.Hooks.EachNext(func(hook options.Hook) {
+	h.opts.Hooks.EachPrev(func(hook options.Hook) {
 		if h, ok := hook.(server.HookHandler); ok {
 			fn = h(fn)
 		}
diff --git a/request.go b/request.go
index 1b301b2..40a7ff9 100644
--- a/request.go
+++ b/request.go
@@ -1,8 +1,6 @@
 package http
 
 import (
-	"io"
-
 	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/metadata"
 	"go.unistack.org/micro/v3/server"
@@ -14,7 +12,7 @@ var (
 )
 
 type rpcRequest struct {
-	rw          io.ReadWriter
+	// rw          io.ReadWriter
 	payload     interface{}
 	codec       codec.Codec
 	header      metadata.Metadata
diff --git a/subscriber.go b/subscriber.go
index 8d7d97a..ed0ad06 100644
--- a/subscriber.go
+++ b/subscriber.go
@@ -152,7 +152,7 @@ func (s *Server) createSubHandler(sb *httpSubscriber, opts server.Options) broke
 				return nil
 			}
 
-			opts.Hooks.EachNext(func(hook options.Hook) {
+			opts.Hooks.EachPrev(func(hook options.Hook) {
 				if h, ok := hook.(server.HookSubHandler); ok {
 					fn = h(fn)
 				}