Merge pull request #90 from unistack-org/master

merge master

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Maintain dependencies for Golang
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/renovate.json

@@ -1,20 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ],
-  "postUpdateOptions": ["gomodTidy"],
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true
-    },
-    {
-      "groupName": "all deps",
-      "separateMajorMinor": true,
-      "groupSlug": "all",
-      "packagePatterns": [
-        "*"
-      ]
-    }
-  ]
-}

.github/stale.sh

@@ -1,13 +0,0 @@
-#!/bin/bash -ex
-
-export PATH=$PATH:$(pwd)/bin
-export GO111MODULE=on
-export GOBIN=$(pwd)/bin
-
-#go get github.com/rvflash/goup@v0.4.1
-
-#goup -v ./...
-#go get github.com/psampaz/go-mod-outdated@v0.6.0
-go list -u -m -mod=mod -json all | go-mod-outdated -update -direct -ci || true
-
-#go list -u -m -json all | go-mod-outdated -update

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,78 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "codeql"
+
+on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+  push:
+    branches: [ master, v3 ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master, v3 ]
+  schedule:
+    - cron: '34 1 * * 0'
+
+jobs:
+  analyze:
+    name: analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: setup
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16
+    # Initializes the CodeQL tools for scanning.
+    - name: init
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: analyze
+      uses: github/codeql-action/analyze@v1

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,31 @@
+name: "prautomerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.1.1
+        with:
+          github-token: "${{ secrets.TOKEN }}"
+      - name: approve
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}
+      - name: merge
+        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.golangci.yml

@@ -0,0 +1,44 @@
+run:
+  concurrency: 4
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true
+
+linters-settings:
+  govet:
+    check-shadowing: true
+    enable:
+      - fieldalignment
+
+linters:
+  enable:
+    - govet
+    - deadcode
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - bodyclose
+    - gci
+    - goconst
+    - gocritic
+    - gosimple
+    - gofmt
+    - gofumpt
+    - goimports
+    - golint
+    - gosec
+    - makezero
+    - misspell
+    - nakedret
+    - nestif
+    - nilerr
+    - noctx
+    - prealloc
+    - unconvert
+    - unparam
+  disable-all: false

go.mod

@@ -1,10 +1,8 @@
-module github.com/unistack-org/micro-server-http/v3
+module go.unistack.org/micro-server-http/v3
 
 go 1.16
 
 require (
-	github.com/unistack-org/micro/v3 v3.3.13
-	golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d
+	go.unistack.org/micro/v3 v3.8.18
+	golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba
 )
-
-//replace github.com/unistack-org/micro/v3 => ../../micro

go.sum

@@ -1,21 +1,36 @@
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
-github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+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/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/unistack-org/micro/v3 v3.3.13 h1:y4bDDkbwnjgOckrhFkC6D/o42tr75X33UbrB+Ko0M68=
-github.com/unistack-org/micro/v3 v3.3.13/go.mod h1:98hNcMXp/WyWJwLwCuwrhN1Jm7aCWaRNsMfRjK8Fq+Y=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d h1:BgJvlyh+UqCUaPlscHJ+PN8GcpfrFdr7NHjd1JL0+Gs=
-golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
+github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+go.unistack.org/micro-proto/v3 v3.1.1 h1:78qRmltwGek5kSQ9tNmDZ9TCRvZM7YDIOgzriKvabjA=
+go.unistack.org/micro-proto/v3 v3.1.1/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8=
+go.unistack.org/micro/v3 v3.8.18 h1:+7UiB46D9EoCgGN+JfhoWCvn36yvtplh6fmA1+ZiqEE=
+go.unistack.org/micro/v3 v3.8.18/go.mod h1:ueDiiOe3fRW9kL0Fbh4OWw/R/SQhMd6vUcAV/WHYRWw=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220121175114-2ed6ce1e1725 h1:YtkHkox9J+kfAdNdlvEXp2SkLMQSkSjWFP4sjgxEPa8=
+golang.org/x/net v0.0.0-20220121175114-2ed6ce1e1725/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba h1:6u6sik+bn/y7vILcYkK3iwTBWN7WtBvB0+SZswQnbf8=
+golang.org/x/net v0.0.0-20220121210141-e204ce36a2ba/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+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/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

handler.go

