allow to response with different content-type

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-20210423184538-5f58ad60dda6
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed
 )

go.sum

@@ -8,8 +8,9 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK
 github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
 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 h1:0PC75Fz/kyMGhL0e1QnypqK2kQMqKt9csD1GnMJR+Zk=
 golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+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

@@ -81,7 +81,15 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	ctx := metadata.NewIncomingContext(r.Context(), nil)
+	ctx := context.WithValue(r.Context(), rspCodeKey{}, &rspCodeVal{})
+	md, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
+		md = metadata.New(len(r.Header))
+	}
+	for k, v := range r.Header {
+		md.Set(k, strings.Join(v, ", "))
+	}
+	ctx = metadata.NewIncomingContext(ctx, md)
 
 	defer r.Body.Close()
 
@@ -136,15 +144,6 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	md, ok := metadata.FromIncomingContext(ctx)
-	if !ok {
-		md = metadata.New(0)
-	}
-
-	for k, v := range r.Header {
-		md.Set(k, strings.Join(v, ", "))
-	}
-
 	// get fields from url values
 	if len(r.URL.RawQuery) > 0 {
 		umd, cerr := rflutil.URLMap(r.URL.RawQuery)
@@ -203,24 +202,28 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		method:      fmt.Sprintf("%s.%s", hldr.name, hldr.mtype.method.Name),
 		body:        b,
 		payload:     argv.Interface(),
+		header:      md,
 	}
 
-	var scode int
 	// define the handler func
 	fn := func(fctx context.Context, req server.Request, rsp interface{}) (err error) {
-		fctx = context.WithValue(fctx, rspCodeKey{}, &rspCodeVal{})
-		fctx = metadata.NewIncomingContext(fctx, md)
 		returnValues = function.Call([]reflect.Value{hldr.rcvr, hldr.mtype.prepareContext(fctx), reflect.ValueOf(argv.Interface()), reflect.ValueOf(rsp)})
 
-		scode = GetRspCode(fctx)
 		// The return value for the method is an error.
 		if rerr := returnValues[0].Interface(); rerr != nil {
 			err = rerr.(error)
 		}
 
-		if md, ok := metadata.FromOutgoingContext(fctx); ok {
-			metadata.SetOutgoingContext(ctx, md)
+		md, ok := metadata.FromOutgoingContext(ctx)
+		if !ok {
+			md = metadata.New(0)
 		}
+		if nmd, ok := metadata.FromOutgoingContext(fctx); ok {
+			for k, v := range nmd {
+				md.Set(k, v)
+			}
+		}
+		metadata.SetOutgoingContext(ctx, md)
 
 		return err
 	}
@@ -239,7 +242,23 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		ct = DefaultContentType
 	}
 
-	if appErr := fn(ctx, hr, replyv.Interface()); appErr != nil {
+	scode := int(200)
+	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 ct != w.Header().Get("Content-Type") {
+		if cf, err = h.newCodec(ct); 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)
@@ -252,24 +271,17 @@ 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
 	}
 
-	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
 	}
-	}
-
-	w.Header().Set("content-Type", ct)
-	if scode != 0 {
 	w.WriteHeader(scode)
-	} else {
-		// handler.sopts.Logger.Warn(handler.sopts.Context, "response code not set in handler via SetRspCode(ctx, http.StatusXXX)")
-		w.WriteHeader(200)
-	}
+
 	if _, cerr := w.Write(b); cerr != nil {
 		logger.DefaultLogger.Errorf(ctx, "write failed: %v", cerr)
 	}

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