fixup new codec detection

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

go.mod

@@ -4,5 +4,5 @@ go 1.16
 
 require (
 	github.com/unistack-org/micro/v3 v3.3.17
-	golang.org/x/net v0.0.0-20210505024714-0287a6fb4125
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed
 )

go.sum

@@ -9,8 +9,8 @@ github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7
 github.com/unistack-org/micro/v3 v3.3.17 h1:WcyS7InP0DlS/JpRQGLh5sG6VstkdHJbgpMp+gmHmwg=
 github.com/unistack-org/micro/v3 v3.3.17/go.mod h1:022EOEZZ789hZY3yB5ZSMXU6jLiadBgcNB/cpediV3c=
 golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 h1:Ugb8sMTWuWRC3+sz5WeN/4kejDx9BvIwnPUiJBjJE+8=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

handler.go

@@ -243,7 +243,22 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	scode := int(200)
-	if appErr := fn(ctx, hr, replyv.Interface()); appErr != nil {
+	appErr := fn(ctx, hr, replyv.Interface())
+
+	w.Header().Set("Content-Type", ct)
+	if md, ok := metadata.FromOutgoingContext(ctx); ok {
+		for k, v := range md {
+			w.Header().Set(k, v)
+		}
+	}
+	if nct := w.Header().Get("Content-Type"); nct != ct {
+		if cf, err = h.newCodec(nct); err != nil {
+			h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
+			return
+		}
+	}
+
+	if appErr != nil {
 		switch verr := appErr.(type) {
 		case *errors.Error:
 			scode = int(verr.Code)
@@ -256,19 +271,12 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	} else {
 		b, err = cf.Marshal(replyv.Interface())
 	}
+
 	if err != nil && handler.sopts.Logger.V(logger.ErrorLevel) {
 		handler.sopts.Logger.Errorf(handler.sopts.Context, "handler err: %v", err)
 		return
 	}
 
-	w.Header().Set("Content-Type", ct)
-
-	if md, ok := metadata.FromOutgoingContext(ctx); ok {
-		for k, v := range md {
-			w.Header().Set(k, v)
-		}
-	}
-
 	if nscode := GetRspCode(ctx); nscode != 0 {
 		scode = nscode
 	}

http.go

@@ -556,8 +556,6 @@ func (h *httpServer) Start() error {
 			}
 		}
 
-		ch <- ts.Close()
-
 		// deregister
 		if err := h.Deregister(); err != nil {
 			config.Logger.Errorf(config.Context, "Server deregister error: %s", err)
@@ -566,6 +564,8 @@ func (h *httpServer) Start() error {
 		if err := config.Broker.Disconnect(config.Context); err != nil {
 			config.Logger.Errorf(config.Context, "Broker disconnect error: %s", err)
 		}
+
+		ch <- ts.Close()
 	}()
 
 	return nil