improve cors

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

.gitignore

@@ -0,0 +1,24 @@
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+bin
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+# Go workspace file
+go.work
+
+# General
+.DS_Store
+.idea
+.vscode

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,16 +1,23 @@
-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
-	golang.org/x/net v0.7.0
+	go.unistack.org/micro-codec-yaml/v3 v3.10.0
+	go.unistack.org/micro-proto/v3 v3.3.1
+	go.unistack.org/micro/v3 v3.10.52
+	golang.org/x/net v0.22.0
 )
 
 require (
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/gnostic v0.7.0 // indirect
+	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
+	google.golang.org/grpc v1.62.1 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )

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,7 +60,7 @@ func (h *httpHandler) Options() server.HandlerOptions {
 	return h.opts
 }
 
-func (h *httpServer) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error) {
+func (h *Server) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, error) {
 	if handler == nil {
 		return nil, fmt.Errorf("invalid handler specified: %v", handler)
 	}
@@ -115,10 +115,16 @@ func (h *httpServer) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, err
 		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["Content-Length"] = fmt.Sprintf("%d", r.ContentLength)
+		md["Transfer-Encoding"] = 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
@@ -333,13 +339,7 @@ func (h *httpServer) HTTPHandlerFunc(handler interface{}) (http.HandlerFunc, err
 	}, nil
 }
 
-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)
-		return
-	}
-
+func (h *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	ct := DefaultContentType
 	if htype := r.Header.Get(metadata.HeaderContentType); htype != "" {
 		ct = htype
@@ -355,19 +355,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)
 
-	if r.Body != nil {
-		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)
@@ -424,6 +427,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
 	}
@@ -440,6 +448,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)
@@ -481,10 +493,12 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	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
+	if len(matches) > 0 {
+		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{

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,38 @@
-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"
+	"compress/gzip"
 	"context"
+	"io"
+	"strings"
+	"sync"
 
-	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/logger"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/meter"
 )
 
+const (
+	contentEncodingHeader = "Content-Encoding"
+	acceptEncodingHeader  = "Accept-Encoding"
+)
+
+var gzipPool = sync.Pool{
+	New: func() interface{} {
+		return gzip.NewWriter(nil)
+	},
+}
+
+var bufPool = sync.Pool{
+	New: func() interface{} {
+		return bytes.NewBuffer(nil)
+	},
+}
+
 // guard to fail early
-var _ MeterServiceServer = (*Handler)(nil)
+var _ MeterServiceServer = &Handler{}
 
 type Handler struct {
 	opts Options
@@ -56,12 +78,46 @@ func NewHandler(opts ...Option) *Handler {
 }
 
 func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.Frame) error {
-	buf := bytes.NewBuffer(nil)
-	if err := h.opts.Meter.Write(buf, h.opts.MeterOptions...); err != nil {
-		return errors.InternalServerError(h.opts.Name, "%v", err)
+	log, ok := logger.FromContext(ctx)
+	if !ok {
+		log = logger.DefaultLogger
+	}
+
+	buf := bufPool.Get().(*bytes.Buffer)
+	defer bufPool.Put(buf)
+	buf.Reset()
+
+	w := io.Writer(buf)
+
+	if md, ok := metadata.FromIncomingContext(ctx); gzipAccepted(md) && ok {
+		md.Set(contentEncodingHeader, "gzip")
+		gz := gzipPool.Get().(*gzip.Writer)
+		defer gzipPool.Put(gz)
+
+		gz.Reset(w)
+		defer gz.Close()
+
+		w = gz
+	}
+
+	if err := h.opts.Meter.Write(w, h.opts.MeterOptions...); err != nil {
+		log.Error(ctx, "http/meter write failed", err)
+		return nil
 	}
 
 	rsp.Data = buf.Bytes()
 
 	return nil
 }
+
+// gzipAccepted returns whether the client will accept gzip-encoded content.
+func gzipAccepted(md metadata.Metadata) bool {
+	a, ok := md.Get(acceptEncodingHeader)
+	if !ok {
+		return false
+	}
+	if strings.Contains(a, "gzip") {
+		return true
+	}
+	return false
+}

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/pprof/pprof.go

@@ -0,0 +1,46 @@
+package pprof
+
+import (
+	"expvar"
+	"net/http"
+	"net/http/pprof"
+	"path"
+	"strings"
+)
+
+func NewHandler(prefixPath string, initFuncs ...func()) http.HandlerFunc {
+	for _, fn := range initFuncs {
+		fn()
+	}
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case strings.EqualFold(r.RequestURI, prefixPath) && r.RequestURI[len(r.RequestURI)-1] != '/':
+			http.Redirect(w, r, r.RequestURI+"/", http.StatusMovedPermanently)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "cmdline")):
+			pprof.Cmdline(w, r)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "profile")):
+			pprof.Profile(w, r)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "symbol")):
+			pprof.Symbol(w, r)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "trace")):
+			pprof.Trace(w, r)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "goroutine")):
+			pprof.Handler("goroutine").ServeHTTP(w, r)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "threadcreate")):
+			pprof.Handler("threadcreate").ServeHTTP(w, r)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "mutex")):
+			pprof.Handler("mutex").ServeHTTP(w, r)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "heap")):
+			pprof.Handler("heap").ServeHTTP(w, r)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "block")):
+			pprof.Handler("block").ServeHTTP(w, r)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "allocs")):
+			pprof.Handler("allocs").ServeHTTP(w, r)
+		case strings.HasPrefix(r.RequestURI, path.Join(prefixPath, "vars")):
+			expvar.Handler().ServeHTTP(w, r)
+		default:
+			pprof.Index(w, r)
+		}
+	}
+}

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"

