add tls headers

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

README.md

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

go.mod

@@ -1,16 +1,19 @@
-module go.unistack.org/micro-server-http/v3
+module go.unistack.org/micro-server-http/v4
 
-go 1.18
+go 1.19
 
 require (
-	go.unistack.org/micro-proto/v3 v3.3.1
+	go.unistack.org/micro-proto/v4 v4.0.0
-	go.unistack.org/micro/v3 v3.10.14
+	go.unistack.org/micro/v4 v4.0.1
-	golang.org/x/net v0.7.0
+	golang.org/x/net v0.10.0
 )
 
 require (
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.6.9 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -35,8 +35,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
 github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -44,21 +44,18 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-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/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 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/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 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/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 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=
@@ -68,10 +65,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/v3 v3.3.1 h1:nQ0MtWvP2G3QrpOgawVOPhpZZYkq6umTGDqs8FxJYIo=
+go.unistack.org/micro-proto/v4 v4.0.0 h1:+TAwKSlx48eLsNO2E2cO0JLE8we1KU2AuWe9Q310FuU=
-go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE=
+go.unistack.org/micro-proto/v4 v4.0.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
-go.unistack.org/micro/v3 v3.10.14 h1:7fgLpwGlCN67twhwtngJDEQvrMkUBDSA5vzZqxIDqNE=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-go.unistack.org/micro/v3 v3.10.14/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
 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=
@@ -87,8 +84,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -114,7 +110,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -142,16 +137,13 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 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/v3/errors"
+	"go.unistack.org/micro/v4/errors"
-	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/register"
+	"go.unistack.org/micro/v4/register"
-	"go.unistack.org/micro/v3/server"
+	"go.unistack.org/micro/v4/server"
-	rhttp "go.unistack.org/micro/v3/util/http"
+	rhttp "go.unistack.org/micro/v4/util/http"
-	rflutil "go.unistack.org/micro/v3/util/reflect"
+	rflutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var (
@@ -60,13 +60,285 @@ func (h *httpHandler) Options() server.HandlerOptions {
 	return h.opts
 }
 
-func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error) {
-	// check for http.HandlerFunc handlers
+	if handler == nil {
-	if ph, _, err := h.pathHandlers.Search(r.Method, r.URL.Path); err == nil {
+		return nil, fmt.Errorf("invalid handler specified: %v", handler)
-		ph.(http.HandlerFunc)(w, r)
-		return
 	}
 
+	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
+		if r.TLS != nil {
+			md["TLS"] = "true"
+			md["TLS_ALPN"] = r.TLS.NegotiatedProtocol
+			md["TLS_ServerName"] = r.TLS.ServerName
+		}
+		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) {
 	ct := DefaultContentType
 	if htype := r.Header.Get(metadata.HeaderContentType); htype != "" {
 		ct = htype
@@ -82,17 +354,22 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		md[k] = strings.Join(v, ", ")
 	}
 	md["RemoteAddr"] = r.RemoteAddr
+	if r.TLS != nil {
+		md["Scheme"] = "https"
+	} else {
+		md["Scheme"] = "http"
+	}
 	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, ",")
+	if len(r.TransferEncoding) > 0 {
+		md["TransferEncoding"] = strings.Join(r.TransferEncoding, ",")
+	}
 	md["Host"] = r.Host
 	md["RequestURI"] = r.RequestURI
 	ctx = metadata.NewIncomingContext(ctx, md)
 
-	defer r.Body.Close()
-
 	path := r.URL.Path
 	if !strings.HasPrefix(path, "/") {
 		h.errorHandler(ctx, nil, w, r, fmt.Errorf("path must starts with /"), http.StatusBadRequest)
@@ -149,6 +426,11 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	} else if !match {
+		// check for http.HandlerFunc handlers
+		if ph, _, err := h.pathHandlers.Search(r.Method, r.URL.Path); err == nil {
+			ph.(http.HandlerFunc)(w, r)
+			return
+		}
 		h.errorHandler(ctx, nil, w, r, fmt.Errorf("not matching route found"), http.StatusNotFound)
 		return
 	}
@@ -165,6 +447,10 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	if r.Body != nil {
+		defer r.Body.Close()
+	}
+
 	cf, err := h.newCodec(ct)
 	if err != nil {
 		h.errorHandler(ctx, nil, w, r, err, http.StatusBadRequest)
@@ -192,21 +478,26 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	function := hldr.mtype.method.Func
 	var returnValues []reflect.Value
 
-	buf, err := io.ReadAll(r.Body)
+	if r.Body != nil {
-	if err != nil && err != io.EOF {
+		var buf []byte
-		h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
+		buf, err = io.ReadAll(r.Body)
-		return
+		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 {
+	if len(matches) > 0 {
-		h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
+		matches = rflutil.FlattenMap(matches)
-		return
+		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
-	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{
@@ -279,6 +570,7 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	var buf []byte
 	if appErr != nil {
 		switch verr := appErr.(type) {
 		case *errors.Error:

handler/generate.go

@@ -0,0 +1,12 @@
+package handler
+
+import (
+	// import required packages
+	_ "go.unistack.org/micro-proto/v4/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/v4) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./ ./health/health.proto"

handler/health/generate.go

@@ -1,8 +0,0 @@
-package health
-
-//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.proto"
-
-import (
-	// import required packages
-	_ "go.unistack.org/micro-proto/v3/openapiv3"
-)

handler/health/health.go

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

handler/health/health.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
-package micro.server.http.v3.handler.health;
+package micro.server.http.v4.handler.health;
-option go_package = "go.unistack.org/micro-server-http/v3/handler/health;health";
+option go_package = "go.unistack.org/micro-server-http/v4/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 v3.10.2
+// - protoc-gen-go-micro v4.0.0
 // - protoc              v3.21.12
-// source: health.proto
+// source: health/health.proto
 
 package health
 
 import (
 	context "context"
-	codec "go.unistack.org/micro-proto/v3/codec"
+	codec "go.unistack.org/micro-proto/v4/codec"
-	v3 "go.unistack.org/micro-server-http/v3"
+	v4 "go.unistack.org/micro-server-http/v4"
 )
 
 var (
 	HealthServiceName = "HealthService"
 )
 var (
-	HealthServiceServerEndpoints = []v3.EndpointMetadata{
+	HealthServiceServerEndpoints = []v4.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: v3.10.2
+// protoc-gen-go-micro version: v4.0.0
-// source: health.proto
+// source: health/health.proto
 
 package health
 
 import (
 	context "context"
-	codec "go.unistack.org/micro-proto/v3/codec"
+	codec "go.unistack.org/micro-proto/v4/codec"
-	v3 "go.unistack.org/micro-server-http/v3"
+	v4 "go.unistack.org/micro-server-http/v4"
-	server "go.unistack.org/micro/v3/server"
+	server "go.unistack.org/micro/v4/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, v3.HandlerEndpoints(HealthServiceServerEndpoints))
+	nopts = append(nopts, v4.HandlerEndpoints(HealthServiceServerEndpoints))
 	return s.Handle(s.NewHandler(&HealthService{h}, append(nopts, opts...)...))
 }

handler/meter/generate.go

@@ -1,8 +0,0 @@
-package meter
-
-//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.proto"
-
-import (
-	// import required packages
-	_ "go.unistack.org/micro-proto/v3/openapiv3"
-)

handler/meter/meter.go

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

handler/meter/meter.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
-package micro.server.http.v3.handler.meter;
+package micro.server.http.v4.handler.meter;
-option go_package = "go.unistack.org/micro-server-http/v3/handler/meter;meter";
+option go_package = "go.unistack.org/micro-server-http/v4/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 v3.10.2
+// - protoc-gen-go-micro v4.0.0
 // - protoc              v3.21.12
-// source: meter.proto
+// source: meter/meter.proto
 
 package meter
 
 import (
 	context "context"
-	codec "go.unistack.org/micro-proto/v3/codec"
+	codec "go.unistack.org/micro-proto/v4/codec"
-	v3 "go.unistack.org/micro-server-http/v3"
+	v4 "go.unistack.org/micro-server-http/v4"
 )
 
 var (
 	MeterServiceName = "MeterService"
 )
 var (
-	MeterServiceServerEndpoints = []v3.EndpointMetadata{
+	MeterServiceServerEndpoints = []v4.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: v3.10.2
+// protoc-gen-go-micro version: v4.0.0
-// source: meter.proto
+// source: meter/meter.proto
 
 package meter
 
 import (
 	context "context"
-	codec "go.unistack.org/micro-proto/v3/codec"
+	codec "go.unistack.org/micro-proto/v4/codec"
-	v3 "go.unistack.org/micro-server-http/v3"
+	v4 "go.unistack.org/micro-server-http/v4"
-	server "go.unistack.org/micro/v3/server"
+	server "go.unistack.org/micro/v4/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, v3.HandlerEndpoints(MeterServiceServerEndpoints))
+	nopts = append(nopts, v4.HandlerEndpoints(MeterServiceServerEndpoints))
 	return s.Handle(s.NewHandler(&MeterService{h}, append(nopts, opts...)...))
 }

handler/swagger-ui/index.css

@@ -0,0 +1,16 @@
+html {
+    box-sizing: border-box;
+    overflow: -moz-scrollbars-vertical;
+    overflow-y: scroll;
+}
+
+*,
+*:before,
+*:after {
+    box-sizing: inherit;
+}
+
+body {
+    margin: 0;
+    background: #fafafa;
+}

handler/swagger-ui/index.html

@@ -0,0 +1,19 @@
+<!-- HTML for static distribution bundle build -->
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <title>Swagger UI</title>
+    <link rel="stylesheet" type="text/css" href="./swagger-ui.css" />
+    <link rel="stylesheet" type="text/css" href="index.css" />
+    <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+  </head>
+
+  <body>
+    <div id="swagger-ui"></div>
+    <script src="./swagger-ui-bundle.js" charset="UTF-8"> </script>
+    <script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
+    <script src="./swagger-initializer.js" charset="UTF-8"> </script>
+  </body>
+</html>

handler/swagger-ui/oauth2-redirect.html

@@ -0,0 +1,79 @@
+<!doctype html>
+<html lang="en-US">
+<head>
+    <title>Swagger UI: OAuth2 Redirect</title>
+</head>
+<body>
+<script>
+    'use strict';
+    function run () {
+        var oauth2 = window.opener.swaggerUIRedirectOauth2;
+        var sentState = oauth2.state;
+        var redirectUrl = oauth2.redirectUrl;
+        var isValid, qp, arr;
+
+        if (/code|token|error/.test(window.location.hash)) {
+            qp = window.location.hash.substring(1).replace('?', '&');
+        } else {
+            qp = location.search.substring(1);
+        }
+
+        arr = qp.split("&");
+        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';});
+        qp = qp ? JSON.parse('{' + arr.join() + '}',
+                function (key, value) {
+                    return key === "" ? value : decodeURIComponent(value);
+                }
+        ) : {};
+
+        isValid = qp.state === sentState;
+
+        if ((
+          oauth2.auth.schema.get("flow") === "accessCode" ||
+          oauth2.auth.schema.get("flow") === "authorizationCode" ||
+          oauth2.auth.schema.get("flow") === "authorization_code"
+        ) && !oauth2.auth.code) {
+            if (!isValid) {
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "warning",
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
+                });
+            }
+
+            if (qp.code) {
+                delete oauth2.state;
+                oauth2.auth.code = qp.code;
+                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
+            } else {
+                let oauthErrorMsg;
+                if (qp.error) {
+                    oauthErrorMsg = "["+qp.error+"]: " +
+                        (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
+                        (qp.error_uri ? "More info: "+qp.error_uri : "");
+                }
+
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "error",
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
+                });
+            }
+        } else {
+            oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
+        }
+        window.close();
+    }
+
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
+</script>
+</body>
+</html>

handler/swagger-ui/swagger-initializer.js

@@ -0,0 +1,20 @@
+window.onload = function() {
+  //<editor-fold desc="Changeable Configuration Block">
+
+  // the following lines will be replaced by docker/configurator, when it runs in a docker-container
+  window.ui = SwaggerUIBundle({
+    url: "{{ .SWAGGER }}",
+    dom_id: '#swagger-ui',
+    deepLinking: true,
+    presets: [
+      SwaggerUIBundle.presets.apis,
+      SwaggerUIStandalonePreset
+    ],
+    plugins: [
+      SwaggerUIBundle.plugins.DownloadUrl
+    ],
+    layout: "StandaloneLayout"
+  });
+
+  //</editor-fold>
+};

handler/swagger-ui/swaggerui.go

@@ -0,0 +1,142 @@
+package swaggerui // import "go.unistack.org/micro-server-http/v4/handler/swagger-ui"
+
+import (
+	"embed"
+	"html/template"
+	"net/http"
+	"path"
+	"reflect"
+)
+
+//go:embed *.js *.css *.html *.png
+var assets embed.FS
+
+var (
+	Handler = func(prefix string) http.HandlerFunc {
+		return func(w http.ResponseWriter, r *http.Request) {
+			if r.Method != http.MethodGet || path.Base(r.URL.Path) != "swagger-initializer.js" {
+				http.StripPrefix(prefix, http.FileServer(http.FS(assets))).ServeHTTP(w, r)
+				return
+			}
+			tpl := template.New("swagger-initializer.js").Funcs(TemplateFuncs)
+			ptpl, err := tpl.Parse(Template)
+			if err != nil {
+				w.WriteHeader(http.StatusInternalServerError)
+				_, _ = w.Write([]byte(err.Error()))
+				return
+			}
+			if err := ptpl.Execute(w, Config); err != nil {
+				w.WriteHeader(http.StatusInternalServerError)
+				_, _ = w.Write([]byte(err.Error()))
+				return
+			}
+		}
+	}
+	TemplateFuncs = template.FuncMap{
+		"isInt": func(i interface{}) bool {
+			v := reflect.ValueOf(i)
+			switch v.Kind() {
+			case reflect.Int, reflect.Int8, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint8, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64:
+				return true
+			default:
+				return false
+			}
+		},
+		"isBool": func(i interface{}) bool {
+			v := reflect.ValueOf(i)
+			switch v.Kind() {
+			case reflect.Bool:
+				return true
+			default:
+				return false
+			}
+		},
+		"isString": func(i interface{}) bool {
+			v := reflect.ValueOf(i)
+			switch v.Kind() {
+			case reflect.String:
+				return true
+			default:
+				return false
+			}
+		},
+		"isSlice": func(i interface{}) bool {
+			v := reflect.ValueOf(i)
+			switch v.Kind() {
+			case reflect.Slice:
+				return true
+			default:
+				return false
+			}
+		},
+		"isMap": func(i interface{}) bool {
+			v := reflect.ValueOf(i)
+			switch v.Kind() {
+			case reflect.Map:
+				return true
+			default:
+				return false
+			}
+		},
+	}
+	Template = `
+	window.onload = function() {
+		//<editor-fold desc="Changeable Configuration Block">
+	
+		window.ui = SwaggerUIBundle({
+			{{- range $k, $v := . }}
+			{{- if (eq (printf "%s" $v) "") -}}
+			{{- continue -}}
+			{{ end }}
+			{{ $k }}: {{ if isBool $v -}}
+			{{- $v -}},
+			{{- else if isInt $v -}}
+      {{- $v -}},
+			{{- else if isString $v -}}
+			"{{- $v -}}",
+			{{- else if and (isSlice $v) (or (eq (printf "%s" $k) "presets") (eq (printf "%s" $k) "plugins")) -}}
+			[
+			{{- range $v }}
+				{{ . }},
+			{{- end }}
+			],
+			{{- end -}} 
+			{{ end }}
+		});
+	
+		//</editor-fold>
+	};`
+	Config = map[string]interface{}{
+		"configUrl": "",
+		"dom_id":    "#swagger-ui",
+		/*
+				"domNode":     "",
+			  "spec":        "",
+				"urls": []interface{}{
+					map[string]interface{}{
+							"url":  "",
+							"name": "",
+						},
+					},
+				},
+		*/
+		"url":                      "https://petstore.swagger.io/v2/swagger.json",
+		"deepLinking":              true,
+		"displayOperationId":       false,
+		"defaultModelsExpandDepth": 1,
+		"defaultModelExpandDepth":  1,
+		"displayRequestDuration":   true,
+		"filter":                   true,
+		"operationsSorter":         "alpha",
+		"showExtensions":           true,
+		"tryItOutEnabled":          true,
+		"presets": []string{
+			"SwaggerUIBundle.presets.apis",
+			"SwaggerUIStandalonePreset",
+		},
+		"plugins": []string{
+			"SwaggerUIBundle.plugins.DownloadUrl",
+		},
+		"layout": "StandaloneLayout",
+	}
+)

handler/swagger-ui/swaggerui_test.go

@@ -0,0 +1,15 @@
+package swaggerui
+
+import (
+	"net/http"
+	"testing"
+)
+
+func TestTemplate(t *testing.T) {
+	t.Skip()
+	h := http.NewServeMux()
+	h.HandleFunc("/", Handler(""))
+	if err := http.ListenAndServe(":8080", h); err != nil {
+		t.Fatal(err)
+	}
+}

handler/swagger/swagger.go

@@ -0,0 +1,41 @@
+package swagger // import "go.unistack.org/micro-server-http/v4/handler/swagger"
+
+import (
+	"context"
+	"io/fs"
+	"net/http"
+
+	httpsrv "go.unistack.org/micro-server-http/v4"
+	"go.unistack.org/micro/v4/server"
+)
+
+type (
+	Hook         func([]byte) []byte
+	ErrorHandler func(ctx context.Context, s server.Handler, w http.ResponseWriter, r *http.Request, err error, status int)
+)
+
+// Handler append to generated swagger data from dst map[string]interface{}
+var Handler = func(fsys fs.FS, hooks []Hook, h httpsrv.ErrorHandler) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodGet {
+			h(r.Context())
+			w.WriteHeader(http.StatusNotFound)
+			return
+		}
+
+		path := r.URL.Path
+		if len(path) > 1 && path[0] == '/' {
+			path = path[1:]
+		}
+
+		buf, err := fs.ReadFile(fsys, path)
+		if err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			_, _ = w.Write([]byte(err.Error()))
+			return
+		}
+
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write(buf)
+	}
+}

http.go

@@ -1,5 +1,5 @@
 // Package http implements a go-micro.Server
-package http // import "go.unistack.org/micro-server-http/v3"
+package http // import "go.unistack.org/micro-server-http/v4"
 
 import (
 	"context"
@@ -9,28 +9,25 @@ import (
 	"net"
 	"net/http"
 	"reflect"
-	"sort"
 	"strings"
 	"sync"
 	"time"
 
-	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v4/register"
-	"go.unistack.org/micro/v3/register"
+	"go.unistack.org/micro/v4/server"
-	"go.unistack.org/micro/v3/server"
+	rhttp "go.unistack.org/micro/v4/util/http"
-	rhttp "go.unistack.org/micro/v3/util/http"
 	"golang.org/x/net/netutil"
 )
 
-var _ server.Server = &httpServer{}
+var _ server.Server = (*Server)(nil)
 
-type httpServer struct {
+type Server 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
@@ -40,7 +37,7 @@ type httpServer struct {
 	init       bool
 }
 
-func (h *httpServer) newCodec(ct string) (codec.Codec, error) {
+func (h *Server) newCodec(ct string) (codec.Codec, error) {
 	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
 		ct = ct[:idx]
 	}
@@ -53,14 +50,14 @@ func (h *httpServer) newCodec(ct string) (codec.Codec, error) {
 	return nil, codec.ErrUnknownContentType
 }
 
-func (h *httpServer) Options() server.Options {
+func (h *Server) Options() server.Options {
 	h.Lock()
 	opts := h.opts
 	h.Unlock()
 	return opts
 }
 
-func (h *httpServer) Init(opts ...server.Option) error {
+func (h *Server) Init(opts ...server.Option) error {
 	if len(opts) == 0 && h.init {
 		return nil
 	}
@@ -101,10 +98,6 @@ func (h *httpServer) 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
@@ -130,7 +123,7 @@ func (h *httpServer) Init(opts ...server.Option) error {
 	return nil
 }
 
-func (h *httpServer) Handle(handler server.Handler) error {
+func (h *Server) Handle(handler server.Handler) error {
 	// passed unknown handler
 	hdlr, ok := handler.(*httpHandler)
 	if !ok {
@@ -159,7 +152,7 @@ func (h *httpServer) Handle(handler server.Handler) error {
 	return nil
 }
 
-func (h *httpServer) NewHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
+func (h *Server) NewHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
 	options := server.NewHandlerOptions(opts...)
 
 	eps := make([]*register.Endpoint, 0, len(options.Metadata))
@@ -288,36 +281,7 @@ func (h *httpServer) NewHandler(handler interface{}, opts ...server.HandlerOptio
 	return hdlr
 }
 
-func (h *httpServer) NewSubscriber(topic string, handler interface{}, opts ...server.SubscriberOption) server.Subscriber {
+func (h *Server) Register() error {
-	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 {
@@ -342,21 +306,6 @@ func (h *httpServer) 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()
@@ -378,29 +327,6 @@ func (h *httpServer) 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()
@@ -408,7 +334,7 @@ func (h *httpServer) Register() error {
 	return nil
 }
 
-func (h *httpServer) Deregister() error {
+func (h *Server) Deregister() error {
 	h.RLock()
 	config := h.opts
 	h.RUnlock()
@@ -435,28 +361,11 @@ func (h *httpServer) 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 *httpServer) Start() error {
+func (h *Server) Start() error {
 	h.RLock()
 	config := h.opts
 	h.RUnlock()
@@ -525,10 +434,6 @@ func (h *httpServer) 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)
@@ -626,40 +531,35 @@ func (h *httpServer) 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 *httpServer) Stop() error {
+func (h *Server) Stop() error {
 	ch := make(chan error)
 	h.exit <- ch
 	return <-ch
 }
 
-func (h *httpServer) String() string {
+func (h *Server) String() string {
 	return "http"
 }
 
-func (h *httpServer) Name() string {
+func (h *Server) Name() string {
 	return h.opts.Name
 }
 
-func NewServer(opts ...server.Option) *httpServer {
+func NewServer(opts ...server.Option) *Server {
 	options := server.NewOptions(opts...)
 	eh := DefaultErrorHandler
 	if v, ok := options.Context.Value(errorHandlerKey{}).(errorHandler); ok && v != nil {
 		eh = v
 	}
-	return &httpServer{
+	return &Server{
 		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/v3/codec"
+	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
 )
 
 type httpMessage struct {

options.go

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

request.go

@@ -3,15 +3,12 @@ package http
 import (
 	"io"
 
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/server"
+	"go.unistack.org/micro/v4/server"
 )
 
-var (
+var _ server.Request = &rpcRequest{}
-	_ server.Request = &rpcRequest{}
-	_ server.Message = &rpcMessage{}
-)
 
 type rpcRequest struct {
 	rw          io.ReadWriter
@@ -25,14 +22,6 @@ 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
 }
@@ -72,23 +61,3 @@ 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,9 +7,11 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"go.unistack.org/micro/v3/server"
+	"go.unistack.org/micro/v4/server"
 )
 
+var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
+
 type methodType struct {
 	ArgType     reflect.Type
 	ReplyType   reflect.Type

subscriber.go

@@ -1,208 +0,0 @@
-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/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/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/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
 )
 
 func TestFillrequest(t *testing.T) {