@@ -9,55 +9,41 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/unistack-org/micro/v3/codec"
-	"github.com/unistack-org/micro/v3/errors"
-	"github.com/unistack-org/micro/v3/logger"
-	"github.com/unistack-org/micro/v3/metadata"
-	"github.com/unistack-org/micro/v3/register"
-	"github.com/unistack-org/micro/v3/server"
-	rflutil "github.com/unistack-org/micro/v3/util/reflect"
-	rutil "github.com/unistack-org/micro/v3/util/router"
+	"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 (
 	DefaultErrorHandler = func(ctx context.Context, s server.Handler, w http.ResponseWriter, r *http.Request, err error, status int) {
 		w.WriteHeader(status)
-		w.Write([]byte(err.Error()))
+		if _, cerr := w.Write([]byte(err.Error())); cerr != nil {
+			logger.DefaultLogger.Errorf(ctx, "write failed: %v", cerr)
+		}
 	}
 	DefaultContentType = "application/json"
 )
 
 type patHandler struct {
-	pat   rutil.Pattern
 	mtype *methodType
-	name  string
 	rcvr  reflect.Value
+	name  string
 }
 
 type httpHandler struct {
-	name     string
 	opts     server.HandlerOptions
-	sopts    server.Options
-	eps      []*register.Endpoint
 	hd       interface{}
-	handlers map[string][]patHandler
+	handlers *rhttp.Trie
+	name     string
+	eps      []*register.Endpoint
+	sopts    server.Options
 	sync.RWMutex
 }
 
-func (h *httpHandler) newCodec(ct string) (codec.Codec, error) {
-	h.RLock()
-	defer h.RUnlock()
-
-	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
-		ct = ct[:idx]
-	}
-
-	if cf, ok := h.sopts.Codecs[ct]; ok {
-		return cf, nil
-	}
-	return nil, codec.ErrUnknownContentType
-}
-
 func (h *httpHandler) Name() string {
 	return h.name
 }
@@ -75,33 +61,40 @@ func (h *httpHandler) Options() server.HandlerOptions {
 }
 
 func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-
-	for exp, ph := range h.pathHandlers {
-		if exp.MatchString(r.URL.String()) {
-			ph(w, r)
-			return
-		}
+	// check for http.HandlerFunc handlers
+	if ph, _, ok := h.pathHandlers.Search(r.Method, r.URL.Path); ok {
+		ph.(http.HandlerFunc)(w, r)
+		return
 	}
 
 	ct := DefaultContentType
-	if htype := r.Header.Get("Content-Type"); htype != "" {
+	if htype := r.Header.Get(metadata.HeaderContentType); htype != "" {
 		ct = htype
 	}
 
-	if idx := strings.Index(ct, ":"); idx > 0 {
-		if ph, ok := h.contentTypeHandlers[ct[:idx]]; ok {
-			ph(w, r)
-			return
-		}
+	ctx := context.WithValue(r.Context(), rspCodeKey{}, &rspCodeVal{})
+	md, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
+		md = metadata.New(len(r.Header) + 8)
 	}
-
-	ctx := metadata.NewContext(r.Context(), nil)
+	for k, v := range r.Header {
+		md.Set(k, strings.Join(v, ", "))
+	}
+	md.Set("RemoteAddr", r.RemoteAddr)
+	md.Set("Method", r.Method)
+	md.Set("URL", r.URL.String())
+	md.Set("Proto", r.Proto)
+	md.Set("ContentLength", fmt.Sprintf("%d", r.ContentLength))
+	md.Set("TransferEncoding", strings.Join(r.TransferEncoding, ","))
+	md.Set("Host", r.Host)
+	md.Set("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 contains /"), http.StatusBadRequest)
+		h.errorHandler(ctx, nil, w, r, fmt.Errorf("path must starts with /"), http.StatusBadRequest)
 		return
 	}
 
@@ -111,59 +104,41 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	components := strings.Split(path[1:], "/")
-	l := len(components)
-	var verb string
-	idx := strings.LastIndex(components[l-1], ":")
-	if idx == 0 {
-		h.errorHandler(ctx, nil, w, r, fmt.Errorf("not found"), http.StatusNotFound)
-		return
-	}
-	if idx > 0 {
-		c := components[l-1]
-		components[l-1], verb = c[:idx], c[idx+1:]
-	}
-
 	matches := make(map[string]interface{})
 
 	var match bool
-	var hldr patHandler
+	var hldr *patHandler
 	var handler *httpHandler