handler/swagger/swagger.go

@@ -0,0 +1,61 @@
+package swagger
+
+import (
+	"io/fs"
+	"net/http"
+
+	yamlcodec "go.unistack.org/micro-codec-yaml/v3"
+	rutil "go.unistack.org/micro/v3/util/reflect"
+)
+
+// Handler append to generated swagger data from dst map[string]interface{}
+var Handler = func(dst map[string]interface{}, fsys fs.FS) http.HandlerFunc {
+	c := yamlcodec.NewCodec()
+	return func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodGet {
+			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
+		}
+
+		if dst == nil {
+			w.WriteHeader(http.StatusOK)
+			_, _ = w.Write(buf)
+			return
+		}
+
+		var src interface{}
+
+		if err = c.Unmarshal(buf, src); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			_, _ = w.Write([]byte(err.Error()))
+			return
+		}
+
+		if err = rutil.Merge(src, dst); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			_, _ = w.Write([]byte(err.Error()))
+			return
+		}
+
+		if buf, err = c.Marshal(src); 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/v4"
+package http // import "go.unistack.org/micro-server-http/v3"
 
 import (
 	"context"
@@ -14,18 +14,18 @@ import (
 	"sync"
 	"time"
 
-	"go.unistack.org/micro/v4/broker"
-	"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 = &httpServer{}
+var _ server.Server = (*Server)(nil)
 
-type httpServer struct {
+type Server struct {
 	hd           server.Handler
 	rsvc         *register.Service
 	handlers     map[string]server.Handler
@@ -35,12 +35,13 @@ type httpServer struct {
 	pathHandlers *rhttp.Trie
 	opts         server.Options
 	registerRPC  bool
+	registerCORS bool
 	sync.RWMutex
 	registered bool
 	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 +54,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
 	}
@@ -84,6 +85,10 @@ func (h *httpServer) Init(opts ...server.Option) error {
 		h.registerRPC = v
 	}
 
+	if v, ok := h.opts.Context.Value(registerCORSHandlerKey{}).(bool); ok {
+		h.registerCORS = v
+	}
+
 	if phs, ok := h.opts.Context.Value(pathHandlerKey{}).(*pathHandlerVal); ok && phs.h != nil {
 		for pm, ps := range phs.h {
 			for pp, ph := range ps {
@@ -130,7 +135,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 +164,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))
@@ -223,13 +228,24 @@ func (h *httpServer) NewHandler(handler interface{}, opts ...server.HandlerOptio
 		pth := &patHandler{mtype: mtype, name: name, rcvr: rcvr}
 		hdlr.name = name
 
-		if err := hdlr.handlers.Insert([]string{md["Method"]}, md["Path"], pth); err != nil {
-			h.opts.Logger.Errorf(h.opts.Context, "cant add handler for %s %s", md["Method"], md["Path"])
+		methods := []string{md["Method"]}
+		if h.registerCORS {
+			logger.Infof(h.opts.Context, "register cors handler for http.MethodOptions %s", md["Path"])
+			methods = append(methods, http.MethodOptions)
+		}
+		if err := hdlr.handlers.Insert(methods, md["Path"], pth); err != nil {
+			logger.Errorf(h.opts.Context, "cant add handler for %v %s", methods, md["Path"])
 		}
 
+		logger.Infof(h.opts.Context, fmt.Sprintf("try to detect rpc handlers usage %v", h.registerRPC))
 		if h.registerRPC {
-			h.opts.Logger.Infof(h.opts.Context, "register rpc handler for http.MethodPost %s /%s", hn, hn)
-			if err := hdlr.handlers.Insert([]string{http.MethodPost}, "/"+hn, pth); err != nil {
+			methods := []string{http.MethodPost}
+			if h.registerCORS {
+				logger.Infof(h.opts.Context, "register cors handler for %v %s", methods, "/"+hn)
+				methods = append(methods, http.MethodOptions)
+			}
+
+			if err := hdlr.handlers.Insert(methods, "/"+hn, pth); err != nil {
 				h.opts.Logger.Errorf(h.opts.Context, "cant add rpc handler for http.MethodPost %s /%s", hn, hn)
 			}
 		}
@@ -288,11 +304,11 @@ 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) NewSubscriber(topic string, handler interface{}, opts ...server.SubscriberOption) server.Subscriber {
 	return newSubscriber(topic, handler, opts...)
 }
 
-func (h *httpServer) Subscribe(sb server.Subscriber) error {
+func (h *Server) Subscribe(sb server.Subscriber) error {
 	sub, ok := sb.(*httpSubscriber)
 	if !ok {
 		return fmt.Errorf("invalid subscriber: expected *httpSubscriber")
@@ -317,7 +333,7 @@ func (h *httpServer) Subscribe(sb server.Subscriber) error {
 	return nil
 }
 
-func (h *httpServer) Register() error {
+func (h *Server) Register() error {
 	var eps []*register.Endpoint
 	h.RLock()
 	for _, hdlr := range h.handlers {
@@ -378,6 +394,17 @@ func (h *httpServer) Register() error {
 	}
 
 	h.Lock()
+
+	h.registered = true
+	h.rsvc = service
+	h.Unlock()
+
+	return nil
+}
+
+func (h *Server) subscribe() error {
+	config := h.opts
+
 	for sb := range h.subscribers {
 		handler := h.createSubHandler(sb, config)
 		var opts []broker.SubscribeOption
@@ -401,14 +428,10 @@ func (h *httpServer) Register() error {
 		h.subscribers[sb] = []broker.Subscriber{sub}
 	}
 
-	h.registered = true
-	h.rsvc = service
-	h.Unlock()
-
 	return nil
 }
 
-func (h *httpServer) Deregister() error {
+func (h *Server) Deregister() error {
 	h.RLock()
 	config := h.opts
 	h.RUnlock()
@@ -456,7 +479,7 @@ func (h *httpServer) Deregister() error {
 	return nil
 }
 
-func (h *httpServer) Start() error {
+func (h *Server) Start() error {
 	h.RLock()
 	config := h.opts
 	h.RUnlock()
@@ -494,7 +517,6 @@ func (h *httpServer) Start() error {
 	h.Unlock()
 
 	var handler http.Handler
-	var srvFunc func(net.Listener) error
 
 	// nolint: nestif
 	if h.opts.Context != nil {
@@ -539,8 +561,13 @@ func (h *httpServer) Start() error {
 		}
 	}
 
+	if err := h.subscribe(); err != nil {
+		return err
+	}
+
 	fn := handler
 
+	var hs *http.Server
 	if h.opts.Context != nil {
 		if mwf, ok := h.opts.Context.Value(middlewareKey{}).([]func(http.Handler) http.Handler); ok && len(mwf) > 0 {
 			// wrap the handler func
@@ -548,25 +575,19 @@ func (h *httpServer) Start() error {
 				fn = mwf[i-1](fn)
 			}
 		}
-		if hs, ok := h.opts.Context.Value(serverKey{}).(*http.Server); ok && hs != nil {
+		var ok bool
+		if hs, ok = h.opts.Context.Value(serverKey{}).(*http.Server); ok && hs != nil {
 			hs.Handler = fn
-			srvFunc = hs.Serve
+		} else {
+			hs = &http.Server{Handler: fn}
 		}
 	}
 
-	if srvFunc != nil {
-		go func() {
-			if cerr := srvFunc(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) {
-				h.opts.Logger.Error(h.opts.Context, cerr)
-			}
-		}()
-	} else {
-		go func() {
-			if cerr := http.Serve(ts, fn); cerr != nil && !errors.Is(cerr, net.ErrClosed) {
-				h.opts.Logger.Error(h.opts.Context, cerr)
-			}
-		}()
-	}
+	go func() {
+		if cerr := hs.Serve(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) {
+			h.opts.Logger.Error(h.opts.Context, cerr)
+		}
+	}()
 
 	go func() {
 		t := new(time.Ticker)
@@ -630,33 +651,41 @@ func (h *httpServer) Start() error {
 			config.Logger.Errorf(config.Context, "Broker disconnect error: %s", err)
 		}
 
-		ch <- ts.Close()
+		ctx, cancel := context.WithTimeout(context.Background(), h.opts.GracefulTimeout)
+		defer cancel()
+
+		err := hs.Shutdown(ctx)
+		if err != nil {
+			err = hs.Close()
+		}
+
+		ch <- err
 	}()
 
 	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),

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{}
 
-// Server provide ability to pass *http.Server
-func Server(hs *http.Server) server.Option {
+// HTTPServer provide ability to pass *http.Server
+func HTTPServer(hs *http.Server) server.Option {
 	return server.SetOption(serverKey{}, hs)
 }
 
@@ -133,6 +133,13 @@ func RegisterRPCHandler(b bool) server.Option {
 	return server.SetOption(registerRPCHandlerKey{}, b)
 }
 
+type registerCORSHandlerKey struct{}
+
+// RegisterCORSHandler registers cors endpoints with /ServiceName.ServiceEndpoint method POPTIONSOST
+func RegisterCORSHandler(b bool) server.Option {
+	return server.SetOption(registerCORSHandlerKey{}, b)
+}
+
 type handlerEndpointsKey struct{}
 
 type EndpointMetadata struct {

request.go

@@ -3,9 +3,9 @@ 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.go

@@ -7,7 +7,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"go.unistack.org/micro/v4/server"
+	"go.unistack.org/micro/v3/server"
 )
 
 type methodType struct {

subscriber.go

@@ -7,11 +7,11 @@ import (
 	"reflect"
 	"strings"
 
-	"go.unistack.org/micro/v4/broker"
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/register"
-	"go.unistack.org/micro/v4/server"
+	"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()
@@ -101,7 +101,7 @@ func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOptio
 	}
 }
 
-func (s *httpServer) createSubHandler(sb *httpSubscriber, opts server.Options) broker.Handler {
+func (s *Server) createSubHandler(sb *httpSubscriber, opts server.Options) broker.Handler {
 	return func(p broker.Event) error {
 		msg := p.Message()
 		ct := msg.Header["Content-Type"]
@@ -111,7 +111,6 @@ func (s *httpServer) createSubHandler(sb *httpSubscriber, opts server.Options) b
 		}
 
 		hdr := metadata.Copy(msg.Header)
-		delete(hdr, "Content-Type")
 		ctx := metadata.NewIncomingContext(context.Background(), hdr)
 
 		results := make(chan error, len(sb.handlers))

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) {