Merge pull request 'issue-155: add swagger-ui handler' (#157) from swaggerui into v3

Reviewed-on: #157

README.md

@@ -9,8 +9,8 @@ to create a HTTP Server that could potentially be used for REST based API servic
 import (
 	"net/http"
 
-	"go.unistack.org/micro/v4/server"
-	httpServer "go.unistack.org/micro-server-http/v4"
+	"github.com/unistack-org/micro/v3/server"
+	httpServer "github.com/unistack-org/micro-server-http"
 )
 
 func main() {
@@ -37,9 +37,9 @@ Or as part of a service
 import (
 	"net/http"
 
-	"go.unistack.org/micro/v4"
-	"go.unistack.org/micro/v4/server"
-	httpServer "go.unistack.org/micro-server-http/v4"
+	"github.com/unistack-org/micro/v3"
+	"github.com/unistack-org/micro/v3/server"
+	httpServer "github.com/unistack-org/micro-server-http"
 )
 
 func main() {

go.mod

@@ -1,10 +1,10 @@
-module go.unistack.org/micro-server-http/v4
+module go.unistack.org/micro-server-http/v3
 
-go 1.19
+go 1.18
 
 require (
-	go.unistack.org/micro-proto/v4 v4.0.0
-	go.unistack.org/micro/v4 v4.0.1
+	go.unistack.org/micro-proto/v3 v3.3.1
+	go.unistack.org/micro/v3 v3.10.14
 	golang.org/x/net v0.7.0
 )
 

go.sum

@@ -48,14 +48,17 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
 github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -65,10 +68,10 @@ github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.unistack.org/micro-proto/v4 v4.0.0 h1:+TAwKSlx48eLsNO2E2cO0JLE8we1KU2AuWe9Q310FuU=
-go.unistack.org/micro-proto/v4 v4.0.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
-go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
+go.unistack.org/micro-proto/v3 v3.3.1 h1:nQ0MtWvP2G3QrpOgawVOPhpZZYkq6umTGDqs8FxJYIo=
+go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE=
+go.unistack.org/micro/v3 v3.10.14 h1:7fgLpwGlCN67twhwtngJDEQvrMkUBDSA5vzZqxIDqNE=
+go.unistack.org/micro/v3 v3.10.14/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -147,6 +150,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

handler.go

@@ -9,13 +9,13 @@ import (
 	"strings"
 	"sync"
 
-	"go.unistack.org/micro/v4/errors"
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/register"
-	"go.unistack.org/micro/v4/server"
-	rhttp "go.unistack.org/micro/v4/util/http"
-	rflutil "go.unistack.org/micro/v4/util/reflect"
+	"go.unistack.org/micro/v3/errors"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/register"
+	"go.unistack.org/micro/v3/server"
+	rhttp "go.unistack.org/micro/v3/util/http"
+	rflutil "go.unistack.org/micro/v3/util/reflect"
 )
 
 var (
@@ -60,280 +60,7 @@ func (h *httpHandler) Options() server.HandlerOptions {
 	return h.opts
 }
 
-func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error) {
-	if handler == nil {
-		return nil, fmt.Errorf("invalid handler specified: %v", handler)
-	}
-
-	rtype := reflect.TypeOf(handler)
-	if rtype.NumIn() != 3 {
-		return nil, fmt.Errorf("invalid handler, NumIn != 3: %v", rtype.NumIn())
-	}
-
-	argType := rtype.In(1)
-	replyType := rtype.In(2)
-
-	// First arg need not be a pointer.
-	if !isExportedOrBuiltinType(argType) {
-		return nil, fmt.Errorf("invalid handler, argument type not exported: %v", argType)
-	}
-
-	if replyType.Kind() != reflect.Ptr {
-		return nil, fmt.Errorf("invalid handler, reply type not a pointer: %v", replyType)
-	}
-
-	// Reply type must be exported.
-	if !isExportedOrBuiltinType(replyType) {
-		return nil, fmt.Errorf("invalid handler, reply type not exported: %v", replyType)
-	}
-
-	if rtype.NumOut() != 1 {
-		return nil, fmt.Errorf("invalid handler, has wrong number of outs: %v", rtype.NumOut())
-	}
-
-	// The return type of the method must be error.
-	if returnType := rtype.Out(0); returnType != typeOfError {
-		return nil, fmt.Errorf("invalid handler, returns %v not error", returnType.String())
-	}
-
-	return func(w http.ResponseWriter, r *http.Request) {
-		ct := DefaultContentType
-		if htype := r.Header.Get(metadata.HeaderContentType); htype != "" {
-			ct = htype
-		}
-
-		ctx := context.WithValue(r.Context(), rspCodeKey{}, &rspCodeVal{})
-		ctx = context.WithValue(ctx, rspHeaderKey{}, &rspHeaderVal{})
-		md, ok := metadata.FromIncomingContext(ctx)
-		if !ok {
-			md = metadata.New(len(r.Header) + 8)
-		}
-		for k, v := range r.Header {
-			md[k] = strings.Join(v, ", ")
-		}
-		md["RemoteAddr"] = r.RemoteAddr
-		md["Method"] = r.Method
-		md["URL"] = r.URL.String()
-		md["Proto"] = r.Proto
-		md["ContentLength"] = fmt.Sprintf("%d", r.ContentLength)
-		md["TransferEncoding"] = strings.Join(r.TransferEncoding, ",")
-		md["Host"] = r.Host
-		md["RequestURI"] = r.RequestURI
-		ctx = metadata.NewIncomingContext(ctx, md)
-
-		path := r.URL.Path
-
-		if r.Body != nil {
-			defer r.Body.Close()
-		}
-
-		matches := make(map[string]interface{})
-		var match bool
-		var hldr *patHandler
-		var handler *httpHandler
-
-		for _, shdlr := range h.handlers {
-			hdlr := shdlr.(*httpHandler)
-			fh, mp, err := hdlr.handlers.Search(r.Method, path)
-			if err == nil {
-				match = true
-				for k, v := range mp {
-					matches[k] = v
-				}
-				hldr = fh.(*patHandler)
-				handler = hdlr
-				break
-			} else if err == rhttp.ErrMethodNotAllowed && !h.registerRPC {
-				w.WriteHeader(http.StatusMethodNotAllowed)
-				_, _ = w.Write([]byte("not matching route found"))
-				return
-			}
-		}
-
-		if !match && h.registerRPC {
-			microMethod, mok := md.Get(metadata.HeaderEndpoint)
-			if mok {
-				serviceMethod := strings.Split(microMethod, ".")
-				if len(serviceMethod) == 2 {
-					if shdlr, ok := h.handlers[serviceMethod[0]]; ok {
-						hdlr := shdlr.(*httpHandler)
-						fh, mp, err := hdlr.handlers.Search(http.MethodPost, "/"+microMethod)
-						if err == nil {
-							match = true
-							for k, v := range mp {
-								matches[k] = v
-							}
-							hldr = fh.(*patHandler)
-							handler = hdlr
-						}
-					}
-				}
-			}
-		}
-
-		// get fields from url values
-		if len(r.URL.RawQuery) > 0 {
-			umd, cerr := rflutil.URLMap(r.URL.RawQuery)
-			if cerr != nil {
-				w.WriteHeader(http.StatusInternalServerError)
-				_, _ = w.Write([]byte(cerr.Error()))
-				return
-			}
-			for k, v := range umd {
-				matches[k] = v
-			}
-		}
-
-		cf, err := h.newCodec(ct)
-		if err != nil {
-			w.WriteHeader(http.StatusBadRequest)
-			_, _ = w.Write([]byte(err.Error()))
-			return
-		}
-
-		var argv, replyv reflect.Value
-
-		// Decode the argument value.
-		argIsValue := false // if true, need to indirect before calling.
-		if hldr.mtype.ArgType.Kind() == reflect.Ptr {
-			argv = reflect.New(hldr.mtype.ArgType.Elem())
-		} else {
-			argv = reflect.New(hldr.mtype.ArgType)
-			argIsValue = true
-		}
-
-		if argIsValue {
-			argv = argv.Elem()
-		}
-
-		// reply value
-		replyv = reflect.New(hldr.mtype.ReplyType.Elem())
-
-		function := hldr.mtype.method.Func
-		var returnValues []reflect.Value
-
-		if r.Body != nil {
-			var buf []byte
-			buf, err = io.ReadAll(r.Body)
-			if err != nil && err != io.EOF {
-				h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
-				return
-			}
-
-			if err = cf.Unmarshal(buf, argv.Interface()); err != nil {
-				h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
-				return
-			}
-		}
-
-		matches = rflutil.FlattenMap(matches)
-		if err = rflutil.Merge(argv.Interface(), matches, rflutil.SliceAppend(true), rflutil.Tags([]string{"protobuf", "json"})); err != nil {
-			h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
-			return
-		}
-
-		hr := &rpcRequest{
-			codec:       cf,
-			service:     handler.sopts.Name,
-			contentType: ct,
-			method:      fmt.Sprintf("%s.%s", hldr.name, hldr.mtype.method.Name),
-			endpoint:    fmt.Sprintf("%s.%s", hldr.name, hldr.mtype.method.Name),
-			payload:     argv.Interface(),
-			header:      md,
-		}
-
-		// define the handler func
-		fn := func(fctx context.Context, req server.Request, rsp interface{}) (err error) {
-			returnValues = function.Call([]reflect.Value{hldr.rcvr, hldr.mtype.prepareContext(fctx), argv, reflect.ValueOf(rsp)})
-
-			// The return value for the method is an error.
-			if rerr := returnValues[0].Interface(); rerr != nil {
-				err = rerr.(error)
-			}
-
-			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
-		}
-
-		// wrap the handler func
-		for i := len(handler.sopts.HdlrWrappers); i > 0; i-- {
-			fn = handler.sopts.HdlrWrappers[i-1](fn)
-		}
-
-		if ct == "application/x-www-form-urlencoded" {
-			cf, err = h.newCodec(DefaultContentType)
-			if err != nil {
-				h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
-				return
-			}
-			ct = DefaultContentType
-		}
-
-		scode := int(200)
-		appErr := fn(ctx, hr, replyv.Interface())
-
-		w.Header().Set(metadata.HeaderContentType, ct)
-		if md, ok := metadata.FromOutgoingContext(ctx); ok {
-			for k, v := range md {
-				w.Header().Set(k, v)
-			}
-		}
-		if md := getRspHeader(ctx); md != nil {
-			for k, v := range md {
-				for _, vv := range v {
-					w.Header().Add(k, vv)
-				}
-			}
-		}
-		if nct := w.Header().Get(metadata.HeaderContentType); nct != ct {
-			if cf, err = h.newCodec(nct); err != nil {
-				h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
-				return
-			}
-		}
-
-		var buf []byte
-		if appErr != nil {
-			switch verr := appErr.(type) {
-			case *errors.Error:
-				scode = int(verr.Code)
-				buf, err = cf.Marshal(verr)
-			case *Error:
-				buf, err = cf.Marshal(verr.err)
-			default:
-				buf, err = cf.Marshal(appErr)
-			}
-		} else {
-			buf, 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 nscode := GetRspCode(ctx); nscode != 0 {
-			scode = nscode
-		}
-		w.WriteHeader(scode)
-
-		if _, cerr := w.Write(buf); cerr != nil {
-			handler.sopts.Logger.Errorf(ctx, "write failed: %v", cerr)
-		}
-	}, nil
-}
-
-func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// check for http.HandlerFunc handlers
 	if ph, _, err := h.pathHandlers.Search(r.Method, r.URL.Path); err == nil {
 		ph.(http.HandlerFunc)(w, r)
@@ -364,9 +91,7 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	md["RequestURI"] = r.RequestURI
 	ctx = metadata.NewIncomingContext(ctx, md)
 
-	if r.Body != nil {
-		defer r.Body.Close()
-	}
+	defer r.Body.Close()
 
 	path := r.URL.Path
 	if !strings.HasPrefix(path, "/") {
@@ -467,18 +192,15 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	function := hldr.mtype.method.Func
 	var returnValues []reflect.Value
 
-	if r.Body != nil {
-		var buf []byte
-		buf, err = io.ReadAll(r.Body)
-		if err != nil && err != io.EOF {
-			h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
-			return
-		}
+	buf, err := io.ReadAll(r.Body)
+	if err != nil && err != io.EOF {
+		h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
+		return
+	}
 
-		if err = cf.Unmarshal(buf, argv.Interface()); err != nil {
-			h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
-			return
-		}
+	if err = cf.Unmarshal(buf, argv.Interface()); err != nil {
+		h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
+		return
 	}
 
 	matches = rflutil.FlattenMap(matches)
@@ -557,7 +279,6 @@ func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	var buf []byte
 	if appErr != nil {
 		switch verr := appErr.(type) {
 		case *errors.Error:

handler/generate.go

@@ -2,11 +2,11 @@ package handler
 
 import (
 	// import required packages
-	_ "go.unistack.org/micro-proto/v4/openapiv3"
+	_ "go.unistack.org/micro-proto/v3/openapiv3"
 )
 
 //go:generate sh -c "curl -L https://github.com/swagger-api/swagger-ui/archive/refs/tags/v4.18.3.zip -o - | bsdtar -C swagger-ui --strip-components=2 -xv swagger-ui-4.18.3/dist && rm swagger-ui/*.map swagger-ui/*-es-*.js swagger-ui/swagger-ui.js swagger-ui/swagger-initializer.js"
 
-//go:generate sh -c "protoc -I./ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v4) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./ ./meter/meter.proto"
+//go:generate sh -c "protoc -I./ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./ ./meter/meter.proto"
 
-//go:generate sh -c "protoc -I./ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v4) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./ ./health/health.proto"
+//go:generate sh -c "protoc -I./ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./ ./health/health.proto"

handler/health/health.go

@@ -1,13 +1,13 @@
-package health // import "go.unistack.org/micro-server-http/v4/handler/health"
+package health // import "go.unistack.org/micro-server-http/v3/handler/health"
 
 import (
 	"context"
 
-	codecpb "go.unistack.org/micro-proto/v4/codec"
-	"go.unistack.org/micro/v4/errors"
+	codecpb "go.unistack.org/micro-proto/v3/codec"
+	"go.unistack.org/micro/v3/errors"
 )
 
-var _ HealthServiceServer = (*Handler)(nil)
+var _ HealthServiceServer = &Handler{}
 
 type Handler struct {
 	opts Options

handler/health/health.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
-package micro.server.http.v4.handler.health;
-option go_package = "go.unistack.org/micro-server-http/v4/handler/health;health";
+package micro.server.http.v3.handler.health;
+option go_package = "go.unistack.org/micro-server-http/v3/handler/health;health";
 
 import "api/annotations.proto";
 import "openapiv3/annotations.proto";

handler/health/health_micro.pb.go

@@ -1,22 +1,22 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v4.0.0
+// - protoc-gen-go-micro v3.10.2
 // - protoc              v3.21.12
-// source: health/health.proto
+// source: health.proto
 
 package health
 
 import (
 	context "context"
-	codec "go.unistack.org/micro-proto/v4/codec"
-	v4 "go.unistack.org/micro-server-http/v4"
+	codec "go.unistack.org/micro-proto/v3/codec"
+	v3 "go.unistack.org/micro-server-http/v3"
 )
 
 var (
 	HealthServiceName = "HealthService"
 )
 var (
-	HealthServiceServerEndpoints = []v4.EndpointMetadata{
+	HealthServiceServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "HealthService.Live",
 			Path:   "/live",

handler/health/health_micro_http.pb.go

@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v4.0.0
-// source: health/health.proto
+// protoc-gen-go-micro version: v3.10.2
+// source: health.proto
 
 package health
 
 import (
 	context "context"
-	codec "go.unistack.org/micro-proto/v4/codec"
-	v4 "go.unistack.org/micro-server-http/v4"
-	server "go.unistack.org/micro/v4/server"
+	codec "go.unistack.org/micro-proto/v3/codec"
+	v3 "go.unistack.org/micro-server-http/v3"
+	server "go.unistack.org/micro/v3/server"
 )
 
 type healthServiceServer struct {
@@ -38,6 +38,6 @@ func RegisterHealthServiceServer(s server.Server, sh HealthServiceServer, opts .
 	}
 	h := &healthServiceServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v4.HandlerEndpoints(HealthServiceServerEndpoints))
+	nopts = append(nopts, v3.HandlerEndpoints(HealthServiceServerEndpoints))
 	return s.Handle(s.NewHandler(&HealthService{h}, append(nopts, opts...)...))
 }

handler/meter/meter.go

@@ -1,16 +1,16 @@
-package meter // import "go.unistack.org/micro-server-http/v4/handler/meter"
+package meter // import "go.unistack.org/micro-server-http/v3/handler/meter"
 
 import (
 	"bytes"
 	"context"
 
-	codecpb "go.unistack.org/micro-proto/v4/codec"
-	"go.unistack.org/micro/v4/errors"
-	"go.unistack.org/micro/v4/meter"
+	codecpb "go.unistack.org/micro-proto/v3/codec"
+	"go.unistack.org/micro/v3/errors"
+	"go.unistack.org/micro/v3/meter"
 )
 
 // guard to fail early
-var _ MeterServiceServer = (*Handler)(nil)
+var _ MeterServiceServer = &Handler{}
 
 type Handler struct {
 	opts Options

handler/meter/meter.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
-package micro.server.http.v4.handler.meter;
-option go_package = "go.unistack.org/micro-server-http/v4/handler/meter;meter";
+package micro.server.http.v3.handler.meter;
+option go_package = "go.unistack.org/micro-server-http/v3/handler/meter;meter";
 
 import "api/annotations.proto";
 import "openapiv3/annotations.proto";

handler/meter/meter_micro.pb.go

@@ -1,22 +1,22 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v4.0.0
+// - protoc-gen-go-micro v3.10.2
 // - protoc              v3.21.12
-// source: meter/meter.proto
+// source: meter.proto
 
 package meter
 
 import (
 	context "context"
-	codec "go.unistack.org/micro-proto/v4/codec"
-	v4 "go.unistack.org/micro-server-http/v4"
+	codec "go.unistack.org/micro-proto/v3/codec"
+	v3 "go.unistack.org/micro-server-http/v3"
 )
 
 var (
 	MeterServiceName = "MeterService"
 )
 var (
-	MeterServiceServerEndpoints = []v4.EndpointMetadata{
+	MeterServiceServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "MeterService.Metrics",
 			Path:   "/metrics",

handler/meter/meter_micro_http.pb.go

@@ -1,14 +1,14 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v4.0.0
-// source: meter/meter.proto
+// protoc-gen-go-micro version: v3.10.2
+// source: meter.proto
 
 package meter
 
 import (
 	context "context"
-	codec "go.unistack.org/micro-proto/v4/codec"
-	v4 "go.unistack.org/micro-server-http/v4"
-	server "go.unistack.org/micro/v4/server"
+	codec "go.unistack.org/micro-proto/v3/codec"
+	v3 "go.unistack.org/micro-server-http/v3"
+	server "go.unistack.org/micro/v3/server"
 )
 
 type meterServiceServer struct {
@@ -28,6 +28,6 @@ func RegisterMeterServiceServer(s server.Server, sh MeterServiceServer, opts ...
 	}
 	h := &meterServiceServer{sh}
 	var nopts []server.HandlerOption
-	nopts = append(nopts, v4.HandlerEndpoints(MeterServiceServerEndpoints))
+	nopts = append(nopts, v3.HandlerEndpoints(MeterServiceServerEndpoints))
 	return s.Handle(s.NewHandler(&MeterService{h}, append(nopts, opts...)...))
 }

handler/swagger-ui/swaggerui.go

@@ -1,4 +1,4 @@
-package swaggerui // import "go.unistack.org/micro-server-http/v4/handler/swagger-ui"
+package swaggerui // import "go.unistack.org/micro-server-http/v3/handler/swagger-ui"
 
 import (
 	"embed"

http.go

@@ -1,5 +1,5 @@
 // Package http implements a go-micro.Server
-package http // import "go.unistack.org/micro-server-http/v4"
+package http // import "go.unistack.org/micro-server-http/v3"
 
 import (
 	"context"
@@ -9,25 +9,28 @@ import (
 	"net"
 	"net/http"
 	"reflect"
+	"sort"
 	"strings"
 	"sync"
 	"time"
 
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/register"
-	"go.unistack.org/micro/v4/server"
-	rhttp "go.unistack.org/micro/v4/util/http"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/register"
+	"go.unistack.org/micro/v3/server"
+	rhttp "go.unistack.org/micro/v3/util/http"
 	"golang.org/x/net/netutil"
 )
 
-var _ server.Server = (*Server)(nil)
+var _ server.Server = &httpServer{}
 
-type Server struct {
+type httpServer struct {
 	hd           server.Handler
 	rsvc         *register.Service
 	handlers     map[string]server.Handler
 	exit         chan chan error
+	subscribers  map[*httpSubscriber][]broker.Subscriber
 	errorHandler func(context.Context, server.Handler, http.ResponseWriter, *http.Request, error, int)
 	pathHandlers *rhttp.Trie
 	opts         server.Options
@@ -37,7 +40,7 @@ type Server struct {
 	init       bool
 }
 
-func (h *Server) newCodec(ct string) (codec.Codec, error) {
+func (h *httpServer) newCodec(ct string) (codec.Codec, error) {
 	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
 		ct = ct[:idx]
 	}
@@ -50,14 +53,14 @@ func (h *Server) newCodec(ct string) (codec.Codec, error) {
 	return nil, codec.ErrUnknownContentType
 }
 
-func (h *Server) Options() server.Options {
+func (h *httpServer) Options() server.Options {
 	h.Lock()
 	opts := h.opts
 	h.Unlock()
 	return opts
 }
 
-func (h *Server) Init(opts ...server.Option) error {
+func (h *httpServer) Init(opts ...server.Option) error {
 	if len(opts) == 0 && h.init {
 		return nil
 	}
@@ -98,6 +101,10 @@ func (h *Server) Init(opts ...server.Option) error {
 		h.RUnlock()
 		return err
 	}
+	if err := h.opts.Broker.Init(); err != nil {
+		h.RUnlock()
+		return err
+	}
 	if err := h.opts.Tracer.Init(); err != nil {
 		h.RUnlock()
 		return err
@@ -123,7 +130,7 @@ func (h *Server) Init(opts ...server.Option) error {
 	return nil
 }
 
-func (h *Server) Handle(handler server.Handler) error {
+func (h *httpServer) Handle(handler server.Handler) error {
 	// passed unknown handler
 	hdlr, ok := handler.(*httpHandler)
 	if !ok {
@@ -152,7 +159,7 @@ func (h *Server) Handle(handler server.Handler) error {
 	return nil
 }
 
-func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
+func (h *httpServer) NewHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
 	options := server.NewHandlerOptions(opts...)
 
 	eps := make([]*register.Endpoint, 0, len(options.Metadata))
@@ -281,7 +288,36 @@ func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) s
 	return hdlr
 }
 
-func (h *Server) Register() error {
+func (h *httpServer) NewSubscriber(topic string, handler interface{}, opts ...server.SubscriberOption) server.Subscriber {
+	return newSubscriber(topic, handler, opts...)
+}
+
+func (h *httpServer) Subscribe(sb server.Subscriber) error {
+	sub, ok := sb.(*httpSubscriber)
+	if !ok {
+		return fmt.Errorf("invalid subscriber: expected *httpSubscriber")
+	}
+	if len(sub.handlers) == 0 {
+		return fmt.Errorf("invalid subscriber: no handler functions")
+	}
+
+	if err := server.ValidateSubscriber(sb); err != nil {
+		return err
+	}
+
+	h.RLock()
+	_, ok = h.subscribers[sub]
+	h.RUnlock()
+	if ok {
+		return fmt.Errorf("subscriber %v already exists", h)
+	}
+	h.Lock()
+	h.subscribers[sub] = nil
+	h.Unlock()
+	return nil
+}
+
+func (h *httpServer) Register() error {
 	var eps []*register.Endpoint
 	h.RLock()
 	for _, hdlr := range h.handlers {
@@ -306,6 +342,21 @@ func (h *Server) Register() error {
 	service.Nodes[0].Metadata["protocol"] = "http"
 	service.Endpoints = eps
 
+	h.Lock()
+	subscriberList := make([]*httpSubscriber, 0, len(h.subscribers))
+	for e := range h.subscribers {
+		// Only advertise non internal subscribers
+		subscriberList = append(subscriberList, e)
+	}
+	sort.Slice(subscriberList, func(i, j int) bool {
+		return subscriberList[i].topic > subscriberList[j].topic
+	})
+
+	for _, e := range subscriberList {
+		service.Endpoints = append(service.Endpoints, e.Endpoints()...)
+	}
+	h.Unlock()
+
 	h.RLock()
 	registered := h.registered
 	h.RUnlock()
@@ -327,6 +378,29 @@ func (h *Server) Register() error {
 	}
 
 	h.Lock()
+	for sb := range h.subscribers {
+		handler := h.createSubHandler(sb, config)
+		var opts []broker.SubscribeOption
+		if queue := sb.Options().Queue; len(queue) > 0 {
+			opts = append(opts, broker.SubscribeGroup(queue))
+		}
+
+		subCtx := config.Context
+		if cx := sb.Options().Context; cx != nil {
+			subCtx = cx
+		}
+		opts = append(opts, broker.SubscribeContext(subCtx))
+		opts = append(opts, broker.SubscribeAutoAck(sb.Options().AutoAck))
+		opts = append(opts, broker.SubscribeBodyOnly(sb.Options().BodyOnly))
+
+		sub, err := config.Broker.Subscribe(subCtx, sb.Topic(), handler, opts...)
+		if err != nil {
+			h.Unlock()
+			return err
+		}
+		h.subscribers[sb] = []broker.Subscriber{sub}
+	}
+
 	h.registered = true
 	h.rsvc = service
 	h.Unlock()
@@ -334,7 +408,7 @@ func (h *Server) Register() error {
 	return nil
 }
 
-func (h *Server) Deregister() error {
+func (h *httpServer) Deregister() error {
 	h.RLock()
 	config := h.opts
 	h.RUnlock()
@@ -361,11 +435,28 @@ func (h *Server) Deregister() error {
 	}
 
 	h.registered = false
+
+	subCtx := h.opts.Context
+	for sb, subs := range h.subscribers {
+		if cx := sb.Options().Context; cx != nil {
+			subCtx = cx
+		}
+
+		for _, sub := range subs {
+			config.Logger.Infof(config.Context, "Unsubscribing from topic: %s", sub.Topic())
+			if err := sub.Unsubscribe(subCtx); err != nil {
+				h.Unlock()
+				config.Logger.Errorf(config.Context, "failed to unsubscribe topic: %s, error: %v", sb.Topic(), err)
+				return err
+			}
+		}
+		h.subscribers[sb] = nil
+	}
 	h.Unlock()
 	return nil
 }
 
-func (h *Server) Start() error {
+func (h *httpServer) Start() error {
 	h.RLock()
 	config := h.opts
 	h.RUnlock()
@@ -434,6 +525,10 @@ func (h *Server) Start() error {
 		return fmt.Errorf("cant process with nil handler")
 	}
 
+	if err := config.Broker.Connect(h.opts.Context); err != nil {
+		return err
+	}
+
 	if err := config.RegisterCheck(h.opts.Context); err != nil {
 		if config.Logger.V(logger.ErrorLevel) {
 			config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, err)
@@ -531,35 +626,40 @@ func (h *Server) Start() error {
 			config.Logger.Errorf(config.Context, "Server deregister error: %s", err)
 		}
 
+		if err := config.Broker.Disconnect(config.Context); err != nil {
+			config.Logger.Errorf(config.Context, "Broker disconnect error: %s", err)
+		}
+
 		ch <- ts.Close()
 	}()
 
 	return nil
 }
 
-func (h *Server) Stop() error {
+func (h *httpServer) Stop() error {
 	ch := make(chan error)
 	h.exit <- ch
 	return <-ch
 }
 
-func (h *Server) String() string {
+func (h *httpServer) String() string {
 	return "http"
 }
 
-func (h *Server) Name() string {
+func (h *httpServer) Name() string {
 	return h.opts.Name
 }
 
-func NewServer(opts ...server.Option) *Server {
+func NewServer(opts ...server.Option) *httpServer {
 	options := server.NewOptions(opts...)
 	eh := DefaultErrorHandler
 	if v, ok := options.Context.Value(errorHandlerKey{}).(errorHandler); ok && v != nil {
 		eh = v
 	}
-	return &Server{
+	return &httpServer{
 		opts:         options,
 		exit:         make(chan chan error),
+		subscribers:  make(map[*httpSubscriber][]broker.Subscriber),
 		errorHandler: eh,
 		pathHandlers: rhttp.NewTrie(),
 	}

message.go

@@ -1,8 +1,8 @@
 package http
 
 import (
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/metadata"
 )
 
 type httpMessage struct {

options.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"go.unistack.org/micro/v4/server"
+	"go.unistack.org/micro/v3/server"
 )
 
 // SetError pass error to caller
@@ -85,8 +85,8 @@ func Middleware(mw ...func(http.Handler) http.Handler) server.Option {
 
 type serverKey struct{}
 
-// HTTPServer provide ability to pass *http.Server
-func HTTPServer(hs *http.Server) server.Option {
+// Server provide ability to pass *http.Server
+func Server(hs *http.Server) server.Option {
 	return server.SetOption(serverKey{}, hs)
 }
 

request.go

@@ -3,12 +3,15 @@ package http
 import (
 	"io"
 
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/server"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/server"
 )
 
-var _ server.Request = &rpcRequest{}
+var (
+	_ server.Request = &rpcRequest{}
+	_ server.Message = &rpcMessage{}
+)
 
 type rpcRequest struct {
 	rw          io.ReadWriter
@@ -22,6 +25,14 @@ type rpcRequest struct {
 	stream      bool
 }
 
+type rpcMessage struct {
+	payload     interface{}
+	codec       codec.Codec
+	header      metadata.Metadata
+	topic       string
+	contentType string
+}
+
 func (r *rpcRequest) ContentType() string {
 	return r.contentType
 }
@@ -61,3 +72,23 @@ func (r *rpcRequest) Stream() bool {
 func (r *rpcRequest) Body() interface{} {
 	return r.payload
 }
+
+func (r *rpcMessage) ContentType() string {
+	return r.contentType
+}
+
+func (r *rpcMessage) Topic() string {
+	return r.topic
+}
+
+func (r *rpcMessage) Body() interface{} {
+	return r.payload
+}
+
+func (r *rpcMessage) Header() metadata.Metadata {
+	return r.header
+}
+
+func (r *rpcMessage) Codec() codec.Codec {
+	return r.codec
+}

server.go

@@ -7,11 +7,9 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"go.unistack.org/micro/v4/server"
+	"go.unistack.org/micro/v3/server"
 )
 
-var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
-
 type methodType struct {
 	ArgType     reflect.Type
 	ReplyType   reflect.Type

subscriber.go

@@ -0,0 +1,208 @@
+package http
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"reflect"
+	"strings"
+
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/register"
+	"go.unistack.org/micro/v3/server"
+)
+
+var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
+
+type handler struct {
+	reqType reflect.Type
+	ctxType reflect.Type
+	method  reflect.Value
+}
+
+type httpSubscriber struct {
+	topic      string
+	rcvr       reflect.Value
+	typ        reflect.Type
+	subscriber interface{}
+	handlers   []*handler
+	endpoints  []*register.Endpoint
+	opts       server.SubscriberOptions
+}
+
+func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOption) server.Subscriber {
+	options := server.NewSubscriberOptions(opts...)
+
+	var endpoints []*register.Endpoint
+	var handlers []*handler
+
+	if typ := reflect.TypeOf(sub); typ.Kind() == reflect.Func {
+		h := &handler{
+			method: reflect.ValueOf(sub),
+		}
+
+		switch typ.NumIn() {
+		case 1:
+			h.reqType = typ.In(0)
+		case 2:
+			h.ctxType = typ.In(0)
+			h.reqType = typ.In(1)
+		}
+
+		handlers = append(handlers, h)
+		ep := &register.Endpoint{
+			Name:     "Func",
+			Request:  register.ExtractSubValue(typ),
+			Metadata: metadata.New(2),
+		}
+		ep.Metadata.Set("topic", topic)
+		ep.Metadata.Set("subscriber", "true")
+		endpoints = append(endpoints, ep)
+	} else {
+		hdlr := reflect.ValueOf(sub)
+		name := reflect.Indirect(hdlr).Type().Name()
+
+		for m := 0; m < typ.NumMethod(); m++ {
+			method := typ.Method(m)
+			h := &handler{
+				method: method.Func,
+			}
+
+			switch method.Type.NumIn() {
+			case 2:
+				h.reqType = method.Type.In(1)
+			case 3:
+				h.ctxType = method.Type.In(1)
+				h.reqType = method.Type.In(2)
+			}
+
+			handlers = append(handlers, h)
+			ep := &register.Endpoint{
+				Name:     name + "." + method.Name,
+				Request:  register.ExtractSubValue(method.Type),
+				Metadata: metadata.New(2),
+			}
+			ep.Metadata.Set("topic", topic)
+			ep.Metadata.Set("subscriber", "true")
+			endpoints = append(endpoints, ep)
+		}
+	}
+
+	return &httpSubscriber{
+		rcvr:       reflect.ValueOf(sub),
+		typ:        reflect.TypeOf(sub),
+		topic:      topic,
+		subscriber: sub,
+		handlers:   handlers,
+		endpoints:  endpoints,
+		opts:       options,
+	}
+}
+
+func (s *httpServer) createSubHandler(sb *httpSubscriber, opts server.Options) broker.Handler {
+	return func(p broker.Event) error {
+		msg := p.Message()
+		ct := msg.Header["Content-Type"]
+		cf, err := s.newCodec(ct)
+		if err != nil {
+			return err
+		}
+
+		hdr := metadata.Copy(msg.Header)
+		delete(hdr, "Content-Type")
+		ctx := metadata.NewIncomingContext(context.Background(), hdr)
+
+		results := make(chan error, len(sb.handlers))
+
+		for i := 0; i < len(sb.handlers); i++ {
+			handler := sb.handlers[i]
+
+			var isVal bool
+			var req reflect.Value
+
+			if handler.reqType.Kind() == reflect.Ptr {
+				req = reflect.New(handler.reqType.Elem())
+			} else {
+				req = reflect.New(handler.reqType)
+				isVal = true
+			}
+			if isVal {
+				req = req.Elem()
+			}
+
+			buf := bytes.NewBuffer(msg.Body)
+
+			if err := cf.ReadHeader(buf, &codec.Message{}, codec.Event); err != nil {
+				return err
+			}
+
+			if err := cf.ReadBody(buf, req.Interface()); err != nil {
+				return err
+			}
+
+			fn := func(ctx context.Context, msg server.Message) error {
+				var vals []reflect.Value
+				if sb.typ.Kind() != reflect.Func {
+					vals = append(vals, sb.rcvr)
+				}
+				if handler.ctxType != nil {
+					vals = append(vals, reflect.ValueOf(ctx))
+				}
+
+				vals = append(vals, reflect.ValueOf(msg.Body()))
+
+				returnValues := handler.method.Call(vals)
+				if err := returnValues[0].Interface(); err != nil {
+					return err.(error)
+				}
+				return nil
+			}
+
+			for i := len(opts.SubWrappers); i > 0; i-- {
+				fn = opts.SubWrappers[i-1](fn)
+			}
+
+			go func() {
+				results <- fn(ctx, &httpMessage{
+					topic:       sb.topic,
+					contentType: ct,
+					payload:     req.Interface(),
+					header:      msg.Header,
+					codec:       cf,
+				})
+			}()
+		}
+
+		var errors []string
+
+		for i := 0; i < len(sb.handlers); i++ {
+			if err := <-results; err != nil {
+				errors = append(errors, err.Error())
+			}
+		}
+
+		if len(errors) > 0 {
+			return fmt.Errorf("subscriber error: %s", strings.Join(errors, "\n"))
+		}
+
+		return nil
+	}
+}
+
+func (s *httpSubscriber) Topic() string {
+	return s.topic
+}
+
+func (s *httpSubscriber) Subscriber() interface{} {
+	return s.subscriber
+}
+
+func (s *httpSubscriber) Endpoints() []*register.Endpoint {
+	return s.endpoints
+}
+
+func (s *httpSubscriber) Options() server.SubscriberOptions {
+	return s.opts
+}

util.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"strings"
 
-	"go.unistack.org/micro/v4/metadata"
-	rutil "go.unistack.org/micro/v4/util/reflect"
+	"go.unistack.org/micro/v3/metadata"
+	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
 func FillRequest(ctx context.Context, req interface{}, opts ...FillRequestOption) error {

util_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v3/metadata"
 )
 
 func TestFillrequest(t *testing.T) {