-	for _, hpat := range h.handlers {
-		handlertmp := hpat.(*httpHandler)
-		for _, hldrtmp := range handlertmp.handlers[r.Method] {
-			mp, err := hldrtmp.pat.Match(components, verb)
-			if err == nil {
-				match = true
-				for k, v := range mp {
-					matches[k] = v
-				}
-				hldr = hldrtmp
-				handler = handlertmp
-				break
+
+	for _, shdlr := range h.handlers {
+		hdlr := shdlr.(*httpHandler)
+		fh, mp, ok := hdlr.handlers.Search(r.Method, path)
+		if ok {
+			match = true
+			for k, v := range mp {
+				matches[k] = v
 			}
+			hldr = fh.(*patHandler)
+			handler = hdlr
+			break
 		}
 	}
 
-	if !match {
+	if !match && h.hd != nil {
+		if hdlr, ok := h.hd.Handler().(http.Handler); ok {
+			hdlr.ServeHTTP(w, r)
+			return
+		}
+	} else if !match {
 		h.errorHandler(ctx, nil, w, r, fmt.Errorf("not matching route found"), http.StatusNotFound)
 		return
 	}
 
-	md, ok := metadata.FromIncomingContext(ctx)
-	if !ok {
-		md = metadata.New(0)
-	}
-
-	for k, v := range r.Header {
-		md.Set(k, strings.Join(v, ", "))
-	}
-
 	// get fields from url values
 	if len(r.URL.RawQuery) > 0 {
-		umd, err := rflutil.URLMap(r.URL.RawQuery)
-		if err != nil {
-			h.errorHandler(ctx, handler, w, r, err, http.StatusBadRequest)
+		umd, cerr := rflutil.URLMap(r.URL.RawQuery)
+		if cerr != nil {
+			h.errorHandler(ctx, handler, w, r, cerr, http.StatusBadRequest)
 			return
 		}
 		for k, v := range umd {
@@ -190,51 +165,54 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	replyv = reflect.New(hldr.mtype.ReplyType.Elem())
 
 	function := hldr.mtype.method.Func
-	//function := hldr.rcvr
 	var returnValues []reflect.Value
 
-	if err = cf.ReadBody(r.Body, argv.Interface()); err != nil && err != io.EOF {
+	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
 	}
 
-	b, err := cf.Marshal(argv.Interface())
-	if 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),
-		body:        b,
+		body:        buf,
 		payload:     argv.Interface(),
+		header:      md,
 	}
 
-	var scode int
 	// define the handler func
 	fn := func(fctx context.Context, req server.Request, rsp interface{}) (err error) {
-		fctx = context.WithValue(fctx, rspCodeKey{}, &rspCodeVal{})
-		fctx = metadata.NewIncomingContext(fctx, md)
 		returnValues = function.Call([]reflect.Value{hldr.rcvr, hldr.mtype.prepareContext(fctx), reflect.ValueOf(argv.Interface()), reflect.ValueOf(rsp)})
 
-		scode = GetRspCode(fctx)
 		// The return value for the method is an error.
 		if rerr := returnValues[0].Interface(); rerr != nil {
 			err = rerr.(error)
 		}
 
-		if md, ok := metadata.FromOutgoingContext(fctx); ok {
-			metadata.SetOutgoingContext(ctx, md)
+		md, ok := metadata.FromOutgoingContext(ctx)
+		if !ok {
+			md = metadata.New(0)
 		}
+		if nmd, ok := metadata.FromOutgoingContext(fctx); ok {
+			for k, v := range nmd {
+				md.Set(k, v)
+			}
+		}
+		metadata.SetOutgoingContext(ctx, md)
 
 		return err
 	}
@@ -250,38 +228,50 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			h.errorHandler(ctx, handler, w, r, err, http.StatusInternalServerError)
 			return
 		}
+		ct = DefaultContentType
 	}
 
-	if appErr := fn(ctx, hr, replyv.Interface()); appErr != nil {
-		switch verr := appErr.(type) {
-		case *errors.Error:
-			scode = int(verr.Code)
-			b, err = cf.Marshal(verr)
-		case *Error:
-			b, err = cf.Marshal(verr.err)
-		default:
-			b, err = cf.Marshal(appErr)
-		}
-	} else {
-		b, err = cf.Marshal(replyv.Interface())
-	}
-	if err != nil && handler.sopts.Logger.V(logger.ErrorLevel) {
-		handler.sopts.Logger.Errorf(handler.sopts.Context, "handler err: %v", err)
-		return
-	}
+	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)
 		}
 	}
-
-	w.Header().Set("content-Type", ct)
-	if scode != 0 {
-		w.WriteHeader(scode)
-	} else {
-		//handler.sopts.Logger.Warn(handler.sopts.Context, "response code not set in handler via SetRspCode(ctx, http.StatusXXX)")
-		w.WriteHeader(200)
+	if 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
+		}
+	}
+
+	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)
 	}
-	w.Write(b)
 }

http.go

@@ -1,5 +1,5 @@
 // Package http implements a go-micro.Server
-package http
+package http // import "go.unistack.org/micro-server-http/v3"
 
 import (
 	"context"
@@ -8,47 +8,45 @@ import (
 	"net"
 	"net/http"
 	"reflect"
-	"regexp"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/codec"
-	"github.com/unistack-org/micro/v3/logger"
-	"github.com/unistack-org/micro/v3/register"
-	"github.com/unistack-org/micro/v3/server"
-	rutil "github.com/unistack-org/micro/v3/util/router"
+	"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{}
+
 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
+	registerRPC  bool
 	sync.RWMutex
-	opts        server.Options
-	handlers    map[string]server.Handler
-	hd          server.Handler
-	exit        chan chan error
-	subscribers map[*httpSubscriber][]broker.Subscriber
-	// used for first registration
 	registered bool
-	// register service instance
-	rsvc                *register.Service
-	init                bool
-	errorHandler        func(context.Context, server.Handler, http.ResponseWriter, *http.Request, error, int)
-	pathHandlers        map[*regexp.Regexp]http.HandlerFunc
-	contentTypeHandlers map[string]http.HandlerFunc
+	init       bool
 }
 
 func (h *httpServer) newCodec(ct string) (codec.Codec, error) {
-	h.RLock()
-	defer h.RUnlock()
-
 	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
 		ct = ct[:idx]
 	}
-
-	if cf, ok := h.opts.Codecs[ct]; ok {
+	h.RLock()
+	cf, ok := h.opts.Codecs[ct]
+	h.RUnlock()
+	if ok {
 		return cf, nil
 	}
 	return nil, codec.ErrUnknownContentType
@@ -67,7 +65,6 @@ func (h *httpServer) Init(opts ...server.Option) error {
 	}
 
 	h.Lock()
-	defer h.Unlock()
 
 	for _, o := range opts {
 		o(&h.opts)
@@ -79,123 +76,114 @@ func (h *httpServer) Init(opts ...server.Option) error {
 		h.handlers = make(map[string]server.Handler)
 	}
 	if h.pathHandlers == nil {
-		h.pathHandlers = make(map[*regexp.Regexp]http.HandlerFunc)
-	}
-	if h.contentTypeHandlers == nil {
-		h.contentTypeHandlers = make(map[string]http.HandlerFunc)
-	}
-	if phs, ok := h.opts.Context.Value(pathHandlerKey{}).(*pathHandlerVal); ok && phs.h != nil {
-		for pp, ph := range phs.h {
-			exp, err := regexp.Compile(pp)
-			if err != nil {
-				return err
-			}
-			h.pathHandlers[exp] = ph
-		}
-	}
-	if phs, ok := h.opts.Context.Value(contentTypeHandlerKey{}).(*contentTypeHandlerVal); ok && phs.h != nil {
-		for pp, ph := range phs.h {
-			h.contentTypeHandlers[pp] = ph
-		}
+		h.pathHandlers = rhttp.NewTrie()
 	}
 
+	if v, ok := h.opts.Context.Value(registerRPCHandlerKey{}).(bool); ok {
+		h.registerRPC = 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 {
+				if err := h.pathHandlers.Insert([]string{pm}, pp, ph); err != nil {
+					h.Unlock()
+					return err
+				}
+			}
+		}
+	}
+	h.Unlock()
+
+	h.RLock()
 	if err := h.opts.Register.Init(); err != nil {
+		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
 	}
 	if err := h.opts.Auth.Init(); err != nil {
+		h.RUnlock()
 		return err
 	}
 	if err := h.opts.Logger.Init(); err != nil {
+		h.RUnlock()
 		return err
 	}
 	if err := h.opts.Meter.Init(); err != nil {
+		h.RUnlock()
 		return err
 	}
 	if err := h.opts.Transport.Init(); err != nil {
+		h.RUnlock()
 		return err
 	}
+	h.RUnlock()
 
+	h.Lock()
 	h.init = true
+	h.Unlock()
 
 	return nil
 }
 
 func (h *httpServer) Handle(handler server.Handler) error {
-	h.Lock()
-	if hdlr, ok := handler.(*httpHandler); ok {
-		if _, ok := hdlr.hd.(http.Handler); ok {
-			h.hd = handler
-		} else {
-			if h.handlers == nil {
-				h.handlers = make(map[string]server.Handler)
-			}
-			h.handlers[handler.Name()] = handler
-		}
-	} else {
+	// passed unknown handler
+	hdlr, ok := handler.(*httpHandler)
+	if !ok {
+		h.Lock()
 		h.hd = handler
+		h.Unlock()
+		return nil
 	}
+
+	// passed http.Handler like some muxer
+	if _, ok := hdlr.hd.(http.Handler); ok {
+		h.Lock()
+		h.hd = handler
+		h.Unlock()
+		return nil
+	}
+
+	// passed micro compat handler
+	h.Lock()
+	if h.handlers == nil {
+		h.handlers = make(map[string]server.Handler)
+	}
+	h.handlers[handler.Name()] = handler
 	h.Unlock()
+
 	return nil
 }
 
 func (h *httpServer) NewHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
 	options := server.NewHandlerOptions(opts...)
 
-	var eps []*register.Endpoint
-
-	if !options.Internal {
-		for name, metadata := range options.Metadata {
-			eps = append(eps, &register.Endpoint{
-				Name:     name,
-				Metadata: metadata,
-			})
-		}
+	eps := make([]*register.Endpoint, 0, len(options.Metadata))
+	for name, metadata := range options.Metadata {
+		eps = append(eps, &register.Endpoint{
+			Name:     name,
+			Metadata: metadata,
+		})
 	}
 
 	hdlr := &httpHandler{
-		eps:   eps,
-		hd:    handler,
-		opts:  options,
-		sopts: h.opts,
+		eps:      eps,
+		hd:       handler,
+		opts:     options,
+		sopts:    h.opts,
+		handlers: rhttp.NewTrie(),
 	}
 
 	tp := reflect.TypeOf(handler)
 
-	/*
-	   for m := 0; m < tp.NumMethod(); m++ {
-	   	    if e := register.ExtractEndpoint(tp.Method(m)); e != nil {
-	   	    	      e.Name = name + "." + e.Name
-
-	   	    	            for k, v := range options.Metadata[e.Name] {
-	   	    	            	        e.Metadata[k] = v
-	   	    	            	              }
-
-	   	    	            	                    eps = append(eps, e)
-	   	    	            	                        }
-	   	    	            	                          }
-
-	*/
-
-	hdlr.handlers = make(map[string][]patHandler)
 	for hn, md := range options.Metadata {
-		cmp, err := rutil.Parse(md["Path"])
-		if err != nil && h.opts.Logger.V(logger.ErrorLevel) {
-			h.opts.Logger.Errorf(h.opts.Context, "parsing path pattern err: %v", err)
-			continue
-		}
-		tpl := cmp.Compile()
-		pat, err := rutil.NewPattern(tpl.Version, tpl.OpCodes, tpl.Pool, tpl.Verb)
-		if err != nil && h.opts.Logger.V(logger.ErrorLevel) {
-			h.opts.Logger.Errorf(h.opts.Context, "creating new pattern err: %v", err)
-			continue
-		}
-
 		var method reflect.Method
 		mname := hn[strings.Index(hn, ".")+1:]
 		for m := 0; m < tp.NumMethod(); m++ {
@@ -217,15 +205,25 @@ func (h *httpServer) NewHandler(handler interface{}, opts ...server.HandlerOptio
 			h.opts.Logger.Errorf(h.opts.Context, "%v", err)
 			continue
 		} else if mtype == nil {
+			h.opts.Logger.Errorf(h.opts.Context, "nil mtype for %s", mname)
 			continue
 		}
 
 		rcvr := reflect.ValueOf(handler)
 		name := reflect.Indirect(rcvr).Type().Name()
 
-		pth := patHandler{pat: pat, mtype: mtype, name: name, rcvr: rcvr}
+		pth := &patHandler{mtype: mtype, name: name, rcvr: rcvr}
 		hdlr.name = name
-		hdlr.handlers[md["Method"]] = append(hdlr.handlers[md["Method"]], pth)
+
+		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"])
+		}
+
+		if h.registerRPC {
+			if err := hdlr.handlers.Insert([]string{http.MethodPost}, "/"+hn, pth); err != nil {
+				h.opts.Logger.Errorf(h.opts.Context, "cant add handler for %s %s", md["Method"], md["Path"])
+			}
+		}
 	}
 
 	return hdlr
@@ -248,13 +246,15 @@ func (h *httpServer) Subscribe(sb server.Subscriber) error {
 		return err
 	}
 
-	h.Lock()
-	defer h.Unlock()
+	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
 }
 
@@ -284,12 +284,10 @@ func (h *httpServer) Register() error {
 	service.Endpoints = eps
 
 	h.Lock()
-	var subscriberList []*httpSubscriber
+	subscriberList := make([]*httpSubscriber, 0, len(h.subscribers))
 	for e := range h.subscribers {
 		// Only advertise non internal subscribers
-		if !e.Options().Internal {
-			subscriberList = append(subscriberList, e)
-		}
+		subscriberList = append(subscriberList, e)
 	}
 	sort.Slice(subscriberList, func(i, j int) bool {
 		return subscriberList[i].topic > subscriberList[j].topic
@@ -306,7 +304,7 @@ func (h *httpServer) Register() error {
 
 	if !registered {
 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Infof(config.Context, "Register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].Id)
+			config.Logger.Infof(config.Context, "Register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].ID)
 		}
 	}
 
@@ -321,8 +319,6 @@ func (h *httpServer) Register() error {
 	}
 
 	h.Lock()
-	defer h.Unlock()
-
 	for sb := range h.subscribers {
 		handler := h.createSubHandler(sb, config)
 		var opts []broker.SubscribeOption
@@ -339,6 +335,7 @@ func (h *httpServer) Register() error {
 
 		sub, err := config.Broker.Subscribe(subCtx, sb.Topic(), handler, opts...)
 		if err != nil {
+			h.Unlock()
 			return err
 		}
 		h.subscribers[sb] = []broker.Subscriber{sub}
@@ -346,6 +343,7 @@ func (h *httpServer) Register() error {
 
 	h.registered = true
 	h.rsvc = service
+	h.Unlock()
 
 	return nil
 }
@@ -361,7 +359,7 @@ func (h *httpServer) Deregister() error {
 	}
 
 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Infof(config.Context, "Deregistering node: %s", service.Nodes[0].Id)
+		config.Logger.Infof(config.Context, "Deregistering node: %s", service.Nodes[0].ID)
 	}
 
 	if err := server.DefaultDeregisterFunc(service, config); err != nil {
@@ -387,6 +385,7 @@ func (h *httpServer) Deregister() error {
 		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
 			}
@@ -437,6 +436,7 @@ func (h *httpServer) Start() error {
 	var handler http.Handler
 	var srvFunc func(net.Listener) error
 
+	// nolint: nestif
 	if h.opts.Context != nil {
 		if hs, ok := h.opts.Context.Value(serverKey{}).(*http.Server); ok && hs != nil {
 			if hs.Handler == nil && h.hd != nil {
@@ -450,9 +450,12 @@ func (h *httpServer) Start() error {
 		}
 	}
 
-	if handler == nil && h.hd == nil {
+	switch {
+	case handler == nil && h.hd == nil:
 		handler = h
-	} else if handler == nil && h.hd != nil {
+	case len(h.handlers) > 0 && h.hd != nil:
+		handler = h
+	case handler == nil && h.hd != nil:
 		if hdlr, ok := h.hd.Handler().(http.Handler); ok {
 			handler = hdlr
 		}
@@ -468,7 +471,7 @@ func (h *httpServer) Start() error {
 
 	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)
+			config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, err)
 		}
 	} else {
 		if err = h.Register(); err != nil {
@@ -492,9 +495,17 @@ func (h *httpServer) Start() error {
 	}
 
 	if srvFunc != nil {
-		go srvFunc(ts)
+		go func() {
+			if cerr := srvFunc(ts); cerr != nil && !strings.Contains(cerr.Error(), "use of closed network connection") {
+				h.opts.Logger.Error(h.opts.Context, cerr)
+			}
+		}()
 	} else {
-		go http.Serve(ts, fn)
+		go func() {
+			if cerr := http.Serve(ts, fn); cerr != nil && !strings.Contains(cerr.Error(), "use of closed network connection") {
+				h.opts.Logger.Error(h.opts.Context, cerr)
+			}
+		}()
 	}
 
 	go func() {
@@ -518,25 +529,26 @@ func (h *httpServer) Start() error {
 				registered := h.registered
 				h.RUnlock()
 				rerr := config.RegisterCheck(h.opts.Context)
+				// nolint: nestif
 				if rerr != nil && registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s, deregister it", config.Name, config.Id, rerr)
+						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s, deregister it", config.Name, config.ID, rerr)
 					}
 					// deregister self in case of error
 					if err := h.Deregister(); err != nil {
 						if config.Logger.V(logger.ErrorLevel) {
-							config.Logger.Errorf(config.Context, "Server %s-%s deregister error: %s", config.Name, config.Id, err)
+							config.Logger.Errorf(config.Context, "Server %s-%s deregister error: %s", config.Name, config.ID, err)
 						}
 					}
 				} else if rerr != nil && !registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.Id, rerr)
+						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, rerr)
 					}
 					continue
 				}
 				if err := h.Register(); err != nil {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(config.Context, "Server %s-%s register error: %s", config.Name, config.Id, err)
+						config.Logger.Errorf(config.Context, "Server %s-%s register error: %s", config.Name, config.ID, err)
 					}
 				}
 
@@ -549,8 +561,6 @@ func (h *httpServer) Start() error {
 			}
 		}
 
-		ch <- ts.Close()
-
 		// deregister
 		if err := h.Deregister(); err != nil {
 			config.Logger.Errorf(config.Context, "Server deregister error: %s", err)
@@ -559,6 +569,8 @@ func (h *httpServer) Start() error {
 		if err := config.Broker.Disconnect(config.Context); err != nil {
 			config.Logger.Errorf(config.Context, "Broker disconnect error: %s", err)
 		}
+
+		ch <- ts.Close()
 	}()
 
 	return nil
@@ -578,13 +590,13 @@ func (h *httpServer) Name() string {
 	return h.opts.Name
 }
 
-func NewServer(opts ...server.Option) server.Server {
+func NewServer(opts ...server.Option) *httpServer {
 	options := server.NewOptions(opts...)
 	return &httpServer{
 		opts:         options,
 		exit:         make(chan chan error),
 		subscribers:  make(map[*httpSubscriber][]broker.Subscriber),
 		errorHandler: DefaultErrorHandler,
-		pathHandlers: make(map[*regexp.Regexp]http.HandlerFunc),
+		pathHandlers: rhttp.NewTrie(),
 	}
 }

message.go

@@ -1,17 +1,17 @@
 package http
 
 import (
-	"github.com/unistack-org/micro/v3/codec"
-	"github.com/unistack-org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/metadata"
 )
 
 type httpMessage struct {
-	topic       string
 	payload     interface{}
-	contentType string
-	header      metadata.Metadata
-	body        []byte
 	codec       codec.Codec
+	header      metadata.Metadata
+	topic       string
+	contentType string
+	body        []byte
 }
 
 func (r *httpMessage) Topic() string {

options.go

@@ -5,19 +5,22 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/unistack-org/micro/v3/server"
+	"go.unistack.org/micro/v3/server"
 )
 
-type rspCodeKey struct{}
-type rspCodeVal struct {
-	code int
-}
-
 // SetError pass error to caller
 func SetError(err interface{}) error {
 	return &Error{err: err}
 }
 
+// GetError return underline error
+func GetError(err interface{}) interface{} {
+	if verr, ok := err.(*Error); ok {
+		return verr.err
+	}
+	return err
+}
+
 // Error struct holds error
 type Error struct {
 	err interface{}
@@ -28,6 +31,13 @@ func (err *Error) Error() string {
 	return fmt.Sprintf("%v", err.err)
 }
 
+type (
+	rspCodeKey struct{}
+	rspCodeVal struct {
+		code int
+	}
+)
+
 // SetRspCode saves response code in context, must be used by handler to specify http code
 func SetRspCode(ctx context.Context, code int) {
 	if rsp, ok := ctx.Value(rspCodeKey{}).(*rspCodeVal); ok {
@@ -65,42 +75,57 @@ func ErrorHandler(fn func(ctx context.Context, s server.Handler, w http.Response
 	return server.SetOption(errorHandlerKey{}, fn)
 }
 
-type pathHandlerKey struct{}
-type pathHandlerVal struct {
-	h map[string]http.HandlerFunc
-}
+type (
+	pathHandlerKey struct{}
+	pathHandlerVal struct {
+		h map[string]map[string]http.HandlerFunc
+	}
+)
 
 // PathHandler specifies http handler for path regexp
-func PathHandler(path string, h http.HandlerFunc) server.Option {
+func PathHandler(method, path string, handler http.HandlerFunc) server.Option {
 	return func(o *server.Options) {
 		if o.Context == nil {
 			o.Context = context.Background()
 		}
 		v, ok := o.Context.Value(pathHandlerKey{}).(*pathHandlerVal)
 		if !ok {
-			v = &pathHandlerVal{h: make(map[string]http.HandlerFunc)}
+			v = &pathHandlerVal{h: make(map[string]map[string]http.HandlerFunc)}
 		}
-		v.h[path] = h
+		m, ok := v.h[method]
+		if !ok {
+			m = make(map[string]http.HandlerFunc)
+			v.h[method] = m
+		}
+		m[path] = handler
 		o.Context = context.WithValue(o.Context, pathHandlerKey{}, v)
 	}
 }
 
-type contentTypeHandlerKey struct{}
-type contentTypeHandlerVal struct {
-	h map[string]http.HandlerFunc
+type registerRPCHandlerKey struct{}
+
+// RegisterRPCHandler registers compatibility endpoints with /ServiceName.ServiceEndpoint method POST
+func RegisterRPCHandler(b bool) server.Option {
+	return server.SetOption(registerRPCHandlerKey{}, b)
 }
 
-// ContentTypeHandler specifies http handler for Content-Type
-func ContentTypeHandler(ct string, h http.HandlerFunc) server.Option {
-	return func(o *server.Options) {
-		if o.Context == nil {
-			o.Context = context.Background()
-		}
-		v, ok := o.Context.Value(contentTypeHandlerKey{}).(*contentTypeHandlerVal)
-		if !ok {
-			v = &contentTypeHandlerVal{h: make(map[string]http.HandlerFunc)}
-		}
-		v.h[ct] = h
-		o.Context = context.WithValue(o.Context, contentTypeHandlerKey{}, v)
+type headerKey struct{}
+
+type handlerOptions struct {
+	headers []string
+	cookies []string
+}
+
+type FillRequestOption func(*handlerOptions)
+
+func Header(headers ...string) FillRequestOption {
+	return func(o *handlerOptions) {
+		o.headers = append(o.headers, headers...)
+	}
+}
+
+func Cookie(cookies ...string) FillRequestOption {
+	return func(o *handlerOptions) {
+		o.cookies = append(o.cookies, cookies...)
 	}
 }

request.go

@@ -3,31 +3,36 @@ package http
 import (
 	"io"
 
-	"github.com/unistack-org/micro/v3/codec"
-	"github.com/unistack-org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/server"
+)
+
+var (
+	_ server.Request = &rpcRequest{}
+	_ server.Message = &rpcMessage{}
 )
 
 type rpcRequest struct {
 	rw          io.ReadWriter
-	service     string
-	method      string
-	endpoint    string
-	target      string
-	contentType string
+	payload     interface{}
 	codec       codec.Codec
 	header      metadata.Metadata
+	method      string
+	endpoint    string
+	contentType string
+	service     string
 	body        []byte
 	stream      bool
-	payload     interface{}
 }
 
 type rpcMessage struct {
+	payload     interface{}
+	codec       codec.Codec
+	header      metadata.Metadata
 	topic       string
 	contentType string
-	payload     interface{}
-	header      metadata.Metadata
 	body        []byte
-	codec       codec.Codec
 }
 
 func (r *rpcRequest) ContentType() string {
@@ -43,7 +48,7 @@ func (r *rpcRequest) Method() string {
 }
 
 func (r *rpcRequest) Endpoint() string {
-	return r.method
+	return r.endpoint
 }
 
 func (r *rpcRequest) Codec() codec.Codec {

server.go

@@ -7,14 +7,14 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/unistack-org/micro/v3/server"
+	"go.unistack.org/micro/v3/server"
 )
 
 type methodType struct {
-	method      reflect.Method
 	ArgType     reflect.Type
 	ReplyType   reflect.Type
 	ContextType reflect.Type
+	method      reflect.Method
 	stream      bool
 }
 
@@ -62,15 +62,14 @@ func prepareEndpoint(method reflect.Method) (*methodType, error) {
 		return nil, fmt.Errorf("method %v of %v has wrong number of ins: %v", mname, mtype, mtype.NumIn())
 	}
 
-	if stream {
+	switch stream {
+	case true:
 		// check stream type
 		streamType := reflect.TypeOf((*server.Stream)(nil)).Elem()
 		if !argType.Implements(streamType) {
 			return nil, fmt.Errorf("%v argument does not implement Streamer interface: %v", mname, argType)
 		}
-	} else {
-		// if not stream check the replyType
-
+	default:
 		// First arg need not be a pointer.
 		if !isExportedOrBuiltinType(argType) {
 			return nil, fmt.Errorf("%v argument type not exported: %v", mname, argType)

subscriber.go

@@ -7,23 +7,19 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/codec"
-	"github.com/unistack-org/micro/v3/metadata"
-	"github.com/unistack-org/micro/v3/register"
-	"github.com/unistack-org/micro/v3/server"
-)
-
-const (
-	subSig = "func(context.Context, interface{}) error"
+	"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 {
-	method  reflect.Value
 	reqType reflect.Type
 	ctxType reflect.Type
+	method  reflect.Value
 }
 
 type httpSubscriber struct {
@@ -116,7 +112,7 @@ func (s *httpServer) createSubHandler(sb *httpSubscriber, opts server.Options) b
 
 		hdr := metadata.Copy(msg.Header)
 		delete(hdr, "Content-Type")
-		ctx := metadata.NewContext(context.Background(), hdr)
+		ctx := metadata.NewIncomingContext(context.Background(), hdr)
 
 		results := make(chan error, len(sb.handlers))
 

util.go

@@ -0,0 +1,55 @@
+package http
+
+import (
+	"context"
+	"net/http"
+	"strings"
+
+	"go.unistack.org/micro/v3/metadata"
+	rutil "go.unistack.org/micro/v3/util/reflect"
+)
+
+func FillRequest(ctx context.Context, req interface{}, opts ...FillRequestOption) error {
+	var err error
+	options := handlerOptions{}
+	for _, o := range opts {
+		o(&options)
+	}
+	md, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
+		return nil
+	}
+
+	for idx := 0; idx < len(options.headers)/2; idx += 2 {
+		k := http.CanonicalHeaderKey(options.headers[idx])
+		v, ok := md[k]
+		if !ok {
+			continue
+		}
+		if err = rutil.SetFieldByPath(req, v, k); err != nil {
+			return err
+		}
+	}
+
+	cookies := strings.Split(md["Cookie"], ";")
+	cmd := make(map[string]string, len(cookies))
+	for _, cookie := range cookies {
+		kv := strings.Split(cookie, "=")
+		if len(kv) != 2 {
+			continue
+		}
+		cmd[strings.TrimSpace(kv[0])] = strings.TrimSpace(kv[1])
+	}
+	for idx := 0; idx < len(options.cookies)/2; idx += 2 {
+		k := http.CanonicalHeaderKey(options.cookies[idx])
+		v, ok := cmd[k]
+		if !ok {
+			continue
+		}
+		if err = rutil.SetFieldByPath(req, v, k); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

util_test.go

@@ -0,0 +1,56 @@
+package http
+
+import (
+	"bytes"
+	"context"
+	"net/http"
+	"strings"
+	"testing"
+
+	"go.unistack.org/micro/v3/metadata"
+)
+
+func TestFillrequest(t *testing.T) {
+	md := metadata.New(1)
+	md.Set("ClientID", "xxx")
+	type request struct {
+		Token    string
+		ClientID string
+	}
+	ctx := context.Background()
+	hreq, _ := http.NewRequestWithContext(ctx, http.MethodGet, "/v1", nil)
+	cookie1 := &http.Cookie{Name: "Token", Value: "zzz"}
+	cookie2 := &http.Cookie{Name: "Token", Value: "zzz"}
+	hreq.AddCookie(cookie1)
+	hreq.AddCookie(cookie2)
+
+	buf := bytes.NewBuffer(nil)
+	_ = hreq.Write(buf)
+	var cookie string
+	var line string
+	var err error
+	for {
+		line, err = buf.ReadString('\n')
+		if err != nil {
+			break
+		}
+		if strings.Contains(line, "Cookie") {
+			cookie = strings.TrimSpace(strings.Split(line, ":")[1])
+			break
+		}
+	}
+
+	md.Set("Cookie", cookie)
+	ctx = metadata.NewIncomingContext(ctx, md)
+	req := &request{}
+
+	if err := FillRequest(ctx, req, Cookie("Token", "true"), Header("ClientID", "true")); err != nil {
+		t.Fatal(err)
+	}
+	if req.ClientID != "xxx" {
+		t.Fatalf("FillRequest error: %#+v", req)
+	}
+	if req.Token != "zzz" {
+		t.Fatalf("FillRequest error: %#+v", req)
+	}
+}